Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r22092 -r22173
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 22092)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 22173)
@@ -146,6 +146,7 @@
 	 * 有资产归属、回收科室、无三个选择可选,对应之前的是否打印科室字段是和否
 	 */
 	private String ftPrintOrgSource = TousseDefinition.PRINGORGSOURCE_NONE;
+	private String ftPrintAmountSource = TousseDefinition.PRINTAMOUNTSOURCE_ALL_FOREIGNTOUSSE;
 
 	/**
 	 * 打印份数，默认为1
@@ -872,6 +873,8 @@
 		
 		supplyRoomConfig.setFtPrintAmount(ftPrintAmount);
 		supplyRoomConfig.setFtPrintOrgSource(ftPrintOrgSource);
+		supplyRoomConfig.setFtPrintAmountSource(ftPrintAmountSource);
+		
 		//外来器械默认申请科室
 		String ftApplyDepartment = rq.getParameter("ftApplyDepartment");
 		String ftApplyDepartmentCode = rq.getParameter("ftApplyDepartmentCode");
@@ -1707,5 +1710,9 @@
 	public void setFtPrintAmount(Integer ftPrintAmount) {
 		this.ftPrintAmount = ftPrintAmount;
 	}
+
+	public void setFtPrintAmountSource(String ftPrintAmountSource) {
+		this.ftPrintAmountSource = ftPrintAmountSource;
+	}
 	
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
===================================================================
diff -u -r22092 -r22173
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 22092)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 22173)
@@ -84,6 +84,10 @@
 	 * 有资产归属、回收科室、无三个选择可选,对应之前的是否打印科室字段是和否
 	 */
 	private String ftPrintOrgSource = TousseDefinition.PRINGORGSOURCE_NONE;
+	/**
+	 * 打印份数来源(目前只有外来器械用到)
+	 */
+	private String ftPrintAmountSource = TousseDefinition.PRINTAMOUNTSOURCE_ALL_FOREIGNTOUSSE;
 
 	/**
 	 * 打印份数，默认为1
@@ -265,6 +269,18 @@
 		this.ftPrintAmount = ftPrintAmount;
 	}
 
+	public String getFtPrintAmountSource() {
+		return ftPrintAmountSource;
+	}
+
+	public void setFtPrintAmountSource(String ftPrintAmountSource) {
+		if(ftPrintAmountSource == null){
+			this.ftPrintAmountSource = TousseDefinition.PRINTAMOUNTSOURCE_ALL_FOREIGNTOUSSE;
+		}else{
+			this.ftPrintAmountSource = ftPrintAmountSource;
+		}
+	}
+
 	public boolean isPrintUserFullName() {
 		return printUserFullName;
 	}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r22112 -r22173
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 22112)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 22173)
@@ -571,6 +571,7 @@
 				ancestorTD.setBarcodePaperType(barcodePaperType);
 				ancestorTD.setPrintAmount(config.getFtPrintAmount());
 				ancestorTD.setPrintOrgSource(config.getFtPrintOrgSource());
+				ancestorTD.setPrintAmountSource(config.getFtPrintAmountSource());
 			}
 			tousseDefinition.setAncestorID(ancestorTD.getId());
 			tousseDefinition.setBarcodePaperType(ancestorTD.getBarcodePaperType());
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r21975 -r22173
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 21975)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 22173)
@@ -3950,6 +3950,7 @@
 		newTousseDefinition.setBarcodePaperType(td.getBarcodePaperType());
 		newTousseDefinition.setPrintAmount(td.getPrintAmount());
 		newTousseDefinition.setPrintAmountSource(td.getPrintAmountSource());
+		newTousseDefinition.setPrintOrgSource(td.getPrintOrgSource());
 		newTousseDefinition.setParentID(td.getId());
 		newTousseDefinition.setIncludeImplant(includeImplantFlag);
 		newTousseDefinition.setInvoicePlanID(td.getInvoicePlanID());
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r22092 -r22173
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 22092)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 22173)
@@ -1317,6 +1317,7 @@
 		    		    	  layout : 'form',
 		    		    	  columnWidth : .25,
 		    				  labelWidth : 180,
+		    				  labelAlign:"right",
 		    		    	  items:[{
 		    		    		  xtype : 'numberfield',
 		    		    		  fieldLabel : "打印份数",
@@ -1327,7 +1328,30 @@
 		    		    		  id : 'ftPrintAmount',
 		    		    		  anchor : '100%'
 		    		    	  }]
-		    		      }
+		    		      },{
+					    	  columnWidth : .25,
+					    	  layout : 'form',
+					    	  labelWidth : 180,
+					    	  labelAlign:"right",
+					    	  items:[{
+					    		  xtype : 'combo',
+					    		  fieldLabel : '打印份数来源',
+					    		  id : 'ftPrintAmountSource',
+					    		  name : 'ftPrintAmountSource',
+					    		  editable:false,
+					    		  valueField : 'value',
+					    		  displayField : 'value',
+					    		  store : new Ext.data.SimpleStore({
+									fields : [ 'value'],
+									data : [['全部外来器械包'],['工具材料'],['植入物材料']]
+					    		  }),
+					    		  value : '全部外来器械包',
+					    		  forceSelection : true,
+					    		  mode : 'local',
+					    		  triggerAction : 'all',
+					    		  anchor : '100%'
+					    	  }]
+					      }
 		             	  
 					]
                 },
@@ -2555,7 +2579,7 @@
             		
             		var ftPrintOrgSource = Ext.getCmp("ftPrintOrgSource").getValue();
             		var ftPrintAmount = Ext.getCmp("ftPrintAmount").getValue();
-            		
+            		var ftPrintAmountSource = Ext.getCmp("ftPrintAmountSource").getValue();
             		//外来器械默认申请科室
             		var ftApplyDepartment = '';
             		var ftApplyDepartmentCode = '';
@@ -2619,6 +2643,7 @@
 	                    	ftDefaultSterilingMethod:ftDefaultSterilingMethod,//
 	                    	ftPrintOrgSource:ftPrintOrgSource,
 	                    	ftPrintAmount:ftPrintAmount,
+	                    	ftPrintAmountSource: ftPrintAmountSource,
 	                    	ftApplyDepartment:ftApplyDepartment,//
 	                    	ftApplyDepartmentCode:ftApplyDepartmentCode,//
 	                    	ftDefaultPackageType:ftDefaultPackageType,//
@@ -2849,6 +2874,8 @@
 			Ext.getCmp('foreignTousseNeedReview').setValue(supplyRoomConfig.foreignTousseNeedReview);
 			Ext.getCmp('ftPrintOrgSource').setValue(supplyRoomConfig.ftPrintOrgSource);
 			Ext.getCmp('ftPrintAmount').setValue(supplyRoomConfig.ftPrintAmount);
+			Ext.getCmp('ftPrintAmountSource').setValue(supplyRoomConfig.ftPrintAmountSource);
+			
   		}
   });