Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r19486 -r19488
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 19486)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 19488)
@@ -65,6 +65,8 @@
 	
 	private String supplyRoom_type_tousse_operation;
 	
+	private String supplyRoom_type_recycling_application_not_invoice;
+	
 	private String saveImageMethod;
 
 	private String saveImagePath;
@@ -215,6 +217,15 @@
 		this.supplyRoom_type_tousse_operation = supplyRoom_type_tousse_operation;
 	}
 
+	public String getSupplyRoom_type_recycling_application_not_invoice() {
+		return supplyRoom_type_recycling_application_not_invoice;
+	}
+
+	public void setSupplyRoom_type_recycling_application_not_invoice(
+			String supplyRoom_type_recycling_application_not_invoice) {
+		this.supplyRoom_type_recycling_application_not_invoice = supplyRoom_type_recycling_application_not_invoice;
+	}
+
 	/**
 	 * 得到申请单终止原因
 	 * 
@@ -646,6 +657,8 @@
 		
 		processSupplyRoomCongfig(SupplyRoomConfig.SUPPLYROOM_TYPE_USERECORD_TO_APPLICATION_NOT_INVOICE, supplyRoom_type_userecord_to_application_not_invoice, supplyRoomConfigToSave, supplyRoomConfigIdsToDelete,supplyRoomConfigToUpdate);
 		processSupplyRoomCongfig(SupplyRoomConfig.SUPPLYROOM_TYPE_TOUSSE_OPERATION, supplyRoom_type_tousse_operation, supplyRoomConfigToSave, supplyRoomConfigIdsToDelete,supplyRoomConfigToUpdate);
+		//回收申请单不发货科室
+		processSupplyRoomCongfig(SupplyRoomConfig.SUPPLYROOM_TYPE_RECYCLING_APPLICATION_NOT_INVOICE, supplyRoom_type_recycling_application_not_invoice, supplyRoomConfigToSave, supplyRoomConfigIdsToDelete,supplyRoomConfigToUpdate);
 		
 		// 保存新的SupplyRoomCongfig
 		if(!supplyRoomConfigToSave.isEmpty()){
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r19487 -r19488
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 19487)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 19488)
@@ -4,6 +4,7 @@
 var supplyRoomStoreSettleAccount;
 var supplyRoomStoreUseRecordToApplicationNotInvoice;
 var supplyRoomStoreTousseOperation;
+var supplyRoomStoreRecyclingApplicationNotInvoice;
 var sterilingTypeStore;
 var packageTypeStore;
 var configWinHeight = top.screen.height > 1000 ? 700 : 600;
@@ -158,7 +159,7 @@
 }
 
 function hideMask(count,myMask){
-	if(count == 5){
+	if(count == 7){
 		myMask.hide();
 	}
 }
@@ -290,6 +291,13 @@
 		}),
 		reader : rd
 	});
+	supplyRoomStoreRecyclingApplicationNotInvoice = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfig.do?type=7',
+			method : 'POST'
+		}),
+		reader : rd
+	});
 	//一级供应室配置的表格列头
 	var cmFirstSupplyRoom = new Ext.grid.ColumnModel( [ {
 		id : 'id',
@@ -474,6 +482,8 @@
 		$Id('supplyRoom_type_userecord_to_application_not_invoice').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoomStoreUseRecordToApplicationNotInvoice);
 		// 器械位置流转科室
 		$Id('supplyRoom_type_tousse_operation').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoomStoreTousseOperation);
+		//回收申请单不发货科室
+		$Id('supplyRoom_type_recycling_application_not_invoice').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoomStoreRecyclingApplicationNotInvoice);
 	}
 	
 	var taskGroupJsonStore = new Ext.data.SimpleStore({
@@ -544,6 +554,10 @@
                 	name :'supplyRoom_type_tousse_operation'
                 },{
                 	xtype:'hidden',
+                	id :'supplyRoom_type_recycling_application_not_invoice',
+                	name :'supplyRoom_type_recycling_application_not_invoice'
+                },{
+                	xtype:'hidden',
                 	id :'dptCodeOfForeignTousse',
                 	name :'dptCodeOfForeignTousse'
                 },{
@@ -1990,6 +2004,127 @@
     	]
 	});
 	
+	tabsItemArr.push({
+    	title: '<strong>回收申请单不发货科室配置</strong>',
+    	layout:'fit',
+    	items:[
+			new Ext.grid.EditorGridPanel({
+				id : 'supplyRoomRecyclingApplicationNotInvoice',
+				store : supplyRoomStoreRecyclingApplicationNotInvoice,
+				cm : new Ext.grid.ColumnModel( [ {
+					dataIndex : 'id',
+					hidden :true
+				},{
+					dataIndex : 'departId',
+                    header : '科室编码',
+                    width : 20,
+					hidden :false
+				},{
+					header : "科室名称",
+					dataIndex : 'name',
+					width : 220,
+					menuDisabled : true
+				},{
+                    header : "科室拼音",
+                    dataIndex : 'spell',
+                    width : 30,
+                    hidden :true,
+                    menuDisabled : true
+                },{
+					id : 'deleteItem',
+					header:'删除',
+					width : 100,
+					renderer: function(v,p,record){
+						var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"removeGridItem('supplyRoomRecyclingApplicationNotInvoice') \">";
+						return str;
+					},
+					menuDisabled : true,
+					dataIndex:'id'
+				} ]),
+				autoExpandColumn : 'deleteItem',
+				enableHdMenu : false,
+				frame : false,
+                viewConfig: {
+                    forceFit:true,
+                    getRowClass: function(record, rowIndex){
+                        return record.get("isFind") ? "resultList" : "";
+                    }
+                },
+				width:document.body.offsetWidth-12,
+				height:document.body.offsetHeight-94,
+				bodyStyle : 'border:1px solid #9cbaef',
+				clicksToEdit : 1,
+				selModel : new Ext.grid.RowSelectionModel({
+					singleSelect : false
+				}),
+				tbar : [{
+					text : '选择科室  :'
+				},{
+					xtype : 'combo',
+					id : 'departNameRecyclingApplicationNotInvoice',
+					name : 'departNameRecyclingApplicationNotInvoice',
+					queryParam : 'spell',
+					minChars : 0,
+					valueField : 'id',
+					displayField : 'name',
+                    listWidth : 300,
+					store : departJsonStore,
+					forceSelection : true,
+					lazyInit : true,
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					allowBlank : true,
+					anchor : '97%'
+				},{
+					text : '添加',
+					iconCls : 'btn_ext_add',
+					handler : function() {
+					    var name =Ext.getCmp('departNameRecyclingApplicationNotInvoice').getRawValue(); 
+					    var departId =Ext.getCmp('departNameRecyclingApplicationNotInvoice').getValue();
+					    addGridItem(Ext.getCmp("supplyRoomRecyclingApplicationNotInvoice").getStore(),name,departId,"departNameRecyclingApplicationNotInvoice");
+					}
+				},
+				{
+			
+					text : '删除全部',
+					iconCls : 'btn_ext_application_del',
+					handler : function() {
+						top.Ext.MessageBox.confirm("请确认","确定要删除所有科室吗？",function(btn){
+							if(btn == "yes"){
+								Ext.getCmp("supplyRoomRecyclingApplicationNotInvoice").getStore().removeAll();
+							}
+						});
+					}
+				},{
+					text : '搜索科室名称:'
+				},{
+					xtype : 'textfield',
+					id : 'keyWordRecyclingApplicationNotInvoice',
+					anchor : '100%',
+					allowBlank : true,
+					listeners : {
+						specialkey : function(field, ee) {
+							if (ee.getKey() == Ext.EventObject.ENTER) {
+								searchSupplyRoomStore(supplyRoomStoreRecyclingApplicationNotInvoice, 'keyWordRecyclingApplicationNotInvoice', 'queryResultRecyclingApplicationNotInvoice');
+							}
+						}
+					}
+				},{
+					xtype: 'button',
+					text: '查询',
+					iconCls: 'icon_search',
+					handler: function () {
+						searchSupplyRoomStore(supplyRoomStoreRecyclingApplicationNotInvoice, 'keyWordRecyclingApplicationNotInvoice', 'queryResultRecyclingApplicationNotInvoice');
+					}
+				},'->',{
+					text : '',
+					id : 'queryResultRecyclingApplicationNotInvoice'
+				}]
+			})
+    	]
+	});
+	
 	var tabs = new Ext.TabPanel({
 		activeTab: 0,
         width:document.body.offsetWidth-10,
@@ -2167,6 +2302,7 @@
         	  		var supplyRoom_type_settleAccount = Ext.getCmp('supplyRoom_type_settleAccount').getValue();
         	  		var supplyRoom_type_userecord_to_application_not_invoice = Ext.getCmp('supplyRoom_type_userecord_to_application_not_invoice').getValue();
         	  		var supplyRoom_type_tousse_operation = Ext.getCmp('supplyRoom_type_tousse_operation').getValue();
+        	  		var supplyRoom_type_recycling_application_not_invoice = Ext.getCmp('supplyRoom_type_recycling_application_not_invoice').getValue();
         	  		Ext.Ajax.request({
         	  			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!saveSupplyRoomCongfig.do',
         	  			method:'POST',
@@ -2177,6 +2313,7 @@
 	                    	supplyRoom_type_settleAccount : supplyRoom_type_settleAccount,
 	                    	supplyRoom_type_userecord_to_application_not_invoice : supplyRoom_type_userecord_to_application_not_invoice,
 	                    	supplyRoom_type_tousse_operation : supplyRoom_type_tousse_operation,
+	                    	supplyRoom_type_recycling_application_not_invoice:supplyRoom_type_recycling_application_not_invoice,
 	                    	saveImageMethod : saveImageMethod,//
 	                    	saveImagePath : saveImagePath,//
 	                    	secondWashCountWorkload : secondWashCountWorkload,//
@@ -2230,7 +2367,11 @@
 	                    failure : function(response, options) {
 	                    	myMask.hide();
 	                    	var result = Ext.decode(response.responseText);
-	                        showResult(result.msg);
+	                    	if(result && result.msg){
+	                    		showResult(result.msg);
+	                    	}else{
+	                    		showResult('保存失败');
+	                    	}
 	                    }
 	                });
         	  		
@@ -2455,4 +2596,10 @@
   			hideMask(count,myMask);
   	    }  
   	});
+	supplyRoomStoreRecyclingApplicationNotInvoice.load({  
+  	    callback: function(records, options, success){  
+  	    	count++;
+  			hideMask(count,myMask);
+  	    }  
+  	});
 });
\ No newline at end of file
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
===================================================================
diff -u -r19486 -r19488
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 19486)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 19488)
@@ -106,6 +106,10 @@
 	 * 器械位置流转科室
 	 */
 	public static final int SUPPLYROOM_TYPE_TOUSSE_OPERATION = 6;
+	/**
+	 * 回收申请单不发货科室
+	 */
+	public static final int SUPPLYROOM_TYPE_RECYCLING_APPLICATION_NOT_INVOICE = 7;
 
 	public static final String INVOICE_ORIGIN_APPLICATION = "申请单";
 	public static final String INVOICE_ORIGIN_RECYCLING = "回收单";