From d64d0077d55c98add42fff85470249eab1f406b8 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 08 十一月 2023 00:23:52 +0800
Subject: [PATCH] 问题修改
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java | 2
src/main/java/com/fzzy/async/fzzy30/entity/InoutRecord.java | 369 +++++++++++++++++++++++++++-------------------------
2 files changed, 190 insertions(+), 181 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy30/entity/InoutRecord.java b/src/main/java/com/fzzy/async/fzzy30/entity/InoutRecord.java
index a33a9a7..a330464 100644
--- a/src/main/java/com/fzzy/async/fzzy30/entity/InoutRecord.java
+++ b/src/main/java/com/fzzy/async/fzzy30/entity/InoutRecord.java
@@ -18,240 +18,249 @@
public class InoutRecord {
- @Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "娴佹按鍙�", description = "鏍规嵁涓�瀹氱殑瑙勫垯鐢熸垚")
- private String id;
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "娴佹按鍙�", description = "鏍规嵁涓�瀹氱殑瑙勫垯鐢熸垚")
+ private String id;
- @Column(name = "COMPANY_ID_", length = 10)
- @PropertyDef(label = "缁勭粐缂栫爜", description = "")
- private String companyId;
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜", description = "")
+ private String companyId;
- @Column(name = "DEPT_ID_", length = 10)
- @PropertyDef(label = "閮ㄩ棬ID", description = "鐢ㄤ簬鍖哄垎閮ㄩ棬")
- private String deptId;
+ @Column(name = "DEPT_ID_", length = 10)
+ @PropertyDef(label = "閮ㄩ棬ID", description = "鐢ㄤ簬鍖哄垎閮ㄩ棬")
+ private String deptId;
- @Column(name = "DEPOT_ID_", length = 20)
- @PropertyDef(label = "瑁呭嵏浠撳簱")
- private String depotId;
+ @Column(name = "DEPOT_ID_", length = 20)
+ @PropertyDef(label = "瑁呭嵏浠撳簱")
+ private String depotId;
- @Column(name = "TYPE_", length = 10)
- @PropertyDef(label = "鍑哄叆搴撶被鍨�", description = "鍑哄簱锛屽叆搴�")
- private String type;
+ @Column(name = "TYPE_", length = 10)
+ @PropertyDef(label = "鍑哄叆搴撶被鍨�", description = "鍑哄簱锛屽叆搴�")
+ private String type;
- @Column(name = "PROGRESS_", length = 20)
- @PropertyDef(label = "娴佺▼杩涘害")
- private String progress;
+ @Column(name = "PROGRESS_", length = 20)
+ @PropertyDef(label = "娴佺▼杩涘害")
+ private String progress;
- @Column(name = "RECORD_STATUS_", length = 10)
- @PropertyDef(label = "鏁版嵁鐘舵��", description = "鏁版嵁鐘舵�侊紝姝ｅ父锛屽紓甯革紙2灏忔椂鍐呴噸澶嶅嚭鍏ュ簱绛夛級锛岃ˉ褰�")
- private String recordStatus;
+ @Column(name = "RECORD_STATUS_", length = 10)
+ @PropertyDef(label = "鏁版嵁鐘舵��", description = "鏁版嵁鐘舵�侊紝姝ｅ父锛屽紓甯革紙2灏忔椂鍐呴噸澶嶅嚭鍏ュ簱绛夛級锛岃ˉ褰�")
+ private String recordStatus;
- // ========鐧昏淇℃伅
- @Column(name = "BIZ_TYPE_", length = 10)
- @PropertyDef(label = "涓氬姟绫诲瀷", description = "鍐滄埛銆佷紒涓�")
- private String bizType = "鍐滄埛";
+ // ========鐧昏淇℃伅
+ @Column(name = "BIZ_TYPE_", length = 10)
+ @PropertyDef(label = "涓氬姟绫诲瀷", description = "鍐滄埛銆佷紒涓�")
+ private String bizType = "鍐滄埛";
- @Column(name = "REGISTER_TIME_")
- @PropertyDef(label = "鐧昏鏃堕棿")
- private Date registerTime;
+ @Column(name = "REGISTER_TIME_")
+ @PropertyDef(label = "鐧昏鏃堕棿")
+ private Date registerTime;
- @Column(name = "REGISTER_USER_", length = 40)
- @PropertyDef(label = "鐧昏浜哄憳")
- private String registerUser;
+ @Column(name = "REGISTER_USER_", length = 40)
+ @PropertyDef(label = "鐧昏浜哄憳")
+ private String registerUser;
- @Column(name = "USER_NAME_", length = 40)
- @PropertyDef(label = "鎵胯繍浜�")
- private String userName = "";
+ @Column(name = "USER_NAME_", length = 40)
+ @PropertyDef(label = "鎵胯繍浜�")
+ private String userName = "";
- @Column(name = "USER_BIRTHDAY_")
- @PropertyDef(label = "鍑虹敓鏃ユ湡")
- private Date userBirthday;
+ @Column(name = "USER_BIRTHDAY_")
+ @PropertyDef(label = "鍑虹敓鏃ユ湡")
+ private Date userBirthday;
- @Column(name = "USER_SEX_", length = 10)
- @PropertyDef(label = "鎬у埆")
- private String userSex;
+ @Column(name = "USER_SEX_", length = 10)
+ @PropertyDef(label = "鎬у埆")
+ private String userSex;
- @Column(name = "USER_NATION_", length = 10)
- @PropertyDef(label = "姘戞棌")
- private String userNation;
+ @Column(name = "USER_NATION_", length = 10)
+ @PropertyDef(label = "姘戞棌")
+ private String userNation;
- @Column(name = "USER_ID_", length = 20)
- @PropertyDef(label = "韬唤璇佸彿")
- private String userId;
+ @Column(name = "USER_ID_", length = 20)
+ @PropertyDef(label = "韬唤璇佸彿")
+ private String userId;
- @Column(name = "USER_CONTACT_", length = 20)
- @PropertyDef(label = "鑱旂郴鏂瑰紡")
- private String userContact;
+ @Column(name = "USER_CONTACT_", length = 20)
+ @PropertyDef(label = "鑱旂郴鏂瑰紡")
+ private String userContact;
- @Column(name = "USER_ADDRESS_", length = 100)
- @PropertyDef(label = "鎵胯繍浜哄湴鍧�")
- private String userAddress;
+ @Column(name = "USER_ADDRESS_", length = 100)
+ @PropertyDef(label = "鎵胯繍浜哄湴鍧�")
+ private String userAddress;
- @Column(name = "CUR_STORAGE_")
- @PropertyDef(label = "褰撳墠搴撳瓨")
- private double curStorage = 0.0;
+ @Column(name = "CUR_STORAGE_")
+ @PropertyDef(label = "褰撳墠搴撳瓨")
+ private double curStorage = 0.0;
- // 鍩烘湰淇℃伅
- @Column(name = "INTEL_CARD_", length = 20)
- @PropertyDef(label = "鏅烘収鍗″彿")
- private String intelCard;
+ // 鍩烘湰淇℃伅
+ @Column(name = "INTEL_CARD_", length = 20)
+ @PropertyDef(label = "鏅烘収鍗″彿")
+ private String intelCard;
- @Column(name = "PLATE_NUM_", length = 20)
- @PropertyDef(label = "杞︾墝鍙�")
- private String plateNum;
+ @Column(name = "PLATE_NUM_", length = 20)
+ @PropertyDef(label = "杞︾墝鍙�")
+ private String plateNum;
- @Column(name = "TRANS_TYPE_", length = 10)
- @PropertyDef(label = "杩愯緭鏂瑰紡", description = "鏁ｇ伯锛岃绮�")
- private String transType = "鏁ｇ伯";
+ @Column(name = "TRANS_TYPE_", length = 10)
+ @PropertyDef(label = "杩愯緭鏂瑰紡", description = "鏁ｇ伯锛岃绮�")
+ private String transType = "鏁ｇ伯";
- @Column(name = "CUSTOMER_ID_", length = 40)
- @PropertyDef(label = "寰�鏉ュ崟浣岻D", description = "鍏ュ簱鏃讹紝琛ㄧず鍙戣揣鍗曚綅锛屽嚭搴撴椂鍊欒〃绀烘敹璐у崟浣�")
- private String customerId;
+ @Column(name = "CUSTOMER_ID_", length = 40)
+ @PropertyDef(label = "寰�鏉ュ崟浣岻D", description = "鍏ュ簱鏃讹紝琛ㄧず鍙戣揣鍗曚綅锛屽嚭搴撴椂鍊欒〃绀烘敹璐у崟浣�")
+ private String customerId;
- @Column(name = "CUSTOMER_NAME_", length = 50)
- @PropertyDef(label = "寰�鏉ュ崟浣�", description = "鍏ュ簱鏃讹紝琛ㄧず鍙戣揣鍗曚綅锛屽嚭搴撴椂鍊欒〃绀烘敹璐у崟浣�")
- private String customerName;
+ @Column(name = "CUSTOMER_NAME_", length = 50)
+ @PropertyDef(label = "寰�鏉ュ崟浣�", description = "鍏ュ簱鏃讹紝琛ㄧず鍙戣揣鍗曚綅锛屽嚭搴撴椂鍊欒〃绀烘敹璐у崟浣�")
+ private String customerName;
- @Column(name = "UNIT_NAME_", length = 50)
- @PropertyDef(label = "鍗曚綅鍚嶇О", description = "褰撳墠浠撳簱鐨勫崟浣嶅悕绉帮紝鍏ュ簱鏃讹紝琛ㄧず鏀惰揣鍗曚綅锛屽嚭搴撴椂锛岃〃绀哄彂璐у崟浣�")
- private String unitName;
+ @Column(name = "UNIT_NAME_", length = 50)
+ @PropertyDef(label = "鍗曚綅鍚嶇О", description = "褰撳墠浠撳簱鐨勫崟浣嶅悕绉帮紝鍏ュ簱鏃讹紝琛ㄧず鏀惰揣鍗曚綅锛屽嚭搴撴椂锛岃〃绀哄彂璐у崟浣�")
+ private String unitName;
- // 绮淇℃伅
- @Column(name = "FOOD_VARIETY_", length = 20)
- @PropertyDef(label = "绮鍝佺")
- private String foodVariety;
+ // 绮淇℃伅
+ @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_TYPE_", length = 20)
+ @PropertyDef(label = "浠撳偍绫诲瀷")
+ private String foodType;
- @Column(name = "FOOD_LEVEL_", length = 40)
- @PropertyDef(label = "绮绛夌骇")
- private String foodLevel;
+ @Column(name = "FOOD_LEVEL_", length = 40)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
- @Column(name = "FOOD_LOCATION_", length = 40)
- @PropertyDef(label = "绮浜у湴")
- private String foodLocation;
+ @Column(name = "FOOD_LOCATION_", length = 40)
+ @PropertyDef(label = "绮浜у湴")
+ private String foodLocation;
- @Column(name = "FOOD_YEAR_", length = 20)
- @PropertyDef(label = "骞翠唤")
- private String foodYear;
+ @Column(name = "FOOD_YEAR_", length = 20)
+ @PropertyDef(label = "骞翠唤")
+ private String foodYear;
- @Column(name = "PRICE_", length = 20)
- @PropertyDef(label = "鍗曚环")
- private String price;
+ @Column(name = "PRICE_", length = 20)
+ @PropertyDef(label = "鍗曚环")
+ private String price;
- // 鍖栭獙淇℃伅
- @Column(name = "CHECK_STATUS_")
- @PropertyDef(label = "鍖栭獙缁撴灉")
- private String checkStatus;
+ // 鍖栭獙淇℃伅
+ @Column(name = "CHECK_STATUS_")
+ @PropertyDef(label = "鍖栭獙缁撴灉")
+ private String checkStatus;
- @Column(name = "CHECK_USER_")
- @PropertyDef(label = "鍖栭獙浜�")
- private String checkUser;
+ @Column(name = "CHECK_USER_")
+ @PropertyDef(label = "鍖栭獙浜�")
+ private String checkUser;
- @Column(name = "CHECK_ID_")
- @PropertyDef(label = "鍖栭獙鍗曞彿")
- private String checkId;
+ @Column(name = "CHECK_ID_")
+ @PropertyDef(label = "鍖栭獙鍗曞彿")
+ private String checkId;
- // 绉伴噸鍜屾墸閲嶄俊鎭�
- @Column(name = "IMPURITY_")
- @PropertyDef(label = "鏉傝川", description = "鐧惧垎姣�")
- private Double impurity = 0.0;
+ // 绉伴噸鍜屾墸閲嶄俊鎭�
+ @Column(name = "IMPURITY_")
+ @PropertyDef(label = "鏉傝川", description = "鐧惧垎姣�")
+ private Double impurity = 0.0;
- @Column(name = "WET_")
- @PropertyDef(label = "姘村垎", description = "鐧惧垎姣�")
- private Double wet = 0.0;
+ @Column(name = "WET_")
+ @PropertyDef(label = "姘村垎", description = "鐧惧垎姣�")
+ private Double wet = 0.0;
- @Column(name = "BROKEN_")
- @PropertyDef(label = "涓嶅畬鏁撮绮�", description = "鐧惧垎姣�")
- private Double broken = 0.0;
+ @Column(name = "BROKEN_")
+ @PropertyDef(label = "涓嶅畬鏁撮绮�", description = "鐧惧垎姣�")
+ private Double broken = 0.0;
- @Column(name = "DE_IMPURITY_")
- @PropertyDef(label = "鏉傝川鎵ｉ噸", description = "鍗曚綅KG")
- private Double deImpurity = 0.0;
+ @Column(name = "DE_IMPURITY_")
+ @PropertyDef(label = "鏉傝川鎵ｉ噸", description = "鍗曚綅KG")
+ private Double deImpurity = 0.0;
- @Column(name = "DE_WET_")
- @PropertyDef(label = "姘村垎鎵ｉ噸", description = "鍗曚綅KG")
- private Double deWet = 0.0;
+ @Column(name = "DE_WET_")
+ @PropertyDef(label = "姘村垎鎵ｉ噸", description = "鍗曚綅KG")
+ private Double deWet = 0.0;
- @Column(name = "DE_BROKEN_")
- @PropertyDef(label = "涓嶅畬鏁撮绮掓墸閲�", description = "鍗曚綅KG")
- private Double deBroken = 0.0;
+ @Column(name = "DE_BROKEN_")
+ @PropertyDef(label = "涓嶅畬鏁撮绮掓墸閲�", description = "鍗曚綅KG")
+ private Double deBroken = 0.0;
- @Column(name = "DE_HANDLE_")
- @PropertyDef(label = "鍊间粨鎵ｉ噸", description = "鍗曚綅KG")
- private Double deHandle = 0.0;
+ @Column(name = "DE_HANDLE_")
+ @PropertyDef(label = "鍊间粨鎵ｉ噸", description = "鍗曚綅KG")
+ private Double deHandle = 0.0;
- @Column(name = "DE_PACK_")
- @PropertyDef(label = "鍖呰鎵ｉ噸", description = "鍗曚綅KG")
- private Double dePack = 0.0;
+ @Column(name = "DE_PACK_")
+ @PropertyDef(label = "鍖呰鎵ｉ噸", description = "鍗曚綅KG")
+ private Double dePack = 0.0;
- @Column(name = "DE_OTHER_")
- @PropertyDef(label = "鍏朵粬鎵ｉ噸", description = "鍗曚綅KG")
- private Double deOther = 0.0;
+ @Column(name = "DE_OTHER_")
+ @PropertyDef(label = "鍏朵粬鎵ｉ噸", description = "鍗曚綅KG")
+ private Double deOther = 0.0;
- @Column(name = "DE_SUM_")
- @PropertyDef(label = "鎬绘墸閲�", description = "鍗曚綅KG")
- private Double deSum = 0.0;
+ @Column(name = "DE_SUM_")
+ @PropertyDef(label = "鎬绘墸閲�", description = "鍗曚綅KG")
+ private Double deSum = 0.0;
- @Column(name = "FULL_WEIGHT_")
- @PropertyDef(label = "婊¤溅绉伴噸", description = "鍏ュ簱鏃跺�欒〃绀虹涓�娆＄О閲嶏紝鍑哄簱鏃跺�欒〃绀虹浜屾绉伴噸锛屽崟浣岾G")
- private Double fullWeight = 0.0;
+ @Column(name = "FULL_WEIGHT_")
+ @PropertyDef(label = "婊¤溅绉伴噸", description = "鍏ュ簱鏃跺�欒〃绀虹涓�娆＄О閲嶏紝鍑哄簱鏃跺�欒〃绀虹浜屾绉伴噸锛屽崟浣岾G")
+ private Double fullWeight = 0.0;
- @Column(name = "FULL_WEIGHT_TIME_")
- @PropertyDef(label = "婊¤溅绉伴噸鏃堕棿")
- private Date fullWeightTime;
+ @Column(name = "FULL_WEIGHT_TIME_")
+ @PropertyDef(label = "婊¤溅绉伴噸鏃堕棿")
+ private Date fullWeightTime;
- @Column(name = "FULL_WEIGHT_USER_", length = 40)
- @PropertyDef(label = "婊¤溅绉伴噸浜�")
- private String fullWeightUser;
+ @Column(name = "FULL_WEIGHT_USER_", length = 40)
+ @PropertyDef(label = "婊¤溅绉伴噸浜�")
+ private String fullWeightUser;
- @Column(name = "EMPTY_WEIGHT_")
- @PropertyDef(label = "绌鸿溅绉伴噸", description = "鍏ュ簱鏃惰〃绀虹浜屾绉伴噸锛屽嚭搴撴椂鍊欒〃绀虹涓�娆＄О閲嶏紝鍗曚綅KG")
- private Double emptyWeight = 0.0;
+ @Column(name = "EMPTY_WEIGHT_")
+ @PropertyDef(label = "绌鸿溅绉伴噸", description = "鍏ュ簱鏃惰〃绀虹浜屾绉伴噸锛屽嚭搴撴椂鍊欒〃绀虹涓�娆＄О閲嶏紝鍗曚綅KG")
+ private Double emptyWeight = 0.0;
- @Column(name = "EMPTY_WEIGHT_TIME_")
- @PropertyDef(label = "绌鸿溅绉伴噸鏃堕棿")
- private Date emptyWeightTime;
+ @Column(name = "EMPTY_WEIGHT_TIME_")
+ @PropertyDef(label = "绌鸿溅绉伴噸鏃堕棿")
+ private Date emptyWeightTime;
- @Column(name = "EMPTY_WEIGHT_USER_")
- @PropertyDef(label = "绌鸿溅绉伴噸浜�")
- private String emptyWeightUser;
+ @Column(name = "EMPTY_WEIGHT_USER_")
+ @PropertyDef(label = "绌鸿溅绉伴噸浜�")
+ private String emptyWeightUser;
- @Column(name = "NET_WEIGHT_")
- @PropertyDef(label = "鍑�閲�", description = "鍗曚綅KG")
- private Double netWeight = 0.0;
+ @Column(name = "NET_WEIGHT_")
+ @PropertyDef(label = "鍑�閲�", description = "鍗曚綅KG")
+ private Double netWeight = 0.0;
- @Column(name = "SETTLE_WEIGHT_")
- @PropertyDef(label = "缁撶畻鍑�閲�", description = "鎵ｉ噸鍚庡噣閲嶏紝缁撶畻鍑�閲嶏紝鍗曚綅KG")
- private Double settleWeight = 0.0;
+ @Column(name = "SETTLE_WEIGHT_")
+ @PropertyDef(label = "缁撶畻鍑�閲�", description = "鎵ｉ噸鍚庡噣閲嶏紝缁撶畻鍑�閲嶏紝鍗曚綅KG")
+ private Double settleWeight = 0.0;
- // 鍊间粨淇℃伅
- @Column(name = "HANDLE_START_")
- @PropertyDef(label = "鍊间粨寮�濮嬫椂闂�")
- private Date handleStart;
+ // 鍊间粨淇℃伅
+ @Column(name = "HANDLE_START_")
+ @PropertyDef(label = "鍊间粨寮�濮嬫椂闂�")
+ private Date handleStart;
- @Column(name = "HANDLE_END_")
- @PropertyDef(label = "鍊间粨缁撴潫鏃堕棿")
- private Date handleEnd;
+ @Column(name = "HANDLE_END_")
+ @PropertyDef(label = "鍊间粨缁撴潫鏃堕棿")
+ private Date handleEnd;
- @Column(name = "HANDLE_USER_", length = 40)
- @PropertyDef(label = "鍊间粨鎿嶄綔浜�")
- private String handleUser;
+ @Column(name = "HANDLE_USER_", length = 40)
+ @PropertyDef(label = "鍊间粨鎿嶄綔浜�")
+ private String handleUser;
- // 鍑哄簱
- @Column(name = "COMPLETE_TIME_")
- @PropertyDef(label = "瀹屾垚鏃堕棿")
- private Date completeTime;
+ // 鍑哄簱
+ @Column(name = "COMPLETE_TIME_")
+ @PropertyDef(label = "瀹屾垚鏃堕棿")
+ private Date completeTime;
- @Column(name = "COMPLETE_USER_", length = 40)
- @PropertyDef(label = "瀹屾垚纭浜�")
- private String completeUser;
+ @Column(name = "COMPLETE_USER_", length = 40)
+ @PropertyDef(label = "瀹屾垚纭浜�")
+ private String completeUser;
- // 澶囨敞
- @Column(name = "REMARKS_", length = 200)
- @PropertyDef(label = "澶囨敞淇℃伅")
- private String remarks;
+ // 澶囨敞
+ @Column(name = "REMARKS_", length = 200)
+ @PropertyDef(label = "澶囨敞淇℃伅")
+ private String remarks;
+
+ @Column(name = "bzw", length = 2)
+ @PropertyDef(label = "鍖呰鐗�", description = "1锛氶夯琚�2锛氱紪缁囪3锛氭暎瑁�9锛氬叾浠�")
+ private String bzw;
+
+ @Column(name = "bzbjs")
+ @PropertyDef(label = "鍖呬欢鏁�", description = "鍗曚綅锛氫欢")
+ private int bzbjs;
+
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
index 0f26f6b..1be957c 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -115,7 +115,7 @@
if (StringUtils.isEmpty(fz40DepotStore.getLqgsdwdm())) {
apiData.setLqgsdwdm(api1102.getDwdm());
} else {
- apiData.setLqxzqhdm(fz40DepotStore.getLqgsdwdm());
+ apiData.setLqgsdwdm(fz40DepotStore.getLqgsdwdm());
}
//绮潈琛屾斂鍖哄垝浠ｇ爜
apiData.setLqxzqhdm(api1102.getXzqhdm());
--
Gitblit v1.9.3