|
|
@@ -2487,8 +2487,9 @@
|
|
|
LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
|
|
|
ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
|
|
|
- ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
- AND TWR.MATERIAL_ID = RM.MATERIAL_ID
|
|
|
+ ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
|
|
|
+ and twr.SALE_MATERIAL_ID is not null
|
|
|
+ OR ( TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID AND TWR.MATERIAL_ID = RM.MATERIAL_ID and twr.sale_material_id is null )
|
|
|
LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
|
|
|
ON BDO.WEIGHT_TASK_RESULT_ID = TWR.WEIGHT_TASK_RESULT_ID
|
|
|
LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp
|
luobang