Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
===================================================================
diff -u -r19527 -r19603
--- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 19527)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 19603)
@@ -257,7 +257,7 @@
      barcodeField.setValue("");
 }
 
-function splitForeignTousse(packTaskId,foreignTousseName,showName,applicationid,thizAmount,supplierName,basketBarcode,packageType,sterilingType){
+function splitForeignTousse(packTaskId,foreignTousseName,showName,invoicePlanId,thizAmount,supplierName,basketBarcode,packageType,sterilingType){
 	
 	top.Ext4.define('cellEditingGrid',{
 	    extend: 'top.Ext4.grid.Panel',
@@ -740,7 +740,43 @@
     		margin :'5 0 0 0',
     		allowBlank : true,
     		anchor : '90%'
-    	}],
+    	},{
+            xtype : 'textfield',
+            columnWidth : .33,
+            labelWidth : 70,
+            fieldLabel : "所属病人",
+            name : "patient2",
+            id : "patient2",
+            labelAlign:'right',
+            margin :'5 0 0 0',
+            allowBlank : true,
+            anchor : '80%',
+            readOnly: true
+        },{
+            xtype : 'textfield',
+            columnWidth : .33,
+            labelWidth : 70,
+            fieldLabel : "供应商",
+            name : "supplierName2",
+            id : "supplierName2",
+            labelAlign:'right',
+            margin :'5 0 0 0',
+            allowBlank : true,
+            anchor : '80%',
+            readOnly: true
+        },{
+            xtype : 'textfield',
+            columnWidth : .33,
+            labelWidth : 70,
+            fieldLabel : "住院号",
+            name : "hospitalNumber2",
+            id : "hospitalNumber2",
+            labelAlign:'right',
+            margin :'5 0 0 0',
+            allowBlank : true,
+            anchor : '80%',
+            readOnly: true
+        }],
         buttons : [{
             text : packingBtnText,
             handler : function() {
@@ -912,7 +948,7 @@
 		layout : 'border',
         items : [{
             region : 'north',
-            height : 130,
+            height : 150,
             layout : 'fit',
             items : [foreignToussePanel]
         }, {
@@ -992,4 +1028,16 @@
     	reviewerBarcode2.disable();
     	reviewerBarcode2.hide();
     }
+    // 加载外来器械信息
+    DWREngine.setAsync(false);
+    ForeignTousseApplicationTableManager.findForeignTousseApplication(invoicePlanId,function(result){
+        if(result != null && result.length > 0){
+            var foreignTousseAppInfo = JSON.parse(result);
+            top.Ext4.getCmp("patient2").setValue(foreignTousseAppInfo.patient);
+            top.Ext4.getCmp("supplierName2").setValue(foreignTousseAppInfo.supplierName);
+            top.Ext4.getCmp("hospitalNumber2").setValue(foreignTousseAppInfo.hospitalNumber);
+            
+        }
+    });
+    DWREngine.setAsync(true);
 }
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
===================================================================
diff -u -r19570 -r19603
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java	(.../WaitPackingTaskItemVo.java)	(revision 19570)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java	(.../WaitPackingTaskItemVo.java)	(revision 19603)
@@ -19,6 +19,8 @@
 	
 	private Long tousseID;
 	
+	private Long invoicePlanId;
+	
 	private String text;
 	
 	private String cls;
@@ -134,6 +136,14 @@
 		this.tousseID = tousseID;
 	}
 
+	public Long getInvoicePlanId() {
+		return invoicePlanId;
+	}
+
+	public void setInvoicePlanId(Long invoicePlanId) {
+		this.invoicePlanId = invoicePlanId;
+	}
+
 	public String getDateTime() {
 		return dateTime;
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r19570 -r19603
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 19570)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 19603)
@@ -350,6 +350,7 @@
 	{name : 'taskId'},
 	{name : 'tousseName'},
 	{name : 'tousseID'},
+	{name : 'invoicePlanId'},
 	{name : 'unPackingAmount'},
 	{name : 'amount'},
 	{name : 'urgentAmount'},
@@ -489,10 +490,10 @@
 			            var amount = record.get('amount');
 			            var basketBarcode = record.get('basketBarcode');
 			            var showName = tousseName;
-			            var applicationid = record.get('applicationID');
+			            var invoicePlanId = record.get('invoicePlanId');
 			            var packageType = record.get('packageType');
 			            var sterilingMethod = record.get('sterilingMethod');
-			            str += "<input type='button' style='height:20px; width:40px;' value='拆包' onclick=\"splitForeignTousse(" + taskid + ",'" + tousseName+ "','"+showName+ "','"+applicationid + "','"+amount+"','"+supplierName+"','"+basketBarcode+"','"+packageType+"','"+sterilingMethod+"') \">";
+			            str += "<input type='button' style='height:20px; width:40px;' value='拆包' onclick=\"splitForeignTousse(" + taskid + ",'" + tousseName+ "','"+showName+ "','"+invoicePlanId + "','"+amount+"','"+supplierName+"','"+basketBarcode+"','"+packageType+"','"+sterilingMethod+"') \">";
 			        }
 				}
 		        return str;
