Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
===================================================================
diff -u -r13017 -r13445
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java	(.../PackingTableManager.java)	(revision 13017)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java	(.../PackingTableManager.java)	(revision 13445)
@@ -390,6 +390,9 @@
 									.getDiposableGoods();
 							obj.put("typeName", DisposableGoodsStock.TYPE_NAME);
 							if (disposableGoods != null) {
+								if(!disposableGoods.printInLabel()){
+									continue;
+								}
 								obj.put("name", disposableGoods.getName());
 								obj.put("specification",
 										disposableGoods.getSpecification());
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js
===================================================================
diff -u -r13080 -r13445
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js	(.../disposableGoodsStockView.js)	(revision 13080)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js	(.../disposableGoodsStockView.js)	(revision 13445)
@@ -24,9 +24,9 @@
 	});
 	
 	//是否供应室物品
-	var isSupplyRoomStore = new Ext.data.SimpleStore( {
+	var yesNoStore = new Ext.data.SimpleStore( {
 		fields : [ 'value'],
-		data : [[SUPPLYROOMGOODS_YES],[SUPPLYROOMGOODS_NO]]
+		data : [[STR_YES],[STR_NO]]
 	});
 	
 	var godownEntryItemStore = new top.Ext.data.Store({
@@ -205,7 +205,7 @@
 						fieldLabel : '消毒供应中心物品',
 						valueField : 'value',
 						displayField : 'value',
-						store : isSupplyRoomStore,
+						store : yesNoStore,
 						forceSelection : true,
 						allowBlank : false,
 						mode : 'local',
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp
===================================================================
diff -u -r13435 -r13445
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp	(.../diposableGoodsView.jsp)	(revision 13435)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp	(.../diposableGoodsView.jsp)	(revision 13445)
@@ -27,8 +27,8 @@
 	var CONSTANT_YES = '<%=DisposableGoods.CONSTANT_YES %>';//能
 	var CONSTANT_NO = '<%=DisposableGoods.CONSTANT_NO %>';//否
 	
-	var SUPPLYROOMGOODS_YES = '<%=Constants.STR_YES %>';//能
-	var SUPPLYROOMGOODS_NO = '<%=Constants.STR_NO %>';//否
+	var STR_YES = '<%=Constants.STR_YES %>';//能
+	var STR_NO = '<%=Constants.STR_NO %>';//否
 </script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/print/printConfig.js" /></script>
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp
===================================================================
diff -u -r13435 -r13445
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp	(.../disposableGoodsStockView.jsp)	(revision 13435)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp	(.../disposableGoodsStockView.jsp)	(revision 13445)
@@ -27,8 +27,8 @@
 	var CONSTANT_YES = '<%=DisposableGoods.CONSTANT_YES %>';//能
 	var CONSTANT_NO = '<%=DisposableGoods.CONSTANT_NO %>';//否
 	
-	var SUPPLYROOMGOODS_YES = '<%=Constants.STR_YES %>';//能
-	var SUPPLYROOMGOODS_NO = '<%=Constants.STR_NO %>';//否
+	var STR_YES = '<%=Constants.STR_YES %>';//能
+	var STR_NO = '<%=Constants.STR_NO %>';//否
 </script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/print/printConfig.js" /></script>
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
===================================================================
diff -u -r13111 -r13445
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 13111)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 13445)
@@ -31,6 +31,7 @@
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils;
 import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodsInstance;
+import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
 import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
@@ -316,18 +317,23 @@
 						.getDiposableGoodsItems();
 				if (diposableGoodsInstanceList != null) {
 					for (DiposableGoodsInstance instance : diposableGoodsInstanceList) {
-						String name = instance.getDiposableGoods()
-								.getName();
-						if (StringUtils.isNotBlank(instance
-								.getDiposableGoods().getSpecification())) {
-							name += ("["
-									+ instance.getDiposableGoods()
-											.getSpecification() + "]");
+						DisposableGoods disposableGoods = instance.getDiposableGoods();
+						if(disposableGoods != null){
+							//如果配置为打印，才打印一次性物品
+							if(disposableGoods.printInLabel()){
+								String name = disposableGoods
+										.getName();
+								if (StringUtils.isNotBlank(disposableGoods.getSpecification())) {
+									name += ("["
+											+ disposableGoods
+													.getSpecification() + "]");
+								}
+								material.put("name", name);
+								material.put("amount", instance.getAmount());
+								material.put("isDiposable", "是");
+								materials.add(material);
+							}
 						}
-						material.put("name", name);
-						material.put("amount", instance.getAmount());
-						material.put("isDiposable", "是");
-						materials.add(material);
 					}
 				}
 			}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
===================================================================
diff -u -r13435 -r13445
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java	(.../DisposableGoods.java)	(revision 13435)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java	(.../DisposableGoods.java)	(revision 13445)
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.forgon.Constants;
+import com.forgon.tools.string.StringTools;
 
 /**
  * 一次性物品定义
@@ -86,6 +87,12 @@
 	 */
 	private String grade;
 	
+	/**
+	 * 在标签中是否打印,值为是或者否。如果标签中配置打印一次性物品,并且此处为是,则会在标签纸中打印
+	 * <br>如果标签中配置不打印一次性物品，则不会在标签纸中打印
+	 */
+	private String printInLabel;
+	
 	public static String GRADE_FIRST = "一类";
 	public static String GRADE_SECOND = "二类";
 	public static String GRADE_THIRD = "三类";
@@ -279,6 +286,31 @@
 	public void setGrade(String grade) {
 		this.grade = grade;
 	}
+	/**
+	 * 默认值为是
+	 * @return
+	 */
+	public String getPrintInLabel() {
+		printInLabel = StringTools.defaultIfEmpty(printInLabel, Constants.STR_YES);
+		return printInLabel;
+	}
+	/**
+	 * 如果参数不为是或者否,则修改为是
+	 * @param printInLabel
+	 */
+	public void setPrintInLabel(String printInLabel) {
+		if(!Constants.STR_YES.equals(printInLabel) && !Constants.STR_NO.equals(printInLabel)){
+			printInLabel = Constants.STR_YES;
+		}
+		this.printInLabel = printInLabel;
+	}
+	/**
+	 * 判断是否在标签中打印。非持久化属性
+	 * @return
+	 */
+	public boolean printInLabel(){
+		return Constants.STR_YES.equals(getPrintInLabel());
+	}
 
 	@Transient
 	public String getShowName() {
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
===================================================================
diff -u -r13205 -r13445
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 13205)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 13445)
@@ -25,10 +25,11 @@
 	});
 	
 	//是否供应室物品
