From 90b950bfd7f8c8c4835edf5e8a1062d17d953032 Mon Sep 17 00:00:00 2001 From: czt <czt18638530771@163.com> Date: 星期二, 14 十月 2025 11:14:59 +0800 Subject: [PATCH] 宁夏轮换计划接口调整 --- src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 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 0c5814c..6bec7ee 100644 --- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java +++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java @@ -47,6 +47,8 @@ @Autowired private Api1206Rep api1206Rep; @Autowired + private Api1310Rep api1310Rep; + @Autowired private Api1404Rep api1404Rep; @Autowired private ApiCommonService commonService; @@ -89,6 +91,9 @@ List<Fz40InoutRecordItem> listInoutRecordItem; for (Fz40InoutRecord sysData : list) { if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) { + continue; + } + if (!sysData.getProgress().equals("RECORD")) { continue; } if (null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0) { @@ -150,12 +155,25 @@ 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); //绮绛夌骇 mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel()); apiData.setLsdjdm(mappingCode); + + //璐ㄦ鎶ュ憡鍗曞彿 + List<Api1310> dataByHwdm = api1310Rep.getDataByHwdm(apiData.getHwdm(), "02"); + if (null != dataByHwdm && dataByHwdm.size() > 0) { + apiData.setZjbgdh(dataByHwdm.get(0).getZjbgdh()); + } + + //鐢熸垚鏂瑰紡 + apiData.setScfs(1); + if (StringUtils.isNotEmpty(sysData.getRecordStatus()) && sysData.getRecordStatus().equals("ADD")) { + apiData.setScfs(2); + apiData.setSdblyy("搴撳尯鍋滅數瀵艰嚧鏃犳硶鎸夋祦绋嬭繘琛屽嚭搴�"); + } //绮鎬ц川 mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType()); @@ -220,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