Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerView.js
===================================================================
diff -u -r25816 -r29008
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerView.js	(.../containerView.js)	(revision 25816)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerView.js	(.../containerView.js)	(revision 29008)
@@ -115,6 +115,136 @@
 	});
 }
 
+var idsArray = [];
+
+function cleanPackingTask(){
+	var records = grid.getSelectionModel().getSelections();
+
+	var id = records[0].data.id;
+	var barcode = records[0].data.barcode;
+
+	if(records[0].data.status == '清洗装载'){
+		showResult("篮筐状态为清洗装载，不允许删除待装配任务！");
+		return false;
+	}
+	
+	Ext.Ajax.request({
+		url : WWWROOT + '/disinfectSystem/packingAction!getPackingTasksByContainerBarcode.do',
+		params : {containerBarcode : barcode},
+		success : function(response, options) {
+			var result = Ext.decode(response.responseText);
+			if(result.length == 0){
+				showResult("该清洗篮筐没有绑定的待装配任务！");
+				return false;
+			}else {
+				for(var i=0;i<result.length;i++){
+					idsArray[i] = result[i].id;
+				}
+				showPackingTask(result);
+			}
+		},
+		failure : function(response, options) {
+			var result = Ext.decode(response.responseText);
+			showResult(result.message);
+		}
+	});
+}
+
+var packingTaskWin;
+
+function showPackingTask(rows){
+	Ext4.define('Teams',{
+		extend:'Ext4.data.Model',
+		fields:['taskGroup','tousseName','amount','washTime','recyclingTime']
+	});
+
+	var storeData = new Ext4.data.Store({
+		model:'Teams',
+		sorters:['taskGroup','tousseName','amount','washTime','recyclingTime'],
+		data:rows
+	});
+	var grid = new top.Ext4.grid.Panel({
+		title : '篮筐绑定的待装配任务如下，您确定要删除吗？',
+		store:storeData,
+		width:585,
+		height:400,
+		columns:[{
+			text:'任务组',
+			width : 85,
+			dataIndex:'taskGroup'
+		},{
+			text:'名称',
+			width : 140,
+			dataIndex:'tousseName'
+		},{
+			text:'数量',
+			width : 60,
+			dataIndex:'amount'
+		},{
+			text:'清洗时间',
+			width : 150,
+			dataIndex:'washTime'
+		},{
+			text:'回收时间',
+			width : 150,
+			dataIndex:'recyclingTime'
+		}],
+		buttons : [{
+			id : 'onOk',
+			text : '是',
+			handler : onOk
+		},{
+			id : 'oncancel',
+			text : '取消',
+			handler : oncancel
+		}]
+	})
+	packingTaskWin = top.Ext4.create('Ext.window.Window', {
+		id : 'packingTaskWin',
+		layout : 'fit',
+		title : '待装配任务',
+		width : 600,
+		height :400,
+		modal : true,
+		border :false,
+		plain : true,
+		items : [grid ]
+	});
+	packingTaskWin.show();
+}
+
+function onOk(){
+	Ext.Ajax.request({
+		url : WWWROOT + '/disinfectSystem/packingAction!deletePackingTask.do',
+		params : {
+			ids : idsArray.join(';'),
+			deleteCause:'容器管理删除装配任务'
+		},
+		success : function(response, options) {
+			var result = Ext.decode(response.responseText);
+			if(result.success){
+				showResult("删除成功");
+				packingTaskWin.close();
+				grid.dwrReload();
+				containerWin.close();
+			}else {
+				showResult('删除失败');
+				packingTaskWin.close();
+				grid.dwrReload();
+				containerWin.close();
+			}
+		},
+		failure : function(response, options) {
+			var result = Ext.decode(response.responseText);
+			showResult(result.message);
+		}
+	});
+}
+
+function oncancel(){
+	packingTaskWin.close()
+}
+
 function setGroup(){
 	var records = grid.getSelectionModel().getSelections();
 
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js
===================================================================
diff -u -r28395 -r29008
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js	(.../containerForm.js)	(revision 28395)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js	(.../containerForm.js)	(revision 29008)
@@ -236,6 +236,11 @@
 			id : 'reSetStatus',
 			text : '重置状态',
 			handler : resetStatus
+		},{
+			id : 'cleanPackingTask',
+			text : '清除待装配任务',
+			handler : cleanPackingTask,
+			hidden:true
 		}, {
 			text : '取消',
 			id : 'saveAndNewBtn',
@@ -263,6 +268,12 @@
 		success : function(form, action) {
 			if(id==0) {
 				top.Ext.getCmp('containerType').setValue('篮筐');
+			}else {
+				if(action.result.data.purpose == '清洗筐'){
+					top.Ext.getCmp('cleanPackingTask').show();
+				}else {
+					top.Ext.getCmp('cleanPackingTask').hide();
+				}
 			}
 		},
 		failure : function(form, action) {