Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-QMS-API

pom.xml

@@ -122,8 +122,8 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>QMS_QUEUE_LIST</param><!--运力-->
-                        <param>QMS_QUEUE_SPELLING_LIST</param><!--运力-->
+<!--                        <param>QMS_QUEUE_LIST</param>&lt;!&ndash;运力&ndash;&gt;-->
+<!--                        <param>QMS_QUEUE_SPELLING_LIST</param>&lt;!&ndash;运力&ndash;&gt;-->
                     </tables>
                 </configuration>
                 <executions>

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

@@ -118,7 +118,7 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
      * @return
      */
     @Transactional
-    public int addQueueList(BigDecimal resultId){
+    public synchronized int addQueueList(BigDecimal resultId){
         //通过订单查询有几种物资
         Map<String, Object> mesMap = qmsQueueListMapper.getMaterialNumByOrderId(resultId);
         try{

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

@@ -175,6 +175,7 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
      * @return
      */
     public Map<String, Object> getQueueResultByTotalId(String resultTotalId){
+        System.out.println(resultTotalId + "resultTotalId");
         Map<String,Object> map = qmsQueueResultMapper.getQueueResultByOrderId(DataChange.dataToBigDecimal(resultTotalId));
         if(map == null){
             return new HashMap<>();

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

@@ -54,11 +54,6 @@ public class QueueDealWithAsync {
                 queuingRulesMapper.updateListToLast(listId, maxListNodeOrder + 1);
                 //移除可进厂资格
                 queuingRulesMapper.updateEnFactory(DataChange.dataToBigDecimal(map.get("resultTotalId")));
-                //if((nowTime - ((Date) map.get("insertTime")).getTime()) > 86400000){
-                //    //如果大于一天则直接删除队列信息
-                //    qmsQueueListMapper.deleteByPrimaryKey(listId);
-                //    queuingRulesMapper.updateQQRRemoveList(DataChange.dataToBigDecimal(map.get("resultId")));
-                //}
             }
         }
     }
@@ -81,11 +76,6 @@ public class QueueDealWithAsync {
                 queuingRulesMapper.updateSpellingListToLast(spellingResultId);
                 //移除可进厂资格
                 queuingRulesMapper.updateEnFactory(DataChange.dataToBigDecimal(map.get("resultTotalId")));
-                //if((nowTime - ((Date) map.get("spellingSureTime")).getTime()) > 86400000){
-                //    //如果大于一天则直接删除队列信息
-                //    qmsQueueSpellingListMapper.deleteByPrimaryKey(spellingResultId);
-                //    queuingRulesMapper.updateQQRRemoveList(DataChange.dataToBigDecimal(map.get("resultId")));
-                //}
             }
         }
     }

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

@@ -39,15 +39,7 @@ public class QueuingRulesServiceImpl implements IQueuingRulesService {
         queueDealWithAsync.dealWithTwo(nowTime);
     }
 
-    /**
-     * 遍历排队所有未勾选确认进厂的排队数据，如果已经超过一天则踢出队列
-     */
-    @Scheduled(fixedRate = 1000 * 60 * 30)
-    public void checkoutQueue(){
-        long nowTime = System.currentTimeMillis();
-        queueDealWithAsync.dealWithThree(nowTime);
-        queueDealWithAsync.dealWithFour(nowTime);
-    }
+
 
     /**
      * 推送消息给websocket

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

@@ -200,7 +200,8 @@
         set
             LIST_ID           = null,
             RESULT_START_TIME = null,
-            RESULT_ACCEPT_TIME = null
+            RESULT_ACCEPT_TIME = null,
+            INSERT_UPDATE_REMARK = '钢材科撤销排队放行'
         where RESULT_ID = #{resultId}
     </update>
     <update id="updateQRESULTEnsureTime">