@@ -1771,7 +1772,7 @@
 //赋值给全局变量
 onErrorDamageBtnClick = errorDamageBtnClick;
 
-function addTaskNode(taskId,td_id,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
+function addTaskNode(taskId,td_id,invoicePlanId,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
 		taskStatus,department,tousseType, packageType, 
 		sterilingMethod,recyclingTime,isTraceable,isPrint,isReview,errors,
 		damages,replenishMaterils,taskType,supplierName,haveIDCard,urgentAmount,idCardBarcode,
@@ -1783,6 +1784,7 @@
 	var node = Ext4.create('cModel',{
 		taskId : taskId,
 		tousseID : td_id,
+		invoicePlanId : invoicePlanId,
 		tousseName : tousseName,
 		amount : amount,
 		urgentAmount : urgentAmount,
@@ -3117,6 +3119,7 @@
 									var haveIDCard = taskVO.haveIDCard;
 									var errorRemark = taskVO.errorRemark;
 									var damageRemark = taskVO.damageRemark;
+									
 									var parentNode = null;
 									rootNode.cascade(function(n) {
 										if(!n.get('leaf') && n.get('tousseName') == tousseName){
@@ -3129,7 +3132,7 @@
 										if(n == 0){
 											checked = true;
 										}
-										parentNode = addTaskNode('',td_id,videoNames,tousseName,0,'','','',
+										parentNode = addTaskNode('',td_id,'',videoNames,tousseName,0,'','','',
 												'','',tousseType, packageType, 
 												sterilingMethod,'',isTraceable,isPrint,isReview,'','',rMaterils,'','',haveIDCard,urgentAmount,
 												taskVO.idCardBarcode,taskVO.allowModifyPackageType,taskVO.errorRemark,taskVO.damageRemark,taskVO.urgentLevel,'','');
@@ -3159,6 +3162,7 @@
 									for (var j = 0; j < cLength; j++) {
 										var task = taskVO.children[j];
 										var taskId = task.taskId;
+										var invoicePlanId = task.invoicePlanId;
 										var tousseName = task.tousseName;
 										var amount = task.amount;
 										var childUrgentAmount = task.urgentAmount;
@@ -3191,7 +3195,7 @@
 											}
 			            				}
 										if(sigle){
-											var childNode =	addTaskNode(taskId,td_id,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
+											var childNode =	addTaskNode(taskId,td_id,invoicePlanId,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
 													taskStatus,department,tousseType, packageType,sterilingMethod,dateTime,isTraceable,isPrint,isReview,
 													errors,damages,replenishMaterils,taskType,supplierName,task.haveIDCard,childUrgentAmount,task.idCardBarcode,
 													task.allowModifyPackageType,task.errorRemark,task.damageRemark,task.urgentLevel,task.serialNumber,task.recyclingItemRemark);
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r19470 -r19603
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 19470)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 19603)
@@ -218,6 +218,7 @@
 		obj.put("toolsAmount", toolsAmount);
 		obj.put("patientArea", patientArea);
 		obj.put("bedNumber", bedNumber);
+		obj.put("supplierName", StringTools.defaultString(app.getSupplierName()));
 		
 		
 		String queryString = "select count(*) from TousseInstance po where po.foreignTousseApp_id = :id";
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java
===================================================================
diff -u -r18137 -r19603
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java	(.../WaitPackingTaskVo.java)	(revision 18137)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java	(.../WaitPackingTaskVo.java)	(revision 19603)
@@ -21,6 +21,8 @@
 	
 	private Long tousseID;
 	
+	private Long invoicePlanId;
+	
 	private Integer unPackingAmount;//未装配数量
 	
 	private Integer amount;//可修改数量
@@ -99,6 +101,14 @@
 		this.tousseID = tousseID;
 	}
 
+	public Long getInvoicePlanId() {
+		return invoicePlanId;
+	}
+
+	public void setInvoicePlanId(Long invoicePlanId) {
+		this.invoicePlanId = invoicePlanId;
+	}
+
 	public String getIsTraceable() {
 		return isTraceable;
 	}
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r19592 -r19603
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 19592)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 19603)
@@ -1338,6 +1338,7 @@
 				}
 				String tousseName = td.getName();
 				Long tousseID = td.getId();
+				Long invoicePlanId = td.getInvoicePlanID();
 				boolean haveIDCard = tousseDefinitionManager.isThereIDCard(td);
 				boolean isTimeout = timeoutManager.isTimeouted(task.getWashTime(), timeoutSetting);
 				WaitPackingTaskItemVo itemVo = new WaitPackingTaskItemVo();
@@ -1379,6 +1380,7 @@
 				itemVo.setIsUploadVideo(td.getIsUploadVideo());
 				itemVo.setTousseName(tousseName);
 				itemVo.setTousseID(tousseID);
+				itemVo.setInvoicePlanId(invoicePlanId);
 				itemVo.setIdCardBarcode(task.getIdCardBarcode());
 				String nodeText = tousseName;					
 				itemVo.setText(nodeText);
@@ -1403,6 +1405,7 @@
 					vo.setIsReview(td.getIsReview());
 					vo.setTousseName(tousseName);
 					vo.setTousseID(tousseID);
+					vo.setInvoicePlanId(invoicePlanId);
 					
 					vo.setTaskType(task.getTaskType());
 					vo.setUuid_vedioNames(td.getUuid_vedioNames());
@@ -1587,7 +1590,7 @@
 	private List<Object[]> findPackingTaskFromCssdHandleToussesConfig(String taskGroup,String basketBarcode,SupplyRoomConfig config) {
 		String orgCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
 		String sql = "select po.recyclingItemRemark,po.serialNumber,po.urgentLevel,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,idCardBarcode,"
-				+ "td.id as tousseDefinitionId,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
+				+ "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
 				+ "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,hidePackingTask from PackingTask po , CssdHandleTousses ct , TousseDefinition td "
 				+ "where po.tousseDefinition_id = td.id and ct.tousseDefinitionId=td.ancestorID and po.orgUnitCoding = ct.orgUnitCode "
 				+ "and ct.taskGroup = '"+taskGroup+"' and po.orgUnitCoding = '" + orgCode + "' and po.unPackAmount > 0 ";
@@ -1631,7 +1634,7 @@
 	private List<Object[]> findForeignToussePackingTask(String basketBarcode) {
 		String orgCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
 		String sql = "select po.recyclingItemRemark,po.serialNumber,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,idCardBarcode,"
-				+ "td.id as tousseDefinitionId,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
+				+ "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
 				+ "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,urgentLevel,hidePackingTask from PackingTask po , TousseDefinition td "
 				+ "where po.tousseDefinition_id = td.id "
 				+ " and (td.tousseType='"+TousseDefinition.PACKAGE_TYPE_FOREIGN + "' or td.tousseType='" + TousseDefinition.PACKAGE_TYPE_SPLIT + "')"
@@ -1663,7 +1666,7 @@
 		List<Object[]> queryResult = new ArrayList<Object[]>();
 		String orgCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
 		String sql = "select po.recyclingItemRemark,po.serialNumber, po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,idCardBarcode,"
-				+ "td.id as tousseDefinitionId,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
+				+ "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
 				+ "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,urgentLevel,hidePackingTask from PackingTask po , TousseDefinition td "
 				+ "where po.tousseDefinition_id = td.id and td.tousseType='"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"' and po.orgUnitCoding = '" + orgCode + "'";
 		if(StringUtils.isNotBlank(basketBarcode)){
@@ -1721,6 +1724,8 @@
 				TousseDefinition td = new TousseDefinition();
 				BigDecimal tousseDefinitionIdBigDecimal = (BigDecimal)rs.getObject("tousseDefinitionId");
 				td.setId(tousseDefinitionIdBigDecimal == null ? null : tousseDefinitionIdBigDecimal.longValue());
+				BigDecimal invoicePlanID = (BigDecimal)rs.getObject("invoicePlanID");
+				td.setInvoicePlanID(invoicePlanID == null ? null : invoicePlanID.longValue());
 				td.setName(rs.getString("name"));
 				td.setAllowModifyPackageType(rs.getString("allowModifyPackageType"));
 				td.setIsDisableIDCard(rs.getString("isDisableIDCard"));