From 4c6b38c84b14e90bd0844046645c61796746696c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 09 三月 2024 14:18:03 +0800
Subject: [PATCH] 出库结算信息加入货位字段，上传不使用

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java |   39 ++++++++++++++++++++++++++++++++-------
 1 files changed, 32 insertions(+), 7 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 054561f..e01d57b 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -44,6 +44,8 @@
     @Autowired
     private Api1205Rep api1205Rep;
     @Autowired
+    private Api1206Rep api1206Rep;
+    @Autowired
     private Api1404Rep api1404Rep;
     @Autowired
     private ApiCommonService commonService;
@@ -82,6 +84,7 @@
         Api1105 api1105;
         List<Fz40InoutNoticeOut> listInoutNotice;
         List<Api1205> api1205List;
+        List<Api1206> api1206List;
         List<Fz40InoutRecordItem> listInoutRecordItem;
         for (Fz40InoutRecord sysData : list) {
             if(sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")){
@@ -114,6 +117,7 @@
             if(StringUtils.isEmpty(sysData.getUserId()) || sysData.getUserId().length() != 18){
                 sysData.setUserId("410183199003187055");
             }
+            apiData.setSfzh(sysData.getUserId());
 
             //閫氱煡鍗曞彿
             apiData.setCktzdh(sysData.getNoticeId());
@@ -128,9 +132,12 @@
                     }
                 }
                 if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
-                    List<Api1404> api1404List = api1404Rep.getDataByBizId(listInoutNotice.get(0).getPlanId());
+                    List<Api1404> api1404List = api1404Rep.getDataByBizIdAndKqdm(listInoutNotice.get(0).getPlanId(), kqdm);
                     if(null != api1404List && api1404List.size() > 0){
                         apiData.setJhmxh(api1404List.get(0).getJhmxdh());
+                        if(StringUtils.isEmpty(sysData.getFoodYear())){
+                            sysData.setFoodYear(api1404List.get(0).getShnd());
+                        }
                     }
                 }
             }
@@ -154,7 +161,7 @@
             mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
             apiData.setLsxzdm(mappingCode);
 
-            apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear())? DateFormatUtils.format(new Date(), "yyyy") :sysData.getFoodYear());
+            apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear())? DateFormatUtils.format(sysData.getRegisterTime(), "yyyy") :sysData.getFoodYear());
 
             //浜у湴浠ｇ爜
             mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
@@ -172,8 +179,8 @@
                 sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
             }
             apiData.setPzjlsj(sysData.getEmptyWeightTime());
-            apiData.setPzjby(sysData.getEmptyWeightUser());
-            apiData.setPzjly(sysData.getEmptyWeightUser());
+            apiData.setPzjby(StringUtils.isEmpty(sysData.getEmptyWeightUser())?"鐩戠鍛�":sysData.getEmptyWeightUser());
+            apiData.setPzjly(StringUtils.isEmpty(sysData.getEmptyWeightUser())?"璁￠噺鍛�":sysData.getEmptyWeightUser());
 
             //姣涢噸淇℃伅
             apiData.setMz(sysData.getFullWeight());
@@ -184,8 +191,8 @@
                 sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
             }
             apiData.setMzjlsj(sysData.getFullWeightTime());
-            apiData.setMzjby(sysData.getFullWeightUser());
-            apiData.setMzjly(sysData.getFullWeightUser());
+            apiData.setMzjby(StringUtils.isEmpty(sysData.getFullWeightUser())?"鐩戠鍛�":sysData.getFullWeightUser());
+            apiData.setMzjly(StringUtils.isEmpty(sysData.getFullWeightUser())?"璁￠噺鍛�":sysData.getFullWeightUser());
 
             //鍑�閲�
             apiData.setJz(sysData.getRecordWeight());
@@ -193,9 +200,27 @@
                 sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
             }
             apiData.setCmsj(sysData.getCompleteTime());
+            //缁撶畻鍗曞彿
             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());
+                }
+            }
+
+            apiData.setCchlx("01");
+            apiData.setXldd("搴撳唴");
+            apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser());
+            apiData.setZcbgyxm(StringUtils.isEmpty(sysData.getHandleUser())?"鍊间粨鍛�":sysData.getHandleUser());
+            apiData.setZxzydw("澶栬仒鍗曚綅");
 
             //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
             apiData.setZhgxsj(sysData.getUpdateTime());
@@ -204,7 +229,7 @@
             apiData.setBizId(sysData.getId());
             apiData.setKqdm(kqdm);
             apiData.setSyncTime(new Date());
-            log.info("1201---鍚屾鏁版嵁锛歿}",apiData.toString());
+            log.info("1205---鍚屾鏁版嵁锛歿}",apiData.toString());
 
             //鍒ゆ柇鏄惁涓鸿埞杩�
             if(StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")){

--
Gitblit v1.9.3