优化出库数据同步

CZT

2024-03-18 17810b3b68347e838f1d5966de25d206c0e63a83

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java

@@ -44,6 +44,8 @@
    @Autowired
    private Api1205Rep api1205Rep;
    @Autowired
    private Api1206Rep api1206Rep;
    @Autowired
    private Api1404Rep api1404Rep;
    @Autowired
    private ApiCommonService commonService;
@@ -82,6 +84,7 @@
        Api1105 api1105;
        List<Fz40InoutNoticeOut> listInoutNotice;
        List<Api1205> api1205List;
        List<Api1206> api1206List;
        List<Fz40InoutRecordItem> listInoutRecordItem;
        for (Fz40InoutRecord sysData : list) {
            if(sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")){
@@ -176,8 +179,8 @@
                sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
            }
            apiData.setPzjlsj(sysData.getEmptyWeightTime());
            apiData.setPzjby(sysData.getEmptyWeightUser());
            apiData.setPzjly(sysData.getEmptyWeightUser());
            apiData.setPzjby(StringUtils.isEmpty(sysData.getEmptyWeightUser())?"监磅员":sysData.getEmptyWeightUser());
            apiData.setPzjly(StringUtils.isEmpty(sysData.getEmptyWeightUser())?"计量员":sysData.getEmptyWeightUser());

            //毛重信息
            apiData.setMz(sysData.getFullWeight());
@@ -188,8 +191,8 @@
                sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
            }
            apiData.setMzjlsj(sysData.getFullWeightTime());
            apiData.setMzjby(sysData.getFullWeightUser());
            apiData.setMzjly(sysData.getFullWeightUser());
            apiData.setMzjby(StringUtils.isEmpty(sysData.getFullWeightUser())?"监磅员":sysData.getFullWeightUser());
            apiData.setMzjly(StringUtils.isEmpty(sysData.getFullWeightUser())?"计量员":sysData.getFullWeightUser());

            //净重
            apiData.setJz(sysData.getRecordWeight());
@@ -197,9 +200,29 @@
                sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
            }
            apiData.setCmsj(sysData.getCompleteTime());
            //结算单号
            if(StringUtils.isNotEmpty(sysData.getSettleId())){
                apiData.setCkjsdh(kqdm + sysData.getSettleId());
            }
            if(StringUtils.isNotEmpty(apiData.getHth())){
                api1206List = api1206Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
                if(null == api1206List || api1206List.isEmpty()){
                    api1206List = api1206Rep.getDataByHth(apiData.getHth());
                    if(null != api1206List && api1206List.size() > 0){
                        apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
                    }
                }else {
                    apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
                }
            }

            apiData.setCchlx("01");
            apiData.setXldd("库内");
            apiData.setBzbdbz(25);
            apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"登记人":sysData.getRegisterUser());
            apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"登记人":sysData.getRegisterUser());
            apiData.setZcbgyxm(StringUtils.isEmpty(sysData.getHandleUser())?"值仓员":sysData.getHandleUser());
            apiData.setZxzydw("外聘单位");

            //操作标志及最后更新时间
            apiData.setZhgxsj(sysData.getUpdateTime());
@@ -208,7 +231,7 @@
            apiData.setBizId(sysData.getId());
            apiData.setKqdm(kqdm);
            apiData.setSyncTime(new Date());
            log.info("1201---同步数据：{}",apiData.toString());
            log.info("1205---同步数据：{}",apiData.toString());

            //判断是否为船运
            if(StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")){
@@ -232,7 +255,7 @@
                    apiData.setJz(fz40InoutRecordItem.getSettleWeight());
                    apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
                    apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());

                    apiData.setKzl(0 - fz40InoutRecordItem.getDe());
                    api1205List = api1205Rep.getDataById(apiData.getCkywdh());
                    if(null == api1205List || api1205List.isEmpty()){
                        apiData.setCzbz(Constant.CZBZ_I);