Merge remote-tracking branch 'origin/master'

CZT

2023-09-27 2eb1ee7ee94cb0769009e1ce6a15dbd7eea792c9

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

@@ -297,6 +297,8 @@
                api1102.setBjw(ShAreaBjw.getBjw(code));
                api1102.setKqsx("2");
                api1102.setCbcr(count);
                //TODO 库区状态
                api1102.setKqzt("1");
                list.add(api1102);
            }
            return JSON.toJSONString(list);
@@ -402,6 +404,7 @@
                api1109 = new SH2023Api1109();
                BeanUtils.copyProperties(apiData, api1109);
                api1109.setBjw(ShAreaBjw.getBjw(code));
                //TODO 业务单号
                if ("1".equals(api1109.getWjlx())) {
                    api1109.setYwdh("无");
                }
@@ -444,6 +447,9 @@
                api1111 = new SH2023Api1111();
                BeanUtils.copyProperties(apiData, api1111);
                api1111.setBjw(ShAreaBjw.getBjw(code));
                if (StringUtils.isEmpty(api1111.getBz())) {
                    api1111.setBz("无");
                }
                list.add(api1111);
            }
            return JSON.toJSONString(list);
@@ -588,7 +594,8 @@
                api1207.setDcrq(apiData.getDcrq());
                api1207.setBjw(ShAreaBjw.getBjw(code));
                //TODO 库调单号

                api1207.setPch(apiData.getDchwdm() +  DateFormatUtils.format(apiData.getDcrq(), "yyyy"));
                api1207.setKddh(apiData.getDcdh().substring(21,33));
                list.add(api1207);
            }
            return JSON.toJSONString(list);
@@ -660,8 +667,10 @@
                BeanUtils.copyProperties(apiData, api1211);

                api1211.setZglkdm(api1211.getKqdm());

                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("无");
                }
@@ -796,6 +805,43 @@
            }
            return JSON.toJSONString(list);
        }

        if (SH2023Constant.SH_2023_API_CODE_1308.equals(inteId)) {
            SH2023Api1308 api1308;
            //最后转换为json
            List<SH2023Api1308> list = new ArrayList<>();
            //把data转化成list集合
            List<Api1308> api1308List = castList(data, Api1308.class);
            for (Api1308 apiData : api1308List) {
                api1308 = new SH2023Api1308();

                BeanUtils.copyProperties(apiData, api1308);
                //TODO 货位代码 图像编号 视频编号
                api1308.setHwdm("无");
                api1308.setBjw(ShAreaBjw.getBjw(code));
                List<Api1109> api1109List = api1109Rep.getDataByFileId(apiData.getFileStorageId());
                api1308.setTxbh(api1109List.get(0).getWjmc());
                api1308.setSpbh(api1109List.get(0).getWjmc());
                list.add(api1308);
            }
            return JSON.toJSONString(list);
        }
        if (SH2023Constant.SH_2023_API_CODE_1309.equals(inteId)) {
            SH2023Api1309 api1309;
            //最后转换为json
            List<SH2023Api1309> list = new ArrayList<>();
            //把data转化成list集合
            List<Api1309> api1308List = castList(data, Api1309.class);
            for (Api1309 apiData : api1308List) {
                api1309 = new SH2023Api1309();

                BeanUtils.copyProperties(apiData, api1309);
                api1309.setBjw(ShAreaBjw.getBjw(code));

                list.add(api1309);
            }
            return JSON.toJSONString(list);
        }
        if (SH2023Constant.SH_2023_API_CODE_1310.equals(inteId)) {
            SH2023Api1310 api1310;
            //最后转换为json
@@ -810,6 +856,7 @@
                api1310.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJysj(), "yyyy"));
                List<Api1202> api1202List = api1202Rep.getDataByHwdm(apiData.getHwdm());
                api1310.setLspzdm(api1202List.get(0).getLspzdm());
                api1310.setLsxzdm("002");
                list.add(api1310);
            }
            return JSON.toJSONString(list);
@@ -823,6 +870,7 @@
            for (Api1401 apiData : api1401List) {
                api1401 = new SH2023Api1401();
                BeanUtils.copyProperties(apiData, api1401);
                api1401.setBjw(ShAreaBjw.getBjw(code));
                list.add(api1401);
            }
            return JSON.toJSONString(list);
@@ -852,6 +900,7 @@
                BeanUtils.copyProperties(apiData, api1403);
                api1403.setJhzxdw(apiData.getJhxddw());
                api1403.setJhzxdwmc(apiData.getJhxddwmc());
                api1403.setBjw(ShAreaBjw.getBjw(code));
                list.add(api1403);
            }
            return JSON.toJSONString(list);
