Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
===================================================================
diff -u -r13980 -r14033
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 13980)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 14033)
@@ -566,7 +566,7 @@
 		}else{
 			disposableGoodsBatchStock.setCost(godownEntryItem.getCost());
 			//盘盈入库处理
-			diposableGoodsManager.newExpensivediposablegoods(disposableGoodsBatchStock, godownEntryItem.getAmount(),godownEntryItem.getConclusion(), godownEntryItem.getGodownEntry().getTime(), godownEntryItem.getIdentification());
+			diposableGoodsManager.newExpensivediposablegoods(disposableGoodsBatchStock, godownEntryItem.getAmount(),null,godownEntryItem.getConclusion(), godownEntryItem.getGodownEntry().getTime(), godownEntryItem.getIdentification());
 		}
 	}
 
@@ -645,7 +645,7 @@
 		if(disposableGoods.expensiveDiposablegoods()){
 			Long amount = godownEntryItem.getAmount();
 			// 高值耗材的处理
-			diposableGoodsManager.newExpensivediposablegoods(disposableGoodsBatchStock, amount,godownEntryItem.getConclusion(), entry.getTime(), godownEntryItem.getIdentification());
+			diposableGoodsManager.newExpensivediposablegoods(disposableGoodsBatchStock, amount,null,godownEntryItem.getConclusion(), entry.getTime(), godownEntryItem.getIdentification());
 		}else{
 			DisposableGoodsIdentification identification = newIdentificationOfDisposableGoods(
 					entry, godownEntryItem, disposableGoodsID,
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
===================================================================
diff -u -r13947 -r14033
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java	(.../DiposableGoodsManager.java)	(revision 13947)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java	(.../DiposableGoodsManager.java)	(revision 14033)
@@ -151,7 +151,7 @@
 	public void changeExpensiveDiposablegoodsToGoods_TRANS_NEW(String id);
 
 	public List<ExpensiveDisposablegoods> newExpensivediposablegoods(
-			DisposableGoodsBatchStock disposableGoodsBatchStock, Long storage,
+			DisposableGoodsBatchStock disposableGoodsBatchStock, Long storage,Double price,
 			String conclusion, Date entryDate, String identification);
 
 	// 获取并锁定一次性物品相关资源
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r13984 -r14033
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 13984)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 14033)
@@ -2096,7 +2096,7 @@
 					String identification = disposableGoodsIdentification
 							.getIdentification();
 					newExpensivediposablegoods(disposableGoodsBatchStock,
-							amount, conclusion, entryDate, identification);
+							amount,disposableGoodsIdentification.getPrice(), conclusion, entryDate, identification);
 				}
 			}
 		}
@@ -2208,12 +2208,15 @@
 	}
 
 	public List<ExpensiveDisposablegoods> newExpensivediposablegoods(
-			DisposableGoodsBatchStock disposableGoodsBatchStock,Long storage,
+			DisposableGoodsBatchStock disposableGoodsBatchStock,Long storage,Double price,
 			String conclusion, Date entryDate, String identification) {
 		List<ExpensiveDisposablegoods> expensiveDiposablegoodsList = new LinkedList<ExpensiveDisposablegoods>();
 		if (storage == null) {
 			storage = 0L;
 		}
+		if(price == null){// 价格为空时用批次库存的价格，用于入库
+			price = disposableGoodsBatchStock.getCost();
+		}
 		for (int i = 0; i < storage; ++i) {
 			ExpensiveDisposablegoods expensiveDiposablegoods = new ExpensiveDisposablegoods();
 			expensiveDiposablegoods.setConclusion(conclusion);
@@ -2230,8 +2233,7 @@
 							.getDisposableGoodsStockId());
 			expensiveDiposablegoods.setEntryDate(entryDate);
 			expensiveDiposablegoods.setIdentification(identification);
-			expensiveDiposablegoods.setPrice(disposableGoodsBatchStock
-					.getCost());
+			expensiveDiposablegoods.setPrice(price);
 			expensiveDiposablegoods.setWarehouseID(disposableGoodsBatchStock
 					.getWarehouseID());
 			expensiveDiposablegoods.setWarehouseName(disposableGoodsBatchStock