Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r17512 -r17538 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 17512) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 17538) @@ -1891,6 +1891,27 @@ ReviewedBasket reviewedBasket = null; if(StringUtils.isNotBlank(basketBarcode)){//灭菌篮筐条码 + BarcodeDevice bd = barcodeManager.getBarcodeByBarcode(basketBarcode); + if(bd == null || !(bd instanceof Container)){ + json.put("success", false); + json.put("message", "条码:" + basketBarcode + "不是篮筐条码,不能进行审核"); + return json; + } + + Container container = (Container)bd; + if(!container.isDisinfectionBasket()){ + json.put("success", false); + json.put("message", "篮筐条码:" + basketBarcode + "不是灭菌篮筐,不能进行审核"); + return json; + } + + if(!Container.CONTAINER_STATUS_FREE.equals(container.getStatus()) + && !Container.CONTAINER_STATUS_STERILIZELOADING.equals(container.getStatus())){ + json.put("success", false); + json.put("message", "篮筐条码:" + basketBarcode + "的状态为"+ container.getStatus() +",不能进行审核"); + return json; + } + reviewedBasket = reviewedBasketManager.getReviewedBasketButNew(basketBarcode); reviewedBasketManager.saveOrUpdate(reviewedBasket); }