Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r32771 -r32773 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 32771) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 32773) @@ -479,6 +479,9 @@ if(StringUtils.equals(SterilizationRecord.STERILIZATION_STATUS_DRAFT, sterilizationRecord.getStatus())){ return JSONUtil.buildJsonObject(false, "暂存状态的灭菌记录不能完成灭菌!"); } + if(SterilizationRecord.STERILIZATION_STATUS_INTERRUPT.equals(sterilizationRecord.getStatus()) && objectDao.countBySql(getOtherSterilizationRecordsSql(sterilizationRecord.getId())) > 0){ + return JSONUtil.buildJsonObject(false, "该灭菌记录里有物品已经存在于新的灭菌记录中,不能操作完成灭菌!"); + } } SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); List goodsStockList = new ArrayList();