From f43613cc5aba07a9cb0482b7171ae6569c901e50 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 22 九月 2025 10:32:01 +0800
Subject: [PATCH] 61版本同步
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
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 e831c2a..1fa9991 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -95,6 +95,9 @@
if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
continue;
}
+ if (!sysData.getProgress().equals("RECORD")) {
+ continue;
+ }
if (null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0) {
sysData.setRecordWeight(sysData.getSettleWeight());
}
@@ -148,7 +151,14 @@
//绮潈鍗曚綅褰掑睘浠ｇ爜
List<Api1208> dataByHwdm = api1208Rep.findDataByHwdm(apiData.getHwdm());
- apiData.setLqgsdwdm(StringUtils.isEmpty(dataByHwdm.get(0).getLqgsdwdm()) ? apiData.getHwdm().substring(0, 18) : dataByHwdm.get(0).getLqgsdwdm());
+ if (null != dataByHwdm && dataByHwdm.size() > 0) {
+ apiData.setLqgsdwdm(StringUtils.isEmpty(dataByHwdm.get(0).getLqgsdwdm()) ? kqdm.substring(0, 18) : dataByHwdm.get(0).getLqgsdwdm());
+ } else {
+ apiData.setLqgsdwdm(kqdm.substring(0, 18));
+ }
+ apiData.setSlr("鍞伯浜�");
+ apiData.setSlrdz("鍞伯浜哄湴鍧�");
+ apiData.setBz(StringUtils.isEmpty(sysData.getRemarks()) ? "澶囨敞" : sysData.getRemarks());
apiData.setXxdz(StringUtils.isEmpty(sysData.getUserAddress()) ? "璇︾粏鍦板潃" : sysData.getUserAddress());
@@ -162,13 +172,13 @@
//鐢熸垚鏂瑰紡
apiData.setScfs(1);
- if(StringUtils.isNotEmpty(sysData.getRecordStatus()) && sysData.getRecordStatus().equals("ADD")){
+ if (StringUtils.isNotEmpty(sysData.getRecordStatus()) && sysData.getRecordStatus().equals("ADD")) {
apiData.setScfs(2);
apiData.setSdblyy("搴撳尯鍋滅數瀵艰嚧鏃犳硶鎸夋祦绋嬭繘琛屽嚭搴�");
}
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
apiData.setLspzdm(mappingCode);
//绮鎬ц川
@@ -185,7 +195,8 @@
apiData.setCddm(mappingCode);
//妫�鏂ょ被鍨嬶紝榛樿0-绉伴噸鍏ュ簱
- apiData.setJjlx("0");
+ apiData.setJjlx(sysData.getJjlx());
+ apiData.setBzbdbz(sysData.getDbz() == null ? 25 : sysData.getDbz());
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
@@ -209,13 +220,14 @@
if (!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())) {
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
}
+
apiData.setPzjlsj(sysData.getEmptyWeightTime());
apiData.setPzjby(sysData.getEmptyWeightUser());
apiData.setPzjly(sysData.getEmptyWeightUser());
//鎵ｉ噸 鍖栭獙鎬绘墸閲�
apiData.setZjklxj(sysData.getDeCheck());
-
+ apiData.setBzw(StringUtils.isEmpty(sysData.getBzw()) ? "9" : sysData.getBzw());
apiData.setBzwkl(0 - sysData.getDePackage());
apiData.setBzbjs(sysData.getBzbjs());
apiData.setCmsj(sysData.getCompleteTime());
@@ -252,7 +264,6 @@
apiData.setBizId(sysData.getId());
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
- apiData.setBz(null == sysData.getRemarks() ? "澶囨敞" : sysData.getRemarks());
apiData.setKlyy("鎵ｉ噺鍘熷洜");
apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "鐧昏浜�" : sysData.getRegisterUser());
@@ -261,6 +272,8 @@
//04:琛ㄧず鍐滅敤杞﹁溅鐗屽彿锛岀豢搴曠櫧瀛楋紱 LS:琛ㄧず涓存椂铏氭嫙鍙风墝锛屼粎闄愪簬鍞� 绮溅鏃犲浐瀹氬彿鐗屾椂浣跨敤
apiData.setCchlx("01");
apiData.setLdd("瑁呯伯鍦扮偣");
+ apiData.setZkj(0.0);
+ apiData.setZlfyzkl(0.0);
apiData.setQzsfzkl(0.0);
apiData.setQzzzzkl(0.0);
apiData.setQzgwcmkl(0.0);
--
Gitblit v1.9.3