YYC
2026-03-26 52628b24e63105d78a75a097909b2c92dec75de0
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -95,6 +95,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,9 +152,9 @@
                //粮权单位归属代码
                List<Api1208> dataByHwdm = api1208Rep.findDataByHwdm(apiData.getHwdm());
                if (null != dataByHwdm && dataByHwdm.size() > 0) {
                    apiData.setLqgsdwdm(StringUtils.isEmpty(dataByHwdm.get(0).getLqgsdwdm()) ? apiData.getKqdm() : dataByHwdm.get(0).getLqgsdwdm());
                }else {
                    apiData.setLqgsdwdm(apiData.getKqdm());
                    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("售粮人地址");
@@ -164,7 +167,8 @@
                //车船号
                apiData.setCch(sysData.getPlateNum().trim());
                apiData.setGch(StringUtils.isEmpty(sysData.getPlateNumAfter()) ? sysData.getPlateNum() : sysData.getPlateNumAfter());
//                apiData.setGch(apiData.getCch());
                apiData.setDjsj(sysData.getRegisterTime());
                //生成方式
@@ -175,7 +179,7 @@
                }
                //粮食品种
                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);
                //粮食性质
@@ -192,7 +196,8 @@
                apiData.setCddm(mappingCode);
                //检斤类型,默认0-称重入库
                apiData.setJjlx("0");
                apiData.setJjlx(sysData.getJjlx());
                apiData.setBzbdbz(sysData.getDbz() == null ? 25 : sysData.getDbz());
                //毛重信息
                apiData.setMz(sysData.getFullWeight());
@@ -216,6 +221,7 @@
                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());
@@ -230,17 +236,17 @@
                if (StringUtils.isNotEmpty(sysData.getSettleId())) {
                    apiData.setRkjsdh(kqdm + sysData.getSettleId());
                }
                if (StringUtils.isNotEmpty(apiData.getHth())) {
                    api1204List = api1204Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
                    if (null == api1204List || api1204List.isEmpty()) {
                        api1204List = api1204Rep.getDataByHth(apiData.getHth());
                        if (null != api1204List && api1204List.size() > 0) {
                            apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
                        }
                    } else {
                        apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
                    }
                }
//                if (StringUtils.isNotEmpty(apiData.getHth())) {
//                    api1204List = api1204Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
//                    if (null == api1204List || api1204List.isEmpty()) {
//                        api1204List = api1204Rep.getDataByHth(apiData.getHth());
//                        if (null != api1204List && api1204List.size() > 0) {
//                            apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
//                        }
//                    } else {
//                        apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
//                    }
//                }
                //其它
                apiData.setQtkl(0 - sysData.getDeOther());
                //值仓 现场扣重