Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r34518 -r34532 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 34518) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 34532) @@ -3777,8 +3777,12 @@ throw new RuntimeException(errorMsg); } WashAndDisinfectRecord washRecord = washRecords.get(0); - if(washRecord != null && washRecord.getEndDate() != null){ - errorMsg += "清洗结束时间:" + sdf.format(washRecord.getEndDate()); + if(washRecord != null){ + if(washRecord.getEndDate() != null){ + errorMsg += "清洗结束时间:" + sdf.format(washRecord.getEndDate()); + }else if(washRecord.getStartDate() != null){ + errorMsg += "清洗开始时间:" + sdf.format(washRecord.getStartDate()); + } } }else if(Container.CONTAINER_STATUS_WASHED.equals(status)){ //验证篮筐清洗完成时间是否清洗完成