From e3804feab5c63af6a2c5a7939f2358772e28b5fd Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 04 十二月 2024 11:09:19 +0800
Subject: [PATCH] 调整广东1213-封仓确认单接口

---
 src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java |  103 +++++++++++++++++++++++++++++++++------------------
 1 files changed, 66 insertions(+), 37 deletions(-)

diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
index 12677c3..2a746e4 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
@@ -2,14 +2,8 @@
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.bstek.dorado.annotation.PropertyDef;
-import com.fzzy.api.entity.ApiParent;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -25,7 +19,6 @@
      */
     private static final long serialVersionUID = 760284619085936798L;
 
-
     //12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟浠g爜锛�14浠h〃绮鍏ュ簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2 浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
 
     @PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
@@ -33,6 +26,9 @@
 
     @PropertyDef(label = "璐т綅浠g爜")
     private String hwdm;
+
+    @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+    private String tyhwbm;
 
     @PropertyDef(label = "涓氬姟绫诲瀷", description = "2锛氬叆搴擄紙榛樿锛�")
     private String ywlx = "2";
@@ -47,8 +43,8 @@
     @PropertyDef(label = "鍚堝悓鍙�")
     private String hth;
 
-    @PropertyDef(label = "绮潈褰掑睘鍗曚綅浠g爜")
-    private String lqgsdwdm;
+    @PropertyDef(label = "绮潈褰掑睘鍗曚綅缁熶竴缂栫爜")
+    private String lqgsdwtybm;
 
     @PropertyDef(label = "鎵胯繍浜�")
     private String cyr;
@@ -65,17 +61,32 @@
     @PropertyDef(label = "杩愯緭宸ュ叿")
     private String ysgj;
 
-    @PropertyDef(label = "杞﹁埞鍙�")
-    private String cch;
-
     @PropertyDef(label = "杞﹁埞鍙风被鍨�")
     private String cchlx;
+
+    @PropertyDef(label = "杞﹁埞鍙�")
+    private String cch;
 
     @PropertyDef(label = "鎸傝溅鍙�")
     private String gch;
 
     @PropertyDef(label = "瑁呯伯鍦扮偣")
     private String ldd;
+
+    @PropertyDef(label = "鍞伯浜�")
+    private String slr;
+
+    @PropertyDef(label = "鍞伯浜鸿仈绯绘柟寮�")
+    private String slrlxfs;
+
+    @PropertyDef(label = "鍞伯浜鸿韩浠借瘉鍙�")
+    private String slrsfzh;
+
+    @PropertyDef(label = "鍞伯浜鸿处鍙凤紙閾惰鍗℃垨璐︽埛锛�")
+    private String slrzh;
+
+    @PropertyDef(label = "鍞伯浜哄湴鍧�")
+    private String slrdz;
 
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @PropertyDef(label = "鐧昏鏃堕棿")
@@ -100,7 +111,7 @@
     private String jjlx;
 
     @PropertyDef(label = "姣涢噸(鍏枻)")
-    private double mz;
+    private Double mz;
 
     @PropertyDef(label = "姣涢噸鐩戠鍛�")
     private String mzjby;
@@ -116,7 +127,7 @@
     private String zcy;
 
     @PropertyDef(label = "鐨噸(鍏枻)")
-    private double pz;
+    private Double pz;
 
     @PropertyDef(label = "鐨噸鐩戠鍛�")
     private String pzjby;
@@ -132,65 +143,64 @@
     private String bzw;
 
     @PropertyDef(label = "鏍囧噯鍖呭崟鍖呴噸(鍏枻)")
-    private double bzbdbz = 25;
+    private Double bzbdbz;
 
     @PropertyDef(label = "鏍囧噯鍖呬欢鏁�(浠�)")
     private Integer bzbjs;
 
     @PropertyDef(label = "璐ㄦ鎵i噺(灏忚:鍏枻)")
-    private double zjklxj;
+    private Double zjklxj;
 
     @PropertyDef(label = "鍏朵腑锛氭按鍒嗗鎵i噺(鍏枻)")
