Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/ForeignProxyDisinfectionManagerInvokerThread.java
===================================================================
diff -u -r12331 -r13856
--- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/ForeignProxyDisinfectionManagerInvokerThread.java	(.../ForeignProxyDisinfectionManagerInvokerThread.java)	(revision 12331)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/ForeignProxyDisinfectionManagerInvokerThread.java	(.../ForeignProxyDisinfectionManagerInvokerThread.java)	(revision 13856)
@@ -1,12 +1,12 @@
 package test.forgon.disinfectsystem.packing;
-import static org.testng.Assert.*;
-import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.LinkedList;
 import java.util.List;
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.sterilizationmanager.foreignproxydisinfection.service.ForeignProxyDisinfectionManager;
 import com.forgon.tools.hibernate.ObjectDao;
 
@@ -67,14 +67,14 @@
 				Session session = objectDao.openNewSession();
 				
 				Transaction tx = session.beginTransaction();
-				List<String[]> printParamList = new ArrayList<String[]>();
+				List<TousseInstance> tousseInstances = new LinkedList<TousseInstance>();
 				
 				for (int i = 1; i <= invokeCount; i++) {
 
 					foreignProxyDisinfectionManager
-							.createNewListTousseInstanceByParam(tousseName,
+							.createForeignProxyDisinfectionTousseInstances(tousseName,
 									packageType, sterilingType, count,
-									basketBarcode, validUntil,waringUntil,null,printParamList);
+									basketBarcode, validUntil,waringUntil,null,tousseInstances);
 				}
 				
 				session.flush();
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
===================================================================
diff -u -r12532 -r13856
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp	(.../invoicePlanExtractedView.jsp)	(revision 12532)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp	(.../invoicePlanExtractedView.jsp)	(revision 13856)
@@ -36,6 +36,7 @@
 %>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx}/js/common.js" /></script>
+<script type="text/javascript" src="${ctx}/js/json3.min.js"></script>
 <script type="text/javascript" src="${ctx}/js/extUtils.js" /></script>
 <script type="text/javascript" src="${ctx}/ext/example/examples.js" /></script>
 <script type="text/javascript" src="${ctx}/ext/grid/ForgonGrid.js"></script>
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java
===================================================================
diff -u -r13461 -r13856
--- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java	(.../PackingTableManagerTests.java)	(revision 13461)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java	(.../PackingTableManagerTests.java)	(revision 13856)
@@ -7,6 +7,7 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeoutException;
@@ -282,7 +283,7 @@
 						String basketBarcode = "018000001";
 						Calendar validUntil = Calendar.getInstance();
 						Calendar waringUntil = Calendar.getInstance();
-						List<String[]> printParamList = new ArrayList<String[]>();
+						List<TousseInstance> tousseInstances = new LinkedList<TousseInstance>();
 						
 						ForeignProxyItem item = new ForeignProxyItem();
 						
@@ -295,9 +296,9 @@
 						
 						try {
 							foreignProxyDisinfectionManager
-							.createNewListTousseInstanceByParam(tousseName,
+							.createForeignProxyDisinfectionTousseInstances(tousseName,
 									packageType, sterilingType, count,
-									basketBarcode, validUntil,waringUntil,item,printParamList);
+									basketBarcode, validUntil,waringUntil,item,tousseInstances);
 						} catch (Exception e) {
 							e.printStackTrace();
 						}
@@ -339,7 +340,7 @@
 						String basketBarcode = "018000001";
 						Calendar validUntil = Calendar.getInstance();
 						Calendar waringUntil = Calendar.getInstance();
-						List<String[]> printParamList = new ArrayList<String[]>();
+						List<TousseInstance> tousseInstances = new LinkedList<TousseInstance>();
 						
 						ForeignProxyItem item = new ForeignProxyItem();
 						
@@ -353,9 +354,9 @@
 						
 						try {
 							foreignProxyDisinfectionManager
-							.createNewListTousseInstanceByParam(tousseName,
+							.createForeignProxyDisinfectionTousseInstances(tousseName,
 									packageType, sterilingType, count,
-									basketBarcode, validUntil,waringUntil,item,printParamList);
+									basketBarcode, validUntil,waringUntil,item,tousseInstances);
 						} catch (Exception e) {
 							e.printStackTrace();
 						}
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r13673 -r13856
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 13673)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 13856)
@@ -262,6 +262,7 @@
     {name : 'storage'}, 
     {name : 'batchNumber'}, 
     {name : 'tousseType'}, 
+    {name : 'typeInfoOnScanned'},
     {name : 'sterilizerName'}, 
     {name : 'frequency'},
     {name : 'isTracable'},
@@ -333,6 +334,7 @@
 		storage : storageAmount,
 		batchNumber : goods.batchNumber,
 		tousseType : goods.tousseType,
+		typeInfoOnScanned : goods.typeInfoOnScanned,
 		sterilizerName : goods.sterilizerName,
 		frequency : goods.frequency,
 		isTracable : goods.isTracable,
@@ -1233,9 +1235,6 @@
 							return false;
 						}
 						getTousseGridData();
-						var tem = top.Ext.getCmp('sendOutGoodsStoreData').getValue();
-						getRecyclingapplicationStoreData();
-						var tem1 = top.Ext.getCmp('recyclingappStoreData').getValue();
 						form.form.submit( {
 							//url : WWWROOT + '/disinfectSystem/invoiceAction!saveDepartInvoice.do',
 							url : WWWROOT + '/disinfectSystem/invoiceAction!saveInvoiceByDepartOrInvoicePlanId.do',
@@ -1362,30 +1361,11 @@
 
 //获取扫描的物品
 function getTousseGridData() {
-	var	tousseIds = "";
+	var submitItems = [];
 	for ( var i = 0; i < sendOutGoodsStore.getCount(); i++) {
 		var record = sendOutGoodsStore.getAt(i);
-		if (tousseIds == null || tousseIds.length <= 0) {
-			tousseIds = record.get('barcode') + "#&" + record.get('count') + "#&" + record.get('diposable') + "#&" + record.get('name') + "#&" + record.get('price') + "#&" + record.get('batchNumber')+ "#&" + record.get('fluctuationPrice');
-		} else {
-			tousseIds = tousseIds + "#@" + record.get('barcode') + "#&" + record.get('count') + "#&" + record.get('diposable') + "#&" + record.get('name')+ "#&" + record.get('price') + "#&" + record.get('batchNumber')+ "#&" + record.get('fluctuationPrice');
-		}
+		record.data.sendAmount = record.data.count;
+		submitItems.push(record.data);
 	}
-	top.Ext.getCmp('sendOutGoodsStoreData').setValue(tousseIds);
-}
-
-//获取发货单明细数据
-function getRecyclingapplicationStoreData(){
-	var result = "";
-	for ( var i = 0; i < recyclingapplicationStore.getCount(); i++) {
-		var record = recyclingapplicationStore.getAt(i);
-		if(record.data['tempAmount'] > 0){
-		    if (result == null || result.length <= 0) {
-              result = record.get('name') + "#&" + record.get('tempAmount') + "#&" + record.get('diposable') + "#&" + record.get('applicationAmount');
-            } else {
-                result = result + "#@" + record.get('name') + "#&" + record.get('tempAmount') + "#&" + record.get('diposable') + "#&" + record.get('applicationAmount');
-            }
-		}
-	}
-	top.Ext.getCmp('recyclingappStoreData').setValue(result);
+	top.Ext.getCmp('sendOutGoodsStoreData').setValue(JSON.stringify(submitItems));
 }
\ No newline at end of file