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/Fzzy40Sync1205.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 bd94dbd..2eae7fc 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -98,7 +98,7 @@
             //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤锛岃嫢涓嶅尮閰嶏紝鍒欐洿鏀逛笟鍔℃椂闂翠负鍗曟嵁鍙锋墍鍦ㄧ殑鏃堕棿
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
             Date time = dateFormat.parse(sysData.getId().substring(2, 10));
-            int numDay = DateUtil.difDay(sysData.getCompleteTime(), time);
+            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));
@@ -150,7 +150,7 @@
 
             //鐨噸淇℃伅
             apiData.setPz(sysData.getEmptyWeight());
-            if(sysData.getEmptyWeightTime().before(sysData.getRegisterTime())){
+            if(!sysData.getEmptyWeightTime().after(sysData.getRegisterTime())){
                 sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
             }
             apiData.setPzjlsj(sysData.getEmptyWeightTime());
@@ -159,7 +159,7 @@
 
             //姣涢噸淇℃伅
             apiData.setMz(sysData.getFullWeight());
-            if(sysData.getFullWeightTime().before(sysData.getEmptyWeightTime())){
+            if(!sysData.getFullWeightTime().after(sysData.getEmptyWeightTime())){
                 sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
             }
             apiData.setMzjlsj(sysData.getFullWeightTime());
@@ -168,7 +168,7 @@
 
             //鍑�閲�
             apiData.setJz(sysData.getRecordWeight());
-            if(sysData.getCompleteTime().before(sysData.getFullWeightTime())){
+            if(!sysData.getCompleteTime().after(sysData.getFullWeightTime())){
                 sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
             }
             apiData.setCmsj(sysData.getCompleteTime());

--
Gitblit v1.9.3