|
|
@@ -2541,10 +2541,15 @@
|
|
|
AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
|
|
|
AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
|
|
|
OO.ORDER_ID AS "orderId",
|
|
|
- AIP.INSERT_TIME AS "insertTime"
|
|
|
+ AIP.INSERT_TIME AS "insertTime",
|
|
|
+ RW.WAREHOUSE_NAME AS "unloadName",
|
|
|
+ RW1.WAREHOUSE_NAME AS "loadName",
|
|
|
+ RM.MATERIAL_NAME AS "materialName"
|
|
|
FROM OMSTRUCK_ORDER OO
|
|
|
LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
|
|
|
ON OOM.ORDER_ID = OO.ORDER_ID
|
|
|
+ LEFT JOIN RMS_MATERIAL RM
|
|
|
+ ON RM.MATERIAL_ID = OOM.MATERIAL_ID
|
|
|
LEFT JOIN RMS_CAPACITY RC
|
|
|
ON RC.CAPACITY_ID = OO.CAPACITY_ID
|
|
|
LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
|
|
|
@@ -2557,6 +2562,10 @@
|
|
|
ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
|
|
|
LEFT JOIN RMS_CARRIER RCA
|
|
|
ON RCA.CARRIER_ID = AIP.CARRIER_ID
|
|
|
+ LEFT JOIN RMS_WAREHOUSE RW
|
|
|
+ ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
|
|
|
+ LEFT JOIN RMS_WAREHOUSE RW1
|
|
|
+ ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
|
|
|
WHERE AIP.DELETED = 0
|
|
|
AND OO.ORDER_TYPE = 11
|
|
|
<if test="carrierId != null">
|
|
|
@@ -2622,6 +2631,24 @@
|
|
|
"capacityNumber" like '%${item}%'
|
|
|
</foreach>
|
|
|
</if>
|
|
|
+ <if test="unloadName != null">
|
|
|
+ and
|
|
|
+ <foreach collection="unloadName" item="item" open="(" separator="or" close=")">
|
|
|
+ "unloadName" like '%${item}%'
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
+ <if test="loadName != null">
|
|
|
+ and
|
|
|
+ <foreach collection="loadName" item="item" open="(" separator="or" close=")">
|
|
|
+ "loadName" like '%${item}%'
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
+ <if test="materialName != null">
|
|
|
+ and
|
|
|
+ <foreach collection="materialName" item="item" open="(" separator="or" close=")">
|
|
|
+ "materialName" like '%${item}%'
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
</where>
|
|
|
<include refid="orderBy"></include>
|
|
|
</select>
|
luobang