@@ -866,70 +915,102 @@
                api1404 = new SH2023Api1404();
                BeanUtils.copyProperties(apiData, api1404);
                //TODO 明细状态

                api1404.setMxzt("1");
                api1404.setBjw(ShAreaBjw.getBjw(code));
                list.add(api1404);
            }
            return JSON.toJSONString(list);
        }

        if (SH2023Constant.SH_2023_API_CODE_2102.equals(inteId)) {
            SH2023Api2102 api2102;
        if (SH2023Constant.SH_2023_API_CODE_2101.equals(inteId)) {
            SH2023Api2101 api2101;
            //最后转换为json
            List<SH2023Api2102> list = new ArrayList<>();
            //把data转化成list集合
            List<Api1207> api1207List = castList(data, Api1207.class);
            for (Api1207 apiData : api1207List) {
                api2102 = new SH2023Api2102();
                BeanUtils.copyProperties(apiData, api2102);
                api2102.setDrdh(apiData.getDcdh());
                api2102.setDcrq(apiData.getDcrq());
                api2102.setPch(api2102.getDrhwdm() + DateFormatUtils.format(apiData.getDcrq(), "yyyy"));
                api2102.setBjw(ShAreaBjw.getBjw(code));
                //TODO 库调单号
            List<SH2023Api2101> list = castList(data, SH2023Api2101.class);

                list.add(api2102);
            }
            return JSON.toJSONString(list);
        }

        if (SH2023Constant.SH_2023_API_CODE_2102.equals(inteId)) {
//            SH2023Api2102 api2102;
//            //最后转换为json
//            List<SH2023Api2102> list = new ArrayList<>();
//            //把data转化成list集合
//            List<Api1207> api1207List = castList(data, Api1207.class);
//            for (Api1207 apiData : api1207List) {
//                api2102 = new SH2023Api2102();
//                BeanUtils.copyProperties(apiData, api2102);
//                api2102.setDrdh(apiData.getDcdh());
//                api2102.setDcrq(apiData.getDcrq());
//                api2102.setPch(api2102.getDrhwdm() + DateFormatUtils.format(apiData.getDcrq(), "yyyy"));
//                api2102.setBjw(ShAreaBjw.getBjw(code));
//                //TODO 库调单号
//
//                list.add(api2102);
//            }
            List<SH2023Api2102> list = castList(data, SH2023Api2102.class);
            return JSON.toJSONString(list);
        }
        if (SH2023Constant.SH_2023_API_CODE_2103.equals(inteId)) {
            SH2023Api2103 api2103;
            //最后转换为json
            //把data转化成list集合

            List<SH2023Api2103> list = castList(data, SH2023Api2103.class);
            List<SH2023Api2103Item> listItems = castList(list.get(0).getDlqplxq(), SH2023Api2103Item.class);
            list.get(0).setCzbz("i");
            list.get(0).setSh2023Api2103Items(listItems);
            return JSON.toJSONString(list);
        }
        if (SH2023Constant.SH_2023_API_CODE_2104.equals(inteId)) {
            SH2023Api2104 api2104;
            //最后转换为json
            //把data转化成list集合
            List<SH2023Api2104> list = castList(data, SH2023Api2104.class);

            return JSON.toJSONString(list);
        }

        if (SH2023Constant.SH_2023_API_CODE_2203.equals(inteId)) {
            SH2023Api2203 api2203;
            //最后转换为json
            List<SH2023Api2203> list = new ArrayList<>();
//            List<SH2023Api2203> list = new ArrayList<>();
            //把data转化成list集合
            List<Api1201> api1201List = castList(data, Api1201.class);
            for (Api1201 apiData : api1201List) {
                api2203 = new SH2023Api2203();
                BeanUtils.copyProperties(apiData, api2203);
                api2203.setHtbh(apiData.getHth());

//                api2203.setBdh();
                api2203.setCjrq(apiData.getQdrq());
//                api2203.setJyzt();
//                api2203.setLsxz();
//                api2203.setLspzmx();
//                api2203.setScnf();
//                api2203.setKd();
                //
                list.add(api2203);
            }
            List<SH2023Api2203> list = castList(data, SH2023Api2203.class);
//            for (Api1201 apiData : api1201List) {
//                api2203 = new SH2023Api2203();
//                BeanUtils.copyProperties(apiData, api2203);
//                api2203.setHtbh(apiData.getHth());
//
////                api2203.setBdh();
//                api2203.setCjrq(apiData.getQdrq());
////                api2203.setJyzt();
////                api2203.setLsxz();
////                api2203.setLspzmx();
////                api2203.setScnf();
////                api2203.setKd();
//                //
//                list.add(api2203);
//            }
            return JSON.toJSONString(list);
        }


        if (SH2023Constant.SH_2023_API_CODE_2204.equals(inteId)) {
            SH2023Api2204 api2204;
            //最后转换为json
            List<SH2023Api2204> list = new ArrayList<>();
//            List<SH2023Api2204> list = new ArrayList<>();
            //把data转化成list集合
            List<Api1310> api1310List = castList(data, Api1310.class);
            for (Api1310 apiData : api1310List) {
                api2204 = new SH2023Api2204();
                BeanUtils.copyProperties(apiData, api2204);
//                api2204.setSf();
//                api2204.setRksf();
//                api2204.setlldm();
                api2204.setBjw(ShAreaBjw.getBjw(code));
                api2204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJysj(), "yyyy"));
                list.add(api2204);
            }
            List<SH2023Api2204> list = castList(data, SH2023Api2204.class);
//            for (Api1310 apiData : api1310List) {
//                api2204 = new SH2023Api2204();
//                BeanUtils.copyProperties(apiData, api2204);
////                api2204.setSf();
////                api2204.setRksf();
////                api2204.setlldm();
//                api2204.setBjw(ShAreaBjw.getBjw(code));
//                api2204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJysj(), "yyyy"));
//                list.add(api2204);
//            }
            return JSON.toJSONString(list);
        }
        //财务报表数据封装