提交代码

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

@@ -690,12 +690,13 @@
     LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO.ORDER_ID = TTR.ORDER_ID
     LEFT JOIN (
     select OO.ORDER_ID "orderId"
-    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 in (4,5)
-    and
-    RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
+        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 in (4,5)
+        and (OOM.MATERIAL_PRIORITY !=71 OR OOM.MATERIAL_PRIORITY is null)
+        and
+        RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
     ) TEMP ON TEMP."orderId"=OO.ORDER_ID
     WHERE
     OO.ORDER_ID = #{orderId}

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

@@ -903,13 +903,12 @@
         </if>
         <if test="locationId != null">
             and QQL.GRID_ID = #{locationId}
-            ORDER BY QQL.ENTRY_SURE_TIME DESC, QQL.IS_VIP, "listNodeOrder"
+            ORDER BY "listNodeOrder",QQL.ENTRY_SURE_TIME DESC, QQL.IS_VIP
         </if>
         <if test="locationId == null">
-            ORDER BY QQL.ENTRY_SURE_TIME DESC, QQL.IS_VIP, "listNodeOrder",QQR.RESULT_START_TIME
+            ORDER BY "listNodeOrder",QQL.ENTRY_SURE_TIME DESC, QQL.IS_VIP ,QQR.RESULT_START_TIME
         </if>
         ) P0
-
     </select>
 
     <!--查询已派车车数-->
@@ -1056,12 +1055,19 @@
             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 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)
+                     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
@@ -1079,10 +1085,10 @@
             </if>
             <if test="locationId != null">
                 and QQSL.SPELILING_NUM  = #{locationId}
-                ORDER BY  QQSL.ENTRY_SURE_TIME DESC, QQSL.IS_VIP,  "listNodeOrder"
+                ORDER BY  "listNodeOrder", QQSL.ENTRY_SURE_TIME DESC, QQSL.IS_VIP
             </if>
             <if test="locationId == null">
-                ORDER BY QQSL.ENTRY_SURE_TIME DESC, QQR.RESULT_START_TIME,QQSL.IS_VIP, "listNodeOrder"
+                ORDER BY "listNodeOrder",QQSL.ENTRY_SURE_TIME DESC, QQR.RESULT_START_TIME,QQSL.IS_VIP
             </if>
     </select>