Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r12742 -r12746
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 12742)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 12746)
@@ -929,6 +929,13 @@
 		return (DisposableGoodsBatch) objectDao.getBySql(
 				DisposableGoodsBatch.class.getSimpleName(), sql);
 	}
+	public DisposableGoodsStock getDisposableGoodsStockByDisposableGoodsID(Long disposableGoodsID){
+		String sql = String.format(
+				" where po.disposableGoodsID=%s",
+				disposableGoodsID);
+		return (DisposableGoodsStock) objectDao.getBySql(
+				DisposableGoodsStock.class.getSimpleName(), sql);
+	}
 	/**
 	 * 从excel文档导入一次性物品信息 add by panhaowen
 	 * 
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
===================================================================
diff -u -r12738 -r12746
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 12738)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 12746)
@@ -432,6 +432,13 @@
 			if(StringUtils.isBlank(batchNumber)){
 				throw new RuntimeException("批次号不能为空!");
 			}
+			// 查找一次性物品库存
+			if(disposableGoodsStock == null){
+				disposableGoodsStock = diposableGoodsManager.getDisposableGoodsStockByDisposableGoodsID(disposableGoodsID);
+			}
+			if(disposableGoodsStock == null){
+				throw new RuntimeException("物品库存对象未找到!");
+			}
 			// 查找批次定义
 			DisposableGoodsBatch disposableGoodsBatch = diposableGoodsManager.getDisposableGoodsBatchByBatchNumber(disposableGoodsID, batchNumber);
 			if(disposableGoodsBatch == null){
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
===================================================================
diff -u -r12728 -r12746
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java	(.../GodownEntryItemManagerImpl.java)	(revision 12728)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java	(.../GodownEntryItemManagerImpl.java)	(revision 12746)
@@ -92,7 +92,7 @@
 		}
 		
 		Long itemId = JSONUtil.optLong(itemObject,"id",null);
-		Long diposableGoodsID = JSONUtil.optLong(itemObject,"diposableGoodsID",null);// 一次性物品id
+		Long disposableGoodsID = JSONUtil.optLong(itemObject,"diposableGoodsID",null);// 一次性物品id
 		Long batchID = JSONUtil.optLong(itemObject,"batchID",null);// 一次性物品批次id
 		Long identificationID = JSONUtil.optLong(itemObject,"identificationID",null);// 一次性物品id
 		String identification = itemObject.optString("identification");// 标识号id
@@ -116,13 +116,13 @@
 		
 		GodownEntryItem godownEntryItem = new GodownEntryItem();
 		godownEntryItem.setId(itemId);
-		godownEntryItem.setDisposableGoodsStockID(diposableGoodsID);
+		godownEntryItem.setDisposableGoodsID(disposableGoodsID);
 		godownEntryItem.setDisposableGoodsBatchStockID(batchID);
 		godownEntryItem.setIdentificationID(identificationID);
 		godownEntryItem.setIdentification(identification);
-		DisposableGoodsStock disposableGoodsStock = new DisposableGoodsStock();
-		disposableGoodsStock.setId(diposableGoodsID);
-		godownEntryItem.setDiposableGoods(disposableGoodsStock);
+//		DisposableGoodsStock disposableGoodsStock = new DisposableGoodsStock();
+//		disposableGoodsStock.setId(diposableGoodsID);
+//		godownEntryItem.setDiposableGoods(disposableGoodsStock);
 		godownEntryItem.setAmount(new Long(amount));
 		godownEntryItem.setCost(cost);
 		godownEntryItem.setBatchNumber(batchNumber);
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
===================================================================
diff -u -r12738 -r12746
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java	(.../DiposableGoodsManager.java)	(revision 12738)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java	(.../DiposableGoodsManager.java)	(revision 12746)
@@ -36,6 +36,7 @@
 	
 	public DisposableGoodsBatchStock getDisposableGoodsStockByBatchNumber(Long warehouseID,Long disposableGoodsID, String batchNumber);
 	public DisposableGoodsBatch getDisposableGoodsBatchByBatchNumber(Long disposableGoodsID, String batchNumber) ;
+	public DisposableGoodsStock getDisposableGoodsStockByDisposableGoodsID(Long disposableGoodsID);
 	
 	public void deleteDiposableGoodsById(String id);