Index: ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialAppropriationView.js
===================================================================
diff -u -r18455 -r18471
--- ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialAppropriationView.js	(.../materialAppropriationView.js)	(revision 18455)
+++ ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialAppropriationView.js	(.../materialAppropriationView.js)	(revision 18471)
@@ -174,7 +174,7 @@
 	for(var i = 0;i < materialEntryItemGridStore.getCount();i++){
 		var materialEntryItem = materialEntryItemGridStore.getAt(i).data;
 		
-		if(materialEntryItem.goodsStockID == goodsStockID && materialEntryItem.name == name){
+		if(materialEntryItem.goodsStockID == goodsStockID && materialEntryItem.name == name && materialEntryItem.cost == priceAmount.price){
 			showResult("该物品已经存在,不能重复添加!");
 			return false;
 		}
@@ -372,7 +372,7 @@
 					fieldLabel : '操作时间',
 					id : 'time',
 					name : 'time',
-					format : 'Y-m-d',
+					format : 'Y-m-d H:i',
 					altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 //					value : new Date(),
 					allowBlank : false,
@@ -425,11 +425,10 @@
 			}),
 			cm : new top.Ext.grid.ColumnModel([new Ext.grid.RowNumberer(), selectModel,
 	           	{header : "id",dataIndex : 'id',hidden : true},
-	        	{header : "名称",dataIndex : 'name',width : 280,menuDisabled : true}, 
-	        	{header : "数量",dataIndex : 'amount',width : 40,menuDisabled : true}, 
-	        	{header : "单价",dataIndex : 'cost',width : 40,menuDisabled : true},
-	        	{header : "供应商",width : 150,dataIndex : 'supplierName',menuDisabled : true},
-	        	{id : 'expandColumn',header : "删除",width : 50,menuDisabled : true,dataIndex : 'deleteButton', renderer:renderDeleteButton,hidden : materialEntry.isOpen()}
+	        	{header : "名称",dataIndex : 'name',width : 200,menuDisabled : true}, 
+	        	{header : "数量",dataIndex : 'amount',width : 80,menuDisabled : true}, 
+	        	{header : "单价",dataIndex : 'cost',width : 80,menuDisabled : true},
+	        	{id : 'expandColumn',header : "删除",width : 80,menuDisabled : true,dataIndex : 'deleteButton', renderer:renderDeleteButton,hidden : materialEntry.isOpen()}
 	        ]),
 			width :835,
 			autoExpandColumn : 'expandColumn',
@@ -468,7 +467,6 @@
 						top.Ext.getCmp('goodsStockID').setValue(record.data.id);
 						top.Ext.getCmp('cost').setValue(record.data.referencePrice);
 						top.Ext.getCmp('supplierName').setValue(record.data.supplierName);
-						top.Ext.getCmp('certification').setValue(record.data.certification);
 						
 						// 清空价格
 						clearBatchNumberAndPrice();
@@ -616,43 +614,38 @@
 	materialEntry.setId(id);
 	addMaterialEntry(id);
 	top.Ext.getCmp('appropriationForm').form.load({
-		url : WWWROOT + '/disinfectSystem/MaterialEntryAction!loadMaterialEntryByid.do',
+		url : WWWROOT + '/disinfectSystem/MaterialEntryAction!loadMaterialEntry.do',
 		method : 'GET',
 		waitMsg : '正在加载数据，请稍候',
 		params : {id : id},
 		success : function(form, action) {
-			var materialEntry = action.result;
-			var serialNumber = materialEntry.serialNumber;
-			var operator = materialEntry.operator;
-			var materialEntryItem = materialEntry.data;
-			var time = materialEntry.time;
-			var remark = materialEntry.remark;
-			var wareHouseName = materialEntry.wareHouseName;
-			var targetWareHouseName = materialEntry.targetWareHouseName;
+			var serialNumber = action.result.data.serialNumber;
+			var operator = action.result.data.operator;
+			var materialEntryItem = action.result.data.data;
+			var remark = action.result.data.remark;
+			var wareHouseName = action.result.data.wareHouseName;
+			var targetWareHouseName = action.result.data.targetWareHouseName;
 			
-			
+			top.Ext.getCmp("time").setValue(Ext.util.Format.date(new Date(action.result.data.time.time), 'Y-m-d H:i'));
 			top.Ext.getCmp('serialNumber').setValue(serialNumber);
 			top.Ext.getCmp('operator').setValue(operator);
-			top.Ext.getCmp('time').setValue(time);
 			top.Ext.getCmp('remark').setValue(remark);
 			top.Ext.getCmp('targetWareHouse').setValue(targetWareHouseName);
 			top.Ext.getCmp('wareHouse').setValue(wareHouseName);
 			
-			for(var i = 0 ;i < materialEntryItem.length ;i++){
-				var temp = materialEntryItem[i];
-				var name = temp.name;
-				var amount = temp.amount;
-				var cost = temp.cost;
-				var materialDefinitionId = temp.materialDefinitionId;
-				
-				//添加操作
-				var materialEntryItem = new MaterialEntryItemRecord({
-					localID : g_localID++,
-					goodsStockID : materialDefinitionId,
-					name : name,
-					amount : amount,
-					cost : cost
-				});
+			for(var i = 0 ;i < action.result.data.itemsList.length ;i++){
+			var materialName = action.result.data.itemsList[i].materialDefinition.name;
+			var specification = action.result.data.itemsList[i].materialDefinition.specification;
+			if((specification != null && specification != '') || specification.length > 0){
+				materialName += "["+specification+"]";
+			}
+			var materialEntryItem = new MaterialEntryItemRecord({
+				id : action.result.data.itemsList[i].id,
+				materialId : action.result.data.itemsList[i].materialDefinition.id,
+				name : materialName,
+				amount : action.result.data.itemsList[i].amount,
+				cost : action.result.data.itemsList[i].cost
+			});
 				top.Ext.getCmp('appropriateItemGrid').getStore().add(materialEntryItem);
 			}