Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r40557 -r40729
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 40557)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 40729)
@@ -13,6 +13,11 @@
 gridOperation = extCompOperationUtil.getGridOperation();
 motionObj = extCompOperationUtil.getMotionObj();
 
+function saveTousses(ids, names) {
+	Ext.getCmp('tdIdsOfAutobasketInsertion').setValue(ids);
+	Ext.getCmp('tdNamesOfAutobasketInsertion').setValue(names);
+}
+
 function openSelectOrgUnit(root) {
 	var orgIds = $Id(root + 'Ids').value;
 	var orgNames = $Id(root + 'Names').value;
@@ -2505,6 +2510,39 @@
 					]
 				}, {
 					xtype: "fieldset",
+					title: '装配管理参数设置',
+					layout: 'column',
+					width: itemWidth,
+					height: 80,
+					labelWidth: 95,
+					hidden:!sstsConfig.enbaleLoadAutomaticallyIntoBasketsAfterAssembly,
+					items:[{
+						layout: 'form',
+						labelWidth: 250,
+						columnWidth: .99,
+						items: [{
+							xtype: 'hidden',
+							id: 'tdIdsOfAutobasketInsertion',
+							name: 'tdIdsOfAutobasketInsertion'
+						}, {
+							xtype: 'trigger',
+							fieldLabel: "装配后不自动加载到灭菌篮筐器械包",
+							allowBlank: true,
+							name: "tdNamesOfAutobasketInsertion",
+							id: "tdNamesOfAutobasketInsertion",
+							msgTarget: 'side',
+							readOnly: true,
+							onTriggerClick: function () {
+								var ids = Ext.getCmp('tdIdsOfAutobasketInsertion').getValue();
+								var names = Ext.getCmp('tdNamesOfAutobasketInsertion').getValue();
+								openSelectTousse(names, ids);
+							},
+							triggerClass: 'x-form-search-trigger',
+							anchor: '100%'
+						}]
+					}]
+				}, {
+					xtype: "fieldset",
 					title: '可追溯器械参数设置',
 					layout: 'column',
 					width: itemWidth,
@@ -4309,6 +4347,12 @@
 						}
 					}
 
+					//GDSKQYY-10：装配后不自动加载到灭菌篮筐器械包
+					var tdIdsOfAutobasketInsertion = '';
+					if(sstsConfig.enbaleLoadAutomaticallyIntoBasketsAfterAssembly){
+						tdIdsOfAutobasketInsertion = Ext.getCmp("tdIdsOfAutobasketInsertion").getValue();
+					}
+
 					var mergeApplicationDepartNameAndCodeArr = "";
 					if (autoMergeApplication == "否" || autoMergeApplication == "") {
 						mergeApplicationDepartNameAndCodeArr = "";
@@ -4449,6 +4493,7 @@
 							expensiveGoodsBillWarningTime: expensiveGoodsBillWarningTime,//高值耗材发票预警期
 							noMergeApplicationTypes: noMergeApplicationTypes,
 							instrumentUseRateWorkingDay: instrumentUseRateWorkingDay,
+							tdIdsOfAutobasketInsertion:tdIdsOfAutobasketInsertion,
 							mergeApplicationDepartArr: mergeApplicationDepartNameAndCodeArr, //自动合并申请单的科室编码和科室名称
 							isEnableTousseOpRecipient: isEnableTousseOpRecipient,
 							isEnableTousseOpDestLocation: isEnableTousseOpDestLocation,
@@ -4576,6 +4621,21 @@
 			if (supplyRoomConfig.instrumentUseRateWorkingDay != null && sstsConfig.enableInstrumentLifeCycleTraceabilityManagement) {//器械使用率工作天数系数配置
 				Ext.getCmp('instrumentUseRateWorkingDay').setValue(supplyRoomConfig.instrumentUseRateWorkingDay);
 			}
+			//GDSKQYY-10：装配后不自动加载到灭菌篮筐器械包
+			if (sstsConfig.enbaleLoadAutomaticallyIntoBasketsAfterAssembly) {
+				var autobasketInsertionConfigInfos = supplyRoomConfig.autobasketInsertionConfigInfos;
+				if(autobasketInsertionConfigInfos !== ''){
+					var obj = JSON.parse(autobasketInsertionConfigInfos);
+					var idArr = [];
+					var nameArr = [];
+					for(var k=0;k<obj.length;k++){
+						idArr.push(obj[i].tousseDefinitionAncestorID);
+						nameArr.push(obj[i].name);
+					}
+					Ext.getCmp('tdIdsOfAutobasketInsertion').setValue(idArr.join(';'));
+					Ext.getCmp('tdNamesOfAutobasketInsertion').setValue(nameArr.join(';'));
+				}
+			}
 			if (supplyRoomConfig.invoiceOrigin != null) {
 				Ext.getCmp('invoiceOrigin').setValue(supplyRoomConfig.invoiceOrigin);
 			}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp
===================================================================
diff -u -r40410 -r40729
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp	(.../supplyRoomTypeView.jsp)	(revision 40410)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp	(.../supplyRoomTypeView.jsp)	(revision 40729)
@@ -9,6 +9,7 @@
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
 <link rel="stylesheet" href="${ctx}/styles/main.css" type="text/css" />
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/common/selectTousseExt4.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/extCompOperationUtil.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/extUtils.js?version=${svnRevision}"></script>