Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
===================================================================
diff -u -r12744 -r12752
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js	(.../godownOutView.js)	(revision 12744)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js	(.../godownOutView.js)	(revision 12752)
@@ -144,8 +144,8 @@
  * @param name
  */
 function setWareHouseInfo(id,name){
-	top.Ext.getCmp('wareHouseId').setValue(id);
-	top.Ext.getCmp('wareHouseName').setValue(name);
+	top.Ext.getCmp('warehouseID').setValue(id);
+	top.Ext.getCmp('warehouseName').setValue(name);
 }
 
 // 获取当前选中的批次
@@ -297,12 +297,12 @@
 				id : 'originalFormParams'
 			},{
 				xtype : 'hidden',
-				name : 'wareHouseId',
-				id : 'wareHouseId'
+				name : 'warehouseID',
+				id : 'warehouseID'
 			},{
 				xtype : 'hidden',
-				name : 'wareHouseName',
-				id : 'wareHouseName'
+				name : 'warehouseName',
+				id : 'warehouseName'
 			},{
 				id : 'serialNum',
 				columnWidth : .33,
@@ -601,7 +601,7 @@
 					return false;
 				}
 				// 设置表单参数json
-				setFormParams(form,['id','remark','time','wareHouseName','wareHouseId']);
+				setFormParams(form,['id','remark','time','warehouseName','warehouseID']);
 				var items = buildJSONStringFromStore(top.Ext.getCmp('godownEntryItemGrid').getStore());
 				top.Ext.getCmp("items").setValue(items);
 				// items为json数组字符串，不会为null
@@ -725,8 +725,8 @@
 		success : function(form, action) {
 			var time = action.result.data.time.time;
 			top.Ext.getCmp("time").setValue(Ext.util.Format.date(new Date(time), 'Y-m-d'));
-			setWareHouseInfo(action.result.data.wareHouseId,action.result.data.wareHouseName);
-			top.Ext.getCmp("wareHouse1").setValue(action.result.data.wareHouseId);
+			setWareHouseInfo(action.result.data.warehouseID,action.result.data.warehouseName);
+			top.Ext.getCmp("wareHouse1").setValue(action.result.data.warehouseID);
 			for(var i = 0 ;i < action.result.data.itemsList.length ;i++){
 				var specification = action.result.data.itemsList[i].diposableGoods.specification;
 				var b = true;
@@ -755,7 +755,7 @@
 				top.Ext.getCmp('godownEntryItemGrid').getStore().add(godownEntryItem);
 			}
 			// 保存原始数据,只需要保存需要修改的属性
-			setOriginalFormParams(form,['id','remark','time','wareHouseName','wareHouseId']);
+			setOriginalFormParams(form,['id','remark','time','warehouseName','warehouseID']);
 			var originalItems = buildJSONStringFromStore(top.Ext.getCmp('godownEntryItemGrid').getStore());
 			//alert(originalItems);
 			top.Ext.getCmp("originalItems").setValue(originalItems);