-	var isSupplyRoomStore = new Ext.data.SimpleStore( {
+	var yesNoStore = new Ext.data.SimpleStore( {
 		fields : [ 'value'],
-		data : [[SUPPLYROOMGOODS_YES],[SUPPLYROOMGOODS_NO]]
+		data : [[STR_YES],[STR_NO]]
 	});
+	
 	var godownEntryItemStore = new top.Ext.data.Store({
 		proxy : new top.Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/diposableGoodsAction!loadDisposableGoodsBatchesByDisposableGoodsID.do?id=' + id,
@@ -208,7 +209,6 @@
 						anchor : '95%'
 					}]
 				},{
-
 					columnWidth : 1,
 					layout : 'form',
 					labelWidth : 110,
@@ -217,7 +217,7 @@
 						fieldLabel : '消毒供应中心物品',
 						valueField : 'value',
 						displayField : 'value',
-						store : isSupplyRoomStore,
+						store : yesNoStore,
 						forceSelection : true,
 						allowBlank : false,
 						mode : 'local',
@@ -226,12 +226,29 @@
 						id : "isSupplyRoomGoods",
 						anchor : '95%'
 					}]
-				
 				},{
 					columnWidth : 1,
 					layout : 'form',
 					labelWidth : 110,
 					items : [{
+						xtype : 'combo',
+						fieldLabel : '是否在标签中打印',
+						valueField : 'value',
+						displayField : 'value',
+						store : yesNoStore,
+						forceSelection : true,
+						allowBlank : false,
+						mode : 'local',
+						triggerAction : 'all',
+						name : "printInLabel",
+						id : "printInLabel",
+						anchor : '95%'
+					}]
+				},{
+					columnWidth : 1,
+					layout : 'form',
+					labelWidth : 110,
+					items : [{
 						xtype : 'numberfield',
 						fieldLabel : '最小库存',
 						allowDecimals : false,