Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r20462 -r20468
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 20462)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 20468)
@@ -3338,7 +3338,7 @@
 		String taskGroup = JSONUtil.optString(paramsObj, "taskGroup", null);
 		String splitPackages = JSONUtil.optString(paramsObj, "splitPackage", null);
 		String basketBarcode = JSONUtil.optString(paramsObj, "basketBarcode", null);
-		String scannedBasketBarcodes = JSONUtil.optString(paramsObj, "basketBarcode", null);
+		String scannedBasketBarcodes = JSONUtil.optString(paramsObj, "scannedBasketBarcodes", null);
 		String idCardDefinitionId = JSONUtil.optString(paramsObj, "idCardDefinitionId", null);
 		String idCardInstanceID = JSONUtil.optString(paramsObj, "idCardInstanceID", null);
 		String sterilizerName = JSONUtil.optString(paramsObj, "sterilizer", null);
@@ -3702,6 +3702,7 @@
 					// TODO：需确认产生的装配记录信息是否准确？
 	
 					splits = JSONArray.fromObject(splitPackages);
+					splitPackages = null;//之后不会再用了，防止下次装配任务的时候，受影响，又重复装配了同一个外来器械包
 	
 					currentPackAmount = splits.size();  //拆包的数量
 					if(currentPackAmount == 0){
@@ -3915,7 +3916,7 @@
 						
 					}
 					//更新清洗明细记录及修改删除对应的装配任务
-					updatePackingTask(currentPackingTaskAsList, packingAmountForThisTask , tousseName,basketBarcode);
+					updatePackingTask(currentPackingTaskAsList, packingAmountForThisTask , tousseName);
 					
 					//判断如果配置二级供应室是否自动发货不为否才自动发货,否则不自动发货
 					if(supplyRoomConfig.getSupplyRoomType() == SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM 
@@ -4543,7 +4544,7 @@
 	 * @param tousseName 器械包名称
 	 * @param basketBarcode 清洗篮筐条码
 	 */
-	private void updatePackingTask(List<PackingTask> packingTaskList, Integer currentPackAmount , String tousseName,String basketBarcode){
+	private void updatePackingTask(List<PackingTask> packingTaskList, Integer currentPackAmount , String tousseName){
 		int leftAmount = currentPackAmount;
 		boolean allowForeignToussePartiallyPacking = CssdUtils.getSystemSetConfigByNameBool("allowForeignToussePartiallyPacking");
 		
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,