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/fzzy40/impl/Fzzy40Sync1208.java |   46 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
index be7a4b5..72d6d97 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -108,20 +108,45 @@
                 apiData.setCd(mappingCode);
 
                 apiData.setBgy(StringUtils.isEmpty(api1105.getBgy()) ? "淇濈鍛�" : api1105.getBgy());
-                //绮潈褰掑睘鍗曚綅
-                if (StringUtils.isEmpty(fz40DepotStore.getLqgsdwdm())) {
-                    apiData.setLqgsdwdm(api1102.getDwdm());
-                } else {
-                    apiData.setLqxzqhdm(fz40DepotStore.getLqgsdwdm());
-                }
-                //绮潈琛屾斂鍖哄垝浠g爜
+
                 apiData.setLqxzqhdm(api1102.getXzqhdm());
+                if (apiData.getLsxzdm().equals("121")) {
+                    //鐪佺骇鍌ㄥ绮�-绮潈琛屾斂鍖哄垝浠g爜涓虹渷绾�
+                    apiData.setLqxzqhdm(api1102.getXzqhdm().substring(0, 2) + "0000");
+                }
+                if (apiData.getLsxzdm().equals("122")) {
+                    //甯傜骇鍌ㄥ绮�-绮潈琛屾斂鍖哄垝浠g爜涓哄競绾�
+                    apiData.setLqxzqhdm(api1102.getXzqhdm().substring(0, 4) + "00");
+                }
+
+                //绮潈褰掑睘鍗曚綅
+                api1208List = api1208Rep.findDataByHwdm(api1105.getHwdm());
+                if(null != api1208List && api1208List.size() > 0){
+                    apiData.setLqgsdwdm(api1208List.get(0).getLqgsdwdm());
+                    apiData.setLqxzqhdm(api1208List.get(0).getLqxzqhdm());
+                    apiData.setLqgstydwbm(api1208List.get(0).getLqgstydwbm());
+                }
+
+                //鑻ヤ负鍟嗗搧绮紝鍒欑伯鏉冩�ц川鍖哄垝浠g爜涓簄ull
+                if("200".equals(apiData.getLsxzdm())){
+                    apiData.setLqxzqhdm(null);
+                }
+
                 //绠$悊鏂瑰紡-榛樿鐩村偍
-                apiData.setGlfs("01");
+                if (StringUtils.isEmpty(fz40DepotStore.getManageType())) {
+                    apiData.setGlfs("01");
+                } else {
+                    apiData.setGlfs(fz40DepotStore.getManageType());
+                }
+
                 //鏀跺偍鍦扮偣-榛樿搴撳唴
                 apiData.setScdd("1");
                 //鍌ㄧ伯鏂瑰紡
                 apiData.setClfs(fz40DepotStore.getStoreType());
+                //鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
+                if ("2".equals(apiData.getClfs())) {
+                    apiData.setBclbs((int) (fz40DepotStore.getStorageReal() / 25));
+                }
 
                 //璐т綅鐘舵��
                 mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz40DepotStore.getDepotStatus());
@@ -133,7 +158,10 @@
                 apiData.setRcsj(fz40DepotStore.getStoreDate());
                 //灏佷粨鏃ユ湡
                 if ("3".equals(apiData.getHwzt()) || "4".equals(apiData.getHwzt())) {
-                    apiData.setFcrq(DateUtils.addDays(fz40DepotStore.getStoreDate(), 10));
+                    if (null == fz40DepotStore.getFullDate()) {
+                        fz40DepotStore.setFullDate(DateUtils.addDays(fz40DepotStore.getStoreDate(), 30));
+                    }
+                    apiData.setFcrq(fz40DepotStore.getFullDate());
                 }
 
                 if ("1".equals(apiData.getHwzt())) {

--
Gitblit v1.9.3