|
|
@@ -1065,11 +1065,11 @@
|
|
|
on ASM1.MATERIAL_ID=RM.MATERIAL_ID
|
|
|
where OO.ORDER_TYPE in (1) and TRR.INSERT_TIME IS NOT NULL
|
|
|
<if test="oneDate != null">
|
|
|
- and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') < = TAR.INSERT_TIME
|
|
|
+ and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') < = TRR.INSERT_TIME
|
|
|
</if>
|
|
|
<if test="startDate != null">
|
|
|
- and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= TAR.INSERT_TIME
|
|
|
- and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TAR.INSERT_TIME
|
|
|
+ and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= TRR.INSERT_TIME
|
|
|
+ and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TRR.INSERT_TIME
|
|
|
</if>
|
|
|
<if test="con!=null">
|
|
|
and (instr(RC.CAPACITY_NUMBER,#{con})>0 or instr(RM.MATERIAL_NAME,#{con})>0
|
