Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r12664 -r13895
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 12664)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 13895)
@@ -75,6 +75,7 @@
 	columns.push(
 		{header : "器械包名称",width : 180,dataIndex : 'tousseDefinition.name',renderer : renderCallTousseInstanceInfoShowFun},
 		{header : "条码",width : 70,dataIndex : 'barcode'},
+		{header : "标识牌条码",width : 70,dataIndex : 'idCardInstanceBarcode'},
 		{header : "状态",width : 50,dataIndex : 'status'},
 		{header : "位置",width : 80,dataIndex : 'locationForDisplay'},
 		{header : "所属仓库",width : 80,dataIndex : 'wareHouseName'},
@@ -105,6 +106,7 @@
 	    {name : 'showTousseName'},
 	    {name : 'tousseDefinition.name'},
 	    {name : 'barcode'},
+	    {name : 'idCardInstanceBarcode'},
 	    {name : 'operator'},
 	    {name : 'operationTime'},
 	    {name : 'status'},
@@ -137,6 +139,7 @@
 		filters : [
 		    {type : 'string',dataIndex : 'tousseDefinition.name'},
 		    {type : 'string',dataIndex : 'barcode'},
+		    {type : 'string',dataIndex : 'idCardInstanceBarcode'},
 		    {type : 'string',dataIndex : 'operator'},
 		    {type : 'date',dataIndex : 'operationTime'},
 		    {type : 'list',dataIndex : 'status',options : [statusPacked, statusReviewed, statusSterileding,statusSteriled, statusShipped,statusSigned, statusUsed, statusDiscard],phpMode : true},
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r13892 -r13895
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 13892)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 13895)
@@ -1216,21 +1216,25 @@
 				}]
 			});
 
-	Ext.Ajax.request({
-		url : WWWROOT + '/disinfectSystem/invoicePlanAction!loadDepartApplicationInfo.do',
-		params : {orgUnitCoding : orgUnitCoding},
-		success : function(response, options) {
-			var result = Ext.decode(response.responseText);
-			var remark = result.remark;
-			top.Ext.getCmp('remark2').setValue(remark);
-			var cookieSender = Ext.state.Manager.getProvider().get('cookieSender');
-			if(cookieSender){
-				top.Ext.getCmp('sender').setValue(cookieSender);
-			}
-		},
-		failure : function(form, action) {
-		}
-	});
+//	Ext.Ajax.request({
+//		url : WWWROOT + '/disinfectSystem/invoicePlanAction!loadDepartApplicationInfo.do',
+//		params : {orgUnitCoding : orgUnitCoding},
+//		success : function(response, options) {
+//			var result = Ext.decode(response.responseText);
+//			var remark = result.remark;
+//			top.Ext.getCmp('remark2').setValue(remark);
+//			var cookieSender = Ext.state.Manager.getProvider().get('cookieSender');
+//			if(cookieSender){
+//				top.Ext.getCmp('sender').setValue(cookieSender);
+//			}
+//		},
+//		failure : function(form, action) {
+//		}
+//	});
+	var cookieSender = Ext.state.Manager.getProvider().get('cookieSender');
+	if(cookieSender){
+		top.Ext.getCmp('sender').setValue(cookieSender);
+	}
 
 	var window = new top.Ext.Window( {
 		id : 'recyclingApplicationWin',
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.2.1_4.2.2.sql
===================================================================
diff -u
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.2.1_4.2.2.sql	(revision 0)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.2.1_4.2.2.sql	(revision 13895)
@@ -0,0 +1 @@
+update TousseInstance set idCardInstanceBarcode=(select barcode from barcodeDevice where id=TousseInstance.idCardInstanceID) where idCardInstanceID is not null and idCardInstanceBarcode is null;
\ No newline at end of file
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r13807 -r13895
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 13807)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 13895)
@@ -2929,6 +2929,7 @@
 			throw new RuntimeException("标识牌已被删除!");
 		}
 		tousseInstance.setIdCardInstanceID(idCardInstance.getId());
+		tousseInstance.setIdCardInstanceBarcode(idCardInstance.getBarcode());
 		
 		Long useAmount = idCardInstance.getUseAmount();
 		if (useAmount != null){
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r13855 -r13895
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 13855)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 13895)
@@ -156,7 +156,9 @@
 	// 二级供应室代理灭菌
 	private Long proxyDisinfection_id;
 	
-	private Long idCardInstanceID;
+	private Long idCardInstanceID;// 标识牌id
+	
+	private String idCardInstanceBarcode;// 标识牌条码
 
 	// 统计数量，如果该器械包按包统计则为1，如果按材料统计则将材料数量加起来
 	private Integer statisticsAmount;
@@ -584,6 +586,14 @@
 		this.idCardInstanceID = idCardInstanceID;
 	}
 
+	public String getIdCardInstanceBarcode() {
+		return idCardInstanceBarcode;
+	}
+
+	public void setIdCardInstanceBarcode(String idCardInstanceBarcode) {
+		this.idCardInstanceBarcode = idCardInstanceBarcode;
+	}
+
 	public Integer getStatisticsAmount() {
 		return statisticsAmount;
 	}