|
@@ -1402,7 +1402,7 @@
|
|
<if test="index!=null">
|
|
<if test="index!=null">
|
|
and ( (instr(rs.supplier_name, #{index}) > 0) or (instr(rm.material_name , #{index}) > 0)
|
|
and ( (instr(rs.supplier_name, #{index}) > 0) or (instr(rm.material_name , #{index}) > 0)
|
|
or (instr(rc.capacity_number , #{index}) > 0) or (instr(rce.consignee_company_name , #{index}) > 0)
|
|
or (instr(rc.capacity_number , #{index}) > 0) or (instr(rce.consignee_company_name , #{index}) > 0)
|
|
- or (instr( RC.CARRIER_NAME , #{index}) > 0) or (instr(RL.LINE_NAME , #{index}) > 0))
|
|
|
|
|
|
+ or (instr( RC.CARRIER_NAME , #{index}) > 0) )
|
|
</if>
|
|
</if>
|
|
<if test="oneDate != null">
|
|
<if test="oneDate != null">
|
|
and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') < = TWR.RESULT_TARE_WEIGHT_TIME
|
|
and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') < = TWR.RESULT_TARE_WEIGHT_TIME
|
|
@@ -1781,6 +1781,7 @@
|
|
TWR.RESULT_NET_WEIGHT IS NOT NULL
|
|
TWR.RESULT_NET_WEIGHT IS NOT NULL
|
|
AND OO.ORDER_STATUS = 2
|
|
AND OO.ORDER_STATUS = 2
|
|
AND OO.ORDER_TYPE = 11
|
|
AND OO.ORDER_TYPE = 11
|
|
|
|
+ AND AIR.INSERT_UPDATE_REMARK not like '%计时且过计量%'
|
|
<if test="orgCode!=null">
|
|
<if test="orgCode!=null">
|
|
AND OO.OPTIONER_CODE=#{orgCode}
|
|
AND OO.OPTIONER_CODE=#{orgCode}
|
|
</if>
|
|
</if>
|
|
@@ -1794,7 +1795,7 @@
|
|
<if test="index!=null">
|
|
<if test="index!=null">
|
|
and ((instr(RC.CAPACITY_NUMBER, #{index}) > 0) or (instr(RW1.WAREHOUSE_NAME, #{index}) > 0)
|
|
and ((instr(RC.CAPACITY_NUMBER, #{index}) > 0) or (instr(RW1.WAREHOUSE_NAME, #{index}) > 0)
|
|
or (instr(RW2.WAREHOUSE_NAME, #{index}) > 0) or (instr(RM.MATERIAL_NAME , #{index}) > 0)
|
|
or (instr(RW2.WAREHOUSE_NAME, #{index}) > 0) or (instr(RM.MATERIAL_NAME , #{index}) > 0)
|
|
- or (instr( RC2.CARRIER_NAME, #{index}) > 0) or (instr(RL.LINE_NAME, #{index}) > 0))
|
|
|
|
|
|
+ or (instr( RC2.CARRIER_NAME, #{index}) > 0) )
|
|
</if>
|
|
</if>
|
|
)
|
|
)
|
|
</where>
|
|
</where>
|