Merge remote-tracking branch 'origin/master'

src/main/java/com/steerinfo/dil/service/impl/QueueDealWithAsync.java

@@ -41,7 +41,7 @@ public class QueueDealWithAsync {
         //查询所有单拼排队网格已经确认进厂的记录
         List<Map<String, Object>> listListMap = queuingRulesMapper.getAllSureTimeList();
         for (Map<String, Object> map : listListMap) {
-            if((nowTime - ((Date) map.get("entrySureTime")).getTime()) > 3600000){
+            if((nowTime - ((Date) map.get("entrySureTime")).getTime()) > 10800000){
                 //如果超过勾选时间30分钟 自动回滚到队列最后--修改为1个小时
                 BigDecimal listId = DataChange.dataToBigDecimal(map.get("listId"));
                 Integer maxListNodeOrder = qmsQueueListMapper.getMaxListNodeOrder(map);
@@ -67,7 +67,7 @@ public class QueueDealWithAsync {
         //查询所有多拼排队网格已经确认进厂的记录
         List<Map<String, Object>> allSureTimeSpellingList = queuingRulesMapper.getAllSureTimeSpellingList();
         for (Map<String, Object> map : allSureTimeSpellingList) {
-            if ((nowTime - ((Date) map.get("entrySureTime")).getTime()) > 3600000) {
+            if ((nowTime - ((Date) map.get("entrySureTime")).getTime()) > 10800000) {
                 BigDecimal spellingResultId = DataChange.dataToBigDecimal(map.get("spellingResultId"));
                 //如果超过勾选时间30分钟 自动回滚到队列最后
                 queuingRulesMapper.updateSpellingListToLast(spellingResultId);

src/main/resources/com/steerinfo/dil/mapper/QmsQueueResultMapper.xml

@@ -873,7 +873,7 @@
         from QMS_QUEUE_LIST QQL2
         where QQL2.GRID_ID = QQL.GRID_ID
         and QQL2.LIST_NODE_ORDER <= QQL.LIST_NODE_ORDER
-        )  || (case when QQL.IS_VIP is not null then ' 优先进厂' else '' end ) "listNodeOrder"
+        )   "listNodeOrder"
         FROM QMS_QUEUE_LIST QQL
         LEFT JOIN QMS_QUEUE_RESULT QQR ON QQL.QUEUE_RESULT_ID = QQR.RESULT_ID
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON QQR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID