提交代码

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

@@ -849,32 +849,35 @@
     <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",
+        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",
-        QQL.IS_VIP                  "resultInsertTime",
-        (
-        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",
+        (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
+        )) "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
@@ -882,7 +885,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
@@ -988,11 +991,14 @@
         RCE.CONSIGNEE_COMPANY_NAME "consigneeName",
         QQSL.IS_VIP "resultInsertTime",
         (
-        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 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
+        )) "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
@@ -1008,12 +1014,19 @@
         AND ASO.SALE_ORDER_STATUS = 4
         and QQSL.SPELILING_NUM not in (1,2)
         AND OO.ORDER_ID NOT IN (
-        select OO.ORDER_ID
+        select
+        OO.ORDER_ID
         from OMSTRUCK_ORDER OO
-        left join OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID=OOM.ORDER_ID
-        left join RMS_MATERIAL RM ON OOM.MATERIAL_ID = RM.MATERIAL_ID
-        where OO.ORDER_STATUS=5 and
-        RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
+        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>
@@ -1058,10 +1071,14 @@
         RCE.CONSIGNEE_COMPANY_NAME "consigneeName",
         QQSL.IS_VIP "resultInsertTime",
         (
-        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
-
+        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
+        )
         ) "listNodeOrder"
         from QMS_QUEUE_SPELLING_LIST QQSL
         left join QMS_QUEUE_RESULT QQR ON QQSL.QUEUE_RESULT_ID = QQR.RESULT_ID
@@ -1078,12 +1095,19 @@
         AND ASO.SALE_ORDER_STATUS = 4
         and QQSL.SPELILING_NUM =2
         AND OO.ORDER_ID NOT IN (
-        select OO.ORDER_ID
+        select
+        OO.ORDER_ID
         from OMSTRUCK_ORDER OO
-        left join OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID=OOM.ORDER_ID
-        left join RMS_MATERIAL RM ON OOM.MATERIAL_ID = RM.MATERIAL_ID
-        where OO.ORDER_STATUS=5 and
-        RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
+        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>