-    private double qzsfzkl;
+    private Double qzsfzkl;
 
     @PropertyDef(label = "鍏朵腑锛氭潅璐ㄥ鎵i噺(鍏枻)")
-    private double qzzzzkl;
+    private Double qzzzzkl;
 
     @PropertyDef(label = "鍏朵腑锛氫笉瀹屽杽绮掓墸閲�(鍏枻)")
-    private double qzbwslkl;
+    private Double qzbwslkl;
 
     @PropertyDef(label = "鍏朵腑锛氫簰娣锋墸閲�(鍏枻)")
-    private double qzhhkl;
+    private Double qzhhkl;
 
     @PropertyDef(label = "鍏朵腑锛氱敓闇夌矑鎵i噺(鍏枻)")
-    private double qzsmlkl;
+    private Double qzsmlkl;
 
     @PropertyDef(label = "鍏朵腑锛氭暣绮剧背绮掓墸閲�(鍏枻)")
-    private double qzzjmlkl;
+    private Double qzzjmlkl;
 
     @PropertyDef(label = "鍏朵腑锛氳胺澶栫硻绫虫墸閲�(鍏枻)")
-    private double qzgwcmkl;
+    private Double qzgwcmkl;
 
     @PropertyDef(label = "鍏朵腑榛勭矑绫虫墸閲�(鍏枻)")
-    private double qzhlmkl;
+    private Double qzhlmkl;
 
     @PropertyDef(label = "鍏朵腑锛氬叾浠栨墸閲�(鍏枻)")
-    private double qzqtkl;
+    private Double qzqtkl;
 
     @PropertyDef(label = "鏁寸悊璐圭敤鎶樻墸閲�(鍏枻)")
-    private double zlfyzkl;
+    private Double zlfyzkl;
 
     @PropertyDef(label = "鍖呰鐗╂墸閲�(鍏枻)")
-    private double bzwkl;
+    private Double bzwkl;
 
     @PropertyDef(label = "鍏朵粬鎵i噺(鍏枻)")
-    private double qtkl;
+    private Double qtkl;
 
     @PropertyDef(label = "鎵i噺鍘熷洜")
     private String klyy;
 
     @PropertyDef(label = "鐜板満鎵i噺(鍏枻)")
-    @Column(name = "xckl")
-    private double xckl;
+    private Double xckl;
 
     @PropertyDef(label = "澧炴墸浠�(鍏枻)")
-    private double zkj;
+    private Double zkj;
 
     @PropertyDef(label = "澧炴墸浠峰師鍥�")
     private String zkhyy;
 
     @PropertyDef(label = "鍑�閲�(鍏枻)")
-    private double jz;
+    private Double jz;
 
     @PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅")
     private String zxzydw;
@@ -215,13 +225,32 @@
     @PropertyDef(label = "鏇存柊鏃堕棿")
     private Date zhgxsj;
 
-    private String pch;
+    @PropertyDef(label = "鎵规鍙�")
+    private String pch = "鏃�";
+
+    @PropertyDef(label = "鏍囪浣�")
     private String bjw;
-    private String bydh;
-    private String jjdh;
-    
+
+    @PropertyDef(label = "椹宠繍鍗曞彿")
+    private String bydh = "鏃�";
+
+    @PropertyDef(label = "妫�鏂ゅ崟鍙�")
+    private String jjdh = "鏃�";
+
+    @PropertyDef(label = "杞崲骞村害")
+    private String lhnd;
+
+    @PropertyDef(label = "绮鎬ц川杞彉鍗曞彿")
+    private String lsxzzbdh;
+
     @JSONField(format = "yyyy-MM-dd")
     @PropertyDef(label = "璁拌处鏃ユ湡")
     private Date jzrq;
 
-}
+    @PropertyDef(label = "鐢熸垚鏂瑰紡")
+    private String scfs;
+
+    @PropertyDef(label = "鎵嬪姩琛ュ綍鍘熷洜")
+    private String sdblyy;
+
+}
\ No newline at end of file

--
Gitblit v1.9.3