Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r29529 -r29532
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 29529)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 29532)
@@ -1732,6 +1732,7 @@
 				}
 			}
 		}
+		boolean isUrgent = false;//是否有加急 如果有 那么页面上看到的装配任务的文件夹要按照紧急程度排序
 		if(scanBasketTaskMap.size() > 0){
 			for (String name : scanBasketTaskMap.keySet()) {
 				WaitPackingTaskVo vo = scanBasketTaskMap.get(name);
@@ -1740,13 +1741,15 @@
 					if(urgentAmount != null && urgentAmount > 0){
 						//设置WaitPackingTaskVo的最高加急信息
 						calcAndSetUrgentLevelOfWaitPackingTaskVo(vo);
+						if(!isUrgent){
+							isUrgent = true;
+						}
 					}
 				}
 				taskVos.add(vo);
 			}
 		}
 		if(unScanBasketTaskMap.size() > 0){
-			boolean isUrgent = false;//是否有加急 如果有 那么页面上看到的装配任务的文件夹要按照紧急程度排序
 			for (String name : unScanBasketTaskMap.keySet()) {
 				WaitPackingTaskVo vo = unScanBasketTaskMap.get(name);
 				if(enableUrgentFunction){
@@ -1761,17 +1764,17 @@
 				}
 				taskVos.add(vo);
 			}
-			if(isUrgent){
-				Collections.sort(taskVos,new Comparator<WaitPackingTaskVo>() {
-					@Override
-					public int compare(WaitPackingTaskVo b1,
-							WaitPackingTaskVo b2) {
-						return b2.getGrade().compareTo(
-								b1.getGrade());
-					}
-				});
-			}
 		}
+		if(isUrgent){
+			Collections.sort(taskVos,new Comparator<WaitPackingTaskVo>() {
+				@Override
+				public int compare(WaitPackingTaskVo b1,
+						WaitPackingTaskVo b2) {
+					return b2.getGrade().compareTo(
+							b1.getGrade());
+				}
+			});
+		}
 		return taskVos;
 	}
 	/**