From 3e8e2bfdfbcf06659d7734d3e1cb63fd0f46c35d Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 03 一月 2025 15:30:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
index 3008cba..2771377 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
@@ -72,6 +72,7 @@
Api1207 apiData;
Api1105 api1105In;
Api1105 api1105Out;
+ List<Api1207> api1207List;
for (Fz40InoutStockChange sysData : list) {
//鑾峰彇璐т綅淇℃伅
api1105Out = commonService.getApi1105Cache(sysData.getDepotIdOut());
@@ -95,17 +96,25 @@
apiData.setDchwdm(api1105Out.getHwdm());
apiData.setDrhwdm(api1105In.getHwdm());
apiData.setDcrq(sysData.getChangeDate());
+ apiData.setDcksrq(sysData.getChangeStartDate());
+ apiData.setDcjsrq(sysData.getChangeEndDate());
apiData.setDcsl(sysData.getNumber());
apiData.setBzw(sysData.getBzw());
apiData.setBzbjs(sysData.getBzbjs());
apiData.setZxzydw(sysData.getZxzydw());
- apiData.setCzbz(Constant.CZBZ_I);
apiData.setZhgxsj(sysData.getUpdateTime());
apiData.setBizId(sysData.getId());
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
+ api1207List = api1207Rep.getDataById(apiData.getDcdh());
+ if (null == api1207List || api1207List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1207List.get(0).getCzbz());
+ }
+
//淇濆瓨鏁版嵁
api1207Rep.save(apiData);
log.info("1207---鍚屾鏁版嵁锛歿}", apiData.toString());
--
Gitblit v1.9.3