|
@@ -413,7 +413,7 @@
|
|
|
c.order_no orderNo,
|
|
|
c.mblno,
|
|
|
c.carreg_no carregNo,
|
|
|
- driver.name,
|
|
|
+ driver.NAME,
|
|
|
c.driver_tel driverTel,
|
|
|
CASE
|
|
|
c.order_status
|
|
@@ -467,8 +467,6 @@
|
|
|
t.weight_plan weightPlan,
|
|
|
t.ysl,
|
|
|
t.voy,
|
|
|
- t.pol_id polId,
|
|
|
- t.pod_id podId,
|
|
|
t.load_addr loadAddr,
|
|
|
t.load_date tLoadDate,
|
|
|
t.load_attn loadAttn,
|
|
@@ -482,8 +480,8 @@
|
|
|
t.un_load_attn unLoadAttn,
|
|
|
t.un_load_attn_tel unLoadAttnTel,
|
|
|
dic.dict_label cntrId,
|
|
|
- pol.dict_label polId,
|
|
|
- pod.dict_label podId,
|
|
|
+ pol.f_name polId,
|
|
|
+ pod.f_name podId,
|
|
|
c.accept_date acceptDate,
|
|
|
c.cntr_qty cntrQty,
|
|
|
c.off_data offData,
|
|
@@ -509,10 +507,10 @@
|
|
|
LEFT JOIN F_TMSORDERBILLS t ON t.id = c.org_id
|
|
|
LEFT JOIN t_corps p ON p.f_id = t.corp_id
|
|
|
LEFT JOIN t_goods g ON g.f_id = t.goods_id
|
|
|
- LEFT JOIN sys_dict_data pol ON pol.dict_value = t.pol_id
|
|
|
- AND pol.dict_type = 'port_start'
|
|
|
- LEFT JOIN sys_dict_data pod ON pod.dict_value = t.pod_id
|
|
|
- AND pod.dict_type = 'port_end'
|
|
|
+ LEFT JOIN t_address pol ON pol.f_id = t.pol_id
|
|
|
+ AND pol.f_types = 1
|
|
|
+ LEFT JOIN t_address pod ON pod.f_id = t.pod_id
|
|
|
+ AND pod.f_types = 1
|
|
|
LEFT JOIN sys_dict_data dic ON dic.dict_value = c.cntr_id
|
|
|
AND dic.dict_type = 'data_cntrId'
|
|
|
LEFT JOIN fleet_driver_msg driver ON driver.id = c.driver_user_id
|
|
@@ -640,6 +638,7 @@
|
|
|
LEFT JOIN t_goods g ON g.f_id = t.goods_id
|
|
|
where
|
|
|
c.id = #{id}
|
|
|
+ ORDER BY c.id desc
|
|
|
</select>
|
|
|
|
|
|
<select id="selectMonthlyOrder" parameterType="ftmsorderbillscars" resultType="Map">
|