Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r29232 -r29316 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 29232) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 29316) @@ -1011,6 +1011,7 @@ List details = null; JSONArray unfinishedPackingTask = null; Set shareDeparts = null;//共享科室 + boolean isFixedBarcode = false; if (StringUtils.isNotBlank(barcode)) { orgUnit = orgUnitManager.getOrgUnitByBarcode(barcode); if (orgUnit != null) { @@ -1067,9 +1068,12 @@ }else if(td.isComboTousse()){ errorMessage = "不能回收聚合包!"; }else{ + if(tousseInstanceManager.equalsBarcode(barcode)){ + isFixedBarcode = true; + } // 北京大学肿瘤医院BJDXZLYY-5 回收时扫描包实例条码进行回收 状态为“已回收”的器械包不能回收 boolean defaultRecycleAmountOfComboFormIsZero = CssdUtils.getSystemSetConfigByNameBool("defaultRecycleAmountOfComboFormIsZero"); - if (defaultRecycleAmountOfComboFormIsZero && + if (!isFixedBarcode && defaultRecycleAmountOfComboFormIsZero && StringUtils.equals(TousseInstance.STATUS_RECYCLED, tousseInstance.getStatus())) { errorMessage = "器械包已回收!"; } else { @@ -1252,6 +1256,7 @@ map.put("isTousseNeedMaintain", isTousseNeedMaintain); map.put("unSupplementMaterials", details); map.put("unfinishedPackingTask", unfinishedPackingTask); + map.put("isFixedBarcode", isFixedBarcode); try { JSONObject jsonObject = JSONObject.fromObject(map, config);