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

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

@@ -153,7 +153,27 @@ public class QmsQueueResultController extends BaseRESTfulController {
                 }
             }
             return success(queueListByQueueUpSpelling);
-        }else {
+        }else if (isSpelling == 2){
+            //两拼数据
+            List<Map<String, Object>> queueListByQueueUpSpellingNew = qmsQueueResultService.getQueueListByQueueUpSpellingNew(mapValue);
+            //现多拼数据
+            for (Map<String, Object> stringObjectMap : queueListByQueueUpSpellingNew) {
+                BigDecimal orderId = (BigDecimal) stringObjectMap.get("orderId");
+                //米数
+                List<Map<String, Object>> materialId = qmsQueueResultMapper.getMaterialId(orderId);
+                for (Map<String, Object> objectMap : materialId) {
+                    BigDecimal materialId2 = DataChange.dataToBigDecimal(stringObjectMap.get("materialId"));
+                    BigDecimal materialId1 = (BigDecimal) objectMap.get("materialId");
+                    if (materialId2.compareTo(materialId1)==0){
+                        //钢材长度
+                        BigDecimal steelmeter = (BigDecimal) objectMap.get("steelmeter");
+                        stringObjectMap.put("steelMeter",steelmeter);
+                    }
+                }
+            }
+            return success(queueListByQueueUpSpellingNew);
+        }
+        else {
             //单拼
             return success(qmsQueueResultService.getQueueListByQueueUp(mapValue));
         }

src/main/java/com/steerinfo/dil/feign/DaZhouFeign.java

@@ -1,25 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.Map;
-
-/**
- * @ author    :TXF
- * @ time      :2021/10/8 19:07
- */
-
-
-@FeignClient(value = "DIL-DAZHOU-API-DEV", url = "${openfeign.DaZhouFeign.url}")
-public interface DaZhouFeign {
-
-    @GetMapping("/api/v1/uc/getSteelOrderNum")
-    RESTfulResult getSteelOrderNum();
-
-
-}

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

@@ -74,4 +74,9 @@ public interface QmsQueueListMapper extends IBaseMapper<QmsQueueList, BigDecimal
 
     @Update("update TMSTRUCK_ENFACTORY_RESULT  set GATEPOST_ID = #{gatepostId} where RESULT_TOTAL_ID = #{resultTotalId}")
     int udpateEnFactoryGatepostId(@Param("resultTotalId") BigDecimal resultTotalId, @Param("gatepostId") BigDecimal gatepostId);
+
+    int selectNodeQueueCount(Map<String, Object> mesMap);
+
+    int deleteListByCapacityId(BigDecimal capacityId);
+
 }

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

@@ -150,6 +150,8 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
 
     List<Map<String, Object>> getQueueListByQueueUpSpelling(Map<String, Object> map);
 
+    List<Map<String, Object>> getQueueListByQueueUpSpellingNew(Map<String, Object> map);
+
     List<Map<String,Object>> getMaterialId(BigDecimal orderId);
 
     List<Map<String,Object>> getStoreQueueList();
@@ -186,6 +188,15 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     */
     List<Map<String, Object>>   getCapacityByDefend(Map<String, Object> map);
 
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-10-27
+     * @Description:复刻进厂车
+     */
+    List<Map<String, Object>>  getCapacityNum();
+
+
     /**
      * @author:zyf
      * @version:1.0
@@ -193,4 +204,9 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
      * @Description:复刻进厂数
     */
     int getSteelOrderNum();
+
+    int updateQmsResult(BigDecimal resultTotalId);
+
+    int getCarNumber();
+
 }

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

@@ -25,5 +25,6 @@ public interface QmsQueueSpellingListMapper extends IBaseMapper<QmsQueueSpelling
     int updateOOMLoadWarehouse(Map<String, Object> mesMap);
 
 
+    int deleteSpellingList(BigDecimal capacityId);
 
 }

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

@@ -10,6 +10,7 @@ import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.model.QmsQueueList;
 import com.steerinfo.dil.service.IQmsQueueListService;
 import com.steerinfo.framework.controller.RESTfulResult;
