Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r14276 -r14290
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 14276)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 14290)
@@ -1474,7 +1474,7 @@
 																showResult("请输入正确的条码！");
 																top.Ext.getCmp('inputBarcode').setValue("");
 															}else{
-																showResult("请输入正确的条码！");
+																showResult(result);
 																top.Ext.getCmp('inputBarcode').setValue("");
 															}
 														}else{
@@ -1483,6 +1483,7 @@
 														}
 													},
 													failure : function(response, options) {
+													top.Ext.getCmp('inputBarcode').setValue("");
 													sterilizationColumnTree.getEl().unmask();
 														var result = Ext.decode(response.responseText);
 														showResult(result);
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
===================================================================
diff -u -r14273 -r14290
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 14273)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 14290)
@@ -431,76 +431,82 @@
 	 * since 2015-10-24
 	 */
 	public void getBarcodeType() {
-		String barcodeStr = StrutsParamUtils.getPraramValue("barcode", "");
-		String[] barcodeArray = barcodeStr.split(";");
-		
-		String barcode = barcodeArray[0];
-		BarcodeDevice barcodeDevice = barcodeManager
-				.getBarcodeByBarcode(barcode);
 		String result = null;
 		
-		//仅输入条码/篮筐(首)的判断
-		if (barcodeDevice != null) {
-			if (barcodeDevice instanceof Container) {// 容器
-				Container container = (Container) barcodeDevice;
-				if (Container.CONTAINERTYPE_SHELF.equals(container
-						.getContainerType())) {// 灭菌架
-					result = SHELF;
-				} else if (Container.CONTAINERTYPE_BASKET.equals(container
-						.getContainerType())) {//篮筐
-					// 灭菌筐
-					if(Container.CONTAINER_PURPOSE_DISINFECTION.equals(container.getPurpose())){
-						result = BASKET;
-					}else if(Container.CONTAINER_PURPOSE_VIRTUAL.equals(container.getPurpose())){//虚拟篮筐
-						result = "virtualBasket";
-					}else{
-						result = "errorBasket";
+		try {
+			String barcodeStr = StrutsParamUtils.getPraramValue("barcode", "");
+			String[] barcodeArray = barcodeStr.split(";");
+			String barcode = barcodeArray[0];
+			BarcodeDevice barcodeDevice = barcodeManager
+					.getBarcodeByBarcode(barcode);
+			
+			
+			//仅输入条码/篮筐(首)的判断
+			if (barcodeDevice != null) {
+				if (barcodeDevice instanceof Container) {// 容器
+					Container container = (Container) barcodeDevice;
+					if (Container.CONTAINERTYPE_SHELF.equals(container
+							.getContainerType())) {// 灭菌架
+						result = SHELF;
+					} else if (Container.CONTAINERTYPE_BASKET.equals(container
+							.getContainerType())) {//篮筐
+						// 灭菌筐
+						if(Container.CONTAINER_PURPOSE_DISINFECTION.equals(container.getPurpose())){
+							result = BASKET;
+						}else if(Container.CONTAINER_PURPOSE_VIRTUAL.equals(container.getPurpose())){//虚拟篮筐
+							result = "virtualBasket";
+						}else{
+							result = "errorBasket";
+						}
 					}
+				} else if (barcodeDevice instanceof Sterilizer) {// 灭菌炉
+					result = STERILIZER;
+				} else if (barcodeDevice instanceof Sterilisation) {// 灭菌程序
+					result = STERILISATION;
+				} else if (barcodeDevice instanceof TousseInstance) {// 器械包
+					result = TOUSSEINSTANCE;
+					
+					TousseInstance tousseInstance = (TousseInstance)barcodeDevice;
+					//如果该器械包定义是否追溯为是,但器械包实例为固定条码,则前台给予提示
+					if(tousseInstance.getTousseFixedBarcode() && tousseInstance.getUnTraceableTousse() && 
+							TousseDefinition.STR_YES.equals(tousseInstance.getTousseDefinition().getIsTraceable())){
+						result = "notFixedBarcode";
+					}
+				} else if(barcodeDevice instanceof User){
+					result = BarcodeDevice.BARCODE_TYPE_USER;
 				}
-			} else if (barcodeDevice instanceof Sterilizer) {// 灭菌炉
-				result = STERILIZER;
-			} else if (barcodeDevice instanceof Sterilisation) {// 灭菌程序
-				result = STERILISATION;
-			} else if (barcodeDevice instanceof TousseInstance) {// 器械包
-				result = TOUSSEINSTANCE;
-				
-				TousseInstance tousseInstance = (TousseInstance)barcodeDevice;
-				//如果该器械包定义是否追溯为是,但器械包实例为固定条码,则前台给予提示
-				if(tousseInstance.getTousseFixedBarcode() && tousseInstance.getUnTraceableTousse() && 
-						TousseDefinition.STR_YES.equals(tousseInstance.getTousseDefinition().getIsTraceable())){
-					result = "notFixedBarcode";
-				}
-			} else if(barcodeDevice instanceof User){
-				result = BarcodeDevice.BARCODE_TYPE_USER;
+			}else{
+				result = "barcodeInvalid";
 			}
-		}else{
-			result = "barcodeInvalid";
-		}
-		
-		if(barcodeArray.length > 1){//条码/篮筐(首)和条码/篮筐(尾)均已输入的判断
-			String barcodeEnd = barcodeArray[1];
-			BarcodeDevice barcodeDeviceEnd = barcodeManager
-					.getBarcodeByBarcode(barcodeEnd);
-			if (barcodeDeviceEnd != null) {
-				if (barcodeDeviceEnd instanceof Container) {// 容器
-					Container container = (Container) barcodeDeviceEnd;
-					if(Container.CONTAINER_PURPOSE_VIRTUAL.equals(container.getPurpose())){
-						if(result != "virtualBasket"){
+			
+			if(barcodeArray.length > 1){//条码/篮筐(首)和条码/篮筐(尾)均已输入的判断
+				String barcodeEnd = barcodeArray[1];
+				BarcodeDevice barcodeDeviceEnd = barcodeManager
+						.getBarcodeByBarcode(barcodeEnd);
+				if (barcodeDeviceEnd != null) {
+					if (barcodeDeviceEnd instanceof Container) {// 容器
+						Container container = (Container) barcodeDeviceEnd;
+						if(Container.CONTAINER_PURPOSE_VIRTUAL.equals(container.getPurpose())){
+							if(result != "virtualBasket"){
+								result = "notTheSame";
+							}
+						}else{
+							result = "barcodeEndInvalid";
+						}
+					} else if (barcodeDeviceEnd instanceof TousseInstance) {// 器械包
+						if(result != TOUSSEINSTANCE){
 							result = "notTheSame";
 						}
 					}else{
 						result = "barcodeEndInvalid";
 					}
-				} else if (barcodeDeviceEnd instanceof TousseInstance) {// 器械包
-					if(result != TOUSSEINSTANCE){
-						result = "notTheSame";
-					}
 				}else{
 					result = "barcodeEndInvalid";
 				}
-			}else{
-				result = "barcodeEndInvalid";
 			}
+		} catch (Exception e1) {
+			e1.printStackTrace();
+			result = e1.getMessage();
 		}
 		
 		try {