Index: ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js
===================================================================
diff -u -r18830 -r19309
--- ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js	(.../materialEntryView.js)	(revision 18830)
+++ ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js	(.../materialEntryView.js)	(revision 19309)
@@ -6,6 +6,7 @@
 var materialEntry = new MaterialEntry();
 
 var materialDefinitionStore = new Ext.data.Store({
+	pageSize : 100,
 	proxy : new Ext.data.HttpProxy({
 		url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDefinitionDatas.do?selectType=material',
 		method : 'POST'
@@ -29,6 +30,9 @@
 		name : 'referencePrice',
 		mapping : 'referencePrice'
 	}, {
+		name : 'inventorySerialNumber',
+		mapping : 'inventorySerialNumber'
+	}, {
 		name : 'goodsType',
 		mapping : 'goodsType'
 	}])
@@ -72,7 +76,7 @@
 	{name : 'goodsType'}
 ]);
 
-function addItems(materialId,name,count,cost,supplierName){
+function addItems(materialId,name,count,cost,supplierName,inventorySerialNumber){
 	if(top.Ext.getCmp('name1').getValue() == null || top.Ext.getCmp('name1').getValue() == ''){
 		showResult("请填写物品名称!");
 		return false;
@@ -111,6 +115,7 @@
 	}
 	var certification = top.Ext.getCmp('certification').getValue();
 	var goodsType = top.Ext.getCmp("goodsType").getRawValue();
+	var inventorySerialNumber = top.Ext.getCmp("inventorySerialNumber").getRawValue();
 	for(var i = 0;i < top.Ext.getCmp('materialEntryItemGrid').getStore().getCount();i++){
 		if(top.Ext.getCmp('materialEntryItemGrid').getStore().getAt(i).data.materialId == materialId){
 			showResult("该物品已经存在,不能重复添加!");
@@ -125,6 +130,7 @@
 		amount : count,
 		cost : cost,
 		supplierName : supplierName,
+		inventorySerialNumber : inventorySerialNumber,
 		certification : certification,
 		hasInvoice : hasInvoice,
 		goodsType : goodsType
@@ -139,6 +145,7 @@
 	top.Ext.getCmp('goodsType').setValue('');
 	top.Ext.getCmp('hasInvoice').setValue('');
 	top.Ext.getCmp('certification').setValue('');
+	top.Ext.getCmp('inventorySerialNumber').setValue('');
 	top.Ext.getCmp('name1').focus();
 }
 
@@ -316,6 +323,7 @@
 				  	    {name : 'batchNumber'},
 				  	    {name : 'cost'},
 				  	    {name : 'supplierName'},
+				  	    {name : 'inventorySerialNumber'},
 				  	    {name : 'deleteButton'},
 				  	    {name : 'certification'},
 				  	    {name : 'hasInvoice'}
@@ -360,6 +368,8 @@
     					allowBlank : false
     				})
     			},
+    			{header : "物资编码", width : 100,menuDisabled : true,dataIndex : 'inventorySerialNumber',hidden : !sstsConfig.hideInventorySerialNumber
+    			},
 	        	{id : 'expandColumn',header : "供应商",width : 100,dataIndex : 'supplierName',menuDisabled : true,
 					editor : new top.Ext.form.ComboBox({
 	        			queryParam : 'spell',
@@ -445,6 +455,7 @@
 				name : 'name1',
 				queryParam : 'spell',
 				minChars : 0,
+				pageSize : 100,
 				valueField : 'id',
 				displayField : 'name',
 				store : materialDefinitionStore,
@@ -454,13 +465,14 @@
 				hideTrigger : true,
 				typeAhead : false,
 				allowBlank : true,
-				width : 250,
+				width : 200,
 				listeners : {
 					select : function(combo, record, index) {
 						top.Ext.getCmp('name1').setValue(record.data.name);
 						top.Ext.getCmp('materialId').setValue(record.data.id);
 						top.Ext.getCmp('cost1').setValue(record.data.cost);
 						top.Ext.getCmp('goodsType').setValue(record.data.goodsType);
+						top.Ext.getCmp('inventorySerialNumber').setValue(record.data.inventorySerialNumber);
 					},
 					specialkey : function(field, ee) {
 						if (ee.getKey() == Ext.EventObject.ENTER) {
@@ -486,14 +498,14 @@
 				hideTrigger : true,
 				typeAhead : false,
 				allowBlank : true,
-				width : 180,
+				width : 160,
 				listeners : {
 					select : function(combo, record, index) {
 						combo.setValue(record.data.name);
 					},
 					specialkey : function(field, e) {
 						if (e.getKey() == Ext.EventObject.ENTER) {
-							top.Ext.getCmp('amount1').focus();
+							top.Ext.getCmp('inventorySerialNumber').focus();
 						}
 					}
 				}
@@ -534,7 +546,8 @@
 	    					var count = top.Ext.getCmp('amount1').getValue();
 	    					var cost = top.Ext.getCmp('cost1').getValue();
 	    					var supplierName = top.Ext.getCmp('supplier1').getValue();
-	    					addItems(materialId,name,count,cost,supplierName);
+	    					var inventorySerialNumber = top.Ext.getCmp('inventorySerialNumber').getValue();
+	    					addItems(materialId,name,count,cost,supplierName，inventorySerialNumber);
 						}
 					}
 				}
@@ -587,12 +600,34 @@
 								tabIndex : 9,
 								hidden:!sstsConfig.godownEntryShowInvoice
 							},{
+								text : '物资编码:',
+								hidden : !sstsConfig.hideInventorySerialNumber
+							},{
+								xtype : 'textfield',
+								maxLength : '16',
+								id : 'inventorySerialNumber',
+								name : 'inventorySerialNumber',
+								width : 150,
+								valueField : 'inventorySerialNumber',
+								displayField : 'inventorySerialNumber',
+								hidden : !sstsConfig.hideInventorySerialNumber,
+								readOnly:true,
+								regexText:'只能输入数字',
+								anchor : '95%',
+								listeners : {
+									specialkey : function(field, e) {
+										if (e.getKey() == Ext.EventObject.ENTER) {
+											top.Ext.getCmp('amount1').focus();
+										}
+									}
+								}
+							},{
 								text : '注册证号:'
 							},{
 								xtype : 'textfield',
 								id : 'certification',
 								name : 'certification',
-								width : 190,
+								width : 150,
 								tabIndex : 12,
 								allowBlank:true,
 								anchor : '100%',
@@ -615,7 +650,8 @@
 									var count = top.Ext.getCmp('amount1').getValue();
 									var cost = top.Ext.getCmp('cost1').getValue();
 									var supplierName = top.Ext.getCmp('supplier1').getValue();
-									addItems(materialId,name,count,cost,supplierName);
+									var inventorySerialNumber = top.Ext.getCmp('inventorySerialNumber').getValue();
+									addItems(materialId,name,count,cost,supplierName,inventorySerialNumber);
 								}
 							}]
 					});
