From a1f0690d10288f9aa82b7fe96a9c4e33d9ad7661 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 23 九月 2023 18:45:47 +0800
Subject: [PATCH] 优化出入库检验数据的时间顺序

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 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 89e8a4f..9aa6057 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
@@ -4,6 +4,7 @@
 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;
@@ -17,6 +18,8 @@
 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.*;
 
 /**
@@ -106,7 +109,16 @@
                 if(null == sysData.getFullWeightTime()){
                     sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
                 }
-                apiData.setQysj(DateUtils.addMinutes(sysData.getRegisterTime(), 10));
+
+                //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤锛岃嫢涓嶅尮閰嶏紝鍒欐洿鏀逛笟鍔℃椂闂翠负鍗曟嵁鍙锋墍鍦ㄧ殑鏃堕棿
+                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");

--
Gitblit v1.9.3