|
@@ -202,13 +202,9 @@
|
|
|
from OMSTRUCK_ORDER OO
|
|
from OMSTRUCK_ORDER OO
|
|
|
left join TMSTRUCK_TOTAL_RESULT TTR
|
|
left join TMSTRUCK_TOTAL_RESULT TTR
|
|
|
on TTR.ORDER_ID = OO.ORDER_ID
|
|
on TTR.ORDER_ID = OO.ORDER_ID
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
- where OO.ORDER_NUMBER=#{orderNumber}
|
|
|
|
|
-=======
|
|
|
|
|
left join RMS_CAPACITY RC
|
|
left join RMS_CAPACITY RC
|
|
|
on OO.CAPACITY_ID = RC.CAPACITY_ID
|
|
on OO.CAPACITY_ID = RC.CAPACITY_ID
|
|
|
where OO.order_Number=#{orderNumber}
|
|
where OO.order_Number=#{orderNumber}
|
|
|
->>>>>>> bf4c2967e0e6aa0fe1e443c7ac538afb6341c61d
|
|
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<select id="getLineSequenceByOrderNumber" parameterType="string" resultType="java.lang.Integer">
|
|
<select id="getLineSequenceByOrderNumber" parameterType="string" resultType="java.lang.Integer">
|
txf