优化上海接口批次号问题

CZT

2023-11-13 cd091408dcff794e3001e43b99a6d521cfff36dc

 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java

@@ -346,12 +346,6 @@
            if (StringUtils.isEmpty(api1202.getCddm())) {
                api1202.setCddm(api1202.getHwdm().substring(2, 8));
            }
            if (StringUtils.isEmpty(api1202.getHth())) {
                api1202.setHth("无");
            }
            if (StringUtils.isEmpty(api1202.getJhmxh())) {
                api1202.setJhmxh("计划明细号");
            }
            if (StringUtils.isEmpty(api1202.getRkjsdh())) {
                api1202.setRkjsdh("0");
            }
@@ -363,7 +357,10 @@
            }

            //设置批次号
            api1202.setPch(apiData.getHwdm() + apiData.getShnd());
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1202.getHwdm());
            if(null != api1208List && api1208List.size() > 0){
                api1202.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }
            //设置空属性为默认值
            changeObject(api1202);
            return api1202;
@@ -386,8 +383,10 @@
                api1203.setZkl("0");
            }
            //设置批次号
            List<Api1202> api1202List = api1202Rep.getDataById(apiData.getRkywdh());
            api1203.setPch(apiData.getHwdm() + api1202List.get(0).getShnd());
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1203.getHwdm());
            if(null != api1208List && api1208List.size() > 0){
                api1203.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }

            //设置空属性为默认值
            changeObject(api1203);
@@ -400,7 +399,15 @@
            api1204.setBjw(ShAreaBjw.getBjw(code));

            //设置批次号
            api1204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJssj(), "yyyy"));
            if(StringUtils.isNotEmpty(api1204.getHth())){
                List<Api1202> api1202List = api1202Rep.getDataByRkjsdh(api1204.getRkjsdh());
                if(null != api1202List && api1202List.size() > 0){
                    List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1202List.get(0).getHwdm());
                    if(null != api1208List && api1208List.size() > 0){
                        api1204.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
                    }
                }
            }

            //设置空属性为默认值
            changeObject(api1204);
@@ -417,12 +424,6 @@
            if (StringUtils.isEmpty(api1205.getCddm())) {
                api1205.setCddm(api1205.getHwdm().substring(2, 8));
            }
            if (StringUtils.isEmpty(api1205.getHth())) {
                api1205.setHth("无");
            }
            if (StringUtils.isEmpty(api1205.getJhmxh())) {
                api1205.setJhmxh("计划明细号");
            }
            if (StringUtils.isEmpty(api1205.getCkjsdh())) {
                api1205.setCkjsdh("0");
            }
@@ -434,7 +435,10 @@
            }

            //设置批次号
            api1205.setPch(apiData.getHwdm() + apiData.getShnd());
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1205.getHwdm());
            if(null != api1208List && api1208List.size() > 0){
                api1205.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }

            //设置空属性为默认值
            changeObject(api1205);
@@ -445,15 +449,23 @@
            Api1206 apiData = (Api1206) data;
            BeanUtils.copyProperties(apiData, api1206);
            api1206.setBjw(ShAreaBjw.getBjw(code));
//            List<Api1205> api1205List = api1205Rep.getDataById(apiData.getCkjsdh());
            //设置批次号
//            api1206.setPch(api1205List.get(0).getHwdm() + DateFormatUtils.format(api1205List.get(0).getCmsj(), "yyyy"));
            //批次号
            if(StringUtils.isNotEmpty(api1206.getHth())){
                List<Api1205> api1205List = api1205Rep.getDataByCkjsdh(api1206.getCkjsdh());
                if(null != api1205List && api1205List.size() > 0){
                    List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1205List.get(0).getHwdm());
                    if(null != api1208List && api1208List.size() > 0){
                        api1206.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
                    }
                }
            }

            //设置空属性为默认值
            changeObject(api1206);
            return api1206;
        }
        if (SH2023Constant.SH_2023_API_CODE_1207.equals(inteId)) {
            //倒仓倒出
            SH2023Api1207 api1207 = new SH2023Api1207();
            Api1207 apiData = (Api1207) data;
            BeanUtils.copyProperties(apiData, api1207);
@@ -461,8 +473,10 @@
            api1207.setDcrq(apiData.getDcrq());
            api1207.setBjw(ShAreaBjw.getBjw(code));

            api1207.setPch(apiData.getDchwdm() + DateFormatUtils.format(apiData.getDcrq(), "yyyy"));
            api1207.setKddh(apiData.getDcdh().substring(21, 33));
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1207.getDchwdm());
            if(null != api1208List && api1208List.size() > 0){
                api1207.setPch(api1207.getDchwdm() + api1208List.get(0).getShnd());
            }

            //设置空属性为默认值
            changeObject(api1207);
