|
@@ -2723,7 +2723,7 @@
|
|
|
LEFT JOIN RMS_CONSIGNEE RC2
|
|
|
ON RC2.CONSIGNEE_ID = BDO.CONSIGNEE_ID
|
|
|
LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB
|
|
|
- ON TWB .WEIGHT_BATCH_ID = BDO .WEIGHT_BATCH_ID
|
|
|
+ ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
|
|
|
WHERE ASO.SALE_TYPE = 1
|
|
|
and (aso.DELETED between 1 and 2 and aso.SALE_ORDER_STATUS = 4 or aso.DELETED = 0 and aso.SALE_ORDER_STATUS between 0 and 4)
|
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
@@ -2879,7 +2879,7 @@
|
|
|
ASO.SALE_ORDER_RECEIVE_CUSTOMER like '%${item}%'
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- order by ASO.SALE_ORDER_ID DESC, ASOM.SALE_ORDER_MATERIAL_ID DESC,OO.ORDER_ID DESC
|
|
|
+ order by ASO.SALE_ORDER_ID DESC, ASOM.SALE_ORDER_MATERIAL_ID DESC,OO.ORDER_ID DESC,TWB .WEIGHT_BATCH_ID DESC
|
|
|
)
|
|
|
</select>
|
|
|
|
|
@@ -3114,7 +3114,7 @@
|
|
|
left join BMSTRUCK_STATEMENT BS
|
|
|
ON BS.STATEMENT_ID = BDO.STATEMENT_ID
|
|
|
LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB
|
|
|
- ON TWB .WEIGHT_BATCH_ID = BDO .WEIGHT_BATCH_ID
|
|
|
+ ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
|
|
|
WHERE ASO.SALE_TYPE = 1
|
|
|
and (aso.DELETED between 1 and 2 and aso.SALE_ORDER_STATUS = 4 or aso.DELETED = 0 and aso.SALE_ORDER_STATUS between 0 and 4)
|
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
@@ -3270,7 +3270,7 @@
|
|
|
<if test="consigneeLoginName != null">
|
|
|
and RC.CONSIGNEE_COMPANY_NAME LIKE '%${consigneeLoginName}%'
|
|
|
</if>
|
|
|
- order by ASO.SALE_ORDER_ID DESC, ASOM.SALE_ORDER_MATERIAL_ID DESC,OO.ORDER_ID DESC
|
|
|
+ order by ASO.SALE_ORDER_ID DESC, ASOM.SALE_ORDER_MATERIAL_ID DESC,OO.ORDER_ID DESC,TWB .WEIGHT_BATCH_ID DESC
|
|
|
)
|
|
|
</select>
|
|
|
|