From 2627c9d3c01458587f9e1873a2a0284b8a08be04 Mon Sep 17 00:00:00 2001
From: WS <1143478319@qq.com>
Date: 星期二, 22 八月 2023 18:54:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
index f383d4b..2583529 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -5,6 +5,7 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.Api1203Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.api.view.repository.GbCheckItemRep;
@@ -14,6 +15,7 @@
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1203Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -37,9 +39,10 @@
private Fzzy35Sync1202Rep fzzySync1202Rep;
@Autowired
private Fzzy35Sync1203Rep fzzySync1203Rep;
-
@Autowired
private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1202Rep api1202Rep;
@Autowired
private Api1203Rep api1203Rep;
@Autowired
@@ -86,12 +89,11 @@
String zkj;
String zkl;
List<Api1203> api1203List;
+ List<Api1202> api1102List;
for (Fz35InoutRecord sysData : list) {
- if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
- sysData.setRecordWeight(sysData.getSettleWeight());
- }
- //鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
- if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+ //鏌ヨ绮鍏ュ簱淇℃伅锛岃嫢涓虹┖鍒欎笉杩涜鍚屾涓婁紶
+ api1102List = api1202Rep.getDataByBizId(sysData.getId());
+ if(null == api1102List || api1102List.isEmpty()){
continue;
}
@@ -102,19 +104,12 @@
continue;
}
- //鑾峰彇璐т綅淇℃伅
- api1105 = commonService.getApi1105Cache(sysData.getDepotId());
- if (null == api1105) {
- continue;
- }
-
apiData = new Api1203();
- apiData.setRkjydh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
-
+ apiData.setRkjydh(api1102List.get(0).getRkywdh());
//璐т綅浠ｇ爜
- apiData.setHwdm(api1105.getHwdm());
- apiData.setRkywdh(apiData.getRkjydh());
+ apiData.setHwdm(api1102List.get(0).getHwdm());
+ apiData.setRkywdh(api1102List.get(0).getRkywdh());
if(null == sysData.getFullWeightTime()){
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
}
@@ -160,6 +155,9 @@
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
apiData.setLspzdm(mappingCode);
+ //淇濈鍛樺鏍�
+ apiData.setBgyfh(apiData.getJyjg());
+
//绮绛夌骇
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());
apiData.setLsdd(mappingCode);
--
Gitblit v1.9.3