Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
===================================================================
diff -u -r17023 -r17536
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 17023)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 17536)
@@ -449,6 +449,29 @@
 				    		  id : 'printAmount',
 				    		  anchor : '95%'
 				    	  }]
+				      },{
+				    	  columnWidth : .33,
+				    	  layout : 'form',
+				    	  labelWidth : 80,
+				    	  items:[{
+				    		  xtype : 'combo',
+				    		  fieldLabel : '是否停用',
+				    		  id : 'isDisable',
+				    		  name : 'isDisable',
+				    		  valueField : 'value',
+				    		  displayField : 'value',
+				    		  store : new Ext.data.SimpleStore( {
+				    				fields : [ 'value'],
+				    				data : [['是'],['否']]
+				    			}),
+				    		  editable : false,
+				    		  forceSelection : true,
+				    		  mode : 'local',
+				    		  allowBlank : false,
+				    		  triggerAction : 'all',
+				    		  anchor : '95%'
+				    			  
+				    	  }]
 				      }]
 				},{
 					columnWidth : 1,
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.js
===================================================================
diff -u -r16436 -r17536
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.js	(.../foreignTousseView.js)	(revision 16436)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.js	(.../foreignTousseView.js)	(revision 17536)
@@ -131,7 +131,6 @@
 Ext.onReady(function() {
 	Ext.QuickTips.init();
 	// 记录cookie（3步）
-
 		var columns = [
 		    {header : "器械包名称",width : 180,dataIndex : 'name', renderer : renderName}, 
 		    {header : "器械包名称",width : 180,dataIndex : 'name', renderer : modifyRecord,hidden:true}, 
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r17512 -r17536
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 17512)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 17536)
@@ -800,6 +800,9 @@
 		return json;
 	}
 
+	/**
+	 * TODO 外来器械查询随着申请单生成的包定义的增加，此方法会越来越慢，需要改造
+	 */
 	public List<TousseDefinition> searchTousseDefinitions(String searchString,String tousseType, 
 			String handlerDepartCodes,String supplierName,boolean showDisableGoods,boolean showForeignTousseAncestorDefinition) {
 		
@@ -864,6 +867,13 @@
 		}else{
 			if(showForeignTousseAncestorDefinition){
 				sql += " and po.forDisplay != 0 ";
+			// 查询外来器械申请单创建的包定义
+			} else {
+				if(!showDisableGoods){
+					//用祖先id的话，有些旧数据祖先id是自己，就没办法停用了。
+					sql += String.format(" and po.name not in(select distinct t.name from TousseDefinition t where t.tousseType = '%s' and t.forDisplay = 1 and t.isDisable = '%s') ", 
+							TousseDefinition.PACKAGE_TYPE_FOREIGN,Constants.STR_YES);
+				}
 			}
 		}
 		
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
===================================================================
diff -u -r17273 -r17536
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java	(.../TousseDefinitionTableManager.java)	(revision 17273)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java	(.../TousseDefinitionTableManager.java)	(revision 17536)
@@ -159,7 +159,12 @@
 		} else {// 二级供应室
 			sql += " and po.handlerDepartCode='" + currentOrgUnitCode + "' ";
 		}
-
+		Map<String, String> sqlWhereParamMap = gridManager.getParamFromView(parameterMap);
+		String onlyShowDisable = sqlWhereParamMap.get("onlyShowDisable");
+		if ("yes".equals(onlyShowDisable)) {
+			sql += String.format(" and po.isDisable='%s' ", Constants.STR_YES);
+		}
+		
 		return gridManager.renderGrid3(parameterMap,
 				TousseDefinition.class.getName(), sql, new String[] {
 						"fieldHandler", "materialInstances",
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r17516 -r17536
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 17516)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 17536)
@@ -343,6 +343,7 @@
 		{hidden :SSTS_Tousse,text:"器械包定义管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
 		{hidden :SSTS_Tousse,text:"停用的器械包",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseView.jsp?editMode=true&onlyShowDisable=yes',hrefTarget:linkTarget,leaf:true},
 		{hidden :SSTS_Tousse,text:"外来器械包管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
+		{hidden :SSTS_Tousse,text:"停用的外来器械包",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp?editMode=true&onlyShowDisable=yes',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_TousseInstanceManager_ViewMenu,text:"器械包信息",href:WWWROOT+'/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_TousseInstanceManager_ViewMenu,text:"标识牌信息",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_Tousse,text:"器械包库存",href:WWWROOT+'/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp
===================================================================
diff -u -r17150 -r17536
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp	(.../foreignTousseView.jsp)	(revision 17150)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp	(.../foreignTousseView.jsp)	(revision 17536)
@@ -118,5 +118,8 @@
         </td>
     </tr>
 </table>
+<form name="parametersFrm">
+    <input type="hidden" id="parm_s_onlyShowDisable" name="parm_s_onlyShowDisable" value="${param.onlyShowDisable}">
+</form>
 </body>
 </html>
\ No newline at end of file