Index: ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java
===================================================================
diff -u -r19136 -r19521
--- ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java	(.../LabelTemplateAction.java)	(revision 19136)
+++ ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java	(.../LabelTemplateAction.java)	(revision 19521)
@@ -23,6 +23,7 @@
 import org.springframework.web.servlet.ModelAndView;
 
 import com.forgon.attachfile.service.AttachFileManager;
+import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.entity.labeltemplate.LabelTemplate;
 import com.forgon.disinfectsystem.labeltemplate.service.LabelTemplateManager;
 import com.forgon.tools.StrutsParamUtils;
@@ -170,9 +171,30 @@
 				addName(array, name);
 			}
 		}
-		addName(array, "大标签");
-		addName(array, "中标签");
-		addName(array, "小标签");
+		//器械包定义标签类型(及器械包定义的标识牌标签类型、外来器械包定义标签类型、科室供应室配置的外来器械标签类型)限制可以使用的标签类型(只针对系统定义的几种原标签类型,不含自定义标签)
+		String canUseBarcodeTypes = CssdUtils.getSystemSetConfigByName("canUseBarcodeTypes");
+		if(StringUtils.isNotBlank(canUseBarcodeTypes)){
+			JSONArray jsonArray = null;
+			try {
+				jsonArray = JSONArray.fromObject(canUseBarcodeTypes);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			if(jsonArray != null && jsonArray.size() > 0){
+				for (int i = 0; i < jsonArray.size(); i++) {
+					String barcodeName = jsonArray.optString(i);
+					addName(array, barcodeName);
+				}
+			}else{
+				addName(array, "大标签");
+				addName(array, "中标签");
+				addName(array, "小标签");
+			}
+		}else{
+			addName(array, "大标签");
+			addName(array, "中标签");
+			addName(array, "小标签");
+		}
 		
 		StrutsResponseUtils.output(array);
 	}
Index: ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java
===================================================================
diff -u -r18964 -r19521
--- ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java	(.../LabelTemplateManagerImpl.java)	(revision 18964)
+++ ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java	(.../LabelTemplateManagerImpl.java)	(revision 19521)
@@ -8,6 +8,7 @@
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
+import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.entity.labeltemplate.LabelTemplate;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.ObjectDao;
@@ -149,12 +150,36 @@
 		if(nameList == null){
 			nameList = new ArrayList<String>();
 		}
-		nameList.add("加大标签");
-		nameList.add("大标签");
-		nameList.add("中标签");
-		nameList.add("中标签2");
-		nameList.add("小标签");
-		nameList.add("小标签2");
+		//器械包定义标签类型(及器械包定义的标识牌标签类型、外来器械包定义标签类型、科室供应室配置的外来器械标签类型)限制可以使用的标签类型(只针对系统定义的几种原标签类型,不含自定义标签)
+		String canUseBarcodeTypes = CssdUtils.getSystemSetConfigByName("canUseBarcodeTypes");
+		if(StringUtils.isNotBlank(canUseBarcodeTypes)){
+			JSONArray jsonArray = null;
+			try {
+				jsonArray = JSONArray.fromObject(canUseBarcodeTypes);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			if(jsonArray != null && jsonArray.size() > 0){
+				for (int i = 0; i < jsonArray.size(); i++) {
+					String barcodeName = jsonArray.optString(i);
+					nameList.add(barcodeName);
+				}
+			}else{
+				nameList.add("加大标签");
+				nameList.add("大标签");
+				nameList.add("中标签");
+				nameList.add("中标签2");
+				nameList.add("小标签");
+				nameList.add("小标签2");
+			}
+		}else{
+			nameList.add("加大标签");
+			nameList.add("大标签");
+			nameList.add("中标签");
+			nameList.add("中标签2");
+			nameList.add("小标签");
+			nameList.add("小标签2");
+		}
 
 		return nameList;
 	}
@@ -167,9 +192,30 @@
 		if(nameList == null){
 			nameList = new ArrayList<String>();
 		}
