From 954480166aad6d24c9e9889906a0edf762f0da2a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 10 二月 2025 16:32:56 +0800
Subject: [PATCH] 优化库存同步

---
 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
index ffb073f..7a5bb82 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -81,6 +81,9 @@
         List<Fz35InoutNoticeOut> listInoutNotice;
         List<Api1205> api1205List;
         for (Fz35InoutRecord sysData : list) {
+            if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
+                continue;
+            }
             if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                 sysData.setRecordWeight(sysData.getSettleWeight());
             }
@@ -114,6 +117,8 @@
             apiData.setCktzdh(sysData.getNoticeId());
 
             apiData.setYwrq(sysData.getRegisterTime());
+            apiData.setCyr(sysData.getUserName().trim());
+            apiData.setSfzh(null == sysData.getUserId() ? "410183199003187055" : sysData.getUserId().trim());
 
             //鑾峰彇鍚堝悓鍙�
             listInoutNotice = fzzy35SyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
@@ -128,11 +133,11 @@
             apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
 
             //杞﹁埞鍙�
-            apiData.setCch(sysData.getPlateNum());
+            apiData.setCch(sysData.getPlateNum().trim());
             apiData.setDjsj(sysData.getRegisterTime());
 
             //绮鍝佺
-            String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+            String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
             apiData.setLspzdm(mappingCode);
 
             //绮绛夌骇
@@ -151,7 +156,7 @@
 
             //鐨噸淇℃伅
             apiData.setPz(sysData.getEmptyWeight());
-            if(sysData.getEmptyWeightTime().before(sysData.getRegisterTime())){
+            if(!sysData.getEmptyWeightTime().after(sysData.getRegisterTime())){
                 sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
             }
             apiData.setPzjlsj(sysData.getEmptyWeightTime());
@@ -160,7 +165,7 @@
 
             //姣涢噸淇℃伅
             apiData.setMz(sysData.getFullWeight());
-            if(sysData.getFullWeightTime().before(sysData.getEmptyWeightTime())){
+            if(!sysData.getFullWeightTime().after(sysData.getEmptyWeightTime())){
                 sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
             }
             apiData.setMzjlsj(sysData.getFullWeightTime());
@@ -169,7 +174,7 @@
 
             //鍑�閲�
             apiData.setJz(sysData.getRecordWeight());
-            if(sysData.getCompleteTime().before(sysData.getFullWeightTime())){
+            if(!sysData.getCompleteTime().after(sysData.getFullWeightTime())){
                 sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
             }
             apiData.setCmsj(sysData.getCompleteTime());

--
Gitblit v1.9.3