Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/steerinfo/dil/service/impl/QmsQueueListServiceImpl.java

src/main/java/com/steerinfo/dil/controller/QmsQueueListController.java

@@ -143,6 +143,12 @@ public class QmsQueueListController extends BaseRESTfulController {
     }
 
 
+    @ApiOperation(value = "撤销排队放行")
+    @PostMapping("/ctrlZQueueAllow")
+    public RESTfulResult ctrlZQueueAllow(@RequestBody(required = false) Map<String,Object> map){
+        return success(qmsQueueListService.ctrlZQueueAllow(map));
+    }
+
 //    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗或月台、转移原因")
 //    @ApiImplicitParams({
 //            @ApiImplicitParam(name = "mapValue", value = "实绩Id、门岗或月台、转移原因", required = false, dataType = "Map"),

src/main/java/com/steerinfo/dil/controller/QmsQueueResultController.java

@@ -119,9 +119,6 @@ public class QmsQueueResultController extends BaseRESTfulController {
     })
     @PostMapping("/getQueueListByQueueUp")
     public RESTfulResult getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
                                                Integer locationId,
                                                String capacityNumber,
                                                Integer isSpelling
@@ -130,7 +127,6 @@ public class QmsQueueResultController extends BaseRESTfulController {
             mapValue.put("locationId", locationId);
         if(capacityNumber != null && !"".equals(capacityNumber))
             mapValue.put("capacityNumber", capacityNumber);
-        PageHelper.startPage(pageNum,pageSize);
         if(isSpelling == 1){
             //原多拼
             List<Map<String, Object>> queueListByQueueUpSpelling = qmsQueueResultService.getQueueListByQueueUpSpelling(mapValue);
@@ -212,6 +208,13 @@ public class QmsQueueResultController extends BaseRESTfulController {
         return success(qmsQueueResultService.isInCircle(longitude,latitude,capacityNo));
     }
 
+    @ApiOperation(value="查询仓库排队列表")
+    @PostMapping("/getStoreQueueList")
+    public RESTfulResult getStoreQueueList(){
+        List<Map<String, Object>> storeQueueList = qmsQueueResultService.getStoreQueueList();
+        return success(storeQueueList);
+    }
+
 
 
 

src/main/java/com/steerinfo/dil/mapper/QmsQueueResultMapper.java

@@ -151,4 +151,6 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     List<Map<String, Object>> getQueueListByQueueUpSpelling(Map<String, Object> map);
 
     List<Map<String,Object>> getMaterialId(BigDecimal orderId);
+
+    List<Map<String,Object>> getStoreQueueList();
 }

src/main/java/com/steerinfo/dil/mapper/QueuingRulesMapper.java

@@ -67,4 +67,7 @@ public interface QueuingRulesMapper {
     List<Map<String, Object>> getAllNotSureEnFactorySpellingList();
 
     Integer checkoutQQR(Object resultTotalId);
+
+    int updateQRESULTEnsureTime(@Param("listId") BigDecimal listId);
+
 }

src/main/java/com/steerinfo/dil/service/IQmsQueueListService.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service;
 
+import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.dil.model.QmsQueueList;
 import java.util.Date;
@@ -37,10 +38,7 @@ public interface IQmsQueueListService{
     //链表监控
     List<Map<String, Object>> listMonitor(Map<String, Object> map);
 
-
-
-
-
+    int ctrlZQueueAllow(Map<String, Object> map);
 
 
     //进厂排队转移(仓库排队转移) 新增一条链表 修改实绩链表Id

src/main/java/com/steerinfo/dil/service/IQmsQueueResultService.java

@@ -38,6 +38,8 @@ public interface IQmsQueueResultService{
 
     boolean isInCircle(String longitude, String latitude, String CapacityNo);
 
+    List<Map<String, Object>> getStoreQueueList();
+
 
     //通过实绩Id查询排队取消实绩
 //    List<Map<String, Object>> getQueueCancelByResultId(Integer resultId);

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

@@ -11,11 +11,13 @@ import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.model.QmsQueueList;
 import com.steerinfo.dil.mapper.QmsQueueListMapper;
 import com.steerinfo.dil.service.IQmsQueueListService;
+import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.math.BigDecimal;
@@ -58,6 +60,9 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
     @Autowired
     LargeScreenFeign largeScreenFeign;
 
+
+
+
     private final SimpleDateFormat gatepostTimeSdf = new SimpleDateFormat("HHmmss");
 
     /**
@@ -362,16 +367,6 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         return count;
     }
 
-    /**
-     * @author:zyf
-     * @version:1.0
-     * @Date: 2022-08-29
-     * @Description:更改物资
-    */
-    /*public int updateOOMLoadWarehouse(){
-        qmsQueueSpellingListMapper.updateOOMLoadWarehouse();
-    }*/
-
     /**
      * 判断是否隔行打钩
      * @param mapList
@@ -439,6 +434,7 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
      * @Date:
      * @Description:做一个定时任务向两块大屏赋予值
      */
+    @Scheduled(cron = "*/60 * * * * ?")
     @Scheduled(cron = "0 0/5 * * * ?")
     public void sendDataToLargeCreen(){
         Map<String,Object> mapValue=new HashMap<>();
@@ -463,6 +459,18 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         }
     }
 
+    @Override
+    public int ctrlZQueueAllow(Map<String, Object> map) {
+        //去除可进厂确认时间,和进厂时间里面的OK
+        int i = 0;
+        BigDecimal listId = DataChange.dataToBigDecimal(map.get("listId"));
+        //移除OK
+        i =+ queuingRulesMapper.updateEnFactory(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        //移除可进厂确认时间
+        i =+ queuingRulesMapper.updateQRESULTEnsureTime(listId);
+        return i;
+    }
+
 //    @Override
 //    public int queueCutInLine(Map<String, Object> map) {
 //        //通过实绩Id查出关联的链表Id

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

@@ -255,7 +255,10 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
         }
         return s;
     }
-
+    @Override
+    public List<Map<String, Object>> getStoreQueueList(){
+        return qmsQueueResultMapper.getStoreQueueList();
+    }
     /**
      * 新增仓库排队实绩
      * @param map orderNumber运输订单号  loadingId 装车点

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

@@ -32,7 +32,7 @@ public class QueuingRulesServiceImpl implements IQueuingRulesService {
     /**
      * 定时检查  钢材科已确认进厂之后  30分钟没有结束 自动回滚到队列末尾，移除可进厂时间
      */
-    @Scheduled(fixedRate = 1000 * 60)
+    @Scheduled(fixedRate = 1000 * 180)
     public void checkoutQueueList(){
         long nowTime = System.currentTimeMillis();
         queueDealWithAsync.dealWithOne(nowTime);

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

@@ -846,64 +846,69 @@
 <!--    </select>-->
 
     <!-- 查询排队开始 -->
-    <select id="getQueueListByQueueUp" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
-        SELECT QQR.RESULT_ID        "resultId",
-               QQR.RESULT_TOTAL_ID  "resultTotalId",
-               QQR.RESULT_START_TIME    "resultStartTime",
-               RCE.CONSIGNEE_COMPANY_NAME   "consigneeName",
-               RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "grid",
-               RM.MATERIAL_ID       "materialId",
-               RM.MATERIAL_NAME     "materialName",
-               RM.MATERIAL_SPECIFICATION||'('||RM.MATERIAL_MODEL||')'    "materialSpecification",
-               RM.MATERIAL_MODEL        "materialModel",
-               QQL.LIST_ID              "listId",
-               RC.CAPACITY_NUMBER  "capacityNumber",
-               RC.CAPACITY_ID           "capacityId",
-               QQL.ENTRY_SURE_TIME          "sureTime",
-               OOM.ORDER_MATERIAL_NUMBER    "materialNumber",
-               OOM.MATERIAL_PRIORITY        "id",
-               OO.DRIVER_TEL                "driverTel",
-               OO.ORDER_ID                  "orderId",
-               RG.GATEPOST_NAME             "gatepostName",
-               ASM.STEEL_METER              "steelMeter",
-               (
-                   select COUNT(QQL2.LIST_ID)
-                   from QMS_QUEUE_LIST QQL2
-                   where QQL2.GRID_ID = QQL.GRID_ID
-                         and QQL2.LIST_NODE_ORDER &lt;= QQL.LIST_NODE_ORDER
-               )  || (case when QQL.IS_VIP is not null then ' 优先进厂' else '' end ) "listNodeOrder"
+    <select id="getQueueListByQueueUp" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT P0.*,ROWNUM "ROW_ID" FROM (
+        SELECT
+        QQR.RESULT_ID        "resultId",
+        QQR.RESULT_TOTAL_ID  "resultTotalId",
+        QQR.RESULT_START_TIME    "resultStartTime",
+        RCE.CONSIGNEE_COMPANY_NAME   "consigneeName",
+        RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "grid",
+        RM.MATERIAL_ID       "materialId",
+        RM.MATERIAL_NAME     "materialName",
+        RM.MATERIAL_SPECIFICATION||'('||RM.MATERIAL_MODEL||')'    "materialSpecification",
+        RM.MATERIAL_MODEL        "materialModel",
+        QQL.LIST_ID              "listId",
+        RC.CAPACITY_NUMBER  "capacityNumber",
+        RC.CAPACITY_ID           "capacityId",
+        QQL.ENTRY_SURE_TIME          "sureTime",
+        OOM.ORDER_MATERIAL_NUMBER    "materialNumber",
+        OOM.MATERIAL_PRIORITY        "id",
+        OO.DRIVER_TEL                "driverTel",
+        OO.ORDER_ID                  "orderId",
+        RG.GATEPOST_NAME             "gatepostName",
+        ASM.STEEL_METER              "steelMeter",
+        (
+        select COUNT(QQL2.LIST_ID)
+        from QMS_QUEUE_LIST QQL2
+        where QQL2.GRID_ID = QQL.GRID_ID
+        and QQL2.LIST_NODE_ORDER &lt;= QQL.LIST_NODE_ORDER
+        )  || (case when QQL.IS_VIP is not null then ' 优先进厂' else '' end ) "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
-            LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON TTR.ORDER_ID = OOM.ORDER_ID
-            LEFT JOIN RMS_MATERIAL RM ON OOM.MATERIAL_ID = RM.MATERIAL_ID
-            LEFT JOIN RMS_CAPACITY RC ON QQL.CAPACITY_ID = RC.CAPACITY_ID
-            LEFT JOIN OMSTRUCK_ORDER OO ON TTR.ORDER_ID = OO.ORDER_ID
-            LEFT JOIN RMS_GATEPOST  RG ON QQR.GATEPOST_ID = RG.GATEPOST_ID
-            LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
-            LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
-            LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
-            LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
-            ON ASTM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
-            LEFT JOIN AMS_SALE_MATERIAL ASM
-            ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
-            where oo.ORDER_STATUS = 5
-            <if test="capacityNumber != null">
-                and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
-            </if>
-            <if test="materialList != null">
-                and RM.MATERIAL_ID in
-                <foreach collection="materialList" item="item" open="(" separator="," close=")">
-                    ${item}
-                </foreach>
-            </if>
-            <if test="locationId != null">
-                and QQL.GRID_ID = #{locationId}
-                ORDER BY QQL.ENTRY_SURE_TIME DESC, QQL.IS_VIP, "listNodeOrder"
-            </if>
+        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
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON TTR.ORDER_ID = OOM.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM ON OOM.MATERIAL_ID = RM.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY RC ON QQL.CAPACITY_ID = RC.CAPACITY_ID
+        LEFT JOIN OMSTRUCK_ORDER OO ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_GATEPOST  RG ON QQR.GATEPOST_ID = RG.GATEPOST_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASTM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM
+        ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        where oo.ORDER_STATUS = 5
+        AND ASO.SALE_ORDER_STATUS = 4
+        <if test="capacityNumber != null">
+            and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
+        </if>
+        <if test="materialList != null">
+            and RM.MATERIAL_ID in
+            <foreach collection="materialList" item="item" open="(" separator="," close=")">
+                ${item}
+            </foreach>
+        </if>
+        <if test="locationId != null">
+            and QQL.GRID_ID = #{locationId}
+            ORDER BY QQL.ENTRY_SURE_TIME DESC, QQL.IS_VIP, "listNodeOrder"
+        </if>
         <if test="locationId == null">
-            ORDER BY  QQL.ENTRY_SURE_TIME DESC,  QQL.IS_VIP, "materialName" DESC, "listNodeOrder"
+            ORDER BY QQL.ENTRY_SURE_TIME DESC, QQR.RESULT_START_TIME
         </if>
+        ) P0
+
     </select>
 
     <update id="updateCancelResult" parameterType="com.steerinfo.dil.model.QmsQueueResult">
@@ -952,6 +957,7 @@
             LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
             LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
             where oo.ORDER_STATUS = 5
+              AND ASO.SALE_ORDER_STATUS = 4
             <if test="capacityNumber != null">
                 and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
             </if>
@@ -971,7 +977,7 @@
                 ORDER BY  QQSL.ENTRY_SURE_TIME DESC, QQSL.IS_VIP,  "listNodeOrder"
             </if>
             <if test="locationId == null">
-                order by  QQSL.ENTRY_SURE_TIME DESC, QQSL.IS_VIP, QQSL.SPELILING_NUM DESC, "listNodeOrder"
+                ORDER BY QQSL.ENTRY_SURE_TIME DESC, QQR.RESULT_START_TIME
             </if>
     </select>
 
@@ -2189,5 +2195,25 @@
         where QQR.RESULT_TOTAL_ID = #{resultTotalId}
     </select>
 
-
+    <select id="getStoreQueueList" resultType="java.util.Map">
+        SELECT
+         o2.material_priority "materialPriority",
+         rw.WAREHOUSE_NAME "warehouseName",
+         count( 1 ) "carQueue"
+        FROM
+         Omstruck_Order o1
+         LEFT JOIN Omstruck_Order_Material o2 ON o1.order_id = o2.order_id
+         LEFT JOIN rms_warehouse rw ON rw.warehouse_id = o2.material_priority
+         LEFT JOIN tmstruck_total_result ttr ON ttr.order_id = o1.order_id
+         LEFT JOIN TMSTRUCK_WEIGHT_RESULT twr ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+         AND O2.MATERIAL_ID = TWR.MATERIAL_ID
+        WHERE
+         o1.order_status = 5
+         AND o1.order_type = 1
+         AND TWR.RESULT_NET_WEIGHT IS NULL
+         AND rw.WAREHOUSE_NAME IS NOT NULL
+        GROUP BY
+         o2.material_priority,
+         rw.WAREHOUSE_NAME
+    </select>
 </mapper>

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

@@ -196,6 +196,11 @@
             RESULT_ACCEPT_TIME = null
         where RESULT_ID = #{resultId}
     </update>
+    <update id="updateQRESULTEnsureTime">
+        UPDATE QMS_QUEUE_LIST QQL
+        SET QQL.ENTRY_SURE_TIME = null
+        where QQL.LIST_ID = #{listId}
+    </update>
 
     <select id="getAllNotSureEnFactoryList" resultType="java.util.Map">
         select QQL.LIST_ID  "listId",