+import com.sun.org.apache.bcel.internal.generic.RETURN;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -121,13 +122,23 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
             //单拼进入链表
             //判断单拼链表中是否有已存在此辆车正在排队
             if(qmsQueueListMapper.existsCapacity(mesMap.get("capacityId")) != null){
-                return 0;
+                try {
+                    qmsQueueListMapper.deleteListByCapacityId(DataChange.dataToBigDecimal(mesMap.get("capacityId")));
+                } catch (Exception e) {
+                    return 0;
+                }
+                //return 0;
             }
             return addListResult(mesMap, calculateGatepost());
         }else {
             //多拼进入排队队列
             if(qmsQueueSpellingListMapper.existsCapacity(mesMap.get("capacityId")) != null){
-                return 0;
+                try {
+                    qmsQueueSpellingListMapper.deleteSpellingList(DataChange.dataToBigDecimal(mesMap.get("capacityId")));
+                } catch (Exception e) {
+                    return 0;
+                }
+                //return 0;
             }
             return addSpellingListResult(mesMap, calculateGatepost());
         }
@@ -321,12 +332,12 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
     public int allowEnFactory(Map<String, Object> map){
         List<Map<String, Object>> mapList = (List<Map<String, Object>>) map.get("mapList"); //获取勾选列表
         if( ! (mapList == null || mapList.size() == 0)){
-//            if(mapList.get(0).get("listId") != null){ //如果是单拼 需要判断有没有跳行打钩
-//                boolean judgeRowIdOrder = judgeRowIdOrder(mapList);
-//                if( ! judgeRowIdOrder){
-//                    return -1;
-//                }
-//            }
+            //if(mapList.get(0).get("listId") != null){ //如果是单拼 需要判断有没有跳行打钩
+            //    boolean judgeRowIdOrder = judgeRowIdOrder(mapList);
+            //    if( ! judgeRowIdOrder){
+            //        return -1;
+            //    }
+            //}
         }else {
             return -2;
         }
@@ -345,6 +356,14 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
             }
             mesMap.put("jobName", jobName);
             if(mesMap.get("listId") != null){ //单拼
+                //如果是通过查询的,则需要去判断
+                //if (DataChange.dataToBigDecimal(map.get("isQueryCapacity")).intValue() == 1) {
+                //    int nodeQueueList = qmsQueueListMapper.selectNodeQueueCount(mesMap);
+                //    if (nodeQueueList > 0) {
+                //        continue;
+                //    }
+                //}
+
                 //更新排队链表
                 count += qmsQueueListMapper.updateListEnFactory(mesMap);
                 //更新进厂实绩
@@ -361,6 +380,8 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
                     list.add(new WebSocketCapacity(5 , "system",String.valueOf(mesMap.get("capacityNumber")), "可以进厂" + new Date(), new Date()));
                 }
             }
