优化3.5版本同步数据

CZT

2023-11-20 b19a8901f4060dcfd4cc2477374da2a7da267336

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

@@ -80,6 +80,9 @@
            List<Fz35InoutNoticeIn> listInoutNotice;
            List<Api1202> api1202List;
            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));
@@ -115,7 +118,7 @@
                //默认一个随便值
                apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact());

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

                //获取合同号
                listInoutNotice = fzzy35SyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
@@ -135,7 +138,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);

                //粮食性质
@@ -153,6 +156,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());
@@ -161,6 +167,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());
@@ -170,14 +179,18 @@

                apiData.setQzsfzkl(0 - sysData.getDeWet());
                apiData.setQzzzzkl(0 - sysData.getDeImpurity());
                //包装
               // apiData.setBzwkl(0 - sysData.getDePack());
                //其它
                if(null == sysData.getDeOther()){
                    sysData.setDeOther(0.0);
                }
                apiData.setQtkl( 0 - sysData.getDeOther());
                //值仓 现场扣重
                apiData.setXckl( 0 - sysData.getDeHandle());

                apiData.setJz(sysData.getRecordWeight());
                if(!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())){
                    sysData.setCompleteTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 10));
                }
                apiData.setCmsj(sysData.getCompleteTime());

                //入库结算单号,默认统一结算，不设置结算单号