|
@@ -882,9 +882,10 @@
|
|
|
LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
|
|
|
LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
|
|
|
LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
|
|
|
+ where oo.ORDER_STATUS = 5
|
|
|
<where>
|
|
|
<if test="capacityNumber != null">
|
|
|
- instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
|
|
|
+ and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
|
|
|
</if>
|
|
|
<if test="materialList != null">
|
|
|
and RM.MATERIAL_ID in
|
|
@@ -948,9 +949,10 @@
|
|
|
LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
|
|
|
LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
|
|
|
LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
|
|
|
+ where oo.ORDER_STATUS = 5
|
|
|
<where>
|
|
|
<if test="capacityNumber != null">
|
|
|
- instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
|
|
|
+ and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
|
|
|
</if>
|
|
|
<if test="materialList != null">
|
|
|
and
|