Merge remote-tracking branch 'origin/master'

YYC

2025-09-22 ee96821fc7990857ad6477690a5758f8c0ebaa66

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java

@@ -48,6 +48,8 @@
    @Autowired
    private Api1204Rep api1204Rep;
    @Autowired
    private Api1208Rep api1208Rep;
    @Autowired
    private Api1404Rep api1404Rep;
    @Autowired
    private ApiCommonService commonService;
@@ -91,6 +93,9 @@
            List<Api1404> api1404List;
            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) {
@@ -144,6 +149,17 @@
                    }
                }

                //粮权单位归属代码
                List<Api1208> dataByHwdm = api1208Rep.findDataByHwdm(apiData.getHwdm());
                if (null != dataByHwdm && dataByHwdm.size() > 0) {
                    apiData.setLqgsdwdm(StringUtils.isEmpty(dataByHwdm.get(0).getLqgsdwdm()) ? kqdm.substring(0, 18) : dataByHwdm.get(0).getLqgsdwdm());
                } else {
                    apiData.setLqgsdwdm(kqdm.substring(0, 18));
                }
                apiData.setSlr("售粮人");
                apiData.setSlrdz("售粮人地址");
                apiData.setBz(StringUtils.isEmpty(sysData.getRemarks()) ? "备注" : sysData.getRemarks());

                apiData.setXxdz(StringUtils.isEmpty(sysData.getUserAddress()) ? "详细地址" : sysData.getUserAddress());

                //运输工具，若为空，则默认给1-汽车
@@ -154,8 +170,15 @@

                apiData.setDjsj(sysData.getRegisterTime());

                //生成方式
                apiData.setScfs(1);
                if (StringUtils.isNotEmpty(sysData.getRecordStatus()) && sysData.getRecordStatus().equals("ADD")) {
                    apiData.setScfs(2);
                    apiData.setSdblyy("库区停电导致无法按流程进行出库");
                }

                //粮食品种
                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);

                //粮食性质
@@ -172,7 +195,8 @@
                apiData.setCddm(mappingCode);

                //检斤类型，默认0-称重入库
                apiData.setJjlx("0");
                apiData.setJjlx(sysData.getJjlx());
                apiData.setBzbdbz(sysData.getDbz() == null ? 25 : sysData.getDbz());

                //毛重信息
                apiData.setMz(sysData.getFullWeight());
@@ -196,28 +220,29 @@
                if (!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())) {
                    sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
                }

                apiData.setPzjlsj(sysData.getEmptyWeightTime());
                apiData.setPzjby(sysData.getEmptyWeightUser());
                apiData.setPzjly(sysData.getEmptyWeightUser());

                //扣重 化验总扣重
                apiData.setZjklxj(sysData.getDeCheck());

                apiData.setBzw(StringUtils.isEmpty(sysData.getBzw()) ? "9" : sysData.getBzw());
                apiData.setBzwkl(0 - sysData.getDePackage());
                apiData.setBzbjs(sysData.getBzbjs());
                apiData.setCmsj(sysData.getCompleteTime());
                //结算单号
                if(StringUtils.isNotEmpty(sysData.getSettleId())){
                if (StringUtils.isNotEmpty(sysData.getSettleId())) {
                    apiData.setRkjsdh(kqdm + sysData.getSettleId());
                }
                if(StringUtils.isNotEmpty(apiData.getHth())){
                if (StringUtils.isNotEmpty(apiData.getHth())) {
                    api1204List = api1204Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
                    if(null == api1204List || api1204List.isEmpty()){
                    if (null == api1204List || api1204List.isEmpty()) {
                        api1204List = api1204Rep.getDataByHth(apiData.getHth());
                        if(null != api1204List && api1204List.size() > 0){
                        if (null != api1204List && api1204List.size() > 0) {
                            apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
                        }
                    }else {
                    } else {
                        apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
                    }
                }
@@ -239,15 +264,16 @@
                apiData.setBizId(sysData.getId());
                apiData.setKqdm(kqdm);
                apiData.setSyncTime(new Date());
                apiData.setBz(null == sysData.getRemarks() ? "备注" : sysData.getRemarks());
                apiData.setKlyy("扣量原因");

                apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"登记人":sysData.getRegisterUser());
                apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"登记人":sysData.getRegisterUser());
                apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "登记人" : sysData.getRegisterUser());
                apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "登记人" : sysData.getRegisterUser());
                //01:表示大型汽车号牌,黄底黑字； 02:表示小型汽车号牌,蓝底白字； 03:表示新能源汽车号牌,绿底黑 字；
                //04:表示农用车车牌号，绿底白字； LS:表示临时虚拟号牌，仅限于售 粮车无固定号牌时使用
                apiData.setCchlx("01");
                apiData.setLdd("装粮地点");
                apiData.setZkj(0.0);
                apiData.setZlfyzkl(0.0);
                apiData.setQzsfzkl(0.0);
                apiData.setQzzzzkl(0.0);
                apiData.setQzgwcmkl(0.0);
@@ -262,7 +288,12 @@
                if (sysData.getCompanyId().equals("5329")) {
                    apiData.setLqgsdwdm("91440604MA56D2AM1X");
                }

                api1202List = api1202Rep.getDataById(apiData.getRkywdh());
                if (null == api1202List || api1202List.isEmpty()) {
                    apiData.setCzbz(Constant.CZBZ_I);
                } else {
                    apiData.setCzbz(api1202List.get(0).getCzbz());
                }
                //判断是否为船运
                if (StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")) {
                    listInoutRecordItem = fzzy40SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
@@ -296,12 +327,6 @@
                        idNum++;
                    }
                } else {
                    api1202List = api1202Rep.getDataById(apiData.getRkywdh());
                    if (null == api1202List || api1202List.isEmpty()) {
                        apiData.setCzbz(Constant.CZBZ_I);
                    } else {
                        apiData.setCzbz(api1202List.get(0).getCzbz());
                    }
                    //保存数据
                    api1202Rep.save(apiData);
                }