-		nameList.add("大标签");
-		nameList.add("中标签");
-		nameList.add("小标签");
+		//器械包定义标签类型(及器械包定义的标识牌标签类型、外来器械包定义标签类型、科室供应室配置的外来器械标签类型)限制可以使用的标签类型(只针对系统定义的几种原标签类型,不含自定义标签)
+		String canUseBarcodeTypes = CssdUtils.getSystemSetConfigByName("canUseBarcodeTypes");
+		if(StringUtils.isNotBlank(canUseBarcodeTypes)){
+			JSONArray jsonArray = null;
+			try {
+				jsonArray = JSONArray.fromObject(canUseBarcodeTypes);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			if(jsonArray != null && jsonArray.size() > 0){
+				for (int i = 0; i < jsonArray.size(); i++) {
+					String barcodeName = jsonArray.optString(i);
+					nameList.add(barcodeName);
+				}
+			}else{
+				nameList.add("大标签");
+				nameList.add("中标签");
+				nameList.add("小标签");
+			}
+		}else{
+			nameList.add("大标签");
+			nameList.add("中标签");
+			nameList.add("小标签");
+		}
 
 		return nameList;
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
===================================================================
diff -u -r19456 -r19521
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp	(.../tousseView.jsp)	(revision 19456)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp	(.../tousseView.jsp)	(revision 19521)
@@ -22,10 +22,16 @@
 if(currentOrgUnitCode!=null){
 	request.setAttribute("currentOrgUnitCode", currentOrgUnitCode);
 	request.setAttribute("departCode", departCode);
-    if(departCode.equals(currentOrgUnitCode)){
+    /* if(departCode.equals(currentOrgUnitCode)){
     	request.setAttribute("isPriceReadOnly", false);
     }else{
     	request.setAttribute("isPriceReadOnly", true);
+    } */
+    //只要是供应室用户,不管是一级供应室还是二级供应室都能修改价格
+	if(supplyRoomConfigManager.isSupplyRoomUser2(userData)){
+    	request.setAttribute("isPriceReadOnly", false);
+    }else{
+    	request.setAttribute("isPriceReadOnly", true);
     }
 }
 %>
Index: ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
===================================================================
diff -u -r19480 -r19521
--- ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js	(.../config.js)	(revision 19480)
+++ ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js	(.../config.js)	(revision 19521)
@@ -75,5 +75,7 @@
   //发货界面，是否启用保存并打印按钮。默认为false,true表示启用，false表示不启用
   enableSaveAndPrintWhenInvoice:true,
   //外来器械申请时显示原始包定义还是显示最近一次申请的包定义,为true表示显示原始包定义
-  isShowForeignTousseAncestorDefinitionForApply:true
+  isShowForeignTousseAncestorDefinitionForApply:true,
+  //器械包定义标签类型(及器械包定义的标识牌标签类型、外来器械包定义标签类型、科室供应室配置的外来器械标签类型)限制可以使用的标签类型(只针对系统定义的几种原标签类型,不含自定义标签)
+  canUseBarcodeTypes : ['中标签']
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
===================================================================
diff -u -r19287 -r19521
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js	(.../idCardForm.js)	(revision 19287)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js	(.../idCardForm.js)	(revision 19521)
@@ -17,6 +17,15 @@
 var forSupplement = false;// 是否装配补充弹出来的
 var supplementResult = false;// 补充结果
 
+//标识牌标签类型
+var idCardPaperTypeData = [['大标签'],['中标签'],['小标签']];
+if(sstsConfig.canUseBarcodeTypes && sstsConfig.canUseBarcodeTypes.length > 0){
+	idCardPaperTypeData = [];
+	for(var i = 0;i < sstsConfig.canUseBarcodeTypes.length;i++){
+		idCardPaperTypeData.push([sstsConfig.canUseBarcodeTypes[i]]);
+	}
+}
+
 var idCardInstanceFields = [
                        	    {name : 'id'},
                        	    {name : 'idCardDefinitionID'},
@@ -514,9 +523,9 @@
                 displayField : 'value',
                 store : new Ext.data.SimpleStore( {
                     fields : [ 'value'],
-                    data : [['大标签'],['中标签'],['小标签']]
+                    data : idCardPaperTypeData
                 }),
-                value : '大标签',
+                value : idCardPaperTypeData[0][0],
                 forceSelection : true,
                 mode : 'local',
                 triggerAction : 'all',
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r19499 -r19521
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 19499)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 19521)
@@ -29,6 +29,21 @@
 	defaultPackageSize = sstsConfig.defaultPackageSize;
 }
 
+//默认的标签纸类型
+var defaultBarcodePaperType = '小标签';
+if(sstsConfig.canUseBarcodeTypes && sstsConfig.canUseBarcodeTypes.length > 0){
+	defaultBarcodePaperType = sstsConfig.canUseBarcodeTypes[0];
+}
+
+//标识牌标签类型
+var idCardPaperTypeData = [['大标签'],['中标签'],['小标签']];
+if(sstsConfig.canUseBarcodeTypes && sstsConfig.canUseBarcodeTypes.length > 0){
+	idCardPaperTypeData = [];
+	for(var i = 0;i < sstsConfig.canUseBarcodeTypes.length;i++){
+		idCardPaperTypeData.push([sstsConfig.canUseBarcodeTypes[i]]);
+	}
+}
+
 var isLastRow = false;//记录当前编辑的行是否是最后一行
 //删除视频
 function deleteVideo(id,uuid_vedioNames){
@@ -1163,7 +1178,7 @@
                       valueField : 'name',
                       displayField : 'name',
                       store : barcodePaperTypeStore,
-                      value : '小标签',
+                      value : defaultBarcodePaperType,
                       allowBlank : false,
                       forceSelection : true,
                       triggerAction : 'all',
@@ -1623,9 +1638,9 @@
                       displayField : 'value',
                       store : new Ext.data.SimpleStore( {
                           fields : [ 'value'],
-                          data : [['大标签'],['中标签'],['小标签']]
+                          data : idCardPaperTypeData
                       }),
-                      value : '大标签',
+                      value : idCardPaperTypeData[0][0],
                       forceSelection : true,
                       mode : 'local',
                       triggerAction : 'all',
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js
===================================================================
diff -u -r19287 -r19521
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js	(.../idCardFormExt4.js)	(revision 19287)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js	(.../idCardFormExt4.js)	(revision 19521)
@@ -17,6 +17,15 @@
 var forSupplement = false;// 是否装配补充弹出来的
 var supplementResult = false;// 补充结果
 
+//标识牌标签类型
+var idCardPaperTypeData = [['大标签'],['中标签'],['小标签']];
+if(sstsConfig.canUseBarcodeTypes && sstsConfig.canUseBarcodeTypes.length > 0){
+	idCardPaperTypeData = [];
+	for(var i = 0;i < sstsConfig.canUseBarcodeTypes.length;i++){
+		idCardPaperTypeData.push([sstsConfig.canUseBarcodeTypes[i]]);
+	}
+}
+
 var idCardInstanceFields = [
                        	    {name : 'id'},
                        	    {name : 'idCardDefinitionID'},
@@ -322,9 +331,9 @@
                 displayField : 'value',
                 store : new Ext4.data.ArrayStore( {
                     fields : [ 'value'],
-                    data : [['大标签'],['中标签'],['小标签']]
+                    data : idCardPaperTypeData
                 }),
-                value : '大标签',
+                value : idCardPaperTypeData[0][0],
                 forceSelection : true,
                 mode : 'local',
                 triggerAction : 'all',