From 010e56c4b7c590c83517dd0b0a65ba23ee828222 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 29 十月 2025 17:17:49 +0800
Subject: [PATCH] 同步数据优化
---
src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutRecord.java | 5 +++++
src/main/java/com/fzzy/api/view/Api1213.view.xml | 2 +-
src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecord.java | 4 ++++
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1205.java | 4 +++-
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1202.java | 3 ++-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 3 ++-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1213.java | 6 ++++--
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 3 ++-
src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1213.java | 4 +++-
9 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/Api1213.view.xml b/src/main/java/com/fzzy/api/view/Api1213.view.xml
index 2df6078..1814e08 100644
--- a/src/main/java/com/fzzy/api/view/Api1213.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1213.view.xml
@@ -56,7 +56,7 @@
<Property></Property>
<Property name="label">鍥藉埆</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("GB")}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("GB_6")}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutRecord.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutRecord.java
index 926a8fd..f5575fc 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutRecord.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutRecord.java
@@ -100,6 +100,11 @@
@PropertyDef(label = "杞﹁埞鍙�", description = "杞︾墝鍙�+鏍囪瘑绗�")
private String plateNum;
+ @Column(name = "PLATE_NUM_AFTER_", length = 20)
+ @PropertyDef(label = "鎸傝溅鍙�", description = "杞︾墝鍙�+鏍囪瘑绗�")
+ private String plateNumAfter;
+
+
@Column(name = "TRANS_TYPE_", length = 6)
@PropertyDef(label = "杩愯緭宸ュ叿")
private String transType;
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 bb7e1d2..6914e75 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -167,7 +167,8 @@
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum().trim());
- apiData.setGch(apiData.getCch());
+ apiData.setGch(StringUtils.isEmpty(sysData.getPlateNumAfter()) ? sysData.getPlateNum() : sysData.getPlateNumAfter());
+// apiData.setGch(apiData.getCch());
apiData.setDjsj(sysData.getRegisterTime());
//鐢熸垚鏂瑰紡
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 2b92410..e25cbd5 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -152,7 +152,8 @@
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum());
- apiData.setGch(apiData.getCch());
+// apiData.setGch(apiData.getCch());
+ apiData.setGch(StringUtils.isEmpty(sysData.getPlateNumAfter()) ? sysData.getPlateNum() : sysData.getPlateNumAfter());
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1213.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1213.java
index 3b81b2a..5a58a49 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1213.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1213.java
@@ -101,8 +101,10 @@
apiData.setCd(mappingCode);
//骞村害
apiData.setShnd(depotStatusConfirm.getFoodYear());
- if(StringUtils.isEmpty(depotStatusConfirm.getCountry())){
- apiData.setGb("156");
+ if (StringUtils.isEmpty(depotStatusConfirm.getCountry())) {
+ apiData.setGb("000156");
+ } else {
+ apiData.setGb("000" + depotStatusConfirm.getCountry());
}
apiData.setBgy(depotStatusConfirm.getStoreKeeperName());
apiData.setFcsqr(depotStatusConfirm.getApplyUser());
diff --git a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecord.java b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecord.java
index ef8f617..a8e6e19 100644
--- a/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecord.java
+++ b/src/main/java/com/fzzy/async/fzzy61/entity/Fz61InoutRecord.java
@@ -103,6 +103,10 @@
@PropertyDef(label = "杞﹁埞鍙�", description = "杞︾墝鍙�+鏍囪瘑绗�")
private String plateNum;
+ @Column(name = "PLATE_NUM_AFTER_", length = 20)
+ @PropertyDef(label = "鎸傝溅鍙�", description = "杞︾墝鍙�+鏍囪瘑绗�")
+ private String plateNumAfter;
+
@Column(name = "TRANS_TYPE_", length = 6)
@PropertyDef(label = "杩愯緭宸ュ叿")
private String transType;
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1202.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1202.java
index 0be494d..91568f8 100644
--- a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1202.java
@@ -168,7 +168,8 @@
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum().trim());
- apiData.setGch(apiData.getCch());
+ apiData.setGch(StringUtils.isEmpty(sysData.getPlateNumAfter()) ? sysData.getPlateNum() : sysData.getPlateNumAfter());
+// apiData.setGch(apiData.getCch());
apiData.setDjsj(sysData.getRegisterTime());
//鐢熸垚鏂瑰紡
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1205.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1205.java
index 608b971..ae3e95a 100644
--- a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1205.java
@@ -153,7 +153,9 @@
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum());
- apiData.setGch(apiData.getCch());
+ apiData.setGch(StringUtils.isEmpty(sysData.getPlateNumAfter()) ? sysData.getPlateNum() : sysData.getPlateNumAfter());
+
+// apiData.setGch(apiData.getCch());
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
diff --git a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1213.java b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1213.java
index 1f7aa52..0cf87c2 100644
--- a/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1213.java
+++ b/src/main/java/com/fzzy/async/fzzy61/impl/Fzzy61Sync1213.java
@@ -102,7 +102,9 @@
//骞村害
apiData.setShnd(depotStatusConfirm.getFoodYear());
if (StringUtils.isEmpty(depotStatusConfirm.getCountry())) {
- apiData.setGb("156");
+ apiData.setGb("000156");
+ } else {
+ apiData.setGb("000" + depotStatusConfirm.getCountry());
}
apiData.setBgy(depotStatusConfirm.getStoreKeeperName());
apiData.setFcsqr(depotStatusConfirm.getApplyUser());
--
Gitblit v1.9.3