@@ -495,7 +509,10 @@
            api1209.setZrshde(apiData.getQzzrshde());
            api1209.setBjw(ShAreaBjw.getBjw(code));
            api1209.setJzrq(apiData.getYwrq());
            api1209.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyy"));
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1209.getHwdm());
            if(null != api1208List && api1208List.size() > 0){
                api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
            }

            //设置空属性为默认值
            changeObject(api1209);
@@ -507,7 +524,10 @@

            BeanUtils.copyProperties(apiData, api1210);
            api1210.setBjw(ShAreaBjw.getBjw(code));
            api1210.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getHzrq(), "yyyy"));
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1210.getHwdm());
            if(null != api1208List && api1208List.size() > 0){
                api1210.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }

            //设置空属性为默认值
            changeObject(api1210);
@@ -521,7 +541,10 @@
            api1211.setZglkdm(api1211.getKqdm());
            api1211.setBjw(ShAreaBjw.getBjw(code));
            api1211.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyyMM"));
            api1211.setZglkdm(apiData.getKqdm());
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1211.getHwdm());
            if(null != api1208List && api1208List.size() > 0){
                api1211.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }

            //设置空属性为默认值
            changeObject(api1211);
@@ -550,12 +573,16 @@
            Api1302 apiData = (Api1302) data;
            BeanUtils.copyProperties(apiData, api1302);
            api1302.setBjw(ShAreaBjw.getBjw(code));
            api1302.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJcsj(), "yyyy"));
            api1302.setCpjw(String.valueOf(apiData.getLspjw()));
            api1302.setCzgw(String.valueOf(apiData.getLspjw()));
            api1302.setCzdw(String.valueOf(apiData.getLspjw()));
            api1302.setGfwjw(String.valueOf(apiData.getLspjw()));
            api1302.setLwmx(apiData.getLswdzjh());

            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1302.getHwdm());
            if(null != api1208List && api1208List.size() > 0){
                api1302.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }

            //设置空属性为默认值
            changeObject(api1302);
@@ -566,8 +593,10 @@
            Api1303 apiData = (Api1303) data;
            BeanUtils.copyProperties(apiData, api1303);
            api1303.setBjw(ShAreaBjw.getBjw(code));
            api1303.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJcsj(), "yyyy"));

            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1303.getHwdm());
            if(null != api1208List && api1208List.size() > 0){
                api1303.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }
            //设置空属性为默认值
            changeObject(api1303);
            return api1303;
@@ -577,7 +606,10 @@
            Api1304 apiData = (Api1304) data;
            BeanUtils.copyProperties(apiData, api1304);
            api1304.setBjw(ShAreaBjw.getBjw(code));
            api1304.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJcsj(), "yyyy"));
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1304.getHwdm());
            if(null != api1208List && api1208List.size() > 0){
                api1304.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }

            //设置空属性为默认值
            changeObject(api1304);
@@ -659,7 +691,7 @@
                api1310.setJyxmz("0");
            }
            String lsxzdm = "122";
            String pch = apiData.getHwdm() + DateFormatUtils.format(new Date(), "yyyy");
            String pch = "";
            List<Api1208> api1208List = api1208Rep.getDataByHwdm(api1310.getHwdm());
            if(null != api1208List && api1208List.size() > 0){
                if(StringUtils.isNotEmpty(api1208List.get(0).getLsxzdm())){
@@ -744,9 +776,15 @@
            return data;
        }
        if (SH2023Constant.SH_2023_API_CODE_2102.equals(inteId)) {
            SH2023Api2102 apiData = new SH2023Api2102();
            BeanUtils.copyProperties(data, apiData);
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getDrhwdm());
            if(null != api1208List && api1208List.size() > 0){
                apiData.setPch(apiData.getDrhwdm() + api1208List.get(0).getShnd());
            }
            //设置空属性为默认值
            changeObject(data);
            return data;
            changeObject(apiData);
            return apiData;
        }
        if (SH2023Constant.SH_2023_API_CODE_2103.equals(inteId)) {
            SH2023Api2103 apiData = new SH2023Api2103();