@@ -650,6 +686,7 @@
 					jsonArray[len].supplierName = record.data.supplierName;
 					jsonArray[len].certification = record.data.certification;
 					jsonArray[len].hasInvoice = record.data.hasInvoice;
+					jsonArray[len].inventorySerialNumber = record.data.inventorySerialNumber;
 					jsonArray[len].goodsType = record.data.goodsType;
 				}
 				top.Ext.getCmp("items").setValue(Ext.encode(jsonArray));
@@ -779,6 +816,7 @@
 					amount : action.result.data.itemsList[i].amount,
 					cost : action.result.data.itemsList[i].cost,
 					supplierName : action.result.data.itemsList[i].supplierName,
+					inventorySerialNumber : action.result.data.itemsList[i].materialDefinition.inventorySerialNumber,
 					certification : action.result.data.itemsList[i].certification,
 					hasInvoice : action.result.data.itemsList[i].hasInvoice,
 					goodsType : action.result.data.itemsList[i].goodsType
@@ -906,6 +944,7 @@
 			tableContent = record.data['htmlContent'];//
 			if(!tableContent){
 				var content = "";
+				var hideis = "";
 				DWREngine.setAsync(false);
 				MaterialEntryTableManager.obtainMaterialDetails(record.data['id'],function(voItems){
 					for(var i=0;i<voItems.length;i++) {
@@ -915,13 +954,24 @@
 						if(voItems[i].certification == null){
 							voItems[i].certification = " ";
 						}
+						if(voItems[i].inventorySerialNumber == null){
+							voItems[i].inventorySerialNumber = " ";
+						}
+						//判断是否显示物资编码
+						if(sstsConfig.hideInventorySerialNumber ){
+							hideis = "<td align='center'>" + voItems[i].inventorySerialNumber + "&nbsp" +"</td>";
+						}
 						content += "<tr height=25 >";
-						content += "<td align='left'>&nbsp" + voItems[i].name +"</td><td align='center'>" + voItems[i].amount  +"</td><td align='center'>" + voItems[i].cost +"</td><td align='center'>" + voItems[i].supplierName+"&nbsp" +"</td><td align='center'>" + voItems[i].certification +"&nbsp"+"</td>";
+						content += "<td align='left'>&nbsp" + voItems[i].name +"</td>"+ hideis +"<td align='center'>" + voItems[i].amount +"</td><td align='center'>" + voItems[i].cost+"&nbsp" +"</td><td align='center'>" + voItems[i].supplierName +"&nbsp"+"</td><td align='center'>" + voItems[i].certification +"&nbsp"+"</td>";
 						content += "</tr>";
 					}
 				});
 				DWREngine.setAsync(true);
-				tableContent = ("<table height='100%'  border='1' align='center' cellpadding='0' cellspacing='0'><tr bgcolor='#D7EBD9'  height=25><td width='300px' align='center'><h3>材料名称</h3></td><td width='100px' align='center'><h3>数量</h3></td><td width='100px' align='center'><h3>单价</h3></td><td width='200px' align='center'><h3>供应商</h3></td><td width='200px' align='center'><h3>注册证号</h3></td>");
+				//判断是否显示物资编码
+				if(sstsConfig.hideInventorySerialNumber ){
+					hideis = "<td width='200px' align='center'><h3>物资编码</h3></td>";
+				}
+				tableContent = ("<table height='100%'  border='1' align='center' cellpadding='0' cellspacing='0'><tr bgcolor='#D7EBD9'  height=25><td width='300px' align='center'><h3>材料名称</h3></td>"+ hideis + "<td width='100px' align='center'><h3>数量</h3></td><td width='100px' align='center'><h3>单价</h3></td><td width='200px' align='center'><h3>供应商</h3></td><td width='200px' align='center'><h3>注册证号</h3></td>");
 				tableContent += "</tr>" + content + "</table></br>";
 				record.set("htmlContent",tableContent);
 			}