From 8f114bf53e12f37782d3fd908f83dc4d81b002de Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 18 三月 2026 01:26:51 +0800
Subject: [PATCH] 出入库同步修改
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 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 03248a5..db702a5 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());
}
@@ -164,7 +167,8 @@
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum().trim());
-
+ apiData.setGch(StringUtils.isEmpty(sysData.getPlateNumAfter()) ? sysData.getPlateNum() : sysData.getPlateNumAfter());
+// apiData.setGch(apiData.getCch());
apiData.setDjsj(sysData.getRegisterTime());
//鐢熸垚鏂瑰紡
@@ -175,7 +179,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 +196,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,9 +221,7 @@
if (!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())) {
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
}
- if (!sysData.getCheckTime().after(sysData.getEmptyWeightTime())) {
- sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getCheckTime(), 30));
- }
+
apiData.setPzjlsj(sysData.getEmptyWeightTime());
apiData.setPzjby(sysData.getEmptyWeightUser());
apiData.setPzjly(sysData.getEmptyWeightUser());
@@ -233,17 +236,17 @@
if (StringUtils.isNotEmpty(sysData.getSettleId())) {
apiData.setRkjsdh(kqdm + sysData.getSettleId());
}
- if (StringUtils.isNotEmpty(apiData.getHth())) {
- api1204List = api1204Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
- if (null == api1204List || api1204List.isEmpty()) {
- api1204List = api1204Rep.getDataByHth(apiData.getHth());
- if (null != api1204List && api1204List.size() > 0) {
- apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
- }
- } else {
- apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
- }
- }
+// if (StringUtils.isNotEmpty(apiData.getHth())) {
+// api1204List = api1204Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
+// if (null == api1204List || api1204List.isEmpty()) {
+// api1204List = api1204Rep.getDataByHth(apiData.getHth());
+// if (null != api1204List && api1204List.size() > 0) {
+// apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
+// }
+// } else {
+// apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
+// }
+// }
//鍏跺畠
apiData.setQtkl(0 - sysData.getDeOther());
//鍊间粨 鐜板満鎵ｉ噸
--
Gitblit v1.9.3