优化3.5版本同步数据

CZT

2023-11-20 b19a8901f4060dcfd4cc2477374da2a7da267336

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

@@ -81,6 +81,9 @@
        List<Fz35InoutNoticeOut> listInoutNotice;
        List<Api1205> api1205List;
        for (Fz35InoutRecord sysData : list) {
            if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
                continue;
            }
            if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                sysData.setRecordWeight(sysData.getSettleWeight());
            }
@@ -99,7 +102,7 @@
            //判断业务时间与单据号是否匹配，若不匹配，则更改业务时间为单据号所在的时间
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
            Date time = dateFormat.parse(sysData.getId().substring(2, 10));
            int numDay = DateUtil.difDay(sysData.getCompleteTime(), time);
            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));
@@ -114,6 +117,8 @@
            apiData.setCktzdh(sysData.getNoticeId());

            apiData.setYwrq(sysData.getRegisterTime());
            apiData.setCyr(sysData.getUserName().trim());
            apiData.setSfzh(null == sysData.getUserId() ? "410183199003187055" : sysData.getUserId().trim());

            //获取合同号
            listInoutNotice = fzzy35SyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
@@ -128,11 +133,11 @@
            apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());

            //车船号
            apiData.setCch(sysData.getPlateNum());
            apiData.setCch(sysData.getPlateNum().trim());
            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);

            //粮食等级
@@ -151,7 +156,7 @@

            //皮重信息
            apiData.setPz(sysData.getEmptyWeight());
            if(sysData.getEmptyWeightTime().before(sysData.getRegisterTime())){
            if(!sysData.getEmptyWeightTime().after(sysData.getRegisterTime())){
                sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
            }
            apiData.setPzjlsj(sysData.getEmptyWeightTime());
@@ -160,7 +165,7 @@

            //毛重信息
            apiData.setMz(sysData.getFullWeight());
            if(sysData.getFullWeightTime().before(sysData.getEmptyWeightTime())){
            if(!sysData.getFullWeightTime().after(sysData.getEmptyWeightTime())){
                sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
            }
            apiData.setMzjlsj(sysData.getFullWeightTime());
@@ -169,7 +174,7 @@

            //净重
            apiData.setJz(sysData.getRecordWeight());
            if(sysData.getCompleteTime().before(sysData.getFullWeightTime())){
            if(!sysData.getCompleteTime().after(sysData.getFullWeightTime())){
                sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
            }
            apiData.setCmsj(sysData.getCompleteTime());