Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java =================================================================== diff -u -r31897 -r32107 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java (.../ProxyDisinfectionAction.java) (revision 31897) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java (.../ProxyDisinfectionAction.java) (revision 32107) @@ -434,20 +434,25 @@ Container container = (Container) barcodeDevice; ReviewedBasket basket = reviewedBasketManager .getReviewedBasketForSterilizeRecord(barcode); - Long basketId = null; - if(basket != null){ - basketId = basket.getId(); + if(Container.CONTAINER_STATUS_STERILIZING.equals(basket.getContainer().getStatus())){ + message = "该篮筐正在进行灭菌,不能使用该篮筐"; + success = false; + }else{ + Long basketId = null; + if(basket != null){ + basketId = basket.getId(); + } + List tousses = proxyDisinfectionManager.buildReviewedTousseInstanceVos(basket); + int count = reviewedBasketManager.getSterilizedTousseAmountBySterilizeBasketWhenNotConfigureDisableGoodsNotShippedAlert(container); + json.put("notDeliverTousseAmount", count); + json.put("containerName", container.getContainerName()); + json.put("purpose", container.getPurpose()); + json.put("produceDeptCode", container.getDepartCode()); + json.put("produceDeptName", container.getDepartName()); + json.put("basketId", basketId); + json.put("type", "容器"); + json.put("instances", tousses); } - List tousses = proxyDisinfectionManager.buildReviewedTousseInstanceVos(basket); - int count = reviewedBasketManager.getSterilizedTousseAmountBySterilizeBasketWhenNotConfigureDisableGoodsNotShippedAlert(container); - json.put("notDeliverTousseAmount", count); - json.put("containerName", container.getContainerName()); - json.put("purpose", container.getPurpose()); - json.put("produceDeptCode", container.getDepartCode()); - json.put("produceDeptName", container.getDepartName()); - json.put("basketId", basketId); - json.put("type", "容器"); - json.put("instances", tousses); }else{ message = "请扫描器械包或者篮筐条码!"; success = false;