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/fzzy35/impl/Fzzy35Sync1203.java | 13 ++++++
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java | 6 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java | 14 ++++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 6 +-
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java | 6 +-
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 44 +++++++++++-----------
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 6 +-
7 files changed, 59 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
index 101db1e..198a7ea 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -153,7 +153,7 @@
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
- if(sysData.getFullWeightTime().before(sysData.getRegisterTime())){
+ if(!sysData.getFullWeightTime().after(sysData.getRegisterTime())){
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
}
apiData.setMzjlsj(sysData.getFullWeightTime());
@@ -164,7 +164,7 @@
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
- if(sysData.getEmptyWeightTime().before(sysData.getFullWeightTime())){
+ if(!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())){
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
}
apiData.setPzjlsj(sysData.getEmptyWeightTime());
@@ -184,7 +184,7 @@
apiData.setXckl( 0 - sysData.getDeHandle());
apiData.setJz(sysData.getRecordWeight());
- if(sysData.getCompleteTime().before(sysData.getEmptyWeightTime())){
+ if(!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())){
sysData.setCompleteTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 10));
}
apiData.setCmsj(sysData.getCompleteTime());
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
index d4547c7..37544c8 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -5,6 +5,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.Api1203Rep;
import com.fzzy.api.view.repository.ApiLogRep;
@@ -20,6 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -113,7 +115,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");
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
index ffb073f..ce60794 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -151,7 +151,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());
@@ -160,7 +160,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());
@@ -169,7 +169,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());
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index bc459b1..8880181 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -73,10 +73,10 @@
}
//瀹㈡埛鍚屾
-// fzzySync1212.syncData(kqdm, deptId, start, end);
+ fzzySync1212.syncData(kqdm, deptId, start, end);
//鍚堝悓鍚屾
-// fzzySync1201.syncData(kqdm, deptId, start, end);
+ fzzySync1201.syncData(kqdm, deptId, start, end);
//绮鍏ュ簱鍚屾
fzzySync1202.syncData(kqdm, deptId, start, end);
@@ -84,26 +84,26 @@
//绮鍏ュ簱璐ㄦ
fzzySync1203.syncData(kqdm, deptId, start, end);
-// //绮鍏ュ簱缁撶畻
-// fzzySync1204.syncData(kqdm, deptId, start, end);
-// //绮鍑哄簱鍚屾
-// fzzySync1205.syncData(kqdm, deptId, start, end);
-//
-// //绮鍑哄簱缁撶畻
-// fzzySync1206.syncData(kqdm, deptId, start, end);
-// //绮鎹熺泭
-// fzzySync1209.syncData(kqdm, deptId, start, end);
-// //鍊掍粨淇℃伅鍚屾
-// fzzySync1207.syncData(kqdm, deptId, start, end);
-//
-// //鍑哄叆搴撴枃浠朵俊鎭悓姝�
-// fzzySync1109.syncData(kqdm, deptId, start, end);
-//
-// //绮搴撳瓨鍚屾
-// fzzySync1208.syncData(kqdm, deptId, start, end);
-//
-// //绮鎬ц川杞彉淇℃伅鍚屾
-// fzzySync1210.syncData(kqdm, deptId, start, end);
+ //绮鍏ュ簱缁撶畻
+ fzzySync1204.syncData(kqdm, deptId, start, end);
+ //绮鍑哄簱鍚屾
+ fzzySync1205.syncData(kqdm, deptId, start, end);
+
+ //绮鍑哄簱缁撶畻
+ fzzySync1206.syncData(kqdm, deptId, start, end);
+ //绮鎹熺泭
+ fzzySync1209.syncData(kqdm, deptId, start, end);
+ //鍊掍粨淇℃伅鍚屾
+ fzzySync1207.syncData(kqdm, deptId, start, end);
+
+ //鍑哄叆搴撴枃浠朵俊鎭悓姝�
+ fzzySync1109.syncData(kqdm, deptId, start, end);
+
+ //绮搴撳瓨鍚屾
+ fzzySync1208.syncData(kqdm, deptId, start, end);
+
+ //绮鎬ц川杞彉淇℃伅鍚屾
+ fzzySync1210.syncData(kqdm, deptId, start, end);
//璐﹂潰搴撳瓨淇℃伅鍚屾 TODO
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 23e301a..993c05d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -155,7 +155,7 @@
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
- if(sysData.getFullWeightTime().before(sysData.getRegisterTime())){
+ if(!sysData.getFullWeightTime().after(sysData.getRegisterTime())){
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
}
apiData.setMzjlsj(sysData.getFullWeightTime());
@@ -166,7 +166,7 @@
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
- if(sysData.getEmptyWeightTime().before(sysData.getFullWeightTime())){
+ if(!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())){
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
}
apiData.setPzjlsj(sysData.getEmptyWeightTime());
@@ -182,7 +182,7 @@
apiData.setXckl( 0 - sysData.getDeHandle());
apiData.setJz(sysData.getRecordWeight());
- if(sysData.getCompleteTime().before(sysData.getEmptyWeightTime())){
+ if(!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())){
sysData.setCompleteTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 10));
}
apiData.setCmsj(sysData.getCompleteTime());
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");
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 5a14ab2..2eae7fc 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -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