Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r15254 -r15298
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 15254)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 15298)
@@ -3174,29 +3174,29 @@
 				/*
 				 * 先判断装配任务对应的器械包定义是否需要扣一次性物品库存(目前只针对普通器械包和敷料包进行扣减,后期在器械包定义的页界加以限制,其它类型的器械包定义的装配扣一次性物品库存的属性只能为否)
 				 */
-				if(CollectionUtils.isNotEmpty(packingTasks)){
-					//如果该包定义的类型为器械包或敷料包或配置需要扣减一次性物品库存的话
-					if((td.isInsideTousse() || td.isDressing()) && TousseDefinition.STR_YES.equals(td.getAutoOutStockForPacking())){
-						//判断对应的各一次性是否库存数量是否够扣,如果够扣的话
-						List<DiposableGoodsInstance> diposableGoodsItems = td.getDiposableGoodsItems();
-						if(CollectionUtils.isNotEmpty(diposableGoodsItems)){
-							
-							disposableGoodsIdToAmount = new HashMap<Long, Long>();
-							for(DiposableGoodsInstance diposableGoodsInstance : diposableGoodsItems){
-								//扣减库存
-								DisposableGoods disposableGoods = diposableGoodsInstance.getDiposableGoods();
-								Integer diposableGoodsAmount = diposableGoodsInstance.getAmount();
-								if(disposableGoods == null){
-									throw new RuntimeException(String.format("%s 有部分一次性物品材料未找到物品定义!", td.getName()));
-								}
-								if(diposableGoodsAmount != null && diposableGoodsAmount > 0){
-									Long outAmount = new Long(needPackingAmount*diposableGoodsAmount);
-									summaryOutDisposableGoodsStockInfo(disposableGoodsServiceContext, disposableGoodsIdToAmount, disposableGoods, outAmount);
-								}
-							}
-						}
-					}
-				}
+//				if(CollectionUtils.isNotEmpty(packingTasks)){
+//					//如果该包定义的类型为器械包或敷料包或配置需要扣减一次性物品库存的话
+//					if((td.isInsideTousse() || td.isDressing()) && TousseDefinition.STR_YES.equals(td.getAutoOutStockForPacking())){
+//						//判断对应的各一次性是否库存数量是否够扣,如果够扣的话
+//						List<DiposableGoodsInstance> diposableGoodsItems = td.getDiposableGoodsItems();
+//						if(CollectionUtils.isNotEmpty(diposableGoodsItems)){
+//							
+//							disposableGoodsIdToAmount = new HashMap<Long, Long>();
+//							for(DiposableGoodsInstance diposableGoodsInstance : diposableGoodsItems){
+//								//扣减库存
+//								DisposableGoods disposableGoods = diposableGoodsInstance.getDiposableGoods();
+//								Integer diposableGoodsAmount = diposableGoodsInstance.getAmount();
+//								if(disposableGoods == null){
+//									throw new RuntimeException(String.format("%s 有部分一次性物品材料未找到物品定义!", td.getName()));
+//								}
+//								if(diposableGoodsAmount != null && diposableGoodsAmount > 0){
+//									Long outAmount = new Long(needPackingAmount*diposableGoodsAmount);
+//									summaryOutDisposableGoodsStockInfo(disposableGoodsServiceContext, disposableGoodsIdToAmount, disposableGoods, outAmount);
+//								}
+//							}
+//						}
+//					}
+//				}
 				
 				// 外来器械包（未拆分成多个包）
 				if (td.isForeignTousse()) {
@@ -3265,7 +3265,7 @@
 							sterileFrequency, td, packingDate, currentPackAmount, currentPackingTask , null);
 					
 					// 汇总装配记录对应的一次性物品扣减信息
-					summaryOutDisposableGoodsStockInfo(packingRecordToDisposableGoodsOutAmount, packingRecord, disposableGoodsIdToAmount);
+//					summaryOutDisposableGoodsStockInfo(packingRecordToDisposableGoodsOutAmount, packingRecord, disposableGoodsIdToAmount);
 	
 					packingSplitPackages(operator, operatorCode,
 							reviewer, reviewerCode, sterilingType, sterilizerName, sterileFrequency,
@@ -3325,7 +3325,7 @@
 							packingAmountForThisTask, currentPackingTask , currentPackingTaskAsList);
 	
 					// 汇总装配记录对应的一次性物品扣减信息
-					summaryOutDisposableGoodsStockInfo(packingRecordToDisposableGoodsOutAmount, packingRecord, disposableGoodsIdToAmount);
+//					summaryOutDisposableGoodsStockInfo(packingRecordToDisposableGoodsOutAmount, packingRecord, disposableGoodsIdToAmount);
 					
 					JSONObject result = batchCreateTousseInstance(
 							operator, operatorCode, reviewer,reviewerCode, packageType,
@@ -3510,7 +3510,7 @@
 			batchLoadMsg = "装配任务id为空";
 		}
 		// 扣减一次性物品库存
-		outDisposableGoodsStock2(disposableGoodsServiceContext, packingRecordToDisposableGoodsOutAmount, supplyRoomConfigParams);
+//		outDisposableGoodsStock2(disposableGoodsServiceContext, packingRecordToDisposableGoodsOutAmount, supplyRoomConfigParams);
 		if(!batchLoadToVirtaulBasket){
 			json.put("success", false);
 			json.put("message", batchLoadMsg);