ds

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

@@ -870,6 +870,10 @@
         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
@@ -878,7 +882,10 @@
         QQL2.LIST_NODE_ORDER
         from QMS_QUEUE_LIST QQL2
         where QQL2.LIST_ID = QQR.list_Id
-        )) "listNodeOrder"
+        ))
+        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
@@ -991,15 +998,21 @@
         RG.GATEPOST_NAME "gatepostName",
         RCE.CONSIGNEE_COMPANY_NAME "consigneeName",
         QQSL.IS_VIP "resultInsertTime",
-        (
-        select COUNT(QQSL.SPELLING_RESULT_ID)
+        (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 <= (
         select QQSL2.SPELLING_SURE_TIME
         from QMS_QUEUE_SPELLING_LIST QQSL2
         where QQSL2.SPELLING_RESULT_ID = QQR.list_Id
-        )) "listNodeOrder"
+        ))
+            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
@@ -1020,8 +1033,8 @@
         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 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
@@ -1071,6 +1084,10 @@
         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
@@ -1080,7 +1097,10 @@
         from QMS_QUEUE_SPELLING_LIST QQSL2
         where QQSL2.SPELLING_RESULT_ID = QQR.list_Id
         )
-        ) "listNodeOrder"
+        )
+            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
@@ -1101,8 +1121,8 @@
         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 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