From 029de836702607a95ccb0a69a74efcea52ddc451 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 25 九月 2025 19:35:38 +0800
Subject: [PATCH] 上海对农数据接口调整2

---
 src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogApply.java |  291 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 291 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogApply.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogApply.java
new file mode 100644
index 0000000..869de10
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61DrugLogApply.java
@@ -0,0 +1,291 @@
+package com.fzzy.async.fzzy61.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fzzy.async.fzzy40.entity.Fz40DrugLogDtl;
+import com.fzzy.async.fzzy40.entity.Fz40DrugLogPeople;
+import com.fzzy.async.fzzy40.entity.Fz40DrugLogWay;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐔忚捀澶囨涓昏〃淇℃伅
+ *
+ * @Author:YAN
+ */
+@Entity
+@Data
+@Table(name = "D_DRUG_LOG_APPLY")
+public class Fz61DrugLogApply implements Serializable {
+
+    public static String SORT_PROP = "xzbm";
+
+    @Id
+    @Column(name = "xzbm", length = 12)
+    @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "濉姤鏃ユ湡yyyyMMdd+4浣嶉『搴忓彿")
+    private String xzbm;
+
+    @Column(name = "DEPT_ID_", length = 21)
+    @PropertyDef(label = "搴撳尯浠g爜")
+    private String deptId;
+
+    @Column(name = "COMPANY_ID_", length = 10)
+    @PropertyDef(label = "缁勭粐缂栫爜")
+    private String companyId;
+
+    @Column(name = "tbrq")
+    @PropertyDef(label = "濉姤鏃ユ湡")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date tbrq;
+
+    @Column(name = "sqxzrq")
+    @PropertyDef(label = "鐢宠鐔忚捀鏃ユ湡")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date sqxzrq;
+
+    @Column(name = "fzr", length = 20)
+    @PropertyDef(label = "璐熻矗浜�")
+    private String fzr;
+
+    @Column(name = "fzrdh", length = 11)
+    @PropertyDef(label = "璐熻矗浜虹數璇�")
+    private String fzrdh;
+
+    @Column(name = "xcfzr", length = 20)
+    @PropertyDef(label = "鐜板満璐熻矗浜�")
+    private String xcfzr;
+
+    @Column(name = "fzrzw", length = 10)
+    @PropertyDef(label = "鐜板満璐熻矗浜鸿亴鍔�")
+    private String xcfzrzw;
+
+    @Column(name = "xcfzrdh", length = 11)
+    @PropertyDef(label = "鐜板満璐熻矗浜虹數璇�")
+    private String xcfzrdh;
+
+    @Column(name = "tbr", length = 20)
+    @PropertyDef(label = "濉〃浜�")
+    private String tbr;
+
+    @Column(name = "tbrdh", length = 11)
+    @PropertyDef(label = "濉〃浜虹數璇�")
+    private String tbrdh;
+
+    @Column(name = "sfszjjxd", length = 2)
+    @PropertyDef(label = "鏄惁璁剧疆璀︽垝绾�(涓�)", description = "鏄垨鍚�")
+    private String sfszjjxd;
+
+    @Column(name = "sfszjjxx", length = 2)
+    @PropertyDef(label = "鏄惁璁剧疆璀︽垝绾�(瑗�)", description = "鏄垨鍚�")
+    private String sfszjjxx;
+
+    @Column(name = "sfszjjxn", length = 2)
+    @PropertyDef(label = "鏄惁璁剧疆璀︽垝绾�(鍗�)", description = "鏄垨鍚�")
+    private String sfszjjxn;
+
+    @Column(name = "sfszjjxb", length = 2)
+    @PropertyDef(label = "鏄惁璁剧疆璀︽垝绾�(鍖�)", description = "鏄垨鍚�")
+    private String sfszjjxb;
+
+    @Column(name = "ssxzzystqybqk", length = 1024)
+    @PropertyDef(label = "瀹炴柦鐔忚捀浣滀笟鏃跺ぉ姘旈鎶ユ儏鍐�")
+    private String ssxzzystqybqk;
+
+    @Column(name = "xzssgcap", length = 1024)
+    @PropertyDef(label = "鐔忚捀瀹夋帓鍙婂疄鏂借繃绋�")
+    private String xzssgcap;
+
+    @Column(name = "aqfhjyjcccs", length = 1024)
+    @PropertyDef(label = "瀹夊叏闃叉姢鍙婂簲鎬ュ缃帾鏂�")
+    private String aqfhjyjcccs;
+
+    @Column(name = "xzzysx", length = 1024)
+    @PropertyDef(label = "鐔忚捀娉ㄦ剰浜嬮」")
+    private String xzzysx;
+
+    @Column(name = "DRUG_NAME_", length = 64)
+    @PropertyDef(label = "鑽墏鍚嶇О")
+    private String drugName;
+
+    @Column(name = "DRUG_TYPE_", length = 10)
+    @PropertyDef(label = "鑽墏绫诲瀷/鍨嬪彿")
+    private String drugType;
+
+    @Column(name = "yjyxqz")
+    @PropertyDef(label = "鑽墏鏈夋晥鏈熻嚦")
+    private Date yjyxqz;
+
+    @Column(name = "lqsl", precision = 20, scale = 3)
+    @PropertyDef(label = "棰嗗彇鏁伴噺", description = "鍏枻")
+    private Double lqsl;
+
+    @Column(name = "sysbjfs", length = 20)
+    @PropertyDef(label = "鏂借嵂璁惧鍙婃柟寮�")
+    private String sysbjfs;
+
+    @Column(name = "zcdd", length = 30)
+    @PropertyDef(label = "鏆傚瓨鍦扮偣")
+    private String zcdd;
+
+    @Column(name = "lqr", length = 20)
+    @PropertyDef(label = "棰嗗彇浜�")
+    private String lqr;
+
+    @Column(name = "lqsj")
+    @PropertyDef(label = "棰嗗彇鏃堕棿")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date lqsj;
+
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏇存柊鏃堕棿")
+    private Date updateTime;
+
+
+    /**
+     * 鍌ㄧ伯绮儏鏄庣粏琛�
+     */
+    @Transient
+    private List<Fz61DrugLogDtl> drugLogDtls;
+
+    @Column(name = "DTL_ID_", length = 40)
+    @PropertyDef(label = "dtlId")
+    private String dtlId;
+
+    @Column(name = "DEPOT_ID_", length = 50)
+    @PropertyDef(label = "浠撴埧/娌圭綈浠g爜")
+    private String depotId;
+
+    @Column(name = "FOOD_VARIETY_", length = 20)
+    @PropertyDef(label = "绮鍝佺")
+    private String foodVariety;
+
+    @Column(name = "FOOD_TYPE_", length = 20)
+    @PropertyDef(label = "绮鎬ц川")
+    private String foodType;
+
+    @Column(name = "FOOD_LEVEL_", length = 10)
+    @PropertyDef(label = "绮绛夌骇")
+    private String foodLevel;
+
+    @Column(name = "NUMBER_", precision = 20, scale = 3)
+    @PropertyDef(label = "绮鏁伴噺", description = "鍗曚綅锛氬惃")
+    private Double number = 0.0;
+
+    @Column(name = "PER_WET_", precision = 20, scale = 3)
+    @PropertyDef(label = "姘村垎", description = "鍗曚綅锛�%")
+    private Double perWet;
+
+    @Column(name = "PER_IMPURITY_", precision = 20, scale = 3)
+    @PropertyDef(label = "鏉傝川", description = "鍗曚綅锛�%")
+    private Double perImpurity;
+
+    @Column(name = "lw", precision = 20, scale = 3)
+    @PropertyDef(label = "绮俯")
+    private Double lw;
+
+    @Column(name = "cw", precision = 20, scale = 3)
+    @PropertyDef(label = "浠撴俯")
+    private Double cw;
+
+    @Column(name = "cnsd", precision = 20, scale = 3)
+    @PropertyDef(label = "浠撳唴婀垮害")
+    private Double cnsd;
+
+    @Column(name = "clfs", length = 1)
+    @PropertyDef(label = "瀛樼伯鏂瑰紡", description = "1锛氭暎瑁呭偍绮�;2锛氬寘瑁�;3锛氬洿鍖呮暎瀛�;9锛氬叾浠�")
+    private String clfs;
+
+    @Column(name = "rkrq")
+    @PropertyDef(label = "鍏ュ簱鏃ユ湡")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date rkrq;
+
+    @Column(name = "hc", length = 30)
+    @PropertyDef(label = "瀹宠櫕")
+    private String hc;
+
+    @Column(name = "cldjpd", length = 3)
+    @PropertyDef(label = "铏伯绛夌骇鍒ゅ畾")
+    private String cldjpd;
+
+    @Column(name = "ldtj", precision = 20, scale = 3)
+    @PropertyDef(label = "绮爢浣撶Н", description = "m鲁")
+    private Double ldtj;
+
+    @Column(name = "kjtj", precision = 20, scale = 3)
+    @PropertyDef(label = "绌洪棿浣撶Н", description = "m鲁")
+    private Double kjtj;
+
+    @Column(name = "lddwyyl", precision = 20, scale = 3)
+    @PropertyDef(label = "绮爢鍗曚綅鐢ㄨ嵂閲�")
+    private Double lddwyyl;
+
+    @Column(name = "kjdwyyl", precision = 20, scale = 3)
+    @PropertyDef(label = "绌洪棿鍗曚綅鐢ㄨ嵂閲�")
+    private Double kjdwyyl;
+
+    @Column(name = "zyyl", precision = 20, scale = 3)
+    @PropertyDef(label = "鎬荤敤鑽噺")
+    private Double zyyl;
+    /**
+     * 浠撴埧姘斿瘑鎬т互 500 Pa 鐨勫帇鍔涘崐琛� 鏈� t 鍒嗕负鍥涗釜绛夌骇銆�
+     * 1锛�   鈪犵骇锛宼鈮�300s銆�
+     * 2锛�   鈪$骇锛�120s鈮<300s銆�
+     * 3锛氣參绾э紝40s鈮<120s (骞虫埧浠�) 锛� 60s鈮� t<120s (绔嬬瓛浠撱�佹祬鍦嗕粨) 銆�
+     * 4锛氣叄绾э紝t<40s (骞虫埧浠�) 锛宼<60s (绔嬬瓛浠撱�佹祬鍦嗕粨) 銆�
+     */
+    @Column(name = "qmx", length = 1)
+    @PropertyDef(label = "姘斿瘑鎬�")
+    private String qmx;
+
+    @Column(name = "jhxzksrq")
+    @PropertyDef(label = "璁″垝鐔忚捀寮�濮嬫棩鏈�")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date jhxzksrq;
+
+    @Column(name = "jhxzjsrq")
+    @PropertyDef(label = "璁″垝鐔忚捀缁撴潫鏃ユ湡")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date jhxzjsrq;
+
+    /**
+     * 鐔忚捀澶囨鏂瑰紡
+     */
+    @Transient
+    private List<Fz61DrugLogWay> drugLogWays;
+
+    @Column(name = "Way_ID_", length = 40)
+    @PropertyDef(label = "wayId")
+    private String wayId;
+
+    @Column(name = "xznd", precision = 20, scale = 3)
+    @PropertyDef(label = "璁惧畾鐔忚捀娴撳害", description = "鍗曚綅锛歮l/m鲁")
+    private Double xznd;
+
+    @Column(name = "mbsj")
+    @PropertyDef(label = "瀵嗛棴鏃堕棿", description = "鍗曚綅锛氬ぉ")
+    private Integer mbsj;
+
+    @Column(name = "xzfs", length = 30)
+    @PropertyDef(label = "鐔忚捀鏂瑰紡")
+    private String xzfs;
+
+    @Column(name = "sqfs", length = 30)
+    @PropertyDef(label = "鏁f皵鏂瑰紡")
+    private String sqfs;
+
+    /**
+     * 鐔忚捀浣滀笟浜哄憳
+     */
+    @Transient
+    private List<Fz61DrugLogPeople> drugLogPeople;
+
+    @Transient
+    @PropertyDef(label = "闄勪欢淇℃伅")
+    private List<Fz61FileInfo> files;
+
+}

--
Gitblit v1.9.3