From b6faf70a938ca9e014d34b235dec449f2a21abb4 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 30 六月 2025 17:03:13 +0800
Subject: [PATCH] 数据同步时,品种处理

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 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..547816e 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());
                 }
@@ -152,7 +155,10 @@
                 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());
+                if(StringUtils.isEmpty(mappingCode)) {
+                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
+                }
                 apiData.setLspzdm(mappingCode);
 
                 //绮绛夌骇
@@ -235,8 +241,9 @@
                 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