From 4c6b38c84b14e90bd0844046645c61796746696c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 09 三月 2024 14:18:03 +0800
Subject: [PATCH] 出库结算信息加入货位字段，上传不使用
---
src/main/java/com/fzzy/api/entity/Api1206.java | 5 +++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java | 11 +++++++++++
src/main/java/com/fzzy/api/entity/Api1202.java | 2 +-
src/main/java/com/fzzy/api/entity/Api1205.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 10 +++++++---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 6 ++++++
6 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1202.java b/src/main/java/com/fzzy/api/entity/Api1202.java
index 128c4d7..8ebb43d 100644
--- a/src/main/java/com/fzzy/api/entity/Api1202.java
+++ b/src/main/java/com/fzzy/api/entity/Api1202.java
@@ -86,7 +86,7 @@
private String cchlx;
@PropertyDef(label = "鎸傝溅鍙�")
- @Column(name = "gch", length = 7)
+ @Column(name = "gch", length = 32)
private String gch;
@PropertyDef(label = "瑁呯伯鍦扮偣")
diff --git a/src/main/java/com/fzzy/api/entity/Api1205.java b/src/main/java/com/fzzy/api/entity/Api1205.java
index 799a3d0..0091b73 100644
--- a/src/main/java/com/fzzy/api/entity/Api1205.java
+++ b/src/main/java/com/fzzy/api/entity/Api1205.java
@@ -88,7 +88,7 @@
private String cchlx;
@PropertyDef(label = "鎸傝溅鍙�")
- @Column(name = "gch", length = 7)
+ @Column(name = "gch", length = 32)
private String gch;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/com/fzzy/api/entity/Api1206.java b/src/main/java/com/fzzy/api/entity/Api1206.java
index 0382116..468ffb1 100644
--- a/src/main/java/com/fzzy/api/entity/Api1206.java
+++ b/src/main/java/com/fzzy/api/entity/Api1206.java
@@ -96,4 +96,9 @@
@PropertyDef(label = "鏇存柊鏃堕棿")
@Column(name = "zhgxsj")
private Date zhgxsj;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ @Column(name = "hwdm", length = 30)
+ private String hwdm;
}
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 c9295df..e01d57b 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -147,7 +147,6 @@
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum());
- apiData.setGch(sysData.getPlateNum());
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
@@ -206,8 +205,13 @@
apiData.setCkjsdh(kqdm + sysData.getSettleId());
}
if(StringUtils.isNotEmpty(apiData.getHth())){
- api1206List = api1206Rep.getDataByHth(apiData.getHth());
- if(null != api1206List && api1206List.size() > 0){
+ api1206List = api1206Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
+ if(null == api1206List || api1206List.isEmpty()){
+ api1206List = api1206Rep.getDataByHth(apiData.getHth());
+ if(null != api1206List && api1206List.size() > 0){
+ apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
+ }
+ }else {
apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
}
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
index aa68e8e..2462093 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
@@ -2,8 +2,10 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1102;
+import com.fzzy.api.entity.Api1105;
import com.fzzy.api.entity.Api1206;
import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1206Rep;
@@ -38,6 +40,8 @@
private Api1102Rep api1102Rep;
@Autowired
private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiCommonService commonService;
/**
* 绮鍑哄簱缁撶畻
@@ -70,6 +74,7 @@
Api1102 api1102 = api1102Rep.findById(kqdm).get();
Api1206 apiData;
+ Api1105 api1105;
List<Api1206> api1206List;
for (Fz40InoutSettle sysData : list) {
@@ -82,6 +87,12 @@
apiData.setHth(api1102.getDwdm() + sysData.getContractId());
}
+ if(StringUtils.isNotEmpty(sysData.getDepotId())){
+ api1105 = commonService.getApi1105Cache(sysData.getDepotId());
+ //璐т綅浠ｇ爜
+ apiData.setHwdm(api1105.getHwdm());
+ }
+
//缁撶畻閲嶉噺銆佺粨绠楀崟浠枫�佺粨绠楅噾棰濄�佺粨绠楁椂闂�
apiData.setJssl(sysData.getSettleWeight());
apiData.setJsdj(sysData.getPayPrice());
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 7454a6e..6c644f0 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -589,6 +589,12 @@
}
}
}
+ if (StringUtils.isNotEmpty(apiData.getHwdm())) {
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1206.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
+ }
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1206);
return api1206;
--
Gitblit v1.9.3