Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r20466 -r20468
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 20466)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 20468)
@@ -2319,7 +2319,7 @@
  	var department = taskNode.get("department");
  	var urgentAmount = taskNode.get("urgentAmount");
 	// 装配
-    packed = packingTousse(false,basketBarcode,taskId,tousseName,tousseType,1,packageType,sterilingType,supplierName,department,urgentAmount);
+    packed = packingTousse(false,basketBarcode,basketBarcode,taskId,tousseName,tousseType,1,packageType,sterilingType,supplierName,department,urgentAmount);
     if(packed){
     	addTaskItemsToDelete(tousseItemsToDelete,tousseName,taskId,1);
     	Ext4.getCmp('remark').setValue();
@@ -2585,6 +2585,7 @@
              basketItem.taskItems = taskItemArray;
              
              var taskIdArray = [];
+             var scannedBasketBarcodes = [];
              var basketBarcode;
              var tousseName;
              var tousseType;
@@ -2641,6 +2642,7 @@
                     
                     if(packingAmount > 0){
                     	taskIdArray.push(taskId);
+                    	scannedBasketBarcodes.push(basketBarcode);
                     	packingAmount -= amount;
                     	basketItem.amount += amount;
                     	basketItem.packed = true;
@@ -2656,7 +2658,7 @@
 				 return;
 			 }
 			 //请求后台装配方法
-			 packingTousse(false,basketBarcode,taskIdArray.join(";"),tousseName,tousseType,pNode.get('amount'),packageType,sterilingType,supplierName,departmentArray.join(";"),pNode.get('urgentAmount'));
+			 packingTousse(false,basketBarcode,scannedBasketBarcodes.join(";"),taskIdArray.join(";"),tousseName,tousseType,pNode.get('amount'),packageType,sterilingType,supplierName,departmentArray.join(";"),pNode.get('urgentAmount'));
 		});
 		// 一次打印
 		printLabelsAfterPacking();
@@ -2736,7 +2738,7 @@
                     }
        			});
        			
-       			packingTousse(false,'',taskIdArray.join(";"),tousseName,tousseType,pNode.get('amount'),packageType,sterilingType,supplierName,departmentArray.join(";"),urgentAmount);
+       			packingTousse(false,'','',taskIdArray.join(";"),tousseName,tousseType,pNode.get('amount'),packageType,sterilingType,supplierName,departmentArray.join(";"),urgentAmount);
        		
        		});
        		// 一次打印
@@ -2764,7 +2766,7 @@
      onPackingTousseBtnClickComplete();
 }
 // 装配器械包
-function packingTousse(printImmediately,basketBarcode,taskIds,tousseName,tousseType,packAmount,packageType,sterilingType,supplierName,department,urgentAmount){
+function packingTousse(printImmediately,basketBarcode,scannedBasketBarcodes,taskIds,tousseName,tousseType,packAmount,packageType,sterilingType,supplierName,department,urgentAmount){
 	if(!validateFormParamsForPack()){
 		return false;
 	}
@@ -2840,6 +2842,7 @@
     		taskGroup: taskGroup,
     		splitPackage: null,
 			basketBarcode: basketBarcode,
+			scannedBasketBarcodes:scannedBasketBarcodes,
 			idCardInstanceID: idCardInstanceID,
 			idCardDefinitionId: idCardInfo==null?'':idCardInfo.idCardDefinition.id,
 			sterilizer: sterilizer,