From 1c5afb4320feceb5584e875dc375482b46bd5bb7 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 23 四月 2025 10:01:31 +0800
Subject: [PATCH] 数据同步调整
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java | 3 +++
src/main/resources/application-pro5347.yml | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 6 +++++-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 5 +++--
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
index 2f3615f..d6d0ff8 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
@@ -115,6 +115,9 @@
if (inoutData.getRecordStatus().equals("DEL") || inoutData.getRecordStatus().equals("ERROR")) {
continue;
}
+ if (!inoutData.getProgress().equals("RECORD")){
+ continue;
+ }
ids = new ArrayList<>();
wjlx = "";
//鑾峰彇鍑哄叆搴撲笟鍔″崟鍙蜂俊鎭�
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 d51a723..9549300 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -95,6 +95,9 @@
if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
continue;
}
+ if (!sysData.getProgress().equals("RECORD")) {
+ continue;
+ }
if (null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0) {
sysData.setRecordWeight(sysData.getSettleWeight());
}
@@ -192,7 +195,8 @@
apiData.setCddm(mappingCode);
//妫�鏂ょ被鍨嬶紝榛樿0-绉伴噸鍏ュ簱
- apiData.setJjlx("0");
+ apiData.setJjlx(sysData.getJjlx());
+ apiData.setBzbdbz(sysData.getDbz());
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
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 0799559..89ef9dd 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -238,8 +238,9 @@
apiData.setCchlx("01");
apiData.setXldd("搴撳唴");
apiData.setBz(StringUtils.isEmpty(sysData.getRemarks()) ? "鏆傛棤澶囨敞淇℃伅" : sysData.getRemarks());
- apiData.setBzbdbz(25);
- apiData.setBzbjs(0);
+ apiData.setBzbdbz(sysData.getDbz());
+ apiData.setBzbjs(sysData.getBzbjs());
+ apiData.setJjlx(sysData.getJjlx());
apiData.setBzw(StringUtils.isEmpty(sysData.getBzw()) ? "9" : sysData.getBzw());
apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "闂ㄥ矖浜�" : sysData.getRegisterUser());
apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "鐧昏浜�" : sysData.getRegisterUser());
diff --git a/src/main/resources/application-pro5347.yml b/src/main/resources/application-pro5347.yml
index 08d3502..a0ae411 100644
--- a/src/main/resources/application-pro5347.yml
+++ b/src/main/resources/application-pro5347.yml
@@ -51,7 +51,7 @@
timeout: 6000
igds:
default:
- companyId: 5326
+ companyId: 5347
file-path: D:/IGDS-API/FILE/
img-path: D:/IGDS/FILE/
\ No newline at end of file
--
Gitblit v1.9.3