From d52b2dfd340399bdd71e124c4b0d9828dcd830c2 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 23 九月 2023 17:39:06 +0800
Subject: [PATCH] 优化出入库数据录入时时间与单号日期不一致问题
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java | 2
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java | 2
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java | 2
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 2
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java | 2
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 44 +++++++++++-----------
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 2
src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java | 48 ++++++++++++------------
8 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
index 04c796e..2767c5d 100644
--- a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
@@ -52,34 +52,34 @@
Date start = param.getStart();
Date end = param.getEnd();
//瀹㈡埛鍗曚綅淇℃伅鍚屾
-// fzzySync1212.syncData(kqdm, deptId, start, end);
+ fzzySync1212.syncData(kqdm, deptId, start, end);
//鍚堝悓鍚屾
fzzySync1201.syncData(kqdm, deptId, start, end);
-//
-// //绮鍏ュ簱鍚屾
+
+ //绮鍏ュ簱鍚屾
fzzySync1202.syncData(kqdm, deptId, start, end);
-//
-// //绮鍏ュ簱璐ㄦ鍚屾
-// 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);
-//
-// //鏂囦欢淇℃伅鍚屾
-// fzzy35Sync1109.syncData(kqdm, deptId, start, end);
-//
-// //绮搴撳瓨鍚屾
-// fzzySync1208.syncData(kqdm, deptId, start, end);
+
+ //绮鍏ュ簱璐ㄦ鍚屾
+ 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);
+
+ //鏂囦欢淇℃伅鍚屾
+ fzzy35Sync1109.syncData(kqdm, deptId, start, end);
+
+ //绮搴撳瓨鍚屾
+ fzzySync1208.syncData(kqdm, deptId, start, end);
}
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
index 90c59db..12fb26d 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
@@ -147,7 +147,7 @@
apiData.setWjlx(wjlx);
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(sysData.getCreateTime());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
apiData.setBizId(sysData.getFileId());
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 710a7ef..101db1e 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -99,7 +99,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));
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 155850e..ffb073f 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -99,7 +99,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));
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 8880181..bc459b1 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/Fzzy40Sync1109.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
index 61c3e9b..39421a0 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
@@ -148,7 +148,7 @@
apiData.setWjlx(wjlx);
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(sysData.getCreateTime());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
apiData.setBizId(sysData.getFileId());
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 d439085..23e301a 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -100,7 +100,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));
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..5a14ab2 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));
--
Gitblit v1.9.3