From fafc8d352aa1a4f943dd9e79d14e8e93ee12ce1f Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 11 十月 2023 08:42:11 +0800
Subject: [PATCH] 优化数据同步时品种转换
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java | 59 +++++++++++++++++++++++++++--------------------------------
1 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
index ded0330..eb161ac 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
@@ -1,13 +1,11 @@
package com.fzzy.async.fzzy40.impl;
import com.fzzy.api.Constant;
-import com.fzzy.api.entity.Api1105;
-import com.fzzy.api.entity.Api1203;
-import com.fzzy.api.entity.ApiLog;
-import com.fzzy.api.entity.GbCheckItem;
-import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.utils.DateUtil;
+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;
@@ -21,8 +19,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.Date;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* 绮鍏ュ簱妫�楠屼俊鎭�
@@ -40,15 +38,14 @@
private Fzzy40Sync1202Rep fzzySync1202Rep;
@Autowired
private Fzzy40Sync1203Rep fzzySync1203Rep;
-
@Autowired
private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1202Rep api1202Rep;
@Autowired
private Api1203Rep api1203Rep;
@Autowired
private GbCheckItemRep gbCheckItemRep;
- @Autowired
- private ApiCommonService commonService;
@Autowired
private ApiLogRep apiLogRep;
@@ -81,7 +78,6 @@
}
Api1203 apiData;
- Api1105 api1105;
List<Fz40CheckItem> fz40CheckItems;
List<GbCheckItem> gbCheckList;
String jyxm;
@@ -89,12 +85,11 @@
String zkj;
String zkl;
List<Api1203> api1203List;
+ List<Api1202> api1102List;
for (Fz40InoutRecord 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;
}
@@ -105,23 +100,25 @@
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));
}
- apiData.setQysj(sysData.getFullWeightTime());
+
+ //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤锛岃嫢涓嶅尮閰嶏紝鍒欐洿鏀逛笟鍔℃椂闂翠负鍗曟嵁鍙锋墍鍦ㄧ殑鏃堕棿
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
+ Date time = dateFormat.parse(apiData.getRkjydh().substring(2, 8));
+ int numDay = DateUtil.difDay(DateUtil.getCurZero(sysData.getRegisterTime()), DateUtil.getCurZero(time));
+ if(numDay != 0){
+ sysData.setRegisterTime(DateUtils.addDays(sysData.getRegisterTime(), numDay));
+ }
+
+ apiData.setQysj(sysData.getRegisterTime());
apiData.setQyrxm(sysData.getCheckUser());
//鎵︽牱鏂瑰紡 2-鏅鸿兘闅忔満
apiData.setQyfs("2");
@@ -157,16 +154,14 @@
apiData.setJyjg("1");
}
apiData.setJyrxm(sysData.getCheckUser());
- apiData.setJysj(DateUtils.addMinutes(sysData.getFullWeightTime(), 5));
+ apiData.setJysj(DateUtils.addMinutes(sysData.getRegisterTime(), 30));
//绮鍝佺
- 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);
- //绮瀹氱瓑
-
//淇濈鍛樺鏍�
-
+ apiData.setBgyfh(apiData.getJyjg());
//绮绛夌骇
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());
--
Gitblit v1.9.3