From 12c99c99ed89d1d11318d9b4c6c295d35e21b1e7 Mon Sep 17 00:00:00 2001 From: czt <czt18638530771@163.com> Date: 星期三, 20 八月 2025 18:30:00 +0800 Subject: [PATCH] 调整船运质检单号 --- src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 17 ++++++++++++----- 1 files changed, 12 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 701e781..6bec7ee 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,7 @@ 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()); apiData.setLspzdm(mappingCode); //绮绛夌骇 @@ -161,11 +164,13 @@ //璐ㄦ鎶ュ憡鍗曞彿 List<Api1310> dataByHwdm = api1310Rep.getDataByHwdm(apiData.getHwdm(), "02"); - apiData.setZjbgdh(dataByHwdm.get(0).getZjbgdh()); + 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("搴撳尯鍋滅數瀵艰嚧鏃犳硶鎸夋祦绋嬭繘琛屽嚭搴�"); } @@ -233,8 +238,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