Index: ssts-storagelocation/src/main/java/com/forgon/disinfectsystem/basedatamanager/storagelocation/goodsaccess/service/StorageLocationGoodsAccessManagerImpl.java =================================================================== diff -u -r39714 -r39720 --- ssts-storagelocation/src/main/java/com/forgon/disinfectsystem/basedatamanager/storagelocation/goodsaccess/service/StorageLocationGoodsAccessManagerImpl.java (.../StorageLocationGoodsAccessManagerImpl.java) (revision 39714) +++ ssts-storagelocation/src/main/java/com/forgon/disinfectsystem/basedatamanager/storagelocation/goodsaccess/service/StorageLocationGoodsAccessManagerImpl.java (.../StorageLocationGoodsAccessManagerImpl.java) (revision 39720) @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import net.sf.json.JSONObject; import net.sf.json.JsonConfig; @@ -31,6 +32,8 @@ import com.forgon.disinfectsystem.returngoodsrecord.service.ReturnGoodsRecordManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; import com.forgon.exception.SystemException; +import com.forgon.log.model.Log; +import com.forgon.log.service.LogManager; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JSONUtil; @@ -56,6 +59,12 @@ private OrgUnitManager orgUnitManager; + private LogManager appLogManager; + + public void setAppLogManager(LogManager appLogManager) { + this.appLogManager = appLogManager; + } + public void setOrgUnitManager(OrgUnitManager orgUnitManager) { this.orgUnitManager = orgUnitManager; } @@ -435,7 +444,16 @@ if(CollectionUtils.isNotEmpty(discardTousseNameBarcodeList)){ throw new SystemException("如下物品状态为已废弃,请移除后再操作:" + StringTools.join(discardTousseNameBarcodeList, ",")); } - tousseInstanceManager.discardTousseInstances(tousseInstances, AcegiHelper.getLoginUserFullName(), "用户通过库位管理功能进行废弃", operationTime); + String wasteReason = "用户通过库位管理功能进行废弃"; + tousseInstanceManager.discardTousseInstances(tousseInstances, AcegiHelper.getLoginUserFullName(), wasteReason, operationTime); + //保存废弃器械包的日志 + List barcodes = tousseInstances.stream().map(ti->ti.getBarcode()).collect(Collectors.toList()); + String barcodeStr = StringTools.join(barcodes, ","); + JSONObject description = new JSONObject(); + description.put("操作", "废弃器械包"); + description.put("wasteReason", wasteReason); + description.put("barcodes", barcodeStr); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_BASEDATA, Log.TYPE_DELETE, description); } }