Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r14076 -r14092
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 14076)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 14092)
@@ -271,15 +271,20 @@
 		var materialNodes = n.childNodes;
 		
 		var materials = [];
+		
+		var materialAmountPass = false;
 		for (var j=0; j < materialNodes.length; j++){
 			var materialNode = materialNodes[j];
+			if(materialNode.get("tousseName") == ""){
+				msg = "外来器械材料必须填写名称！";
+				break;
+			}
 			if(materialNode.get("includeImplant") == ""){
 				msg = "外来器械材料必须填写是否植入物！";
 				break;
 			}
-			if(materialNode.get("tousseName") == ""){
-				msg = "外来器械材料必须填写名称！";
-				break;
+			if(materialNode.get("amount") > 0){
+				materialAmountPass = true;
 			}
 			materials.push({
 				materialInstanceId : materialNode.get("id"),
@@ -290,6 +295,11 @@
 				minDismantleAmount : materialNode.get('minDismantleAmount')
 			});
 		}
+		if(!materialAmountPass && msg == ""){
+			msg = "外来器械材料数量不能都为0！";
+			break;
+		}
+		
 		foreignTousseInfo.push({
 			tousseItemId : n.get("id"),
 			tousseDefinitionId : n.get("tousseDefinitionId"),
@@ -535,22 +545,25 @@
 			allowBlank : true,
 			width : 200,
 			listeners : {
-		    	specialkey : function(field, ee) {
-					if (ee.getKey() == Ext4.EventObject.ENTER) {
-						ContainerTableManager.getBasketByBarcodeAndProcedures(field.value,basketAllowProcedure,function(jsonStr){
-							var obj = Ext4.JSON.decode(jsonStr);
-							if(!obj.success){
-								showResult(obj.message);
-							}else{
-								var basketBarcodeField = top.Ext4.getCmp('barcodeStr');
-								var basketNameField = top.Ext4.getCmp('basketName');
-								basketBarcodeField.setValue(field.value);
-								basketNameField.setValue(obj.containerName);
-								top.Ext4.getCmp('basketBarcode').setValue('');
-							}
-						});
-					}
-				}
+				render : function(c) {
+	                c.getEl().on('keypress',function(e) {
+	                    if (e.getKey() == 13) {
+	                      var thisBarcode = top.Ext4.getCmp('basketBarcode').getValue();
+	                      ContainerTableManager.getBasketByBarcodeAndProcedures(thisBarcode,basketAllowProcedure,function(jsonStr){
+				                var obj = Ext4.JSON.decode(jsonStr);
+				                if(!obj.success){
+				                  showResult(obj.message);
+				                }else{
+				                  var basketBarcodeField = top.Ext4.getCmp('barcodeStr');
+				                  var basketNameField = top.Ext4.getCmp('basketName');
+				                  basketBarcodeField.setValue(thisBarcode);
+				                  basketNameField.setValue(obj.containerName);
+				                }
+				                top.Ext4.getCmp('basketBarcode').setValue('');
+			              });
+	                    }
+	                })
+	           }
 		    }
 		},{
 			text: "篮筐名称:"