优化出入库数据同步的必填项

CZT

2024-03-08 069c3ea2792899256f46c44ff2bd497d91f91a4d

优化出入库数据同步的必填项

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

@@ -242,8 +242,8 @@
                apiData.setBz(null == sysData.getRemarks() ? "备注" : sysData.getRemarks());
                apiData.setKlyy("扣量原因");

                apiData.setCmqrmgryxm(sysData.getRegisterUser());
                apiData.setDjmgryxm(sysData.getRegisterUser());
                apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"登记人":sysData.getRegisterUser());
                apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"登记人":sysData.getRegisterUser());
                //01:表示大型汽车号牌,黄底黑字； 02:表示小型汽车号牌,蓝底白字； 03:表示新能源汽车号牌,绿底黑 字；
                //04:表示农用车车牌号，绿底白字； LS:表示临时虚拟号牌，仅限于售 粮车无固定号牌时使用
                apiData.setCchlx("01");

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

@@ -147,6 +147,7 @@

            //车船号
            apiData.setCch(sysData.getPlateNum());
            apiData.setGch(sysData.getPlateNum());
            apiData.setDjsj(sysData.getRegisterTime());

            //粮食品种
@@ -179,8 +180,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());
@@ -191,8 +192,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());
@@ -205,16 +206,18 @@
                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 {
                api1206List = api1206Rep.getDataByHth(apiData.getHth());
                if(null != api1206List && api1206List.size() > 0){
                    apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
                }
            }

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

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

@@ -222,7 +225,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")){