|
@@ -1766,7 +1766,6 @@
|
|
|
) - 1
|
|
|
where OO.ORDER_ID = #{orderId}
|
|
|
</update>
|
|
|
-
|
|
|
<select id="checkMaterialIdLoad" resultType="java.lang.Integer">
|
|
|
select TLR.RESULT_ID
|
|
|
from TMSTRUCK_LOAD_RESULT TLR
|
|
@@ -1813,6 +1812,7 @@
|
|
|
</select>
|
|
|
<select id="selectLoadingIdRemark" resultType="java.util.Map">
|
|
|
SELECT OO.ORDER_ID "orderId",
|
|
|
+ OO.ORDER_TYPE "orderType",
|
|
|
OO.ORDER_NUMBER "orderNumber",
|
|
|
RC.CAPACITY_NUMBER "capacityNumber",
|
|
|
TTR.RESULT_TOTAL_ID "resultTotalId",
|
|
@@ -1825,11 +1825,13 @@
|
|
|
TUR.RESULT_UNLOAD_PLACE_ID "unloadingId",
|
|
|
RWU.WAREHOUSE_NAME "unloadingName",
|
|
|
TUR.MATERIAL_ID "materialId",
|
|
|
- RM.MATERIAL_NAME "materialName"
|
|
|
+ RM.MATERIAL_NAME "materialName",
|
|
|
+ TWR.WEIGHT_TASK_RESULT_ID "weightTaskId"
|
|
|
FROM OMSTRUCK_ORDER OO
|
|
|
LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO.ORDER_ID = TTR.ORDER_ID
|
|
|
LEFT JOIN TMSTRUCK_LOAD_RESULT TLR ON TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
|
|
|
LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
|
|
|
+ LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
|
|
|
LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = TUR.MATERIAL_ID
|
|
|
LEFT JOIN RMS_WAREHOUSE RWL ON RWL.WAREHOUSE_ID = TLR.LOADING_ID
|
|
@@ -1837,5 +1839,26 @@
|
|
|
WHERE OO.ORDER_NUMBER = #{orderNumber}
|
|
|
FETCH NEXT 1 ROWS ONLY
|
|
|
</select>
|
|
|
-
|
|
|
+ <select id="selectInwardOrderPlanId" resultType="java.math.BigDecimal" parameterType="map">
|
|
|
+ SELECT ARP.PLAN_ID FROM AMSTRUCK_INWARD_REQUIREMENT AIR
|
|
|
+ LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
|
|
|
+ ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
|
|
|
+ LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
|
|
|
+ ON ARP.REQUIREMENT_ID = AIR.REQUIREMENT_ID
|
|
|
+ WHERE ARM.REQUIREMENT_UNLOAD_UNIT_ID = #{unloadingId}
|
|
|
+ AND ARM.REQUIREMENT_PLATFORM_ID = #{loadingId}
|
|
|
+ ORDER BY AIR.INSERT_TIME DESC
|
|
|
+ FETCH NEXT 1 ROWS ONLY
|
|
|
+ </select>
|
|
|
+ <update id="updateOOOrderPlanId" parameterType="map">
|
|
|
+ UPDATE OMSTRUCK_ORDER OO
|
|
|
+ SET OO.ORDER_PLAN_ID = #{orderPlanId}
|
|
|
+ WHERE OO.ORDER_ID = #{orderId}
|
|
|
+ and oo.order_type in (11,21)
|
|
|
+ </update>
|
|
|
+ <update id="updateOOMaterialId" >
|
|
|
+ update OMSTRUCK_ORDER_MATERIAL OOM
|
|
|
+ set oom.MATERIAL_ID = #{materialId}
|
|
|
+ where OOM.order_id = #{orderId}
|
|
|
+ </update>
|
|
|
</mapper>
|