Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java
===================================================================
diff -u -r14407 -r14726
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java	(.../ForeignTousseApplication.java)	(revision 14407)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java	(.../ForeignTousseApplication.java)	(revision 14726)
@@ -2,13 +2,10 @@
 
 import java.util.Date;
 import java.util.List;
-
 import javax.persistence.Entity;
 import javax.persistence.Transient;
-
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
-
 import com.forgon.Constants;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
@@ -54,6 +51,8 @@
 	
 	private String tousseName;//外来器械包名称
 	
+	private String supplierName;//供应商
+	
 	//处理方式，用于灭菌价格的参考，一般有（普通、加急、夜班集中处理方式）
 	private String processType;
 
@@ -374,5 +373,13 @@
 	public void setTousseName(String tousseName) {
 		this.tousseName = tousseName;
 	}
+
+	public String getSupplierName() {
+		return supplierName;
+	}
+
+	public void setSupplierName(String supplierName) {
+		this.supplierName = supplierName;
+	}
 	
 }
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.3.2_4.3.3.sql
===================================================================
diff -u -r14724 -r14726
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.3.2_4.3.3.sql	(.../4.3.2_4.3.3.sql)	(revision 14724)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.3.2_4.3.3.sql	(.../4.3.2_4.3.3.sql)	(revision 14726)
@@ -1 +1,2 @@
-update MaterialEntry set totalprice = (select sum(cost*amount) from MaterialEntryItem where materialEntry_id=MaterialEntry.id) where totalPrice is null;
\ No newline at end of file
+update MaterialEntry set totalprice = (select sum(cost*amount) from MaterialEntryItem where materialEntry_id=MaterialEntry.id) where totalPrice is null;
+update foreigntousseapplication  set suppliername = (select min(i.suppliername) from invoiceplan p,tousseitem i where p.id = i.recyclingapplication_id and foreigntousseapplication.id = p.id);
\ No newline at end of file
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r14715 -r14726
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 14715)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 14726)
@@ -410,6 +410,7 @@
 				tousseItem.setIsRecycling("是");
 				foreignTousseItems.add(tousseItem);
 				foreignTousseApplication.setTousseName(tousseItem.getTousseName());
+				foreignTousseApplication.setSupplierName(tousseItem.getSupplierName());
 			}
 		}
 		//为外来器械申请单设置科室查看权限
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
===================================================================
diff -u -r14143 -r14726
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java	(.../ForeignTousseApplicationTableManager.java)	(revision 14143)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java	(.../ForeignTousseApplicationTableManager.java)	(revision 14726)
@@ -2,11 +2,8 @@
 
 import java.util.List;
 import java.util.Map;
-
 import net.sf.json.JSONObject;
-
 import org.apache.commons.lang.StringUtils;
-
 import com.forgon.component.grid.GridManager;
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
@@ -15,7 +12,6 @@
 import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.foreigntousseapplication.service.ForeignTousseApplicationManager;
-import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
 import com.forgon.tools.db.DatabaseUtil;
 
@@ -32,20 +28,13 @@
 
 	private TousseInstanceManager tousseInstanceManager;
 
-	private TousseDefinitionManager tousseDefinitionManager;
-	
 	private SupplyRoomConfigManager supplyRoomConfigManager;
 	
 	public void setSupplyRoomConfigManager(
 			SupplyRoomConfigManager supplyRoomConfigManager) {
 		this.supplyRoomConfigManager = supplyRoomConfigManager;
 	}
 
-	public void setTousseDefinitionManager(
-			TousseDefinitionManager tousseDefinitionManager) {
-		this.tousseDefinitionManager = tousseDefinitionManager;
-	}
-
 	public void setTousseInstanceManager(
 			TousseInstanceManager tousseInstanceManager) {
 		this.tousseInstanceManager = tousseInstanceManager;
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r14407 -r14726
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 14407)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 14726)
@@ -94,8 +94,9 @@
 	    {header : "住院号",width : 70,dataIndex : 'hospitalNumber'},
 	    {header : "病人姓名",width : 60,dataIndex : 'patient'},
 	    {header : "医生",width : 60,dataIndex : 'doctor'},
-	    {header : "外来器械包名称",width : 150,dataIndex : 'tousseName'}, 
-	    {header : "手术名称",width : 120,dataIndex : 'surgery'}, 
+	    {header : "外来器械包名称",width : 150,dataIndex : 'tousseName'},
+	    {header : "供应商",width : 150,dataIndex : 'supplierName'}, 
+	    {header : "手术名称",width : 150,dataIndex : 'surgery'}, 
 	    {header : "包状态",width : 50,dataIndex : 'packageStatus',renderer:renderColor}, 
 	    {header : "回收状态",width : 60,dataIndex : 'recyclingStatus',renderer:renderColor},
 	    {header : "发货状态",width : 60,dataIndex : 'deliverStatus',renderer:renderColor},
@@ -126,6 +127,7 @@
 	     {name : 'patient'},
 	     {name : 'doctor'},
 	     {name : 'tousseName'},
+	     {name : 'supplierName'},
 	     {name : 'surgery'},
 	     {name : 'receiveMan'},
 	     {name : 'receiveTime'},
@@ -146,6 +148,7 @@
 			{type: 'string',  dataIndex: 'hospitalNumber'},
 			{type: 'string',  dataIndex: 'patient'},
 			{type: 'string',  dataIndex: 'tousseName'},
+			{type: 'string',  dataIndex: 'supplierName'},
 			{type: 'string',  dataIndex: 'doctor'},
 			{type: 'string',  dataIndex: 'surgery'},
 			{type: 'string',  dataIndex: 'receiveMan'},