From e2a064410d4ea573bae6e8bf96da378c8ad0e809 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 05 三月 2024 15:31:14 +0800
Subject: [PATCH] 优化出入库信息的结算单绑定
---
src/main/java/com/fzzy/api/entity/Api1211.java | 2 +-
src/main/java/com/fzzy/api/view/repository/Api1204Rep.java | 3 +++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 17 ++++++++++++-----
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 10 ++++++----
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 10 ++++++++++
src/main/java/com/fzzy/api/view/repository/Api1206Rep.java | 3 +++
6 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1211.java b/src/main/java/com/fzzy/api/entity/Api1211.java
index 39103b2..7291b63 100644
--- a/src/main/java/com/fzzy/api/entity/Api1211.java
+++ b/src/main/java/com/fzzy/api/entity/Api1211.java
@@ -34,7 +34,7 @@
@JSONField(serialize = false)
@Id
- @Column(name = "bizId", length = 60)
+ @Column(name = "id", length = 60)
private String id;
@JSONField(serialize = false)
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1204Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1204Rep.java
index 4eebaeb..2de818d 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1204Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1204Rep.java
@@ -26,4 +26,7 @@
@Query("from Api1204 where rkjsdh=:rkjsdh ")
List<Api1204> getDataById(@Param("rkjsdh") String rkjsdh);
+
+ @Query("from Api1204 where hth=:hth ")
+ List<Api1204> getDataByHth(@Param("hth") String hth);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1206Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1206Rep.java
index ff212bc..8612390 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1206Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1206Rep.java
@@ -25,4 +25,7 @@
@Query("from Api1206 where ckjsdh=:ckjsdh ")
List<Api1206> getDataById(@Param("ckjsdh") String ckjsdh);
+
+ @Query("from Api1206 where hth=:hth ")
+ List<Api1206> getDataByHth(@Param("hth") String hth);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 4154085..52b6c4e 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -70,19 +70,21 @@
//鍚堝悓鍚屾
fzzySync1201.syncData(kqdm, deptId, start, end);
+ //绮鍏ュ簱缁撶畻
+ fzzySync1204.syncData(kqdm, deptId, start, end);
+
//绮鍏ュ簱鍚屾
fzzySync1202.syncData(kqdm, deptId, start, end);
//绮鍏ュ簱璐ㄦ
fzzySync1203.syncData(kqdm, deptId, start, end);
- //绮鍏ュ簱缁撶畻
- fzzySync1204.syncData(kqdm, deptId, start, end);
+ //绮鍑哄簱缁撶畻
+ fzzySync1206.syncData(kqdm, deptId, start, end);
+
//绮鍑哄簱鍚屾
fzzySync1205.syncData(kqdm, deptId, start, end);
- //绮鍑哄簱缁撶畻
- fzzySync1206.syncData(kqdm, deptId, start, end);
//绮鎹熺泭
fzzySync1209.syncData(kqdm, deptId, start, end);
//鍊掍粨淇℃伅鍚屾
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 caff32f..77c0db5 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -5,10 +5,7 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.view.repository.Api1201Rep;
-import com.fzzy.api.view.repository.Api1202Rep;
-import com.fzzy.api.view.repository.Api1404Rep;
-import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.api.view.repository.*;
import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeIn;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecordItem;
@@ -49,6 +46,8 @@
@Autowired
private Api1202Rep api1202Rep;
@Autowired
+ private Api1204Rep api1204Rep;
+ @Autowired
private Api1404Rep api1404Rep;
@Autowired
private ApiCommonService commonService;
@@ -88,6 +87,7 @@
List<Api1202> api1202List;
List<Fz40InoutRecordItem> listInoutRecordItem;
List<Api1201> api1201List;
+ List<Api1204> api1204List;
List<Api1404> api1404List;
for (Fz40InoutRecord sysData : list) {
if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
@@ -206,9 +206,16 @@
apiData.setBzwkl(0 - sysData.getDePackage());
apiData.setBzbjs(sysData.getBzbjs());
apiData.setCmsj(sysData.getCompleteTime());
- if (StringUtils.isNotEmpty(sysData.getSettleId())) {
+ //缁撶畻鍗曞彿
+ if(StringUtils.isNotEmpty(sysData.getSettleId())){
apiData.setRkjsdh(kqdm + sysData.getSettleId());
}
+ if(StringUtils.isNotEmpty(apiData.getHth())){
+ api1204List = api1204Rep.getDataByHth(apiData.getHth());
+ if(null != api1204List && api1204List.size() > 0){
+ apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
+ }
+ }
//鍏跺畠
apiData.setQtkl(0 - sysData.getDeOther());
//鍊间粨 鐜板満鎵ｉ噸
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 0975df3..d08232b 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -44,6 +44,8 @@
@Autowired
private Api1205Rep api1205Rep;
@Autowired
+ private Api1206Rep api1206Rep;
+ @Autowired
private Api1404Rep api1404Rep;
@Autowired
private ApiCommonService commonService;
@@ -82,6 +84,7 @@
Api1105 api1105;
List<Fz40InoutNoticeOut> listInoutNotice;
List<Api1205> api1205List;
+ List<Api1206> api1206List;
List<Fz40InoutRecordItem> listInoutRecordItem;
for (Fz40InoutRecord sysData : list) {
if(sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")){
@@ -197,9 +200,16 @@
sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
}
apiData.setCmsj(sysData.getCompleteTime());
+ //缁撶畻鍗曞彿
if(StringUtils.isNotEmpty(sysData.getSettleId())){
apiData.setCkjsdh(kqdm + sysData.getSettleId());
}
+ if(StringUtils.isNotEmpty(apiData.getHth())){
+ api1206List = api1206Rep.getDataByHth(apiData.getHth());
+ if(null != api1206List && api1206List.size() > 0){
+ apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
+ }
+ }
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
apiData.setZhgxsj(sysData.getUpdateTime());
--
Gitblit v1.9.3