Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/dwr/table/ContainerTableManager.java
===================================================================
diff -u -r14011 -r14232
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/dwr/table/ContainerTableManager.java	(.../ContainerTableManager.java)	(revision 14011)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/dwr/table/ContainerTableManager.java	(.../ContainerTableManager.java)	(revision 14232)
@@ -77,9 +77,17 @@
 	 * @return
 	 */
 	public String getBasketByBarcodeAndProcedures(String barcode, String procedures) {
-		String msg = "请扫描清洗篮筐或清洗架";
-		Container container = containerManager.getContainerByBarcode(barcode);
-		if (container != null) {
+		String msg = "加载失败";
+		try {
+			if(StringUtils.isBlank(barcode)){
+				msg = "条码不能为空!";
+				return JSONUtil.buildJsonObject(false, msg).toString();
+			}
+			Container container = containerManager.getContainerByBarcode(barcode);
+			if(container == null){
+				msg = String.format("未找到条码为%s的容器!", barcode);
+				return JSONUtil.buildJsonObject(false, msg).toString();
+			}
 			if (container.isCleanBasket() || container.isCleaningShelf()) {
 				String basketName = container.getContainerName();
 				String status = container.getStatus();
@@ -91,7 +99,13 @@
 				} else {
 					msg = "无法加载，该清洗篮筐或清洗架正在" + status;
 				}
+			}else{
+				msg = String.format("条码为%s的容器不是清洗筐或清洗架,请扫描清洗筐或清洗架条码!", barcode);
+				return JSONUtil.buildJsonObject(false, msg).toString();
 			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			return JSONUtil.buildJsonObject(false, e.getMessage()).toString();
 		}
 		return JSONUtil.buildJsonObject(false, msg).toString();
 	}