Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r12743 -r12747
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 12743)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 12747)
@@ -146,8 +146,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);
 }
 
 function addItems(diposableGoodsID,batchID,name,amount,cost,batchNumber,expDate,supplierName,sterileBatchNumber,manufacturer,certification,identification,producingArea){
@@ -356,12 +356,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 : .20,
@@ -403,7 +403,7 @@
 						select : function(combo, record, index) {
 							setWareHouseInfo(record.data.id,record.data.name);
 							top.Ext.getCmp('wareHouse1').setValue(record.data.id);
-							//diposableGoodsStore.proxy.extraParams.wareHouseId = record.data.id;
+							//diposableGoodsStore.proxy.extraParams.warehouseID = record.data.id;
 							//diposableGoodsStore.proxy.conn.extraParams.spell = top.Ext.getCmp('name1').getValue();
 							/*diposableGoodsStore.reload({
 								callback:function(e){
@@ -1051,7 +1051,7 @@
 				var items = buildJSONStringFromStore(top.Ext.getCmp('godownEntryItemGrid').getStore());
 				
 				// 设置表单参数json
-				setFormParams(form,['id','remark','time','wareHouseName','wareHouseId']);
+				setFormParams(form,['id','remark','time','warehouseName','warehouseID']);
 				top.Ext.getCmp("items").setValue(items);
 				
 				// items为json数组字符串，不会为null
@@ -1351,8 +1351,8 @@
 		params : {id : id},
 		success : function(form, action) {
 			top.Ext.getCmp("time").setValue(Ext.util.Format.date(new Date(action.result.data.time.time), 'Y-m-d H:i'));
-			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;
@@ -1387,7 +1387,7 @@
 			}
 			setTotalMoney(top.Ext.getCmp('godownEntryItemGrid'));
 			// 保存原始数据,只需要保存需要修改的属性
-			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);
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
===================================================================
diff -u -r12746 -r12747
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 12746)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 12747)
@@ -743,7 +743,13 @@
 			Long disposableGoodsBatchID = godownEntryItem.getDisposableGoodsBatchID();
 			Long batchID = godownEntryItem.getDisposableGoodsBatchStockID();
 			
-			/////
+			// 查找一次性物品库存
+			if(disposableGoodsStock == null){
+				disposableGoodsStock = diposableGoodsManager.getDisposableGoodsStockByDisposableGoodsID(disposableGoodsID);
+			}
+			if(disposableGoodsStock == null){
+				throw new RuntimeException("物品库存对象未找到!");
+			}
 			// 查找批次定义
 			DisposableGoodsBatch disposableGoodsBatch = diposableGoodsManager.getDisposableGoodsBatchByBatchNumber(disposableGoodsID, batchNumber);
 			if(disposableGoodsBatch == null){
@@ -1768,8 +1774,8 @@
 		Long id = godownEntryInfo.optLong("id");
 		String remark = godownEntryInfo.optString("remark");
 		String timeStr = godownEntryInfo.optString("time");
-		Long wareHouseId = JSONUtil.optLong(godownEntryInfo, "wareHouseId", null);
-		String wareHouseName = JSONUtil.optString(godownEntryInfo, "wareHouseName", "");
+		Long wareHouseId = JSONUtil.optLong(godownEntryInfo, "warehouseID", null);
+		String wareHouseName = JSONUtil.optString(godownEntryInfo, "warehouseName", "");
 		entry.setId(id);
 		entry.setRemark(remark);
 		entry.setWarehouseID(wareHouseId);