From dadeff7f68d36c6a369c8d2d30cbe210d1be9a6c Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 06 十一月 2023 22:06:30 +0800
Subject: [PATCH] 同步入库信息和库存
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java | 22 ++++---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 59 ++++++++++---------
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotStore.java | 4 +
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 56 +++++++++---------
4 files changed, 76 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 54e99b0..1921416 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -61,34 +61,34 @@
Date end = param.getEnd();
// //瀹㈡埛鍚屾
-// fzzySync1212.syncData(kqdm, deptId, start, end);
-//
-// //鍚堝悓鍚屾
-// fzzySync1201.syncData(kqdm, deptId, start, end);
-//
-// //绮鍏ュ簱鍚屾
-// fzzySync1202.syncData(kqdm, deptId, start, end);
-//
-// //绮鍏ュ簱璐ㄦ
-// fzzySync1203.syncData(kqdm, deptId, start, end);
-//
-// //绮鍏ュ簱缁撶畻
-// fzzySync1204.syncData(kqdm, deptId, start, end);
-// //绮鍑哄簱鍚屾
-// fzzySync1205.syncData(kqdm, deptId, start, end);
-//
-// //绮鍑哄簱缁撶畻
-// fzzySync1206.syncData(kqdm, deptId, start, end);
-// //绮鎹熺泭
-// fzzySync1209.syncData(kqdm, deptId, start, end);
-// //鍊掍粨淇℃伅鍚屾
-// fzzySync1207.syncData(kqdm, deptId, start, end);
-//
-// //鍑哄叆搴撴枃浠朵俊鎭悓姝�
-// fzzySync1109.syncData(kqdm, deptId, start, end);
-//
-// //绮搴撳瓨鍚屾
-// fzzySync1208.syncData(kqdm, deptId, start, end);
+ fzzySync1212.syncData(kqdm, deptId, start, end);
+
+ //鍚堝悓鍚屾
+ fzzySync1201.syncData(kqdm, deptId, start, end);
+
+ //绮鍏ュ簱鍚屾
+ fzzySync1202.syncData(kqdm, deptId, start, end);
+
+ //绮鍏ュ簱璐ㄦ
+ fzzySync1203.syncData(kqdm, deptId, start, end);
+
+ //绮鍏ュ簱缁撶畻
+ fzzySync1204.syncData(kqdm, deptId, start, end);
+ //绮鍑哄簱鍚屾
+ fzzySync1205.syncData(kqdm, deptId, start, end);
+
+ //绮鍑哄簱缁撶畻
+ fzzySync1206.syncData(kqdm, deptId, start, end);
+ //绮鎹熺泭
+ fzzySync1209.syncData(kqdm, deptId, start, end);
+ //鍊掍粨淇℃伅鍚屾
+ fzzySync1207.syncData(kqdm, deptId, start, end);
+
+ //鍑哄叆搴撴枃浠朵俊鎭悓姝�
+ fzzySync1109.syncData(kqdm, deptId, start, end);
+
+ //绮搴撳瓨鍚屾
+ fzzySync1208.syncData(kqdm, deptId, start, end);
//绮鎬ц川杞彉淇℃伅鍚屾
fzzySync1210.syncData(kqdm, deptId, start, end);
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotStore.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotStore.java
index 988f681..a671203 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotStore.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotStore.java
@@ -126,6 +126,10 @@
@Column(name = "CREATE_DATE_")
private Date createDate;
+ @PropertyDef(label = "绮潈褰掑睘鍗曚綅浠ｇ爜")
+ @Column(name = "lqgsdwdm", length = 18)
+ private String lqgsdwdm;
+
public Fz40DepotStore() {
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 1335dd4..6144701 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -87,14 +87,14 @@
List<Api1202> api1202List;
List<Fz40InoutRecordItem> listInoutRecordItem;
for (Fz40InoutRecord sysData : list) {
- if(sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")){
+ if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
continue;
}
- if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+ if (null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0) {
sysData.setRecordWeight(sysData.getSettleWeight());
}
//鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
- if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+ if (null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0) {
continue;
}
//鑾峰彇璐т綅淇℃伅
@@ -109,7 +109,7 @@
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
apiData.setYwlx(Constant.INOUT_TYPE_2);
- apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
+ apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[]{"yyyyMMdd"}));
apiData.setCyr(sysData.getUserName());
//榛樿涓�涓殢渚垮��
@@ -119,19 +119,19 @@
//鑾峰彇鍚堝悓鍙�
listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
- if(null != listInoutNotice && listInoutNotice.size() >0){
- if(StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())){
- apiData.setHth(api1105.getHwdm().substring(0,18) + listInoutNotice.get(0).getContractId());
+ if (null != listInoutNotice && listInoutNotice.size() > 0) {
+ if (StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())) {
+ apiData.setHth(api1105.getHwdm().substring(0, 18) + listInoutNotice.get(0).getContractId());
}
- if(StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())){
+ if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
apiData.setJhmxh(listInoutNotice.get(0).getPlanId());
}
}
- apiData.setXxdz(StringUtils.isEmpty(sysData.getUserAddress()) ? "璇︾粏鍦板潃":sysData.getUserAddress());
+ apiData.setXxdz(StringUtils.isEmpty(sysData.getUserAddress()) ? "璇︾粏鍦板潃" : sysData.getUserAddress());
//杩愯緭宸ュ叿锛岃嫢涓虹┖锛屽垯榛樿缁�1-姹借溅
- apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
+ apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1" : sysData.getTransType());
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum().trim());
@@ -139,19 +139,19 @@
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
apiData.setLspzdm(mappingCode);
//绮鎬ц川
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
apiData.setLsxzdm(mappingCode);
- apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear())? DateFormatUtils.format(new Date(), "yyyy") :sysData.getFoodYear());
+ apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear()) ? DateFormatUtils.format(new Date(), "yyyy") : sysData.getFoodYear());
//浜у湴浠ｇ爜
mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
- if(StringUtils.isEmpty(mappingCode)){
- mappingCode = apiData.getHwdm().substring(2,8);
+ if (StringUtils.isEmpty(mappingCode)) {
+ mappingCode = apiData.getHwdm().substring(2, 8);
}
apiData.setCddm(mappingCode);
@@ -160,7 +160,7 @@
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
- if(!sysData.getFullWeightTime().after(sysData.getRegisterTime())){
+ if (!sysData.getFullWeightTime().after(sysData.getRegisterTime())) {
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
}
apiData.setMzjlsj(sysData.getFullWeightTime());
@@ -171,7 +171,7 @@
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
- if(!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())){
+ if (!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())) {
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
}
apiData.setPzjlsj(sysData.getEmptyWeightTime());
@@ -181,13 +181,16 @@
//鎵ｉ噸 鍖栭獙鎬绘墸閲�
apiData.setZjklxj(sysData.getDeCheck());
+ apiData.setBzwkl(0 - sysData.getDePackage());
+ apiData.setBzbjs(sysData.getBzbjs());
+
//鍏跺畠
- apiData.setQtkl( 0 - sysData.getDeOther());
+ apiData.setQtkl(0 - sysData.getDeOther());
//鍊间粨 鐜板満鎵ｉ噸
- apiData.setXckl( 0 - sysData.getDeHandle());
+ apiData.setXckl(0 - sysData.getDeHandle());
apiData.setJz(sysData.getRecordWeight());
- if(!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())){
+ if (!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())) {
sysData.setCompleteTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 10));
}
apiData.setCmsj(sysData.getCompleteTime());
@@ -200,33 +203,33 @@
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
api1202List = api1202Rep.getDataById(apiData.getRkywdh());
- if(null == api1202List || api1202List.isEmpty()){
+ if (null == api1202List || api1202List.isEmpty()) {
apiData.setCzbz(Constant.CZBZ_I);
- }else {
+ } else {
apiData.setCzbz(api1202List.get(0).getCzbz());
}
//鍒ゆ柇鏄惁涓鸿埞杩�
- if(StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")){
+ if (StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")) {
listInoutRecordItem = fzzy40SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
- if(null == listInoutRecordItem || listInoutRecordItem.isEmpty()){
+ if (null == listInoutRecordItem || listInoutRecordItem.isEmpty()) {
api1202Rep.save(apiData);
continue;
}
- int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
+ int idNum = Integer.valueOf(sysData.getId().substring(12)) * 100 + 10001;
for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
- if(fz40InoutRecordItem.getSettleWeight() <= 0){
+ if (fz40InoutRecordItem.getSettleWeight() <= 0) {
continue;
}
- apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4,10) + String.valueOf(idNum).substring(1));
+ apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4, 10) + String.valueOf(idNum).substring(1));
apiData.setMz(fz40InoutRecordItem.getFullWeight());
apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
apiData.setJz(fz40InoutRecordItem.getSettleWeight());
api1202Rep.save(apiData);
- idNum ++;
+ idNum++;
}
- }else {
+ } else {
//淇濆瓨鏁版嵁
api1202Rep.save(apiData);
}
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 4b0f543..be7a4b5 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -87,7 +87,7 @@
apiData.setHwdm(api1105.getHwdm());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety().substring(0,3));
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety().substring(0, 3));
apiData.setLspzdm(mappingCode);
//绮鎬ц川
@@ -102,14 +102,18 @@
//浜у湴浠ｇ爜
mappingCode = commonService.getFoodLocationIdFromCache(fz40DepotStore.getFoodLocation());
- if(StringUtils.isEmpty(mappingCode)){
- mappingCode = apiData.getHwdm().substring(2,8);
+ if (StringUtils.isEmpty(mappingCode)) {
+ mappingCode = apiData.getHwdm().substring(2, 8);
}
apiData.setCd(mappingCode);
apiData.setBgy(StringUtils.isEmpty(api1105.getBgy()) ? "淇濈鍛�" : api1105.getBgy());
//绮潈褰掑睘鍗曚綅
- apiData.setLqgsdwdm(api1102.getDwdm());
+ if (StringUtils.isEmpty(fz40DepotStore.getLqgsdwdm())) {
+ apiData.setLqgsdwdm(api1102.getDwdm());
+ } else {
+ apiData.setLqxzqhdm(fz40DepotStore.getLqgsdwdm());
+ }
//绮潈琛屾斂鍖哄垝浠ｇ爜
apiData.setLqxzqhdm(api1102.getXzqhdm());
//绠＄悊鏂瑰紡-榛樿鐩村偍
@@ -122,17 +126,17 @@
//璐т綅鐘舵��
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz40DepotStore.getDepotStatus());
apiData.setHwzt(mappingCode);
- if(null == fz40DepotStore.getStoreDate()){
+ if (null == fz40DepotStore.getStoreDate()) {
fz40DepotStore.setStoreDate(new Date());
}
//鍏ヤ粨鏃堕棿
apiData.setRcsj(fz40DepotStore.getStoreDate());
//灏佷粨鏃ユ湡
- if("3".equals(apiData.getHwzt()) || "4".equals(apiData.getHwzt())){
+ if ("3".equals(apiData.getHwzt()) || "4".equals(apiData.getHwzt())) {
apiData.setFcrq(DateUtils.addDays(fz40DepotStore.getStoreDate(), 10));
}
- if("1".equals(apiData.getHwzt())){
+ if ("1".equals(apiData.getHwzt())) {
//鍑轰粨瀹屾垚鏃堕棿
apiData.setCcwcsj(DateUtils.addDays(fz40DepotStore.getStoreDate(), 5));
//娓呬粨鏃堕棿
@@ -154,9 +158,9 @@
//搴撳瓨姣忔鏂板
api1208List = api1208Rep.getDataById(apiData.getId());
- if(null == api1208List || api1208List.isEmpty()){
+ if (null == api1208List || api1208List.isEmpty()) {
apiData.setCzbz(Constant.CZBZ_I);
- }else {
+ } else {
apiData.setCzbz(api1208List.get(0).getCzbz());
}
--
Gitblit v1.9.3