Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r14149 -r14231
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 14149)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 14231)
@@ -633,7 +633,8 @@
 	{name : 'isReview'},
 	{name : 'replenishMaterils'},
 	{name : 'haveIDCard'},
-	{name : 'uuid_vedioNames'}
+	{name : 'uuid_vedioNames'},
+	{name : 'isTimeout'}
 ]});
 
 Ext4.define('columnTreeGrid',{
@@ -654,7 +655,7 @@
                 sortable: true,
                 xtype : 'treecolumn',
                 dataIndex: 'tousseName',
-                renderer: function(v,p,record,rowIndex, columnIndex, store){
+                renderer: function(v,p,record,rowIndex, columnIndex, store,view){
                 	var tousseName = record.get('tousseName');
                 	var showName = tousseName;
                 	if(record.get('replenishMaterils')){
@@ -1768,7 +1769,30 @@
             	taskGroup : taskGroup 
             };
             Ext4.apply(store.proxy.extraParams, params);  
-        }  
+        },
+        load : function(treeStore, node, records, successful, eOpts){
+        	Ext4.Ajax.request({
+    			url :  WWWROOT + '/system/timeoutAction!getTimeoutSetting.do',
+    			params : {procedure : 'washToPacking'},
+    			success : function(response, options) {
+    				var result = Ext4.decode(response.responseText);
+    				if(result.success && result.showMessageBox){
+    					var timeoutCount = 0;
+                		for(var i = 0; i < records.length;++i){
+                			for(var j = 0; j < records[i].data.children.length;++j){
+                				var task = records[i].data.children[j];
+                    			if(task.isTimeout){
+                    				timeoutCount++;
+                    			}
+                			}
+                		}
+                		if(timeoutCount > 0){
+                			showResult('有'+timeoutCount+'个超时未装配的装配任务,请及时处理红色标注的装配任务');
+                		}
+    				}
+    			}
+    		});
+        }
     },
     folderSort: true
 })
@@ -2446,7 +2470,9 @@
 				                	id : 'waitPackingTreeGrid',
 				                	flex : 1,
 				                	border : false,
-				                	viewConfig : {loadMask : {msg : '正在加载，请稍候...'}},
+				                	viewConfig : {
+				                		loadMask : {msg : '正在加载，请稍候...'}
+				                	},
 				                	height: (document.body.clientHeight - 30)/2,
 				                	listeners:{
 				                		// cellclick事件改为select事件，便于selenium进行测试