|
|
@@ -324,7 +324,7 @@ class ocean_booking {
|
|
|
from ocean o
|
|
|
LEFT JOIN LATERAL ( SELECT shippr_uncode,shipper_city,
|
|
|
consignee_uncode,consignee_city,
|
|
|
- place_of_receipt_un,place_of_delivery_un,
|
|
|
+ place_of_receipt_uncode,place_of_delivery_uncode,
|
|
|
fport_of_loading_uncode,mport_of_discharge_uncode,po_no as _po_no
|
|
|
FROM public.online_booking ob WHERE o.serial_no::text = ob.serial_no::text) ob ON true
|
|
|
LEFT JOIN LATERAL ( SELECT company as cn_company,
|
|
|
@@ -551,8 +551,8 @@ class ocean_booking {
|
|
|
//由于这些基础数据还待完善，而且现在提单样式改版也没有显示客户自身的地址数据，所以我们这边的这个取值也要麻烦调整一下：
|
|
|
//1.Shipment detail顶部的Origin和Destination的取值换成Place of Receipt、Place of Delivery的UNCODE
|
|
|
//2.Tracking列表页里面字段Origin和Destination先隐藏（客户地址），不做展示
|
|
|
- $ocean['shippr_uncode'] = $ocean['place_of_receipt_un'];
|
|
|
- $ocean['consignee_uncode'] = $ocean['place_of_delivery_un'];
|
|
|
+ $ocean['shippr_uncode'] = $ocean['place_of_receipt_uncode'];
|
|
|
+ $ocean['consignee_uncode'] = $ocean['place_of_delivery_uncode'];
|
|
|
|
|
|
//获取对应uncode 对应的时间
|
|
|
$uncodes = $ocean['fport_of_loading_uncode'].";".$ocean['mport_of_discharge_uncode'];
|
