Index: forgon-core/src/main/java/com/forgon/log/model/Log.java =================================================================== diff -u -r16230 -r16408 --- forgon-core/src/main/java/com/forgon/log/model/Log.java (.../Log.java) (revision 16230) +++ forgon-core/src/main/java/com/forgon/log/model/Log.java (.../Log.java) (revision 16408) @@ -28,6 +28,7 @@ public static final String MODEL_WASH = "清洗模块"; public static final String MODEL_PACKING = "装配模块"; public static final String MODEL_REVIEW = "审核模块"; + public static final String MODEL_STERILELOADING = "灭菌装载模块"; public static final String MODEL_STERILIZATION = "灭菌模块"; public static final String MODEL_INVOICE = "发货模块"; public static final String MODEL_USERECORD = "使用记录模块"; Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r16407 -r16408 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16407) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16408) @@ -646,8 +646,9 @@ JSONUtil.modifyPropertyLog(logObj, "status",tousseInstance.getStatus(),TousseInstance.STATUS_REVIEWED); JSONUtil.addLogProperty(logObj, "tousseInstanceId", tousseInstance.getId()); JSONUtil.addLogProperty(logObj, "tousseInstanceBarcode", tousseInstance.getBarcode()); + JSONUtil.addLogProperty(logObj, "tousseName", tousseInstance.getTousseName()); JSONUtil.addLogProperty(logObj, "操作","包实例从篮筐中移除"); - appLogManager.saveLog(AcegiHelper.getLoginUser(), "审核模块或者灭菌装载或者灭菌模块", Log.TYPE_UPDATE, logObj); + appLogManager.saveLog(AcegiHelper.getLoginUser(), "审核模块或者灭菌装载或者灭菌模块", Log.TYPE_DELETE, logObj); String sql = String .format("update TousseInstance set reviewBasket_ID = null, status = '%s' where id = %d", Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java =================================================================== diff -u -r16407 -r16408 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java (.../SterileLoadingTableManager.java) (revision 16407) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java (.../SterileLoadingTableManager.java) (revision 16408) @@ -18,6 +18,8 @@ import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.sterilizationmanager.sterileloading.service.SterileLoadingManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; +import com.forgon.log.model.Log; +import com.forgon.log.service.LogManager; import com.forgon.tools.json.JSONUtil; /** @@ -30,6 +32,12 @@ private TousseInstanceManager tousseInstanceManager; private SterileLoadingManager sterileLoadingManager; + private LogManager appLogManager; + + public void setAppLogManager(LogManager appLogManager) { + this.appLogManager = appLogManager; + } + public void setBarcodeManager(BarcodeManager barcodeManager) { this.barcodeManager = barcodeManager; } @@ -64,11 +72,43 @@ if(barCodeArray.length >= 2){ barcodeEnd = barCodeArray[1]; } + BarcodeDevice barcodeDevice = barcodeManager.getBarcodeByBarcode(barcode); + + BarcodeDevice barcodeDeviceEnd = null; + + //条码的详细信息(条码、类型、对应的名称),用于记录日志 + String barcodeDetailInfo = null; + if(StringUtils.isNotBlank(barcodeEnd)){ + barcodeDeviceEnd = barcodeManager.getBarcodeByBarcode(barcode); + if(barcodeDeviceEnd != null){ + barcodeDetailInfo = "尾条码为:" + barcode + ",类型为:" + barcodeDeviceEnd.getType(); + if(barcodeDeviceEnd instanceof Container){ + barcodeDetailInfo += ",container名称为:" + ((Container)barcodeDeviceEnd).getContainerName(); + }else if(barcodeDeviceEnd instanceof TousseInstance){ + barcodeDetailInfo += ",TousseInstance名称为:" + ((TousseInstance)barcodeDeviceEnd).getTousseName(); + } + }else{ + barcodeDetailInfo = "尾条码为:" + barcode + ",不存在的无效条码"; + } + }else{ + if(barcodeDevice != null){ + barcodeDetailInfo = "首条码为:" + barcode + ",类型为:" + barcodeDevice.getType(); + if(barcodeDevice instanceof Container){ + barcodeDetailInfo += ",container名称为:" + ((Container)barcodeDevice).getContainerName(); + }else if(barcodeDevice instanceof TousseInstance){ + barcodeDetailInfo += ",TousseInstance名称为:" + ((TousseInstance)barcodeDevice).getTousseName(); + } + }else{ + barcodeDetailInfo = "首条码为:" + barcode + ",不存在的无效条码"; + } + } + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_STERILELOADING, Log.TYPE_ADD, barcodeDetailInfo); //判断是否存在 if(barcodeDevice == null){ return json.toString(); } + //当前登录用户所属科室 String currentOrgUnitCode = AcegiHelper.getLoginUser() .getCurrentOrgUnitCode(); @@ -202,6 +242,36 @@ barcodeEnd = barCodeArray[1]; } BarcodeDevice barcodeDevice = barcodeManager.getBarcodeByBarcode(barcode); + + BarcodeDevice barcodeDeviceEnd = null; + + //条码的详细信息(条码、类型、对应的名称),用于记录日志 + String barcodeDetailInfo = null; + if(StringUtils.isNotBlank(barcodeEnd)){ + barcodeDeviceEnd = barcodeManager.getBarcodeByBarcode(barcode); + if(barcodeDeviceEnd != null){ + barcodeDetailInfo = "尾条码为:" + barcode + ",类型为:" + barcodeDeviceEnd.getType(); + if(barcodeDeviceEnd instanceof Container){ + barcodeDetailInfo += ",container名称为:" + ((Container)barcodeDeviceEnd).getContainerName(); + }else if(barcodeDeviceEnd instanceof TousseInstance){ + barcodeDetailInfo += ",TousseInstance名称为:" + ((TousseInstance)barcodeDeviceEnd).getTousseName(); + } + }else{ + barcodeDetailInfo = "尾条码为:" + barcode + ",不存在的无效条码"; + } + }else{ + if(barcodeDevice != null){ + barcodeDetailInfo = "首条码为:" + barcode + ",类型为:" + barcodeDevice.getType(); + if(barcodeDevice instanceof Container){ + barcodeDetailInfo += ",container名称为:" + ((Container)barcodeDevice).getContainerName(); + }else if(barcodeDevice instanceof TousseInstance){ + barcodeDetailInfo += ",TousseInstance名称为:" + ((TousseInstance)barcodeDevice).getTousseName(); + } + }else{ + barcodeDetailInfo = "首条码为:" + barcode + ",不存在的无效条码"; + } + } + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_STERILELOADING, Log.TYPE_ADD, barcodeDetailInfo); //判断是否存在 if(barcodeDevice == null){ return json.toString();