Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r17204 -r17412 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 17204) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 17412) @@ -591,7 +591,13 @@ for (TousseInstance tousseInstance : allTousseInstancesOfSterile) { // 检测不合格的包,状态变为已废弃,否则是已灭菌 if( barcodeList.contains(tousseInstance.getBarcode()) ){ + // 已废弃的包添加废弃人、废弃时间、废弃原因,并且写日志 tousseInstance.setStatus(TousseInstance.STATUS_DISCARD); + tousseInstance.setWasteDate(new Date()); + tousseInstance.setWasteReason("灭菌完成废弃"); + tousseInstance.setOperateUser(confirmName); + String description = "灭菌完成废弃器械包,器械包名称 :" + tousseInstance.getTousseName() + " 条码 :" + tousseInstance.getBarcode(); + appLogManager.saveLog(AcegiHelper.getLoginUser(), "灭菌管理", "修改", description); }else{ tousseInstance.setStatus(TousseInstance.STATUS_STERILED); //只有当所属聚合包实例的id属性为空(即聚合包实例及不属于任何聚合包实例内的普通器械包实例)时才计算库存,比如聚合包内普通器械包不计算到库存中