From 97c668bfeb07420baccadaf43abfbbb2b34fa467 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 11 十月 2023 08:46:53 +0800
Subject: [PATCH] 优化库存数据同步
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 55 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 696ffbc..993c05d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -7,6 +7,7 @@
import com.fzzy.api.service.ApiCommonService;
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.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeIn;
@@ -16,11 +17,12 @@
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;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* 绮鍏ュ簱淇℃伅
@@ -65,7 +67,6 @@
apiLog.setInteId(Constant.API_CODE_1202);
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
- String sfzh = "";
try {
//鑾峰彇绮鍏ュ簱璁板綍淇℃伅锛屾牴鎹祦绋嬪畬鎴愭椂闂磋幏鍙�
List<Fz40InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);
@@ -79,7 +80,6 @@
Api1105 api1105;
List<Fz40InoutNoticeIn> listInoutNotice;
List<Api1202> api1202List;
- Calendar c = Calendar.getInstance();
for (Fz40InoutRecord sysData : list) {
if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
sysData.setRecordWeight(sysData.getSettleWeight());
@@ -95,23 +95,28 @@
}
apiData = new Api1202();
-
apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
- //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤
- if(!DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd").equals(sysData.getId().substring(4, 10))){
- apiData.setRkywdh(Constant.INOUT_TYPE_14 + DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd") + sysData.getId().substring(10));
+
+ //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤锛岃嫢涓嶅尮閰嶏紝鍒欐洿鏀逛笟鍔℃椂闂翠负鍗曟嵁鍙锋墍鍦ㄧ殑鏃堕棿
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+ Date time = dateFormat.parse(sysData.getId().substring(2, 10));
+ int numDay = DateUtil.difDay(DateUtil.getCurZero(sysData.getCompleteTime()), DateUtil.getCurZero(time));
+ if(numDay != 0){
+ sysData.setFullWeightTime(DateUtils.addDays(sysData.getFullWeightTime(), numDay));
+ sysData.setEmptyWeightTime(DateUtils.addDays(sysData.getEmptyWeightTime(), numDay));
+ sysData.setCompleteTime(DateUtils.addDays(sysData.getCompleteTime(), numDay));
}
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
apiData.setYwlx(Constant.INOUT_TYPE_2);
- apiData.setYwrq(sysData.getRegisterTime());
+ apiData.setYwrq(sysData.getCompleteTime());
apiData.setCyr(sysData.getUserName());
//榛樿涓�涓殢渚垮��
- apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact());
+ apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
- apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId());
+ apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());
//鑾峰彇鍚堝悓鍙�
listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
@@ -127,10 +132,9 @@
apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
//杞﹁埞鍙�
- apiData.setCch(sysData.getPlateNum());
- c.setTime(sysData.getRegisterTime());
- c.add(Calendar.MINUTE,-3);
- apiData.setDjsj(c.getTime());
+ apiData.setCch(sysData.getPlateNum().trim());
+
+ apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
@@ -151,6 +155,9 @@
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
+ if(!sysData.getFullWeightTime().after(sysData.getRegisterTime())){
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
+ }
apiData.setMzjlsj(sysData.getFullWeightTime());
apiData.setMzjby(sysData.getFullWeightUser());
apiData.setMzjly(sysData.getFullWeightUser());
@@ -159,6 +166,9 @@
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
+ if(!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())){
+ sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
+ }
apiData.setPzjlsj(sysData.getEmptyWeightTime());
apiData.setPzjby(sysData.getEmptyWeightUser());
apiData.setPzjly(sysData.getEmptyWeightUser());
@@ -172,12 +182,13 @@
apiData.setXckl( 0 - sysData.getDeHandle());
apiData.setJz(sysData.getRecordWeight());
- c.setTime(sysData.getCompleteTime());
- c.add(Calendar.MINUTE,3);
- apiData.setCmsj(c.getTime());
+ if(!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())){
+ sysData.setCompleteTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 10));
+ }
+ apiData.setCmsj(sysData.getCompleteTime());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setZhgxsj(c.getTime());
+ apiData.setZhgxsj(sysData.getUpdateTime());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
apiData.setBizId(sysData.getId());
@@ -189,13 +200,13 @@
}else {
apiData.setCzbz(api1202List.get(0).getCzbz());
}
- sfzh = apiData.getSfzh();
+
//淇濆瓨鏁版嵁
api1202Rep.save(apiData);
log.info("1202---鍚屾鏁版嵁锛歿}", apiData.toString());
}
} catch (Exception e) {
- System.out.println(sfzh);
+
log.error("---鍚屾澶辫触----{}", e);
apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
apiLogRep.save(apiLog);
--
Gitblit v1.9.3