优化调整上报信息

CZT

2023-11-08 7ab13e3b8f4ab768dd68b1bd8e1f8bbce31fb8a6

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

@@ -12,7 +12,9 @@
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeOut;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecordItem;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40SyncInoutRecordItemRep;
import com.fzzy.async.fzzy40.repository.Fzzy40SyncNoticeOutRep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -37,6 +39,8 @@
    private final static String INOUT_TYPE_OUT = "OUT";
    @Autowired
    private Fzzy40Sync1202Rep fzzySync1202Rep;
    @Autowired
    private Fzzy40SyncInoutRecordItemRep fzzy40SyncInoutRecordItemRep;
    @Autowired
    private Fzzy40SyncNoticeOutRep fzzySyncNoticeOutRep;
    @Autowired
@@ -80,7 +84,11 @@
        Api1105 api1105;
        List<Fz40InoutNoticeOut> listInoutNotice;
        List<Api1205> api1205List;
        List<Fz40InoutRecordItem> listInoutRecordItem;
        for (Fz40InoutRecord sysData : list) {
            if(sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")){
                continue;
            }
            if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                sysData.setRecordWeight(sysData.getSettleWeight());
            }
@@ -95,15 +103,6 @@
            }
            apiData = new Api1205();
            apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4));
            //判断业务时间与单据号是否匹配，若不匹配，则更改业务时间为单据号所在的时间
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
            Date time = dateFormat.parse(sysData.getId().substring(2, 10));
            int numDay = DateUtil.difDay(DateUtil.getCurZero(sysData.getCompleteTime()), DateUtil.getCurZero(time));
            if(numDay != 0){
                sysData.setFullWeightTime(DateUtils.addDays(sysData.getFullWeightTime(), numDay));
                sysData.setEmptyWeightTime(DateUtils.addDays(sysData.getEmptyWeightTime(), numDay));
                sysData.setCompleteTime(DateUtils.addDays(sysData.getCompleteTime(), numDay));
            }

            //货位代码
            apiData.setHwdm(api1105.getHwdm());
@@ -112,16 +111,18 @@
            //通知单号
            apiData.setCktzdh(sysData.getNoticeId());

            apiData.setYwrq(sysData.getRegisterTime());
            apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));

            //获取合同号
            listInoutNotice = fzzySyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
            if(null != listInoutNotice && listInoutNotice.size() >0){
                apiData.setHth(api1105.getHwdm().substring(0,18) + listInoutNotice.get(0).getContractId());
            }else {
                apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getCkywdh());
                if(StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())){
                    apiData.setHth(api1105.getHwdm().substring(0,18) + listInoutNotice.get(0).getContractId());
                }
                if(StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())){
                    apiData.setJhmxh(listInoutNotice.get(0).getPlanId());
                }
            }


            //运输工具，若为空，则默认给1-汽车
            apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
@@ -131,7 +132,7 @@
            apiData.setDjsj(sysData.getRegisterTime());

            //粮食品种
            String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
            String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
            apiData.setLspzdm(mappingCode);

            //粮食等级
@@ -145,8 +146,11 @@
            apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear())? DateFormatUtils.format(new Date(), "yyyy") :sysData.getFoodYear());

            //产地代码
            String cddm = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
            apiData.setCddm(cddm);
            mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
            if(StringUtils.isEmpty(mappingCode)){
                mappingCode = apiData.getHwdm().substring(2,8);
            }
            apiData.setCddm(mappingCode);

            //皮重信息
            apiData.setPz(sysData.getEmptyWeight());
@@ -188,8 +192,30 @@
            }else {
                apiData.setCzbz(api1205List.get(0).getCzbz());
            }
            //保存数据
            api1205Rep.save(apiData);
            //判断是否为船运
            if(StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")){
                listInoutRecordItem = fzzy40SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
                if(null == listInoutRecordItem || listInoutRecordItem.isEmpty()){
                    api1205Rep.save(apiData);
                    continue;
                }

                int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
                for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
                    if(fz40InoutRecordItem.getSettleWeight() <= 0){
                        continue;
                    }
                    apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4,10) + String.valueOf(idNum).substring(1));
                    apiData.setMz(fz40InoutRecordItem.getFullWeight());
                    apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
                    apiData.setJz(fz40InoutRecordItem.getSettleWeight());
                    api1205Rep.save(apiData);
                    idNum ++;
                }
            }else {
                //保存数据
                api1205Rep.save(apiData);
            }
        }
        } catch (Exception e) {
            log.error("---同步失败----{}", e);