|
@@ -439,7 +439,7 @@
|
|
|
LEFT JOIN RMS_MATERIAL RM
|
|
|
ON RM.MATERIAL_ID = RMS.MATERIAL_ID
|
|
|
where WIE.WAREHOUSE_ID = #{warehouseId}
|
|
|
-
|
|
|
+ AND WIE.DELETED = 0
|
|
|
<if test="oneDate != null">
|
|
|
and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') < = WIE.INSERT_TIME
|
|
|
</if>
|
|
@@ -447,6 +447,7 @@
|
|
|
and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= WIE.INSERT_TIME
|
|
|
and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= WIE.INSERT_TIME
|
|
|
</if>
|
|
|
+ ORDER BY WIE.INBOUND_EAS_ID DESC
|
|
|
</select>
|
|
|
<select id="getInboundResult" resultType="java.math.BigDecimal" parameterType="java.lang.Integer">
|
|
|
SELECT WIR.INBOUND_ID FROM WMSP_INBOUND_RESULT WIR
|