czt
8 天以前 1652aa57e12625926886c9450c7fbbfab6f2b2b5
src/main/java/com/fzzy/push/sx2025/SX2025ApiRemoteService.java
@@ -148,7 +148,9 @@
            SX2025Dto result = sx2025RespDto.getMsgBody();
            apiLog.setStatus(result.getCode().equals("200") ? 0 : Integer.valueOf(result.getCode()));
            apiLog.setResult(result.getVER());
            apiLogRep.save(apiLog);
            if (!result.getCode().equals("200")) {
                apiLogRep.save(apiLog);
            }
            ResponseDto resd = new ResponseDto();
            resd.setSuccess(result.getCode().equals("200") ? 0 : Integer.valueOf(result.getCode()));
            resd.setMsg(result.getVER());
@@ -389,7 +391,7 @@
        }
        //账套信息
        if (Constant.API_CODE_1504.equals(inteId)) {
            Api1504 api1504 = (Api1504)data;
            Api1504 api1504 = (Api1504) data;
            SX2025Api1504 apiData = new SX2025Api1504();
            BeanUtils.copyProperties(api1504, apiData);
            //设置統一库区编码
@@ -406,7 +408,7 @@
        }
        //科目信息
        if (Constant.API_CODE_1505.equals(inteId)) {
            Api1505 api1505 = (Api1505)data;
            Api1505 api1505 = (Api1505) data;
            SX2025Api1505 apiData = new SX2025Api1505();
            BeanUtils.copyProperties(api1505, apiData);
            apiData.setCqunit(api1505.getCqunit() + "");
@@ -720,9 +722,96 @@
            }
            return apiData;
        }
        //TODO 新增接口
        //空仓验收表
        if (Constant.API_CODE_1214.equals(inteId)) {
            Api1214 api1214 = (Api1214) data;
            SX2025Api1214 apiData = new SX2025Api1214();
            BeanUtils.copyProperties(api1214, apiData);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1214.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            //设置验收视频照片
            apiData.setYsspzp(FileUtils.fileToByteString(api1214.getWjdz()));
            return apiData;
        }
        //空罐验收表
        if (Constant.API_CODE_1215.equals(inteId)) {
            Api1215 api1215 = (Api1215) data;
            SX2025Api1215 apiData = new SX2025Api1215();
            BeanUtils.copyProperties(api1215, apiData);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyygbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1215.getHwdm());
                apiData.setTyygbm(tyhwbm);
            }
            //设置验收视频照片
            apiData.setYsspzp(FileUtils.fileToByteString(api1215.getWjdz()));
            return apiData;
        }
        //储备粮倒仓验收表
        if (Constant.API_CODE_1216.equals(inteId)) {
            Api1216 api1216 = (Api1216) data;
            SX2025Api1216 apiData = new SX2025Api1216();
            BeanUtils.copyProperties(api1216, apiData);
            //设置倒出货位统一编码
            if (StringUtils.isEmpty(apiData.getDctyhwbm())) {
                String dchwtybm = apiCommonService.getTyhwbm(api1216.getDchwbm());
                apiData.setDctyhwbm(dchwtybm);
            }
            //设置倒入货位统一编码
            if (StringUtils.isEmpty(apiData.getDrtyhwbm())) {
                String drhwtybm = apiCommonService.getTyhwbm(api1216.getDrhwbm());
                apiData.setDrtyhwbm(drhwtybm);
            }
            //设置验收视频照片
            apiData.setYsspzp(FileUtils.fileToByteString(api1216.getWjdz()));
            return apiData;
        }
        //轮换验收信息
        if (Constant.API_CODE_1217.equals(inteId)) {
            Api1217 api1217 = (Api1217) data;
            SX2025Api1217 apiData = new SX2025Api1217();
            BeanUtils.copyProperties(api1217, apiData);
            //设置倒出货位统一编码
            if (StringUtils.isEmpty(apiData.getDctyhwbm())) {
                String dchwtybm = apiCommonService.getTyhwbm(api1217.getDchwbm());
                apiData.setDctyhwbm(dchwtybm);
            }
            //设置倒入货位统一编码
            if (StringUtils.isEmpty(apiData.getDrtyhwbm())) {
                String drhwtybm = apiCommonService.getTyhwbm(api1217.getDrhwbm());
                apiData.setDrtyhwbm(drhwtybm);
            }
            //设置验收视频照片
            apiData.setYsspzp(FileUtils.fileToByteString(api1217.getWjdz()));
            return apiData;
        }
        //入库成本核定表
        if (Constant.API_CODE_1218.equals(inteId)) {
            Api1218 api1218 = (Api1218) data;
            SX2025Api1218 apiData = new SX2025Api1218();
            BeanUtils.copyProperties(api1218, apiData);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1218.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            return apiData;
        }
        //入库成本核定明细表
        if (Constant.API_CODE_1219.equals(inteId)) {
            Api1219 api1219 = (Api1219) data;
            SX2025Api1219 apiData = new SX2025Api1219();
            BeanUtils.copyProperties(api1219, apiData);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1219.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            return apiData;
        }
        //安全管理信息
        if (Constant.API_CODE_1301.equals(inteId)) {
            Api1301 api1301 = (Api1301) data;
@@ -869,7 +958,7 @@
            cntxwjlj += apiData.getTykqbm() + "/";
            cntxwjlj += apiData.getYzwbh() + "/";
            cntxwjlj += apiData.getSpjksbid() + "/";
            cntxwjlj += apiData.getTyhwbm() + "_" + DateFormatUtils.format(apiData.getZpsj(),"yyyyMMdd HHmmss") + "." + apiData.getTxwjhzm();
            cntxwjlj += apiData.getTyhwbm() + "_" + DateFormatUtils.format(apiData.getZpsj(), "yyyyMMdd HHmmss") + "." + apiData.getTxwjhzm();
            apiData.setCntxwjlj(cntxwjlj);
            return apiData;
        }
@@ -888,7 +977,7 @@
            spwjlj += apiData.getTykqbm() + "/";
            spwjlj += apiData.getSpjksbid() + "/";
            spwjlj += apiData.getSpjksbid() + "/";
            spwjlj += apiData.getTykqbm() + "_" + DateFormatUtils.format(apiData.getGjsj(),"yyyyMMdd HHmmss") + "." + apiData.getSpwjhzm();
            spwjlj += apiData.getTykqbm() + "_" + DateFormatUtils.format(apiData.getGjsj(), "yyyyMMdd HHmmss") + "." + apiData.getSpwjhzm();
            apiData.setSpwjlj(spwjlj);
            return apiData;
        }
@@ -1039,6 +1128,18 @@
                return SX2025Constant.SX_2025_API_ODS_UP_KHXXJK;
            case "1213":
                return SX2025Constant.SX_2025_API_ODS_UP_FCQRDXXJK;
            case "1214":
                return SX2025Constant.SX_2025_API_ODS_UP_KCYSJK;
            case "1215":
                return SX2025Constant.SX_2025_API_ODS_UP_KGYSJK;
            case "1216":
                return SX2025Constant.SX_2025_API_ODS_UP_DCYSJK;
            case "1217":
                return SX2025Constant.SX_2025_API_ODS_UP_LHYSJK;
            case "1218":
                return SX2025Constant.SX_2025_API_ODS_UP_RKCBHDJK;
            case "1219":
                return SX2025Constant.SX_2025_API_ODS_UP_RKCBHDMXJK;
            case "1301":
                return SX2025Constant.SX_2025_API_ODS_UP_AQGLXXJK;
            case "1302":