|
@@ -1927,9 +1927,9 @@
|
|
|
and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TWR.RESULT_GROSS_WEIGHT_TIME
|
|
|
</if>
|
|
|
<if test="index!=null">
|
|
|
- and (instr(RC.CONSIGNEE_COMPANY_NAME, #{index}) > 0) or (instr( RS.SHIPPER_NAME, #{index}) > 0) or
|
|
|
+ and ((instr(RC.CONSIGNEE_COMPANY_NAME, #{index}) > 0) or (instr( RS.SHIPPER_NAME, #{index}) > 0) or
|
|
|
(instr(RM.MATERIAL_NAME, #{index}) > 0) or (instr(RC3.CARRIER_NAME, #{index}) > 0) or
|
|
|
- (instr( RL.LINE_NAME, #{index}) > 0)
|
|
|
+ (instr( RL.LINE_NAME, #{index}) > 0))
|
|
|
</if>
|
|
|
</where>
|
|
|
ORDER BY OO.ORDER_NUMBER DESC
|
|
@@ -2017,9 +2017,9 @@
|
|
|
and oo.OPTIONER_CODE = #{orgCode}
|
|
|
</if>
|
|
|
<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.CARRIER_NAME , #{index}) > 0) or (instr(RL.LINE_NAME , #{index}) > 0)
|
|
|
+ or (instr( RC.CARRIER_NAME , #{index}) > 0) or (instr(RL.LINE_NAME , #{index}) > 0))
|
|
|
</if>
|
|
|
<if test="oneDate != null">
|
|
|
and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') < = TWR4.RESULT_TARE_WEIGHT_TIME
|
|
@@ -2073,9 +2073,9 @@
|
|
|
AND OO.OPTIONER_CODE=#{orgCode}
|
|
|
</if>
|
|
|
<if test="index!=null">
|
|
|
- and (instr(RC.CAPACITY_NUMBER, #{index}) > 0) or (instr(RS.SHIPPER_NAME, #{index}) > 0)
|
|
|
+ and ((instr(RC.CAPACITY_NUMBER, #{index}) > 0) or (instr(RS.SUPPLIER_NAME, #{index}) > 0)
|
|
|
or (instr( RC2.CONSIGNEE_COMPANY_NAME, #{index}) > 0) or (instr( RC3.CARRIER_NAME, #{index}) > 0)
|
|
|
- or (instr(RL.LINE_NAME, #{index}) > 0) or (instr(RM.MATERIAL_NAME, #{index}) > 0)
|
|
|
+ or (instr(RL.LINE_NAME, #{index}) > 0) or (instr(RM.MATERIAL_NAME, #{index}) > 0))
|
|
|
</if>
|
|
|
<if test="oneDate != null">
|
|
|
and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') < = TWR.RESULT_TARE_WEIGHT_TIME
|
|
@@ -2132,9 +2132,9 @@
|
|
|
and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= greatest(TWR.RESULT_TARE_WEIGHT_TIME,TWR.RESULT_GROSS_WEIGHT_TIME)
|
|
|
</if>
|
|
|
<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( RC2.CARRIER_NAME, #{index}) > 0) or (instr(RL.LINE_NAME, #{index}) > 0)
|
|
|
+ or (instr( RC2.CARRIER_NAME, #{index}) > 0) or (instr(RL.LINE_NAME, #{index}) > 0))
|
|
|
</if>
|
|
|
)
|
|
|
</where>
|