调整单位、库区、仓房、廒间、货位等基础信息

CZT

2023-10-18 246752d298f9955b1112c3028f271d546fd3bc3b

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

@@ -266,13 +266,9 @@
            List<SH2023Api1101> list = new ArrayList<>();
            //把data转化成list集合
            List<Api1101> api1101List = castList(data, Api1101.class);
            //查询廒间数
            List<Api1104> api1104List = api1104Rep.findPushData(api1101List.get(0).getKqdm());
            for (Api1101 apiData : api1101List) {
                api1101 = new SH2023Api1101();
                BeanUtils.copyProperties(apiData, api1101);
                api1101.setAjs(api1104List.size());
                api1101.setBjw(ShAreaBjw.getBjw(code));
                list.add(api1101);
            }
            return JSON.toJSONString(list);
@@ -283,22 +279,9 @@
            List<SH2023Api1102> list = new ArrayList<>();
            //把data转化成list集合
            List<Api1102> api1101List = castList(data, Api1102.class);
            //查询廒间数
            List<Api1104> api1104List = api1104Rep.findPushData(api1101List.get(0).getKqdm());
            //计算储备仓容
            Double count = 0.0;
            for (Api1104 api1104 : api1104List) {
                count = count + api1104.getAjsjcrong();
            }
            for (Api1102 apiData : api1101List) {
                api1102 = new SH2023Api1102();
                BeanUtils.copyProperties(apiData, api1102);
                api1102.setAjs(api1104List.size());
                api1102.setBjw(ShAreaBjw.getBjw(code));
                api1102.setKqsx("2");
                api1102.setCbcr(count);
                //TODO 库区状态
                api1102.setKqzt("1");
                list.add(api1102);
            }
            return JSON.toJSONString(list);
@@ -309,13 +292,9 @@
            List<SH2023Api1103> list = new ArrayList<>();
            //把data转化成list集合
            List<Api1103> api1103List = castList(data, Api1103.class);
            //查询廒间数
            List<Api1104> api1104List = api1104Rep.findPushData(api1103List.get(0).getKqdm());
            for (Api1103 apiData : api1103List) {
                api1103 = new SH2023Api1103();
                BeanUtils.copyProperties(apiData, api1103);
                api1103.setAjs(api1104List.size());
                api1103.setBjw(ShAreaBjw.getBjw(code));
                list.add(api1103);
            }
            return JSON.toJSONString(list);
@@ -331,25 +310,12 @@
                BeanUtils.copyProperties(apiData, api1104);
                api1104.setAjdm(apiData.getAjdh());
                api1104.setCfdm(apiData.getCfbh());
                api1104.setSykqdm(apiData.getKqdm());
                api1104.setBjw(ShAreaBjw.getBjw(code));
                list.add(api1104);
            }
            return JSON.toJSONString(list);
        }
        if (SH2023Constant.SH_2023_API_CODE_1105.equals(inteId)) {
            SH2023Api1105 api1105;
            //最后转换为json
            List<SH2023Api1105> list = new ArrayList<>();
            //把data转化成list集合
            List<Api1105> api1105List = castList(data, Api1105.class);
            for (Api1105 apiData : api1105List) {
                api1105 = new SH2023Api1105();
                BeanUtils.copyProperties(apiData, api1105);
                api1105.setBjw(ShAreaBjw.getBjw(code));
                list.add(api1105);
            }
            return JSON.toJSONString(list);
            return JSON.toJSONString(data);
        }
        if (SH2023Constant.SH_2023_API_CODE_1106.equals(inteId)) {
            SH2023Api1106 api1106;
@@ -404,9 +370,9 @@
                api1109 = new SH2023Api1109();
                BeanUtils.copyProperties(apiData, api1109);
                api1109.setBjw(ShAreaBjw.getBjw(code));
                if ("1".equals(api1109.getWjlx())) {
                    api1109.setYwdh("无");
                }

                api1109.setYwdh("无");

                map = new HashMap<>();
                map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
                api1109.setWjl(JSON.toJSONString(map));
@@ -666,13 +632,10 @@
                BeanUtils.copyProperties(apiData, api1211);

                api1211.setZglkdm(api1211.getKqdm());
                //TODO 货位代码 粮食性质代码 来粮代码
//                api1211.setHwdm("91310114703439394M001000100101");
//                api1211.setLsxzdm("001");
//                api1211.setLldm("91310114703439394M001000100101");

                api1211.setBjw(ShAreaBjw.getBjw(code));
                api1211.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyyMM"));
                api1211.setZglkdm(apiData.getKqdm());
                if(StringUtils.isEmpty(api1211.getLldm())){
                    api1211.setLldm("无");
                }