|
|
@@ -122,7 +122,11 @@
|
|
|
TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
|
|
|
TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
|
|
|
TWR.RESULT_NET_WEIGHT "resultNetWeight",
|
|
|
- TLFR.RESULT_OUT_GATE_TIME "resultOutGateTime"
|
|
|
+ TLFR.RESULT_OUT_GATE_TIME "resultOutGateTime",
|
|
|
+ RTCMAO.TRUCK_CALCULATE_NUMBER "maoCalculate",
|
|
|
+ RTCPI.TRUCK_CALCULATE_NUMBER "piCalculate",
|
|
|
+ RGEN.GATEPOST_NAME "enGatepostName",
|
|
|
+ RGOUT.GATEPOST_NAME "outGatepostName"
|
|
|
from OMSTRUCK_ORDER OO
|
|
|
join TMSTRUCK_TOTAL_RESULT TTR
|
|
|
on TTR.ORDER_ID = OO.ORDER_ID
|
|
|
@@ -132,10 +136,18 @@
|
|
|
on RW.WAREHOUSE_ID = TLR.LOADING_ID
|
|
|
join TMSTRUCK_WEIGHT_RESULT TWR
|
|
|
on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
+ join RMS_TRUCK_CALCULATE RTCMAO
|
|
|
+ on TWR.RESULT_GROSS_PLACE_ID = RTCMAO.TRUCK_CALCULATE_ID
|
|
|
+ join RMS_TRUCK_CALCULATE RTCPI
|
|
|
+ on TWR.RESULT_TARE_PLACE_ID = RTCPI.TRUCK_CALCULATE_ID
|
|
|
join TMSTRUCK_ENFACTORY_RESULT TER
|
|
|
on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
+ join RMS_GATEPOST RGEN
|
|
|
+ on RGEN.GATEPOST_ID = TER.GATEPOST_ID
|
|
|
join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
|
|
|
on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
+ join RMS_GATEPOST RGOUT
|
|
|
+ on RGOUT.GATEPOST_ID = TLFR.GATEPOST_ID
|
|
|
join RMS_CAPACITY RC
|
|
|
on RC.CAPACITY_ID = OO.CAPACITY_ID
|
|
|
<if test="carrierSsoId != null">
|
txf