优化上海接口-性质转变加入计划明细单号

CZT

2024-01-09 f646df3f4fa190bb2fac0d9c752880b16c636dd3

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

@@ -441,6 +441,7 @@
            //设置粮食轮换年度,根据计划明细号查询计划明细，再根据计划明细查询轮换计划
            List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
            if (null != api1404List && api1404List.size() > 0) {
                api1202.setShnd(api1404List.get(0).getShnd());
                List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh());
                if(null != api1403List && api1403List.size() > 0){
                    if(StringUtils.isNotEmpty(api1403List.get(0).getJhnd())){
@@ -487,9 +488,14 @@
            if (null != api1208List && api1208List.size() > 0) {
                api1203.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }
            //设置质检编码(默认等同于入库质检单号)
            //设置质检编码(默认等同于入库质检单号),若为船运，则设置为系统内船运的单号
            api1203.setZjbh(api1203.getRkjydh());

            List<Api1202> api1202List = api1202Rep.getDataById(api1203.getRkywdh());
            if (null != api1202List && api1202List.size() > 0) {
                if(api1202List.get(0).getYsgj().equals("3")){
                    api1203.setZjbh(api1202List.get(0).getBizId().substring(2));
                }
            }
            //设置空属性为默认值
            changeObject(api1203);
            return api1203;
@@ -608,6 +614,13 @@
            if (StringUtils.isEmpty(api1208.getCd())) {
                api1208.setCd(api1208.getHwdm().substring(2, 8));
            }
            //包装储粮是，核查包存粮包数
            if(null == apiData.getBclbs()){
                apiData.setBclbs(0);
            }
            if("2".equals(apiData.getClfs()) && apiData.getBclbs() == 0){
                apiData.setBclbs((int)(apiData.getSjsl()/25));
            }
            //设置空属性为默认值
            changeObject(api1208);
            return api1208;
@@ -644,6 +657,22 @@
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1210.getHwdm());
            if (null != api1208List && api1208List.size() > 0) {
                api1210.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }

            //设置计划明细号，根据划转性质查询出入库信息获取计划号
            if("200".equals(api1210.getHzqlsxzdm())){
                //若划转前性质为商品粮，则查询入库信息获取计划明细号
                List<Api1202> api1202List = api1202Rep.getDataByHwdmAndTime(api1210.getHwdm(), api1210.getHzrq());
                if (null != api1202List && api1202List.size() > 0) {
                    api1210.setJhmxdh(api1202List.get(0).getJhmxh());
                }
            }
            if("200".equals(api1210.getHzhlsxzdm())){
                //若划转后性质为商品粮，则查询出库信息获取计划明细号
                List<Api1205> api1205List = api1205Rep.getDataByHwdmAndTime(api1210.getHwdm(), api1210.getHzrq());
                if (null != api1205List && api1205List.size() > 0) {
                    api1210.setJhmxdh(api1205List.get(0).getJhmxh());
                }
            }

            //设置空属性为默认值
@@ -830,6 +859,9 @@
            if (StringUtils.isEmpty(api1310.getShrxm())) {
                api1310.setShrxm("审核人");
            }
            if (StringUtils.isEmpty(api1310.getBglx())) {
                api1310.setBglx("1");
            }

            //设置空属性为默认值
            changeObject(api1310);
@@ -885,8 +917,8 @@
                    }
                }
            }
            api1403.setLrsl(lrsl);
            api1403.setLcsl(lcsl);
            api1403.setLrsl(lrsl + "");
            api1403.setLcsl(lcsl + "");

            //设置空属性为默认值
            changeObject(api1403);