|
|
@@ -357,6 +357,7 @@
|
|
|
TLR.INSERT_UPDATE_REMARK "materialRemark",
|
|
|
ASO.SALE_NUMBER "saleNumber",
|
|
|
ASM.SALE_WAREHOUSE "saleWarehouse",
|
|
|
+ ASM.MATERIAL_NUMBER "materialNum",
|
|
|
TLR.CASE_NUMBER "caseNumber",
|
|
|
RC2.CARRIER_NAME "carrierName",
|
|
|
TAR.RESULT_ARRIVAL_ADDRESS "arrivalAddress",
|
|
|
@@ -373,10 +374,12 @@
|
|
|
on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
|
|
|
left join AMS_SALE_TRUCKNO_MATERIAL ASTM
|
|
|
on ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
|
|
|
- left join AMS_SALE_MATERIAL ASM
|
|
|
- on ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
|
|
|
left join RMS_MATERIAL RM
|
|
|
- on ASM.MATERIAL_ID = RM.MATERIAL_ID
|
|
|
+ on RM.MATERIAL_ID = TWR.MATERIAL_ID
|
|
|
+ left join AMS_SALE_MATERIAL ASM
|
|
|
+ on ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID AND ASM.MATERIAL_ID=RM.MATERIAL_ID
|
|
|
+-- left join RMS_MATERIAL RM
|
|
|
+-- on ASM.MATERIAL_ID = RM.MATERIAL_ID
|
|
|
left join AMS_DISPATCH_SALE_ORDER ADSO
|
|
|
on ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
|
|
|
left join RMS_CARRIER RC2
|
|
|
@@ -406,8 +409,6 @@
|
|
|
on RGOUT.GATEPOST_ID = TLFR.GATEPOST_ID
|
|
|
left join RMS_CAPACITY RC
|
|
|
on RC.CAPACITY_ID = OO.CAPACITY_ID
|
|
|
--- left join RMS_MATERIAL RM
|
|
|
--- on RM.MATERIAL_ID = TWR.MATERIAL_ID
|
|
|
left join TMSTRUCK_ARRIVAL_RESULT TAR
|
|
|
on TAR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
left join TMStRUCK_RECEIPT_RESULT TRR
|
|
|
@@ -415,6 +416,8 @@
|
|
|
WHERE OO.ORDER_TYPE = #{orderTypee}
|
|
|
AND ASO.SHIPPER_ID = #{shipperId}
|
|
|
AND OO.ORDER_STATUS IN (2,5)
|
|
|
+ AND TWR.RESULT_NET_WEIGHT IS NOT NULL
|
|
|
+ AND ASM.MATERIAL_NUMBER IS NOT NULL
|
|
|
<if test="carrierSsoId != null">
|
|
|
and RC2.CARRIER_SSO_ID = #{carrierSsoId}
|
|
|
</if>
|
