Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r12626 -r12684
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 12626)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 12684)
@@ -1418,16 +1418,16 @@
 		                     	departmentArray.push(department);
 		                     	
 		                     	if(status == '待确认'){
-		        					showResult(tousseName+",有器械丢失，请先确认！");
+		        					showResult(tousseName+",有器械丢失，请确认！");
 		        					return;
 		        				}
 		                     	
 		                     	if(errors != null && errors.length > 0){
-		                            showResult("材料缺失，不够组成器械包，请先补充缺失器械！");
+		                     		showResult("材料缺失，不够组成器械包，请补充缺失器械！");
 		                            return;
 		                        }
 		                        if(damages != null && damages.length > 0){
-		                            showResult("材料已报损，不够组成器械包，请先补充报损器械！");
+		                        	showResult("材料已报损，不够组成器械包，请补充报损器械！");
 		                            return;
 		                        }
 		                        
@@ -1444,11 +1444,11 @@
 						 });
 						 if(packingAmount > 0){
 							 showResult(tousseName + "需装配数量已超过该器械包所有装配任务数量之和.");
-							 delBasketItems = [];
+							 delBasketItems.splice(dl,1);//删除
 							 return;
 						 }
 						 //请求后台装配方法
-						 packingTousse(basketBarcode,taskIdArray.join(";"),tousseName,tousseType,pNode.get('amount'),packageType,sterilingType,supplierName,damages,errors,departmentArray.join(";"),status);
+						 packingTousse(basketBarcode,taskIdArray.join(";"),tousseName,tousseType,pNode.get('amount'),packageType,sterilingType,supplierName,departmentArray.join(";"));
 					});
 					 //删除篮筐内物品
 					deleteBasketItems(delBasketItems);
@@ -1508,7 +1508,7 @@
 		                     	var damages = cNode.get("damages");
 		                     	var errors = cNode.get("errors");
 		                     	var department = cNode.get("department");
-	                       		var printed = packingTousse(basketBarcode,taskId,tousseName,tousseType,amount,packageType,sterilingType,supplierName,damages,errors,department,status);
+	                       		var printed = packingTousse(basketBarcode,taskId,tousseName,tousseType,amount,packageType,sterilingType,supplierName,department);
 	                       		if(printed != false){
 	                       			packingAmount -= amount;
 	                       		}
@@ -1905,7 +1905,7 @@
  	var damages = taskNode.get("damages");
  	var errors = taskNode.get("errors");
  	var department = taskNode.get("department");
-    packed = packingTousse(basketBarcode,taskId,tousseName,tousseType,1,packageType,sterilingType,supplierName,damages,errors,department,status);
+    packed = packingTousse(basketBarcode,taskId,tousseName,tousseType,1,packageType,sterilingType,supplierName,department);
     if(packed){
     	addTaskItemsToDelete(tousseItemsToDelete,tousseName,taskId,1);
     }
@@ -1951,7 +1951,7 @@
      	var damages = cNode.get("damages");
      	var errors = cNode.get("errors");
      	var department = cNode.get("department");
-        packed = packingTousse(basketBarcode,taskId,tousseName,tousseType,amount,packageType,sterilingType,supplierName,damages,errors,department,status);
+        packed = packingTousse(basketBarcode,taskId,tousseName,tousseType,amount,packageType,sterilingType,supplierName,department);
         if(packed){
         	packingAmount -= amount;
         	addTaskItemsToDelete(tousseItemsToDelete,tousseName,taskId,amount);
@@ -1996,14 +1996,10 @@
 }
 
 // 装配器械包
-function packingTousse(basketBarcode,taskIds,tousseName,tousseType,packAmount,packageType,sterilingType,supplierName,damages,errors,department,status){
+function packingTousse(basketBarcode,taskIds,tousseName,tousseType,packAmount,packageType,sterilingType,supplierName,department){
 	if(!validateFormParamsForPack()){
 		return false;
 	}
-	if(status == '待确认'){
-		showResult(tousseName+",有器械丢失，请先确认！");
-		return false;
-	}
     //是否消毒物品
     var validatepass = true;
     DWREngine.setAsync(false);
@@ -2020,14 +2016,6 @@
     if(!validatepass){
         return validatepass;
     }
-    if(errors != null && errors.length > 0){
-        showResult("材料缺失，不够组成器械包，请先补充缺失器械！");
-        return false;
-    }
-    if(damages != null && damages.length > 0){
-        showResult("材料已报损，不够组成器械包，请先补充报损器械！");
-        return false;
-    }
     inspector = Ext4.getCmp('inspector').getValue();
     operator = Ext4.getCmp('operator').getValue();
     reviewer = Ext4.getCmp('reviewer').getValue();