From b6faf70a938ca9e014d34b235dec449f2a21abb4 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 30 六月 2025 17:03:13 +0800
Subject: [PATCH] 数据同步时，品种处理
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
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 2bca00f..547816e 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -93,6 +93,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());
}
@@ -152,7 +155,10 @@
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ if(StringUtils.isEmpty(mappingCode)) {
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
+ }
apiData.setLspzdm(mappingCode);
//绮绛夌骇
@@ -161,13 +167,13 @@
//璐ㄦ鎶ュ憡鍗曞彿
List<Api1310> dataByHwdm = api1310Rep.getDataByHwdm(apiData.getHwdm(), "02");
- if(null != dataByHwdm && dataByHwdm.size() > 0){
+ if (null != dataByHwdm && dataByHwdm.size() > 0) {
apiData.setZjbgdh(dataByHwdm.get(0).getZjbgdh());
}
//鐢熸垚鏂瑰紡
apiData.setScfs(1);
- if(StringUtils.isNotEmpty(sysData.getRecordStatus()) && sysData.getRecordStatus().equals("ADD")){
+ if (StringUtils.isNotEmpty(sysData.getRecordStatus()) && sysData.getRecordStatus().equals("ADD")) {
apiData.setScfs(2);
apiData.setSdblyy("搴撳尯鍋滅數瀵艰嚧鏃犳硶鎸夋祦绋嬭繘琛屽嚭搴�");
}
@@ -235,8 +241,10 @@
apiData.setCchlx("01");
apiData.setXldd("搴撳唴");
apiData.setBz(StringUtils.isEmpty(sysData.getRemarks()) ? "鏆傛棤澶囨敞淇℃伅" : sysData.getRemarks());
- apiData.setBzbdbz(25);
- apiData.setBzbjs(0);
+ apiData.setBzbdbz(sysData.getDbz() == null ? 25 : 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());
apiData.setZcbgyxm(StringUtils.isEmpty(sysData.getHandleUser()) ? "鍊间粨鍛�" : sysData.getHandleUser());
--
Gitblit v1.9.3