|
@@ -1140,7 +1140,7 @@
|
|
|
left join RMS_CONSIGNEE RCON
|
|
|
on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
|
|
|
|
|
|
- where RESULT_TARE_WEIGHT_TIME is not null and OO.ORDER_TYPE = #{orderTypee}
|
|
|
+ where RESULT_TARE_WEIGHT_TIME is not null and OO.ORDER_TYPE in (1, 2)
|
|
|
)
|
|
|
<where>
|
|
|
<if test="purchaseOrderNo != null">
|
|
@@ -1267,7 +1267,7 @@
|
|
|
on RS.SHIPPER_ID = ASO.SHIPPER_ID
|
|
|
left join RMS_CONSIGNEE RCON
|
|
|
on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
|
|
|
- where RESULT_GROSS_WEIGHT_TIME is not null and OO.ORDER_TYPE = #{orderTypee}
|
|
|
+ where RESULT_GROSS_WEIGHT_TIME is not null and OO.ORDER_TYPE in (1, 2)
|
|
|
)
|
|
|
<where>
|
|
|
<if test="saleNumber != null">
|