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

CZT

2023-10-19 da0dfffe0c57ed3ca0c66b24a68ccc64da0873c9

 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java

@@ -3,11 +3,11 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1105;
import com.fzzy.api.entity.Api1202;
import com.fzzy.api.entity.Api1208;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.DateUtil;
import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy35.entity.Fz35InoutNoticeIn;
@@ -17,12 +17,11 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.text.SimpleDateFormat;
import java.util.*;

/**
 * 粮食入库信息
@@ -80,7 +79,6 @@
            Api1105 api1105;
            List<Fz35InoutNoticeIn> listInoutNotice;
            List<Api1202> api1202List;
            Calendar c = Calendar.getInstance();
            for (Fz35InoutRecord sysData : list) {
                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                    sysData.setRecordWeight(sysData.getSettleWeight());
@@ -98,6 +96,16 @@

                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);
@@ -107,7 +115,7 @@
                //默认一个随便值
                apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact());

                apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId());
                apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());

                //获取合同号
                listInoutNotice = fzzy35SyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
@@ -119,17 +127,15 @@

                apiData.setXxdz(sysData.getUserAddress());

                //运输工具，默认汽车，TODO>> 待调整为根据数据库获取
                apiData.setYsgj("1");
                //运输工具，若为空，则默认给1-汽车
                apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());

                //车船号
                apiData.setCch(sysData.getPlateNum());
                c.setTime(sysData.getRegisterTime());
                c.add(Calendar.MINUTE,-3);
                apiData.setDjsj(c.getTime());
                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);

                //粮食性质
@@ -147,6 +153,9 @@

                //毛重信息
                apiData.setMz(sysData.getFullWeight());
                if(!sysData.getFullWeightTime().after(sysData.getRegisterTime())){
                    sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
                }
                apiData.setMzjlsj(sysData.getFullWeightTime());
                apiData.setMzjby(sysData.getFullWeightUser());
                apiData.setMzjly(sysData.getFullWeightUser());
@@ -155,6 +164,9 @@

                //皮重信息
                apiData.setPz(sysData.getEmptyWeight());
                if(!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())){
                    sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
                }
                apiData.setPzjlsj(sysData.getEmptyWeightTime());
                apiData.setPzjby(sysData.getEmptyWeightUser());
                apiData.setPzjly(sysData.getEmptyWeightUser());
@@ -172,15 +184,16 @@
                apiData.setXckl( 0 - sysData.getDeHandle());

                apiData.setJz(sysData.getRecordWeight());
                c.setTime(sysData.getCompleteTime());
                c.add(Calendar.MINUTE,3);
                apiData.setCmsj(c.getTime());
                if(!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())){
                    sysData.setCompleteTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 10));
                }
                apiData.setCmsj(sysData.getCompleteTime());

                //入库结算单号,默认统一结算，不设置结算单号
                //apiData.setRkjsdh(kqdm + sysData.getId().substring(2));

                //操作标志及最后更新时间
                apiData.setZhgxsj(c.getTime());
                apiData.setZhgxsj(sysData.getCompleteTime());

                //业务id、库区编码、同步时间
                apiData.setBizId(sysData.getId());