+            //更新排队实绩,将放行时间保存
+            count += qmsQueueResultMapper.updateQmsResult(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
             //更新物资子表 每个物资的装货点ID
             mesMap.replace("id",DataChange.dataToBigDecimal(mesMap.get("id")));
             qmsQueueSpellingListMapper.updateOOMLoadWarehouse(mesMap);
@@ -453,14 +474,15 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         List<Map<String, Object>> datalist =new ArrayList<>();
         List<Map<String, Object>> queueListByQueueUp = qmsQueueResultService.getQueueListByQueueUp(mapValue);
         List<Map<String, Object>> queueListByQueueUpSpelling = qmsQueueResultService.getQueueListByQueueUpSpelling(mapValue);
+        List<Map<String, Object>> queueListByQueueUpSpellingNew = qmsQueueResultService.getQueueListByQueueUpSpellingNew(mapValue);
         //求出所有的数据
         Map<String, Object> getnumber = qmsQueueResultService.getnumber();
         datalist.add(getnumber);
         HashSet<Map<String,Object>> set=new HashSet<>(queueListByQueueUpSpelling);
-        //queueListByQueueUp=queueListByQueueUp.stream().distinct().collect(Collectors.toList());
+        HashSet<Map<String,Object>> set1=new HashSet<>(queueListByQueueUpSpellingNew);
         datalist.addAll(queueListByQueueUp);
-        //queueListByQueueUpSpelling=queueListByQueueUpSpelling.stream().distinct().collect(Collectors.toList());
         datalist.addAll(set);
+        datalist.addAll(set1);
         System.out.println(datalist.toString());
         //更新大屏(钢材科与东门)
         try{

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

@@ -241,12 +241,16 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
         return  qmsQueueResultMapper.getQueueListByQueueUpSpelling(map);
     }
 
+    public List<Map<String, Object>> getQueueListByQueueUpSpellingNew(Map<String, Object> map) {
+        return  qmsQueueResultMapper.getQueueListByQueueUpSpellingNew(map);
+    }
+
     /**
      * @author:zyf
      * @version:1.0
      * @Date:2022-09-27
      * @Description:查询出来所有的数据
-    */
+     */
     public Map<String,Object> getnumber(){
         Map<String,Object> map=new HashMap<>();
         try{
@@ -255,33 +259,15 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
             Date now=new Date();
             Calendar call=Calendar.getInstance();
             call.setTime(now);
-            call.set(Calendar.HOUR_OF_DAY,0);
+            call.set(Calendar.HOUR_OF_DAY,8);
             call.set(Calendar.MINUTE,0);
             call.set(Calendar.SECOND,0);
             call.set(Calendar.MILLISECOND,0);
             Date date=call.getTime();
             Map<String,Object> map1=new HashMap<>();
             map1.put("oneDate",date);
-            map1.put("entity",date);
-            RESTfulResult haveCarTruckNoList = amsFeign.getHaveCarTruckNoList(map1, 466, null, null, null, null, null);
-            Map<String,Object> data = (Map<String, Object>) haveCarTruckNoList.getData();
-            List<Map<String,Object>> data1 = (List<Map<String, Object>>) data.get("list");
             int SentCarNumber=0;
-            try {
-                for (int i=0;i<data1.size();i++){
-                    for (int j=i+1;j<data1.size();j++){
-                        if (data1.get(i).get("capacityNumber").equals(data1.get(j).get("capacityNumber"))){
-                            data1.remove(j);
-                            j--;
-                        }
-                    }
-                }
-                SentCarNumber=data1.size();
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-            //int SentCarNumber = qmsQueueResultMapper.querySentCarNumber();
-            //int IntoFactoryNumber=qmsQueueResultMapper.queryIntoFactoryNumber();
+            SentCarNumber = qmsQueueResultMapper.getCarNumber();
             //查询出销售钢材的进厂数(由于呼叫进厂页面的数据不止)
             int IntoFactoryNumber = qmsQueueResultMapper.getSteelOrderNum();
             //查询出销售钢材的出厂数
@@ -291,8 +277,21 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
             Map<String,Object> map2=new HashMap<>();
             map2.put("oneDate",format);
             List<Map<String, Object>> capacityByDefend = qmsQueueResultMapper.getCapacityByDefend(map2);
-            int LeaveFactoryNumber = capacityByDefend.size();
-            //int LeaveFactoryNumber=qmsQueueResultMapper.queryLeaveFactoryNumber();
+            int LeaveFactoryNumber=0;
+            try{
+                //获得进厂车
+                List<Map<String, Object>> capacityNum = qmsQueueResultMapper.getCapacityNum();
+                for (int i=0;i<capacityNum.size();i++){
+                    for (int j=0;j<capacityByDefend.size();j++){
+                        if (capacityNum.get(i).get("capacityNumber").equals(capacityByDefend.get(j).get("capacityNumber"))){
+                            capacityByDefend.remove(j);
+                        }
+                    }
+                }
+                LeaveFactoryNumber=capacityByDefend.size();
+            }catch (Exception e){
+                e.printStackTrace();
+            }
             map.put("sentCarNumber",SentCarNumber);
             map.put("intoFactoryNumber",IntoFactoryNumber);
             map.put("leaveFactoryNumber",LeaveFactoryNumber);

src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
       username: dagang
       driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-trick-queue-dev
+    name: dil-truck-queue-dev
 
 #feign设置
 openfeign:

src/main/resources/application-prod.yml

@@ -5,7 +5,7 @@ spring:
       username: dil
       driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-trick-queue-prod
+    name: dil-truck-queue-prod
 
 #feign设置
 openfeign:

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

@@ -625,6 +625,7 @@
   </delete>
 
 
+
   <update id="updateListEnFactory" parameterType="map">
     UPDATE QMS_QUEUE_LIST SET ENTRY_SURE_TIME = SYSDATE, DELETED = 2
     <if test="jobName != null">
@@ -742,5 +743,14 @@
         from RMS_GATEPOST_RULES
         where GATEPOST_ID = 1 or GATEPOST_ID = 2
   </select>
-
+  <select id="selectNodeQueueCount" resultType="java.lang.Integer" parameterType="java.util.Map">
+    SELECT count(QQL1.LIST_ID) FROM QMS_QUEUE_LIST QQL1
+    WHERE QQL1.ENTRY_SURE_TIME IS NULL
+    AND QQL1.LIST_NODE_ORDER &lt;
+    (SELECT QQL.LIST_NODE_ORDER FROM QMS_QUEUE_LIST QQL
+    WHERE QQL.LIST_ID = #{listId})
+  </select>
+  <delete id="deleteListByCapacityId" parameterType="java.math.BigDecimal">
+    DELETE FROM QMS_QUEUE_LIST QQL WHERE QQL.CAPACITY_ID = #{capacityId}
+  </delete>
 </mapper>

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

@@ -849,31 +849,43 @@
     <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",
+        QQR.RESULT_ID "resultId",
+        QQR.RESULT_TOTAL_ID "resultTotalId",
+        QQR.RESULT_START_TIME "resultStartTime",
+        QQL.GRID_ID             "gridId",
         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)
+        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",
+        QQL.IS_VIP "resultInsertTime",
+        (CASE WHEN
+            QQL.IS_VIP is not null
+            then 0
+            else
+        (select COUNT(QQL.LIST_ID)
+        from QMS_QUEUE_LIST QQL
+        where QQL.GRID_ID = QQR.grid_Id
+        and QQL.LIST_NODE_ORDER &lt;= (
+        select
+        QQL2.LIST_NODE_ORDER
         from QMS_QUEUE_LIST QQL2
-        where QQL2.GRID_ID = QQL.GRID_ID
-        and QQL2.LIST_NODE_ORDER &lt;= QQL.LIST_NODE_ORDER
-        )   "listNodeOrder"
+        where QQL2.LIST_ID = QQR.list_Id
+        ))
+        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
@@ -881,7 +893,7 @@
         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 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
@@ -889,8 +901,11 @@
         ON ASTM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
         LEFT JOIN AMS_SALE_MATERIAL ASM
         ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         where oo.ORDER_STATUS = 5
         AND ASO.SALE_ORDER_STATUS = 4
+        AND TER.RESULT_ENTRY_GATE_TIME IS NULL
         AND RM.MATERIAL_ID||'' NOT IN (SELECT DISTINCT SPECTIONS_MODEL FROM QMS_MODEL_UNROOLED)
         <if test="capacityNumber != null">
             and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
@@ -903,12 +918,13 @@
         </if>
         <if test="locationId != null">
             and QQL.GRID_ID = #{locationId}
-            ORDER BY "listNodeOrder",QQL.ENTRY_SURE_TIME DESC, QQL.IS_VIP
+            ORDER BY QQL.ENTRY_SURE_TIME ASC NULLS FIRST,QQL.IS_VIP DESC NULLS LAST ,"listNodeOrder"
         </if>
         <if test="locationId == null">
-            ORDER BY "listNodeOrder",QQL.ENTRY_SURE_TIME DESC, QQL.IS_VIP ,QQR.RESULT_START_TIME
+            ORDER BY QQL.ENTRY_SURE_TIME ASC NULLS FIRST,QQL.IS_VIP DESC NULLS LAST ,"listNodeOrder"
         </if>
         ) P0
+
     </select>
 
     <!--查询已派车车数-->
@@ -955,57 +971,6 @@
        and to_char(trunc(sysdate,'dd')+23/24+59/24/60+59/24/60/60,'yyyy-mm-dd hh24:mi:ss')
     </select>
 
-    <select id="getSteelOrderNum" resultType="java.lang.Integer">
-        SELECT
-            COUNT( * )
-        FROM
-            OMSTRUCK_ORDER OO
-                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
-                LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        WHERE
-            OO.ORDER_LINE_SEQUENCE >= 1
-          AND OO.ORDER_STATUS = 5
-          AND TLFR.RESULT_OUT_GATE_TIME IS NULL
-          AND OO.ORDER_TYPE = 1
-    </select>
-
-    <select id="getCapacityByDefend" resultType="java.util.Map" parameterType="java.util.Map">
-        select distinct * from(
-        select rc.CAPACITY_NUMBER "capacityNumber",
-        rc.CAPACITY_TEL "capacityTel",
-        oo.ORDER_NUMBER "orderNumber",
-        ter.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
-        rg1.GATEPOST_NAME "gatepostName1",
-        tlfr.RESULT_OUT_GATE_TIME "resultOutGateTime",
-        rg2.GATEPOST_NAME "gatepostName2",
-        rm.material_name "materialName"
-        from OMSTRUCK_ORDER oo
-        left join OMSTRUCK_ORDER_MATERIAL oom
-        on oom.ORDER_ID = oo.ORDER_ID
-        left join RMS_MATERIAL rm
-        on rm.MATERIAL_ID = oom.MATERIAL_ID
-        left join RMS_CAPACITY rc
-        on rc.CAPACITY_ID = oo.CAPACITY_ID
-        left join TMSTRUCK_TOTAL_RESULT ttr
-        on ttr.ORDER_ID = oo.ORDER_ID
-        left join TMSTRUCK_ENFACTORY_RESULT ter
-        on ter.RESULT_TOTAL_ID = ttr.RESULT_TOTAL_ID
-        left join RMS_GATEPOST rg1
-        on rg1.GATEPOST_ID = ter.GATEPOST_ID
-        left join TMSTRUCK_LEAVE_FACTORY_RESULT tlfr
-        on tlfr.RESULT_TOTAL_ID = ttr.RESULT_TOTAL_ID
-        left join RMS_GATEPOST rg2
-        on rg2.GATEPOST_ID = tlfr.GATEPOST_ID
-        <where>
-            <if test="oneDate != null">
-                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = tlfr.RESULT_OUT_GATE_TIME
-                and oo.order_type=1
-            </if>
-        </where>
-        order by ter.RESULT_ENTRY_GATE_TIME desc
-        )
-    </select>
-
     <!--查询待进厂车数-->
     <update id="updateCancelResult" parameterType="com.steerinfo.dil.model.QmsQueueResult">
         update QMS_QUEUE_RESULT
@@ -1015,83 +980,186 @@
         where RESULT_ID = #{resultId}
     </update>
 
-
     <select id="getQueueListByQueueUpSpelling" parameterType="map" resultType="java.util.LinkedHashMap">
-        select QQR.RESULT_ID        "resultId",
-               QQR.RESULT_TOTAL_ID  "resultTotalId",
-               QQR.RESULT_START_TIME    "resultStartTime",
-               RC.CAPACITY_NUMBER       "capacityNumber",
-               QQSL.SPELILING_NUM       "grid",
-               QQSL.SPELLING_RESULT_ID  "spellingResultId",
-                RM.MATERIAL_ID       "materialId",
-                RM.MATERIAL_NAME     "materialName",
-                RM.MATERIAL_SPECIFICATION||'('||RM.MATERIAL_MODEL||')'    "materialSpecification",
-                RC.CAPACITY_ID           "capacityId",
-                RM.MATERIAL_MODEL        "materialModel",
-               QQSL.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",
-               RCE.CONSIGNEE_COMPANY_NAME   "consigneeName",
-              (
-                  select count(QQSL2.SPELLING_RESULT_ID) from QMS_QUEUE_SPELLING_LIST QQSL2
-                  where QQSL.SPELILING_NUM = QQSL2.SPELILING_NUM
-                   and QQSL.SPELLING_SURE_TIME &lt;= QQSL2.SPELLING_SURE_TIME
-
-              )     "listNodeOrder"
+        select QQR.RESULT_ID "resultId",
+        QQR.RESULT_TOTAL_ID "resultTotalId",
+        QQR.RESULT_START_TIME "resultStartTime",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        QQSL.SPELILING_NUM "grid",
+        QQSL.SPELLING_RESULT_ID "spellingResultId",
+        RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION||'('||RM.MATERIAL_MODEL||')' "materialSpecification",
+        RC.CAPACITY_ID "capacityId",
+        RM.MATERIAL_MODEL "materialModel",
+        QQSL.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",
+        RCE.CONSIGNEE_COMPANY_NAME "consigneeName",
+        QQSL.IS_VIP "resultInsertTime",
+        (CASE WHEN
+            QQSL.IS_VIP is not null
+            then 0
+            ELSE
+        (select COUNT(QQSL.SPELLING_RESULT_ID)
+        from QMS_QUEUE_SPELLING_LIST QQSL3
+        where SPELILING_NUM = QQR.grid_Id
+        and QQSL3.SPELLING_SURE_TIME &lt;= (
+        select QQSL2.SPELLING_SURE_TIME
+        from QMS_QUEUE_SPELLING_LIST QQSL2
+        where QQSL2.SPELLING_RESULT_ID = QQR.list_Id
+        ))
+            end
+        )
+        "listNodeOrder"
         from QMS_QUEUE_SPELLING_LIST QQSL
-            left join QMS_QUEUE_RESULT  QQR ON QQSL.QUEUE_RESULT_ID = QQR.RESULT_ID
-            left join RMS_CAPACITY RC ON QQR.CAPACITY_ID = RC.CAPACITY_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 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
-            where oo.ORDER_STATUS = 5
-              AND ASO.SALE_ORDER_STATUS = 4
-              AND OO.ORDER_ID NOT IN (
-                     select
-                     OO.ORDER_ID
-                     from OMSTRUCK_ORDER OO
-                     LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
-                     ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
-                     LEFT JOIN AMS_SALE_MATERIAL ASM
-                     ON ASM.SALE_ORDER_ID=ASOM.SALE_ORDER_ID
-                     LEFT JOIN RMS_MATERIAL RM
-                     ON RM.MATERIAL_ID=ASM.MATERIAL_ID
-                     WHERE ASM.DELETED  != 0 or  ASM.DELETED is null
-                     AND OO.ORDER_TYPE=1
-                     AND OO.ORDER_STATUS=5
-                     and RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
-                  )
-            <if test="capacityNumber != null">
-                and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
-            </if>
-            <if test="materialList != null">
-                and
-                EXISTS (
-                SELECT OO2.ORDER_ID
-                from OMSTRUCK_ORDER OO2 left join OMSTRUCK_ORDER_MATERIAL OOM2 on OO2.ORDER_ID = OOM2.ORDER_ID
-                where OO2.ORDER_ID = OO.ORDER_ID  and OOM2.MATERIAL_ID in
-                <foreach collection="materialList" item="item" open="(" separator="," close=")">
+        left join QMS_QUEUE_RESULT QQR ON QQSL.QUEUE_RESULT_ID = QQR.RESULT_ID
+        left join RMS_CAPACITY RC ON QQR.CAPACITY_ID = RC.CAPACITY_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 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 TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        where oo.ORDER_STATUS = 5
+        AND ASO.SALE_ORDER_STATUS = 4
+        AND TER.RESULT_ENTRY_GATE_TIME IS NULL
+        and QQSL.SPELILING_NUM not in (1,2)
+        AND OO.ORDER_ID NOT IN (
+        select
+        OO.ORDER_ID
+        from OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID=ASM.MATERIAL_ID
+        WHERE ASM.DELETED  != 0 or  ASM.DELETED is null
+        AND OO.ORDER_TYPE=1
+        AND OO.ORDER_STATUS=5
+        and RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
+        )
+        <if test="capacityNumber != null">and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
+        </if>
+        <if test="
+        materialList != null">and
+            EXISTS (
+            SELECT OO2.ORDER_ID
+            from OMSTRUCK_ORDER OO2 left join OMSTRUCK_ORDER_MATERIAL OOM2 on OO2.ORDER_ID = OOM2.ORDER_ID
+            where OO2.ORDER_ID = OO.ORDER_ID and OOM2.MATERIAL_ID in
+            <foreach collection="materialList" item="item" open="(" separator="," close=")">
                     ${item}
                 </foreach>
                 )
             </if>
             <if test="locationId != null">
                 and QQSL.SPELILING_NUM  = #{locationId}
-                ORDER BY  "listNodeOrder", QQSL.ENTRY_SURE_TIME DESC, QQSL.IS_VIP
+                ORDER BY QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,"listNodeOrder",OO.ORDER_ID
             </if>
             <if test="locationId == null">
-                ORDER BY "listNodeOrder",QQSL.ENTRY_SURE_TIME DESC, QQR.RESULT_START_TIME,QQSL.IS_VIP
+                ORDER BY QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,"listNodeOrder",OO.ORDER_ID
             </if>
     </select>
 
+    <select id="getQueueListByQueueUpSpellingNew" parameterType="map" resultType="java.util.LinkedHashMap">
+        select QQR.RESULT_ID "resultId",
+        QQR.RESULT_TOTAL_ID "resultTotalId",
+        QQR.RESULT_START_TIME "resultStartTime",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        QQSL.SPELILING_NUM "grid",
+        QQSL.SPELLING_RESULT_ID "spellingResultId",
+        RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION||'('||RM.MATERIAL_MODEL||')' "materialSpecification",
+        RC.CAPACITY_ID "capacityId",
+        RM.MATERIAL_MODEL "materialModel",
+        QQSL.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",
+        RCE.CONSIGNEE_COMPANY_NAME "consigneeName",
+        QQSL.IS_VIP "resultInsertTime",
+        (CASE WHEN
+            QQSL.IS_VIP IS NOT NULL
+            THEN 0
+            ELSE
+        (
+        select COUNT(QQSL.SPELLING_RESULT_ID)
+        from QMS_QUEUE_SPELLING_LIST QQSL3
+        where SPELILING_NUM = QQR.grid_Id
+        and QQSL3.SPELLING_SURE_TIME &lt;= (
+        select QQSL2.SPELLING_SURE_TIME
+        from QMS_QUEUE_SPELLING_LIST QQSL2
+        where QQSL2.SPELLING_RESULT_ID = QQR.list_Id
+        )
+        )
+            end
+        )
+         "listNodeOrder"
+        from QMS_QUEUE_SPELLING_LIST QQSL
+        left join QMS_QUEUE_RESULT QQR ON QQSL.QUEUE_RESULT_ID = QQR.RESULT_ID
+        left join RMS_CAPACITY RC ON QQR.CAPACITY_ID = RC.CAPACITY_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 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 TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        where oo.ORDER_STATUS = 5
+        AND ASO.SALE_ORDER_STATUS = 4
+        AND TER.RESULT_ENTRY_GATE_TIME IS NULL
+        and QQSL.SPELILING_NUM =2
+        AND OO.ORDER_ID NOT IN (
+        select
+        OO.ORDER_ID
+        from OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID=ASM.MATERIAL_ID
+        WHERE ASM.DELETED  != 0 or  ASM.DELETED is null
+        AND OO.ORDER_TYPE=1
+        AND OO.ORDER_STATUS=5
+        and RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
+        )
+        <if test="capacityNumber != null">and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
+        </if>
+        <if test="
+        materialList != null">and
+            EXISTS (
+            SELECT OO2.ORDER_ID
+            from OMSTRUCK_ORDER OO2 left join OMSTRUCK_ORDER_MATERIAL OOM2 on OO2.ORDER_ID = OOM2.ORDER_ID
+            where OO2.ORDER_ID = OO.ORDER_ID and OOM2.MATERIAL_ID in
+            <foreach collection="materialList" item="item" open="(" separator="," close=")">
+                ${item}
+            </foreach>
+            )
+        </if>
+        <if test="locationId != null">
+            and QQSL.SPELILING_NUM  = #{locationId}
+            ORDER BY QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,"listNodeOrder",OO.ORDER_ID
+        </if>
+        <if test="locationId == null">
+            ORDER BY QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,"listNodeOrder",OO.ORDER_ID
+        </if>
+    </select>
+
     <select id="getMaterialId" resultType="java.util.Map">
         select
         distinct
@@ -2327,4 +2395,104 @@
          o2.material_priority,
          rw.WAREHOUSE_NAME
     </select>
+
+    <select id="getSteelOrderNum" resultType="java.lang.Integer">
+       SELECT
+           COUNT( * )
+       FROM
+           OMSTRUCK_ORDER OO
+               LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+               LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+       WHERE
+           OO.ORDER_LINE_SEQUENCE >= 1
+         AND OO.ORDER_STATUS = 5
+         AND TLFR.RESULT_OUT_GATE_TIME IS NULL
+         AND OO.ORDER_TYPE = 1
+   </select>
+
+    <select id="getCapacityByDefend" resultType="java.util.Map" parameterType="java.util.Map">
+                select distinct * from(
+                select rc.CAPACITY_NUMBER "capacityNumber",
+                rc.CAPACITY_TEL "capacityTel",
+                oo.ORDER_NUMBER "orderNumber",
+                ter.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
+                rg1.GATEPOST_NAME "gatepostName1",
+                tlfr.RESULT_OUT_GATE_TIME "resultOutGateTime",
+                rg2.GATEPOST_NAME "gatepostName2",
+                rm.material_name "materialName"
+                from OMSTRUCK_ORDER oo
+                left join OMSTRUCK_ORDER_MATERIAL oom
+                on oom.ORDER_ID = oo.ORDER_ID
+                left join RMS_MATERIAL rm
+                on rm.MATERIAL_ID = oom.MATERIAL_ID
+                left join RMS_CAPACITY rc
+                on rc.CAPACITY_ID = oo.CAPACITY_ID
+                left join TMSTRUCK_TOTAL_RESULT ttr
+                on ttr.ORDER_ID = oo.ORDER_ID
+                left join TMSTRUCK_ENFACTORY_RESULT ter
+                on ter.RESULT_TOTAL_ID = ttr.RESULT_TOTAL_ID
+                left join RMS_GATEPOST rg1
+                on rg1.GATEPOST_ID = ter.GATEPOST_ID
+                left join TMSTRUCK_LEAVE_FACTORY_RESULT tlfr
+                on tlfr.RESULT_TOTAL_ID = ttr.RESULT_TOTAL_ID
+                left join RMS_GATEPOST rg2
+                on rg2.GATEPOST_ID = tlfr.GATEPOST_ID
+                <where>
+                    <if test="oneDate != null">
+                        and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = tlfr.RESULT_OUT_GATE_TIME
+                        and oo.order_type=1
+                    </if>
+                </where>
+                order by ter.RESULT_ENTRY_GATE_TIME desc
+                )
+            </select>
+
+    <!--获得进厂车的号码-->
+    <select id="getCapacityNum" resultType="java.util.Map">
+        SELECT
+            RC.CAPACITY_NUMBER "capacityNumber"
+        FROM
+            OMSTRUCK_ORDER OO
+                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+                LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                LEFT JOIN RMS_CAPACITY RC
+                          ON RC.CAPACITY_ID=OO.CAPACITY_ID
+        WHERE
+            OO.ORDER_LINE_SEQUENCE >= 1
+          AND OO.ORDER_STATUS = 5
+          AND TLFR.RESULT_OUT_GATE_TIME IS NULL
+          AND OO.ORDER_TYPE = 1
+    </select>
+    <update id="updateQmsResult" parameterType="java.math.BigDecimal">
+        update QMS_QUEUE_RESULT QQR
+        SET QQR.UPDATE_TIME = sysdate
+        where QQR.RESULT_TOTAL_ID = #{resultTotalId}
+    </update>
+    <select id="getCarNumber" resultType="java.lang.Integer">
+        SELECT distinct RCA.CAPACITY_NUMBER
+        FROM AMS_SALE_ORDER ASO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+        ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN RMS_CARRIER R_CARRIER
+        ON R_CARRIER.CARRIER_ID = ADSO.CARRIER_ID
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM
+        ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        AND NVL(OO.ORDER_TYPE,0) in (0,1)
+        LEFT JOIN RMS_CAPACITY RCA
+        ON RCA.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE ASO.SALE_TYPE = 1
+        AND ASO.DELETED = 0
+        and RCA.CAPACITY_NUMBER is not null
+        and ASM.SALE_MATERIAL_ID IS NOT NULL
+        and ASOM.SALE_DATE_OF_RECEIPT  > sysdate
+        and ASOM.SALE_DATE_OF_RECEIPT - 1 &lt; sysdate
+    </select>
 </mapper>

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

@@ -371,6 +371,7 @@
     DELETE FROM QMS_QUEUE_SPELLING_LIST WHERE QUEUE_RESULT_ID = #{queueResultId}
   </delete>
 
+
   <update id="updateListEnFactory" parameterType="map">
     UPDATE QMS_QUEUE_SPELLING_LIST QQSL
         SET QQSL.ENTRY_SURE_TIME = SYSDATE,DELETED = 2
@@ -392,5 +393,8 @@
      set MATERIAL_PRIORITY = #{id}
      where ORDER_ID = #{orderId} and MATERIAL_ID = #{materialId}
   </update>
-
+  <delete id="deleteSpellingList" parameterType="java.math.BigDecimal">
+    DELETE FROM QMS_QUEUE_SPELLING_LIST QQSL
+    WHERE QQSL.QUEUE_RESULT_ID IN (SELECT QQR.RESULT_ID FROM QMS_QUEUE_RESULT QQR WHERE QQR.CAPACITY_ID = #{capacityId})
+  </delete>
 </mapper>