| | |
| | | sysData.setRegisterTime(DateUtils.addDays(sysData.getRegisterTime(), numDay)); |
| | | } |
| | | |
| | | apiData.setQysj(sysData.getRegisterTime()); |
| | | |
| | | apiData.setQyrxm(sysData.getCheckUser()); |
| | | //扦样方式 2-智能随机 |
| | | apiData.setQyfs("2"); |
| | |
| | | if (StringUtils.isEmpty(fz40CheckItem.getValue())) { |
| | | continue; |
| | | } |
| | | jyxm += gbCheckList.get(0).getCode() + ","; |
| | | jyz += fz40CheckItem.getValue() + ","; |
| | | jyxm += "," + gbCheckList.get(0).getCode(); |
| | | jyz += "," + fz40CheckItem.getValue(); |
| | | zkj += ",0.0"; |
| | | zkl += ",0.0"; |
| | | } |
| | | |
| | | if(jyxm.length() > 0){ |
| | | jyxm = jyxm.substring(1); |
| | | } |
| | | if(jyz.length() > 0){ |
| | | jyz = jyz.substring(1); |
| | | } |
| | | apiData.setJyxm(jyxm); |
| | | apiData.setJyz(jyz); |
| | | apiData.setZkj(StringUtils.isEmpty(zkj)?"":zkj.substring(1)); |
| | |
| | | apiData.setJyjg("1"); |
| | | } |
| | | apiData.setJyrxm(sysData.getCheckUser()); |
| | | apiData.setJysj(DateUtils.addMinutes(sysData.getRegisterTime(), 30)); |
| | | if (null == sysData.getCheckTime()) { |
| | | sysData.setCheckTime(DateUtils.addMinutes(sysData.getFullWeightTime(), -5)); |
| | | } |
| | | if (sysData.getCheckTime().after(sysData.getEmptyWeightTime())) { |
| | | sysData.setCheckTime(DateUtils.addMinutes(sysData.getFullWeightTime(), -5)); |
| | | } |
| | | apiData.setJysj(sysData.getCheckTime()); |
| | | if (null == sysData.getSampleTime()) { |
| | | sysData.setSampleTime(DateUtils.addMinutes(sysData.getCheckTime(), -1)); |
| | | } |
| | | if (sysData.getSampleTime().after(sysData.getCheckTime())) { |
| | | sysData.setSampleTime(DateUtils.addMinutes(sysData.getCheckTime(), -1)); |
| | | } |
| | | apiData.setQysj(sysData.getSampleTime()); |
| | | |
| | | //粮食品种 |
| | | String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3)); |
| | | String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety()); |
| | | if(StringUtils.isEmpty(mappingCode)) { |
| | | mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3)); |
| | | } |
| | | apiData.setLspzdm(mappingCode); |
| | | |
| | | //保管员复核 |
| | | apiData.setBgyfh(apiData.getJyjg()); |
| | | apiData.setSpaqzbsfhg("1"); |
| | | |
| | | //粮食等级 |
| | | mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel()); |