Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/StockDiposableGoods.java
===================================================================
diff -u -r12331 -r13209
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/StockDiposableGoods.java	(.../StockDiposableGoods.java)	(revision 12331)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/StockDiposableGoods.java	(.../StockDiposableGoods.java)	(revision 13209)
@@ -48,6 +48,8 @@
 	
     private String isApplicationMaterial = CONSTANT_YES; //能否被科室申请
     
+    private Long disposableGoodsId;//一次性物品定义id
+    
     private StockTakeRecord stockTakeRecord;
     
     private List<StockDiposableGoodBatch> goodsBatchs = new ArrayList<StockDiposableGoodBatch>();
@@ -155,7 +157,13 @@
 	public void setTypeSequence(Integer typeSequence) {
 		this.typeSequence = typeSequence;
 	}
+
+	public Long getDisposableGoodsId() {
+		return disposableGoodsId;
+	}
+
+	public void setDisposableGoodsId(Long disposableGoodsId) {
+		this.disposableGoodsId = disposableGoodsId;
+	}
 	
-	
-	
 }
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/service/StockTakeRecordManagerImpl.java
===================================================================
diff -u -r13179 -r13209
--- ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/service/StockTakeRecordManagerImpl.java	(.../StockTakeRecordManagerImpl.java)	(revision 13179)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/service/StockTakeRecordManagerImpl.java	(.../StockTakeRecordManagerImpl.java)	(revision 13209)
@@ -195,26 +195,26 @@
 	    	record.setOrgUnitCoding(loginUser.getOrgUnitCodingFromSupplyRoomConfig());
 	    	record.setInventoryRecordId(inventoryRecordId);
 	    	List<StockDiposableGoods> list = new ArrayList<StockDiposableGoods>();
-	    	for (DisposableGoodsStock diposableGoods : diposableGoodsStockList) {
+	    	for (DisposableGoodsStock disposableGoodsStock : diposableGoodsStockList) {
 		    	//入库记
 	    		List<StockDiposableGoodBatch> batcheList = new ArrayList<StockDiposableGoodBatch>();
 	    		Double goodsPrice = 0.00;
-	    		for (DisposableGoodsBatchStock goodsBatch : diposableGoods.getGoodsBatchs()) {
+	    		for (DisposableGoodsBatchStock batchStock : disposableGoodsStock.getGoodsBatchs()) {
 	    			StockDiposableGoodBatch stockDiposableGoodBatch = new StockDiposableGoodBatch();
-	    			stockDiposableGoodBatch.setBarcode(goodsBatch.getBarcode());
-		    		stockDiposableGoodBatch.setBatchNumber(goodsBatch.getBatchNumber());
-		    		stockDiposableGoodBatch.setCost(goodsBatch.getCost());
-		    		stockDiposableGoodBatch.setStorage(goodsBatch.getStorage());
-		    		stockDiposableGoodBatch.setSupplierName(goodsBatch.getSupplierName());
-		    		stockDiposableGoodBatch.setManufacturer(goodsBatch.getManufacturer());
+	    			stockDiposableGoodBatch.setBarcode(batchStock.getBarcode());
+		    		stockDiposableGoodBatch.setBatchNumber(batchStock.getBatchNumber());
+		    		stockDiposableGoodBatch.setCost(batchStock.getCost());
+		    		stockDiposableGoodBatch.setStorage(batchStock.getStorage());
+		    		stockDiposableGoodBatch.setSupplierName(batchStock.getSupplierName());
+		    		stockDiposableGoodBatch.setManufacturer(batchStock.getManufacturer());
 		    		
-		    		if(goodsBatch.getStorage() != 0 ){
-		    			goodsPrice = goodsBatch.getCost();
+		    		if(batchStock.getStorage() != 0 ){
+		    			goodsPrice = batchStock.getCost();
 		    		}
 		    		//设置标识号
 		    		List<StockIdentificationOfGoods> identificationList = new ArrayList<StockIdentificationOfGoods>();
-		    		if(goodsBatch.getIdentifications() != null && goodsBatch.getIdentifications().size() > 0){
-		    			for (IdentificationOfDisposableGoods identification : goodsBatch.getIdentifications()) {
+		    		if(batchStock.getIdentifications() != null && batchStock.getIdentifications().size() > 0){
+		    			for (IdentificationOfDisposableGoods identification : batchStock.getIdentifications()) {
 							 StockIdentificationOfGoods stockIdentification = new StockIdentificationOfGoods();
 							 stockIdentification.setAmount(identification.getAmount());
 							 stockIdentification.setIdentification(identification.getIdentification());
@@ -238,19 +238,20 @@
 				}
 	    		//物品
 	    		StockDiposableGoods stockDiposableGoods = new StockDiposableGoods();
-	    		stockDiposableGoods.setAmount(diposableGoods.getAmount());
-	    		stockDiposableGoods.setType(diposableGoods.getType());
-	    		stockDiposableGoods.setTypeSequence(typeMap.get(diposableGoods.getType()));
-	    		stockDiposableGoods.setExternalCode(diposableGoods.getExternalCode());
-	    		stockDiposableGoods.setIsApplicationMaterial(diposableGoods.getIsApplicationMaterial());
-	    		stockDiposableGoods.setName(diposableGoods.getName());
-	    		stockDiposableGoods.setSpecification(diposableGoods.getSpecification());
+	    		stockDiposableGoods.setAmount(disposableGoodsStock.getAmount());
+	    		stockDiposableGoods.setType(disposableGoodsStock.getType());
+	    		stockDiposableGoods.setTypeSequence(typeMap.get(disposableGoodsStock.getType()));
+	    		stockDiposableGoods.setExternalCode(disposableGoodsStock.getExternalCode());
+	    		stockDiposableGoods.setIsApplicationMaterial(disposableGoodsStock.getIsApplicationMaterial());
+	    		stockDiposableGoods.setName(disposableGoodsStock.getName());
+	    		stockDiposableGoods.setSpecification(disposableGoodsStock.getSpecification());
 	    		stockDiposableGoods.setStockTakeRecord(record);
-	    		stockDiposableGoods.setUnit(diposableGoods.getUnit());
+	    		stockDiposableGoods.setUnit(disposableGoodsStock.getUnit());
+	    		stockDiposableGoods.setDisposableGoodsId(disposableGoodsStock.getDisposableGoodsID());
 	    		stockDiposableGoods.setGoodsBatchs(batcheList);
 
 				Double totalPrice2 = MathTools
-						.mul(MathTools.object2Double(diposableGoods
+						.mul(MathTools.object2Double(disposableGoodsStock
 								.getAmount()),
 								MathTools.object2Double(goodsPrice))
 						.doubleValue();