From 52628b24e63105d78a75a097909b2c92dec75de0 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 26 三月 2026 09:28:49 +0800
Subject: [PATCH] 库存同步修改

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index 963afa1..1550da5 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -93,6 +93,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,10 +152,12 @@
 
                 //杞﹁埞鍙�
                 apiData.setCch(sysData.getPlateNum());
+//                apiData.setGch(apiData.getCch());
+                apiData.setGch(StringUtils.isEmpty(sysData.getPlateNumAfter()) ? sysData.getPlateNum() : sysData.getPlateNumAfter());
                 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());
                 apiData.setLspzdm(mappingCode);
 
                 //绮绛夌骇
@@ -220,23 +225,24 @@
                 if (StringUtils.isNotEmpty(sysData.getSettleId())) {
                     apiData.setCkjsdh(kqdm + sysData.getSettleId());
                 }
-                if (StringUtils.isNotEmpty(apiData.getHth())) {
-                    api1206List = api1206Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
-                    if (null == api1206List || api1206List.isEmpty()) {
-                        api1206List = api1206Rep.getDataByHth(apiData.getHth());
-                        if (null != api1206List && api1206List.size() > 0) {
-                            apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
-                        }
-                    } else {
-                        apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
-                    }
-                }
+//                if (StringUtils.isNotEmpty(apiData.getHth())) {
+//                    api1206List = api1206Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
+//                    if (null == api1206List || api1206List.isEmpty()) {
+//                        api1206List = api1206Rep.getDataByHth(apiData.getHth());
+//                        if (null != api1206List && api1206List.size() > 0) {
+//                            apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
+//                        }
+//                    } else {
+//                        apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
+//                    }
+//                }
 
                 apiData.setCchlx("01");
                 apiData.setXldd("搴撳唴");
                 apiData.setBz(StringUtils.isEmpty(sysData.getRemarks()) ? "鏆傛棤澶囨敞淇℃伅" : sysData.getRemarks());
-                apiData.setBzbdbz(25);
-                apiData.setBzbjs(0);
+                apiData.setBzbdbz(sysData.getDbz() == null ? 25 : sysData.getDbz());
+                apiData.setBzbjs(sysData.getBzbjs());
+                apiData.setJjlx(sysData.getJjlx());
                 apiData.setBzw(StringUtils.isEmpty(sysData.getBzw()) ? "9" : sysData.getBzw());
                 apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "闂ㄥ矖浜�" : sysData.getRegisterUser());
                 apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "鐧昏浜�" : sysData.getRegisterUser());

--
Gitblit v1.9.3