Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r34500 -r34518 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 34500) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 34518) @@ -3777,19 +3777,8 @@ throw new RuntimeException(errorMsg); } WashAndDisinfectRecord washRecord = washRecords.get(0); - if(DatabaseUtil.isPoIdValid(washRecord.getRinserId())){ - Rinser rinser = (Rinser)objectDao.getById(Rinser.class.getSimpleName(), washRecord.getRinserId()); - if(rinser == null){ - continue; - } - CleanMethod cleanMethod = cleanMethodManager.getCleanMethodByName(washRecord.getDisinfectProgram()); - if(cleanMethod != null && cleanMethod.getCleanMinutes() != null && cleanMethod.getCleanMinutes() > 0){ - washAndDisinfectRecordManager.timingAutoCompleteWashRecord(cleanMethod.getCleanMinutes(), washRecord,releaseBasketAfterReturn); - } - Calendar endDate = Calendar.getInstance(); - endDate.setTime(washRecord.getStartDate()); - endDate.add(Calendar.MINUTE, cleanMethod.getCleanMinutes()); - errorMsg += "清洗结束时间:" + sdf.format(endDate.getTime()); + if(washRecord != null && washRecord.getEndDate() != null){ + errorMsg += "清洗结束时间:" + sdf.format(washRecord.getEndDate()); } }else if(Container.CONTAINER_STATUS_WASHED.equals(status)){ //验证篮筐清洗完成时间是否清洗完成