陕西2024版接口-测试调整

czt

2024-11-06 11af6525c78f401f8e7ca1100417adf90415586e

 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;
@@ -113,7 +115,7 @@
                apiData.setHwdm(api1105.getHwdm());
                apiData.setYwlx(Constant.INOUT_TYPE_2);
                apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[]{"yyyyMMdd"}));
                apiData.setCyr(sysData.getUserName());
                apiData.setCyr(sysData.getUserName().trim());

                //默认一个随便值
                apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
@@ -144,6 +146,12 @@
                    }
                }

                //粮权单位归属代码
                List<Api1208> dataByHwdm = api1208Rep.findDataByHwdm(apiData.getHwdm());
                if(null != dataByHwdm && dataByHwdm.size() > 0){
                    apiData.setLqgsdwdm(StringUtils.isEmpty(dataByHwdm.get(0).getLqgsdwdm()) ? apiData.getHwdm().substring(0, 18) : dataByHwdm.get(0).getLqgsdwdm());
                }

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

                //运输工具，若为空，则默认给1-汽车
@@ -153,6 +161,13 @@
                apiData.setCch(sysData.getPlateNum().trim());

                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));
@@ -207,17 +222,17 @@
                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());
                    }
                }
@@ -242,13 +257,13 @@
                apiData.setBz(null == sysData.getRemarks() ? "备注" : sysData.getRemarks());
                apiData.setKlyy("扣量原因");

                apiData.setCmqrmgryxm(sysData.getRegisterUser());
                apiData.setDjmgryxm(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.setQzbwslkl(0.0);
                apiData.setQzsfzkl(0.0);
                apiData.setQzzzzkl(0.0);
                apiData.setQzgwcmkl(0.0);
                apiData.setQzhhkl(0.0);
@@ -257,11 +272,17 @@
                apiData.setQzsmlkl(0.0);
                apiData.setQzzjmlkl(0.0);
                apiData.setQzqtkl(0.0);
                apiData.setZkhyy("增扣价原因");
                apiData.setZxzydw(api1105.getBgdw());
                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());
@@ -284,6 +305,7 @@
                        apiData.setJz(fz40InoutRecordItem.getSettleWeight());
                        apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
                        apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());
                        apiData.setQtkl(0 - fz40InoutRecordItem.getDe());
                        api1202List = api1202Rep.getDataById(apiData.getRkywdh());
                        if (null == api1202List || api1202List.isEmpty()) {
                            apiData.setCzbz(Constant.CZBZ_I);
@@ -294,12 +316,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);
                }