From 715af00851145d97afa322c211dcc44f78238ef1 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 24 九月 2025 14:24:14 +0800
Subject: [PATCH] 61版本13,14同步
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 17 +++++++++++------
1 files changed, 11 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 9e01afb..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());
}
@@ -149,9 +152,9 @@
//绮潈鍗曚綅褰掑睘浠ｇ爜
List<Api1208> dataByHwdm = api1208Rep.findDataByHwdm(apiData.getHwdm());
if (null != dataByHwdm && dataByHwdm.size() > 0) {
- apiData.setLqgsdwdm(StringUtils.isEmpty(dataByHwdm.get(0).getLqgsdwdm()) ? apiData.getKqdm() : dataByHwdm.get(0).getLqgsdwdm());
- }else {
- apiData.setLqgsdwdm(apiData.getKqdm());
+ 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("鍞伯浜哄湴鍧�");
@@ -175,7 +178,7 @@
}
//绮鍝佺
- 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);
//绮鎬ц川
@@ -192,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());
@@ -216,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(sysData.getBzw());
+ apiData.setBzw(StringUtils.isEmpty(sysData.getBzw()) ? "9" : sysData.getBzw());
apiData.setBzwkl(0 - sysData.getDePackage());
apiData.setBzbjs(sysData.getBzbjs());
apiData.setCmsj(sysData.getCompleteTime());
--
Gitblit v1.9.3