|
|
@@ -565,6 +565,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="selectOutResult" resultType="java.util.Map" parameterType="java.util.Map">
|
|
|
+ select * from (
|
|
|
SELECT
|
|
|
DISTINCT
|
|
|
ckd.RESULT_NUMBER "resultNumber",
|
|
|
@@ -620,36 +621,39 @@
|
|
|
ckd.INSERT_UPDATE_REMARK "insertUpdateRemark"
|
|
|
FROM WMSP_OUTBOUND_RESULT ckd
|
|
|
LEFT JOIN OMSTRUCK_ORDER ysdd
|
|
|
- ON ckd.BILL_LADING_ID = ysdd.ORDER_ID
|
|
|
+ ON ckd.BILL_LADING_ID = ysdd.ORDER_ID
|
|
|
LEFT JOIN RMS_CAPACITY ylxx
|
|
|
- ON ysdd.CAPACITY_ID = ylxx.CAPACITY_ID
|
|
|
+ ON ysdd.CAPACITY_ID = ylxx.CAPACITY_ID
|
|
|
LEFT JOIN OMSTRUCK_ORDER_MATERIAL yswz
|
|
|
- ON ysdd.ORDER_ID = yswz.ORDER_ID
|
|
|
+ ON ysdd.ORDER_ID = yswz.ORDER_ID
|
|
|
LEFT JOIN WMSP_OUTBOUND_SCAN_RESULT wosr
|
|
|
- ON wosr.OUTBOUND_RESULT_ID = ckd.RESULT_ID
|
|
|
+ ON wosr.OUTBOUND_RESULT_ID = ckd.RESULT_ID
|
|
|
LEFT JOIN WMSP_INBOUND_SCAN_RESULT sisr
|
|
|
- ON wosr.INBOUND_RESULT_ID = sisr.INBOUND_RESULT_ID
|
|
|
+ ON wosr.INBOUND_RESULT_ID = sisr.INBOUND_RESULT_ID
|
|
|
LEFT JOIN WMSP_GRID_MATERIAL wzwg
|
|
|
- ON sisr.MATERIAL_ID = wzwg.MATERIAL_ID
|
|
|
+ ON sisr.MATERIAL_ID = wzwg.MATERIAL_ID
|
|
|
LEFT JOIN RMS_PWAREHOUSE_GRID wg
|
|
|
- ON wzwg.GRID_ID = wg.GRID_ID
|
|
|
+ ON wzwg.GRID_ID = wg.GRID_ID
|
|
|
LEFT JOIN RMS_WAREHOUSE ck
|
|
|
- ON wg.WAREHOUSE_ID = ck.WAREHOUSE_ID
|
|
|
+ ON wg.WAREHOUSE_ID = ck.WAREHOUSE_ID
|
|
|
LEFT JOIN RMS_STACKING dw
|
|
|
- ON wg.STACKING_ID = dw.STACKING_ID
|
|
|
+ ON wg.STACKING_ID = dw.STACKING_ID
|
|
|
LEFT JOIN RMS_MATERIAL_STEEL gcwz
|
|
|
- ON wzwg.MATERIAL_ID = gcwz.MATERIAL_STEEL_ID
|
|
|
+ ON wzwg.MATERIAL_ID = gcwz.MATERIAL_STEEL_ID
|
|
|
LEFT JOIN RMS_MATERIAL wz
|
|
|
- ON gcwz.MATERIAL_ID = wz.MATERIAL_ID
|
|
|
+ ON gcwz.MATERIAL_ID = wz.MATERIAL_ID
|
|
|
LEFT JOIN RMS_UNIT_OF_MEASURE jldw
|
|
|
- ON wz.UNIT_OF_MEASURE_ID = jldw.UNIT_OF_MEASURE_ID
|
|
|
- WHERE wg.WAREHOUSE_ID = #{warehouseId}
|
|
|
+ ON wz.UNIT_OF_MEASURE_ID = jldw.UNIT_OF_MEASURE_ID
|
|
|
+ WHERE wg.WAREHOUSE_ID = #{warehouseId}
|
|
|
<if test="startTime != null and endTime !=null">
|
|
|
- and ckd.insert_time between to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss')
|
|
|
+ and ckd.insert_time between to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') and to_date(#{endDate},
|
|
|
+ 'yyyy-mm-dd hh24:mi:ss')
|
|
|
</if>
|
|
|
<if test="oneDate != null">
|
|
|
and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') <= ckd.insert_time
|
|
|
</if>
|
|
|
+ order by ckd.INSERT_TIME desc
|
|
|
+ )
|
|
|
<where>
|
|
|
<if test="resultNumber != null">
|
|
|
and
|
