From 98ac5d4fd994172e106f66588062f5e79c9955b8 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 23 九月 2023 16:54:27 +0800
Subject: [PATCH] 优化出入库及检验接口同步数据时各流程的时间前后
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java | 4 +-
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java | 9 ++++
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1212Rep.java | 2 +
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java | 4 +-
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java | 30 ++++++++++----
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 9 ++++
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java | 9 ++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 9 ++++
src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java | 6 +-
9 files changed, 66 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
index ec1541f..04c796e 100644
--- a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
@@ -55,16 +55,16 @@
// fzzySync1212.syncData(kqdm, deptId, start, end);
//鍚堝悓鍚屾
-// fzzySync1201.syncData(kqdm, deptId, start, end);
+ fzzySync1201.syncData(kqdm, deptId, start, end);
//
// //绮鍏ュ簱鍚屾
-// fzzySync1202.syncData(kqdm, deptId, start, end);
+ fzzySync1202.syncData(kqdm, deptId, start, end);
//
// //绮鍏ュ簱璐ㄦ鍚屾
// fzzySync1203.syncData(kqdm, deptId, start, end);
//
// //绮鍏ュ簱缁撶畻鍚屾
- fzzySync1204.syncData(kqdm, deptId, start, end);
+// fzzySync1204.syncData(kqdm, deptId, start, end);
//
// //绮鍑哄簱鍚屾
// fzzySync1205.syncData(kqdm, deptId, start, end);
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
index 0f5faab..31d24c9 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
@@ -9,8 +9,11 @@
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1201Rep;
import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy35.entity.Fz35InoutCustomer;
import com.fzzy.async.fzzy35.entity.Fz35MContract;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1201Rep;
+import com.fzzy.async.fzzy35.repository.Fzzy35Sync1212Rep;
+import com.fzzy.async.fzzy40.entity.Fz40InoutCustomer;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +39,9 @@
private Api1102Rep api1102Rep;
@Autowired
private ApiLogRep apiLogRep;
+
+ @Autowired
+ private Fzzy35Sync1212Rep fzzySync1212Rep;
/**
@@ -70,6 +76,7 @@
Api1201 apiData;
List<Api1201> api1201List;
+ List<Fz35InoutCustomer> listCustomer;
for (Fz35MContract sysData : list) {
apiData = new Api1201();
@@ -79,20 +86,24 @@
apiData.setDwdm(api1201.getDwdm());
//涓氬姟绫诲瀷
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HT_YWLX, sysData.getType());
- apiData.setYwlx(mappingCode);
+ apiData.setYwlx(sysData.getType());
//瀹㈡埛绫诲瀷
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_KHLX, sysData.getCustomerType());
- apiData.setKhlx(mappingCode);
-
- apiData.setKhtyshxydm(StringUtils.isEmpty(sysData.getCustomerId()) ? "100000000000000000" :sysData.getCustomerId());
+ apiData.setKhlx(sysData.getCustomerType());
+ //浼佷笟瀹㈡埛锛岄渶瑕佽缃俊鐢ㄧ爜
+ if ("1".equals(sysData.getCustomerType())) {
+ listCustomer = fzzySync1212Rep.getDataById(sysData.getCustomerId());
+ if (null == listCustomer || listCustomer.isEmpty()) {
+ continue;
+ }
+ apiData.setKhtyshxydm(listCustomer.get(0).getKhbh());
+ }
apiData.setKhmc(sysData.getCustomerName());
- apiData.setFddbr(sysData.getCustomerSignUser());
+ apiData.setFddbr(StringUtils.isEmpty(sysData.getCustomerSignUser()) ? null : sysData.getCustomerSignUser());
apiData.setQdrq(sysData.getSigningTime());
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
apiData.setLspzdm(mappingCode);
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodVariety());
@@ -107,9 +118,10 @@
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_JSYHTYZX, "");
apiData.setJsyhtyzx(mappingCode);
+ apiData.setJsyhtyzx("1");
+
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_BANK, sysData.getCustomerBank());
apiData.setKhfkhh(mappingCode);
-
apiData.setKhfzh(sysData.getCustomerBankAccount());
apiData.setKhqyr(sysData.getCustomerSignUser());
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 90d7b8f..710a7ef 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -153,6 +153,9 @@
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
+ if(sysData.getFullWeightTime().before(sysData.getRegisterTime())){
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
+ }
apiData.setMzjlsj(sysData.getFullWeightTime());
apiData.setMzjby(sysData.getFullWeightUser());
apiData.setMzjly(sysData.getFullWeightUser());
@@ -161,6 +164,9 @@
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
+ if(sysData.getEmptyWeightTime().before(sysData.getFullWeightTime())){
+ sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
+ }
apiData.setPzjlsj(sysData.getEmptyWeightTime());
apiData.setPzjby(sysData.getEmptyWeightUser());
apiData.setPzjly(sysData.getEmptyWeightUser());
@@ -178,6 +184,9 @@
apiData.setXckl( 0 - sysData.getDeHandle());
apiData.setJz(sysData.getRecordWeight());
+ if(sysData.getCompleteTime().before(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 2583529..d4547c7 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -113,7 +113,7 @@
if(null == sysData.getFullWeightTime()){
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
}
- apiData.setQysj(sysData.getFullWeightTime());
+ apiData.setQysj(DateUtils.addMinutes(sysData.getRegisterTime(), 10));
apiData.setQyrxm(sysData.getCheckUser());
//鎵︽牱鏂瑰紡 2-鏅鸿兘闅忔満
apiData.setQyfs("2");
@@ -149,7 +149,7 @@
apiData.setJyjg("1");
}
apiData.setJyrxm(sysData.getCheckUser());
- apiData.setJysj(DateUtils.addMinutes(sysData.getFullWeightTime(), 5));
+ apiData.setJysj(DateUtils.addMinutes(sysData.getRegisterTime(), 90));
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
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 4476f2a..155850e 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -151,18 +151,27 @@
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
+ if(sysData.getEmptyWeightTime().before(sysData.getRegisterTime())){
+ sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
+ }
apiData.setPzjlsj(sysData.getEmptyWeightTime());
apiData.setPzjby(sysData.getEmptyWeightUser());
apiData.setPzjly(sysData.getEmptyWeightUser());
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
+ if(sysData.getFullWeightTime().before(sysData.getEmptyWeightTime())){
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
+ }
apiData.setMzjlsj(sysData.getFullWeightTime());
apiData.setMzjby(sysData.getFullWeightUser());
apiData.setMzjly(sysData.getFullWeightUser());
//鍑�閲�
apiData.setJz(sysData.getRecordWeight());
+ if(sysData.getCompleteTime().before(sysData.getFullWeightTime())){
+ sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
+ }
apiData.setCmsj(sysData.getCompleteTime());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1212Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1212Rep.java
index e4867a2..f4ead2b 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1212Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1212Rep.java
@@ -19,4 +19,6 @@
@Query("from Fz35InoutCustomer where deptId=:deptId order by id ")
List<Fz35InoutCustomer> listInoutCustomer(@Param("deptId") String deptId);
+ @Query("from Fz35InoutCustomer where id=:id order by id ")
+ List<Fz35InoutCustomer> getDataById(@Param("id") String id);
}
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 fb5fbdc..d439085 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -155,6 +155,9 @@
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
+ if(sysData.getFullWeightTime().before(sysData.getRegisterTime())){
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
+ }
apiData.setMzjlsj(sysData.getFullWeightTime());
apiData.setMzjby(sysData.getFullWeightUser());
apiData.setMzjly(sysData.getFullWeightUser());
@@ -163,6 +166,9 @@
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
+ if(sysData.getEmptyWeightTime().before(sysData.getFullWeightTime())){
+ sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
+ }
apiData.setPzjlsj(sysData.getEmptyWeightTime());
apiData.setPzjby(sysData.getEmptyWeightUser());
apiData.setPzjly(sysData.getEmptyWeightUser());
@@ -176,6 +182,9 @@
apiData.setXckl( 0 - sysData.getDeHandle());
apiData.setJz(sysData.getRecordWeight());
+ if(sysData.getCompleteTime().before(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 ea46b9a..89e8a4f 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
@@ -106,7 +106,7 @@
if(null == sysData.getFullWeightTime()){
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
}
- apiData.setQysj(sysData.getFullWeightTime());
+ apiData.setQysj(DateUtils.addMinutes(sysData.getRegisterTime(), 10));
apiData.setQyrxm(sysData.getCheckUser());
//鎵︽牱鏂瑰紡 2-鏅鸿兘闅忔満
apiData.setQyfs("2");
@@ -142,7 +142,7 @@
apiData.setJyjg("1");
}
apiData.setJyrxm(sysData.getCheckUser());
- apiData.setJysj(DateUtils.addMinutes(sysData.getFullWeightTime(), 5));
+ apiData.setJysj(DateUtils.addMinutes(sysData.getRegisterTime(), 90));
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
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 36241be..bd94dbd 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -150,18 +150,27 @@
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
+ if(sysData.getEmptyWeightTime().before(sysData.getRegisterTime())){
+ sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
+ }
apiData.setPzjlsj(sysData.getEmptyWeightTime());
apiData.setPzjby(sysData.getEmptyWeightUser());
apiData.setPzjly(sysData.getEmptyWeightUser());
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
+ if(sysData.getFullWeightTime().before(sysData.getEmptyWeightTime())){
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
+ }
apiData.setMzjlsj(sysData.getFullWeightTime());
apiData.setMzjby(sysData.getFullWeightUser());
apiData.setMzjly(sysData.getFullWeightUser());
//鍑�閲�
apiData.setJz(sysData.getRecordWeight());
+ if(sysData.getCompleteTime().before(sysData.getFullWeightTime())){
+ sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
+ }
apiData.setCmsj(sysData.getCompleteTime());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
--
Gitblit v1.9.3