Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java =================================================================== diff -u -r16346 -r16387 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java (.../BarcodeTableManager.java) (revision 16346) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java (.../BarcodeTableManager.java) (revision 16387) @@ -71,18 +71,23 @@ || barcodeDevice.getType().equals(BarcodeDevice.BARCODE_TYPE_SIGNBOARD))){ obj.put("returnType", "tousseInstance"); }else if(barcodeDevice.getType()!=null && barcodeDevice.getType().equals(BarcodeDevice.BARCODE_TYPE_CONTAINER)){ - Container container = (Container)barcodeDevice; - obj.put("returnType", "container"); - obj.put("containerType", container.getPurpose()); - obj.put("status", container.getStatus()); - String coding = container.getDepartCode(); - if(StringUtils.isNotBlank(curUserDepartCoding)){ - if(curUserDepartCoding.equals(coding)){ - obj.put("isCurUserDepart", true); - }else{ - obj.put("isCurUserDepart", false); + if(barcodeDevice instanceof Container){ + Container container = (Container)barcodeDevice; + obj.put("returnType", "container"); + obj.put("containerType", container.getPurpose()); + obj.put("status", container.getStatus()); + String coding = container.getDepartCode(); + if(StringUtils.isNotBlank(curUserDepartCoding)){ + if(curUserDepartCoding.equals(coding)){ + obj.put("isCurUserDepart", true); + }else{ + obj.put("isCurUserDepart", false); + } } + }else{ + obj.put("message", "该条码对应的篮筐已被删除,请勿再使用此条码!"); } + }else if(barcodeDevice.getType()!=null && barcodeDevice.getType().equals(BarcodeDevice.BARCODE_TYPE_CLEANMETHOD)){ obj.put("returnType", "cleanmethod"); }else if(barcodeDevice.getType()!=null && barcodeDevice.getType().equals(BarcodeDevice.BARCODE_TYPE_RINSER)){