调整上海接口-船运时调整每车为一条数据

CZT

2023-10-19 da0dfffe0c57ed3ca0c66b24a68ccc64da0873c9

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

@@ -12,7 +12,9 @@
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeIn;
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.Fzzy40SyncNoticeInRep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -21,6 +23,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;

@@ -38,6 +41,8 @@

    @Autowired
    private Fzzy40Sync1202Rep fzzySync1202Rep;
    @Autowired
    private Fzzy40SyncInoutRecordItemRep fzzy40SyncInoutRecordItemRep;
    @Autowired
    private Fzzy40SyncNoticeInRep fzzySyncNoticeInRep;
    @Autowired
@@ -80,7 +85,11 @@
            Api1105 api1105;
            List<Fz40InoutNoticeIn> listInoutNotice;
            List<Api1202> api1202List;
            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());
                }
@@ -97,20 +106,10 @@

                apiData.setRkywdh(Constant.INOUT_TYPE_14 + 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());
                apiData.setYwlx(Constant.INOUT_TYPE_2);
                apiData.setYwrq(sysData.getCompleteTime());
                apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
                apiData.setCyr(sysData.getUserName());

                //默认一个随便值
@@ -119,11 +118,15 @@
                apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());

                //获取合同号
                apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getRkywdh());
                listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(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.getRkywdh());
                    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());
                    }
                }

                apiData.setXxdz(StringUtils.isEmpty(sysData.getUserAddress()) ? "详细地址":sysData.getUserAddress());
@@ -137,7 +140,7 @@
                apiData.setDjsj(sysData.getRegisterTime());

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

                //粮食性质
@@ -200,9 +203,29 @@
                }else {
                    apiData.setCzbz(api1202List.get(0).getCzbz());
                }
                //判断是否为船运
                if(StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")){
                    listInoutRecordItem = fzzy40SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
                    if(null == listInoutRecordItem || listInoutRecordItem.isEmpty()){
                        api1202Rep.save(apiData);
                        continue;
                    }

                //保存数据
                api1202Rep.save(apiData);
                    int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
                    for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
                        apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4,10) + String.valueOf(idNum).substring(1));
                        apiData.setMz(fz40InoutRecordItem.getFullWeight());
                        apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
                        apiData.setJz(fz40InoutRecordItem.getSettleWeight());

                        api1202Rep.save(apiData);
                        idNum ++;
                    }
                }else {
                    //保存数据
                    api1202Rep.save(apiData);
                }

                log.info("1202---同步数据：{}", apiData.toString());
            }
        } catch (Exception e) {