Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r13007 -r13258
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 13007)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 13258)
@@ -423,6 +423,9 @@
 			secondSupplyRoomNeedRecycle = true;
 		}
 		supplyRoomConfig.setSecondSupplyRoomNeedRecycle(secondSupplyRoomNeedRecycle);
+		
+		//二级供应室是否自动发货(用于二级供应室灭菌完成后判断是否自动发货)
+		supplyRoomConfig.setIsSecondSupplyRoomAutoInvoice(rq.getParameter("isSecondSupplyRoomAutoInvoice"));
 		String afterRecyclingTousseDeliverStr = rq.getParameter("afterRecyclingTousseDeliver");
 		boolean afterRecyclingTousseDeliver = false;
 		if("是".equals(afterRecyclingTousseDeliverStr)){
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r13053 -r13258
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 13053)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 13258)
@@ -302,7 +302,8 @@
 		String result = "";
 		SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager
 				.getSupplyRoomConfigByOrgUnitCoding(orgUnitCode);
-		boolean isSupplyRoomUser = supplyRoomConfig != null
+		//判断该科室是否为一级供应室
+		boolean isFirstSupplyRoomUser = supplyRoomConfig != null
 				&& supplyRoomConfig.getSupplyRoomType() == SupplyRoomConfig.SUPPLYROOM_TYPE_1;
 		
 		Map<String, Integer> tousseMap = new HashMap<String, Integer>();
@@ -402,9 +403,13 @@
 				e.printStackTrace();
 				throw new RuntimeException(e.getMessage());
 			}
-			if (!isSupplyRoomUser) {
-				//二级供应室
-				generateInvoiceForSecondSupplyRoom(sterilizationRecord);
+			if (!isFirstSupplyRoomUser) {
+				SupplyRoomConfig supplyRoomConfigParams = supplyRoomConfigManager.getSystemParamsObj();
+				//判断如果配置二级供应室是否自动发货不为否才自动发货,否则不自动发货
+				if(!SupplyRoomConfig.RECYCLING_PACKING_NO.equals(supplyRoomConfigParams.getIsSecondSupplyRoomAutoInvoice())){
+					//二级供应室
+					generateInvoiceForSecondSupplyRoom(sterilizationRecord);
+				}
 			} else {
 				for (TousseInstance tousseInstance : allTousseInstancesOfSterile) {
 					// 二级供应室不需要库存，只有供应室的人登录系统才记录库存
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
===================================================================
diff -u -r12581 -r13258
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 12581)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 13258)
@@ -108,6 +108,7 @@
 	private Integer sequence;// 排序
 
 	private Boolean isSecondSupplyRoomNeedRecycle = false; // 二级供应室是否需要回收
+	private String isSecondSupplyRoomAutoInvoice = RECYCLING_PACKING_YES; // 二级供应室是否自动发货
 	private Boolean printUserFullName = true;//在装配打印的时候打印用户全名还是登录名，默认打印全名
 	
 	private String dptCodeOfForeignTousse;  //外来器械包的处理科室code
@@ -359,6 +360,15 @@
 		this.isSecondSupplyRoomNeedRecycle = isSecondSupplyRoomNeedRecycle;
 	}
 
+	public String getIsSecondSupplyRoomAutoInvoice() {
+		return isSecondSupplyRoomAutoInvoice;
+	}
+	
+	public void setIsSecondSupplyRoomAutoInvoice(
+			String isSecondSupplyRoomAutoInvoice) {
+		this.isSecondSupplyRoomAutoInvoice = isSecondSupplyRoomAutoInvoice;
+	}
+
 	public String getDptCodeOfForeignTousse() {
 		return dptCodeOfForeignTousse;
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r13007 -r13258
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 13007)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 13258)
@@ -851,6 +851,28 @@
                 		  columnWidth : .25,
                 		  items : [{
                 			  xtype : 'combo',
+								fieldLabel : '二级供应室是否自动发货',
+								id : 'isSecondSupplyRoomAutoInvoice',
+								name : 'isSecondSupplyRoomAutoInvoice',
+								valueField : 'name',
+								displayField : 'name',
+								mode : 'local',
+								anchor : '100%',
+								editable : false,
+								store : new Ext.data.SimpleStore( {
+									fields : [ 'name'],
+									data : [['否'],['是']]
+								}),
+								forceSelection : true,
+								allowBlank : false,
+								triggerAction : 'all'
+					       }]
+                	  },{
+                		  layout : 'form',
+                		  labelWidth : 180,
+                		  columnWidth : .25,
+                		  items : [{
+                			  xtype : 'combo',
 							  valueField : 'name',
 							  displayField : 'name',
 							  mode : 'local',
@@ -1613,6 +1635,13 @@
 				Ext.getCmp('isSecondSupplyRoomNeedRecycle').setValue('否');
 			}
 
+			//二级供应室是否自动发货
+			if(supplyRoomConfig.isSecondSupplyRoomAutoInvoice == '是'){
+				Ext.getCmp('isSecondSupplyRoomAutoInvoice').setValue('是');
+			}else{
+				Ext.getCmp('isSecondSupplyRoomAutoInvoice').setValue('否');
+			}
+
 			if(supplyRoomConfig.afterRecyclingTousseDeliver){
 				Ext.getCmp('afterRecyclingTousseDeliver').setValue('是');
 			}else{