|
@@ -457,6 +457,10 @@
|
|
|
|
|
|
WHERE RPG.WAREHOUSE_ID =#{warehouseId}
|
|
|
AND WIR.INBOUND_ISCOMPLETE=#{status}
|
|
|
+ <if test="startDate != null">
|
|
|
+ AND to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= WIR.INBOUND_TIME
|
|
|
+ AND to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= WIR.INBOUND_TIME
|
|
|
+ </if>
|
|
|
GROUP BY RM.MATERIAL_CODE
|
|
|
) table1
|
|
|
ON table1.code = RM.MATERIAL_CODE
|
|
@@ -465,6 +469,10 @@
|
|
|
AND RM.MATERIAL_NAME LIKE (#{con})
|
|
|
AND table1.count>0
|
|
|
</if>
|
|
|
+ <if test="startDate != null">
|
|
|
+ AND to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= WIR.INBOUND_TIME
|
|
|
+ AND to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= WIR.INBOUND_TIME
|
|
|
+ </if>
|
|
|
AND WIR.INBOUND_ISCOMPLETE=#{status}
|
|
|
<include refid="orderBy"></include>
|
|
|
</select>
|