Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r14341 -r14342
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 14341)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 14342)
@@ -1046,10 +1046,13 @@
 									top.Ext.getCmp('isTraceable').disable();
 									top.Ext.getCmp('isReview').setValue("否");
 									top.Ext.getCmp('isReview').disable();
+									top.Ext.getCmp('autoOutStockForPacking').setValue("否");
+									top.Ext.getCmp('autoOutStockForPacking').disable();
 								}else{
 									top.Ext.getCmp('isPrint').enable();
 									top.Ext.getCmp('isTraceable').enable();
 									top.Ext.getCmp('isReview').enable();
+									top.Ext.getCmp('autoOutStockForPacking').enable();
 								}
 							}
 						}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r14330 -r14342
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 14330)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 14342)
@@ -3582,6 +3582,8 @@
 		td.setIsPrintOrg(ancestorTD.getIsPrintOrg());
 		//是否打印材料属性设置
 		td.setIsPrintMaterialForPacking(ancestorTD.getIsPrintMaterialForPacking());
+		//装配是否扣减库存
+		td.setAutoOutStockForPacking(ancestorTD.getAutoOutStockForPacking());
 		List<DiposableGoodsInstance> diposableGoodsItems = new ArrayList<DiposableGoodsInstance>();
 		for (DiposableGoodsInstance item : ancestorTD
 				.getDiposableGoodsItems()) {