|
|
@@ -847,65 +847,67 @@
|
|
|
|
|
|
<!-- 查询排队开始 -->
|
|
|
<select id="getQueueListByQueueUp" parameterType="java.util.Map" resultType="java.util.Map">
|
|
|
+ SELECT P0.*,ROWNUM "ROW_ID" FROM (
|
|
|
SELECT
|
|
|
- rownum as "ROW_ID",
|
|
|
- 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",
|
|
|
- (
|
|
|
- select COUNT(QQL2.LIST_ID)
|
|
|
- from QMS_QUEUE_LIST QQL2
|
|
|
- where QQL2.GRID_ID = QQL.GRID_ID
|
|
|
- and QQL2.LIST_NODE_ORDER <= QQL.LIST_NODE_ORDER
|
|
|
- ) || (case when QQL.IS_VIP is not null then ' 优先进厂' else '' end ) "listNodeOrder"
|
|
|
+ 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",
|
|
|
+ (
|
|
|
+ select COUNT(QQL2.LIST_ID)
|
|
|
+ from QMS_QUEUE_LIST QQL2
|
|
|
+ where QQL2.GRID_ID = QQL.GRID_ID
|
|
|
+ and QQL2.LIST_NODE_ORDER <= QQL.LIST_NODE_ORDER
|
|
|
+ ) || (case when QQL.IS_VIP is not null then ' 优先进厂' else '' 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
|
|
|
- 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 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 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 AMS_SALE_TRUCKNO_MATERIAL ASTM
|
|
|
- ON ASTM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
|
|
|
- LEFT JOIN AMS_SALE_MATERIAL ASM
|
|
|
- ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
|
|
|
- where oo.ORDER_STATUS = 5
|
|
|
- <if test="capacityNumber != null">
|
|
|
- and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
|
|
|
- </if>
|
|
|
- <if test="materialList != null">
|
|
|
- and RM.MATERIAL_ID in
|
|
|
- <foreach collection="materialList" item="item" open="(" separator="," close=")">
|
|
|
- ${item}
|
|
|
- </foreach>
|
|
|
- </if>
|
|
|
- <if test="locationId != null">
|
|
|
- and QQL.GRID_ID = #{locationId}
|
|
|
- ORDER BY QQL.ENTRY_SURE_TIME DESC, QQL.IS_VIP, "listNodeOrder"
|
|
|
- </if>
|
|
|
+ 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
|
|
|
+ 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 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 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 AMS_SALE_TRUCKNO_MATERIAL ASTM
|
|
|
+ ON ASTM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
|
|
|
+ LEFT JOIN AMS_SALE_MATERIAL ASM
|
|
|
+ ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
|
|
|
+ where oo.ORDER_STATUS = 5
|
|
|
+ <if test="capacityNumber != null">
|
|
|
+ and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
|
|
|
+ </if>
|
|
|
+ <if test="materialList != null">
|
|
|
+ and RM.MATERIAL_ID in
|
|
|
+ <foreach collection="materialList" item="item" open="(" separator="," close=")">
|
|
|
+ ${item}
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
+ <if test="locationId != null">
|
|
|
+ and QQL.GRID_ID = #{locationId}
|
|
|
+ ORDER BY QQL.ENTRY_SURE_TIME DESC, QQL.IS_VIP, "listNodeOrder"
|
|
|
+ </if>
|
|
|
<if test="locationId == null">
|
|
|
ORDER BY QQL.ENTRY_SURE_TIME DESC, QQL.IS_VIP, "materialName" DESC, "listNodeOrder"
|
|
|
</if>
|
|
|
+ ) P0
|
|
|
+
|
|
|
</select>
|
|
|
|
|
|
<update id="updateCancelResult" parameterType="com.steerinfo.dil.model.QmsQueueResult">
|
luobang