From edca45e62b6bb47e51853c4168415f20c2f861cd Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 13 九月 2023 15:03:45 +0800
Subject: [PATCH] 调整出入库业务时间跟单号日期不统一的问题
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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 86a9d16..36241be 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.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.Api1205Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeOut;
@@ -16,9 +17,11 @@
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.text.SimpleDateFormat;
import java.util.*;
/**
@@ -77,9 +80,6 @@
Api1105 api1105;
List<Fz40InoutNoticeOut> listInoutNotice;
List<Api1205> api1205List;
- String ywsj = "";
- String num = "";
- Map<String, Integer> map = new HashMap<>();
for (Fz40InoutRecord sysData : list) {
if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
sysData.setRecordWeight(sysData.getSettleWeight());
@@ -95,15 +95,14 @@
}
apiData = new Api1205();
apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4));
- //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤
- ywsj = DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd");
- if(!ywsj.equals(sysData.getId().substring(4, 10))){
- if(null == map.get(ywsj)){
- map.put(ywsj, 10201);
- }
- num = String.valueOf(map.get(ywsj)).substring(1);
- apiData.setCkywdh(Constant.INOUT_TYPE_15 + ywsj + num);
- map.put(ywsj, map.get(ywsj) + 1);
+ //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤锛岃嫢涓嶅尮閰嶏紝鍒欐洿鏀逛笟鍔℃椂闂翠负鍗曟嵁鍙锋墍鍦ㄧ殑鏃堕棿
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+ Date time = dateFormat.parse(sysData.getId().substring(2, 10));
+ int numDay = DateUtil.difDay(sysData.getCompleteTime(), 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));
}
//璐т綅浠ｇ爜
--
Gitblit v1.9.3