tj

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

@@ -2194,12 +2194,24 @@
     </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_enfactory_result ter on ter.result_total_id=ttr.result_total_id
-        where o1.order_status=5 and o1.order_type=1 and ter.result_entry_gate_time is null and rw.WAREHOUSE_NAME is not null
-        group by o2.material_priority,rw.WAREHOUSE_NAME
+        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>