| | |
| | | //判断业务时间与单据号是否匹配,若不匹配,则更改业务时间为单据号所在的时间 |
| | | 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)); |
| | |
| | | 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); |
| | | |
| | | //粮食等级 |
| | |
| | | |
| | | //皮重信息 |
| | | 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()); |
| | |
| | | |
| | | //毛重信息 |
| | | 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()); |
| | |
| | | |
| | | //净重 |
| | | 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()); |