出入库同步修改

YYC

2026-03-18 8f114bf53e12f37782d3fd908f83dc4d81b002de

 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());
                }
@@ -149,10 +152,12 @@

                //车船号
                apiData.setCch(sysData.getPlateNum());
//                apiData.setGch(apiData.getCch());
                apiData.setGch(StringUtils.isEmpty(sysData.getPlateNumAfter()) ? sysData.getPlateNum() : sysData.getPlateNumAfter());
                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 +166,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("库区停电导致无法按流程进行出库");
                }
@@ -218,23 +225,25 @@
                if (StringUtils.isNotEmpty(sysData.getSettleId())) {
                    apiData.setCkjsdh(kqdm + sysData.getSettleId());
                }
                if (StringUtils.isNotEmpty(apiData.getHth())) {
                    api1206List = api1206Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
                    if (null == api1206List || api1206List.isEmpty()) {
                        api1206List = api1206Rep.getDataByHth(apiData.getHth());
                        if (null != api1206List && api1206List.size() > 0) {
                            apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
                        }
                    } else {
                        apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
                    }
                }
//                if (StringUtils.isNotEmpty(apiData.getHth())) {
//                    api1206List = api1206Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
//                    if (null == api1206List || api1206List.isEmpty()) {
//                        api1206List = api1206Rep.getDataByHth(apiData.getHth());
//                        if (null != api1206List && api1206List.size() > 0) {
//                            apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
//                        }
//                    } else {
//                        apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
//                    }
//                }

                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());