From 2eb1ee7ee94cb0769009e1ce6a15dbd7eea792c9 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 27 九月 2023 10:23:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java
index 9ce5adb..4313e4a 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java
@@ -83,7 +83,7 @@
bjw = ShAreaBjw.getBjw(api1102List.get(0).getXzqhdm());
}
for (Fz40InoutRecord sysData : list) {
- List<ApiInfoData> apiInfoData = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, sysData.getId().substring(2));
+ List<ApiInfoData> apiInfoData = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, sysData.getId().substring(2),kqdm);
if (null != apiInfoData && apiInfoData.size() > 0) {
continue;
}
@@ -102,7 +102,7 @@
sh2023Api2104.setLldm(kqdm);
sh2023Api2104.setJz(sysData.getNetWeight());
- sh2023Api2104.setZhgxsh(sysData.getUpdateTime());
+ sh2023Api2104.setZhgxsj(sysData.getUpdateTime());
//鑾峰彇璐т綅淇℃伅
api1105 = commonService.getApi1105Cache(sysData.getDepotId());
@@ -121,7 +121,7 @@
infoData.setRemarks("甯傚偍椹宠繍鍗�");
//璁剧疆鎿嶄綔鏍囧織
- apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
+ apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, infoData.getDataId(),kqdm);
if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
infoData.setCzbz(Constant.CZBZ_I);
sh2023Api2104.setCzbz(Constant.CZBZ_I);
--
Gitblit v1.9.3