Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r28064 -r28130
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28064)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28130)
@@ -740,14 +740,17 @@
 		}
 	}
 }
-deletePackingTask = function(ids) {
+deletePackingTask = function(ids,tousseID,amount,missRow) {
 	top.Ext4.MessageBox.confirm("请确认","是否确定要删除选中的装配任务信息？",
 			function(button, text) {
 		if ("yes" == button){
 			Ext4.Ajax.request({
 				url : WWWROOT + '/disinfectSystem/packingAction!deletePackingTask.do',
 				params : {
-					ids : ids
+					ids : ids,
+					tousseID:tousseID,
+					amount:amount,
+					missRow:missRow
 				},success : function(response, options) {
 					var result = Ext4.decode(response.responseText);
 					var success = result.success;
@@ -992,21 +995,24 @@
 					var tousseName = record.get('tousseName');
 					var tousseID = record.get('tousseID');
 					var status = record.get('status');
+					var amount = record.get('amount');
+					var supplent = true;
+					if(status == '待装配'){
+			            var errors = record.get('errors');
+			            for(var i = 0;i < errors.length ; i++) {
+			                if(errorTypeAdd != errors[i].errorType && ((errors[i].amount - errors[i].additionalAmount) != 0)) {
+			                    supplent = false;
+			                }
+			            }
+			        }
 					if(!SSTS_PackingTask_Delete){
 						if(taskid != undefined && taskid != null){
-							str += "<img style='float: left;margin-top: 3px;' src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"deletePackingTask('" + taskid + "')\" >";
+							str += "<img style='float: left;margin-top: 3px;' src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"deletePackingTask('" + taskid +"','" + tousseID +"','" + amount + "','" + supplent +"')\" >";
 						}
 					}
 			        if(status == '待装配'){
-			            var supplent = true;
-			            var errors = record.get('errors');
 			            var errorRemark = record.get('errorRemark');
 			            var damageRemark = record.get('damageRemark');
-			            for(var i = 0;i < errors.length ; i++) {
-			                if(errorTypeAdd != errors[i].errorType && ((errors[i].amount - errors[i].additionalAmount) != 0)) {
-			                    supplent = false;
-			                }
-			            }
 			            if(!supplent){
 			            	str += "<input type='button' style='height:20px; width:40px;' value='丢失' onclick=\"onErrorDamageBtnClick('"+type_lost+"','"+taskid+"')\" >";
 			            }
@@ -1017,7 +1023,7 @@
 			        }
 			        if(record.get('tousseType') == '外来器械包' && treeId == 'basketTreeGrid'){
 			            var supplierName = record.get('supplierName');
-			            var amount = record.get('amount');
+			           
 			            var basketBarcode = record.get('basketBarcode');
 			            var showName = tousseName;
 			            var invoicePlanId = record.get('invoicePlanId');
@@ -2458,7 +2464,7 @@
     			ids += taskId;
     		});
     	});
-    	deletePackingTask(ids);
+    	deletePackingTask(taskid,null,null,true);
     }
 },"-",{
     text : '添加报损器械',