|
|
@@ -1254,7 +1254,7 @@ class ocean_order {
|
|
|
END AS new_status
|
|
|
from ocean o
|
|
|
LEFT JOIN LATERAL ( SELECT shippr_uncode,shipper_city,
|
|
|
- consignee_uncode,consignee_city,fport_of_loading_un,mport_of_discharge_un
|
|
|
+ consignee_uncode,consignee_city,fport_of_loading_un,mport_of_discharge_un,place_of_receipt_un,place_of_delivery_un
|
|
|
FROM public.online_ocean oo WHERE oo.serial_no::text = o.serial_no::text) oo ON true
|
|
|
left join LATERAL (select case when a.code='IFFBCF' then 'Created'
|
|
|
when a.code='IFFCPU' then 'Cargo Received'
|
|
|
@@ -1340,7 +1340,7 @@ class ocean_order {
|
|
|
$simplexData = array();
|
|
|
//place_of_Receipt
|
|
|
$place_of_Receipt_stauts = array("index" =>1,"label" =>"Place of Receipt",
|
|
|
- "path" =>$ocean['place_of_receipt_exp']."/".$ocean['place_of_receipt'],"isArrival" =>$state >= 0 ? true : false);
|
|
|
+ "path" =>$ocean['place_of_receipt_exp']."/".$ocean['place_of_receipt_un'],"isArrival" =>$state >= 0 ? true : false);
|
|
|
$children = array();
|
|
|
if($state >= 1 && !empty($ocean_milestone_status_code['IFFREC']['act_date'])){
|
|
|
//发生后，未发生前没有
|
|
|
@@ -1351,7 +1351,7 @@ class ocean_order {
|
|
|
|
|
|
//port_of_Loading
|
|
|
$port_of_Loading_stauts = array("index" =>2,"label" =>"Port of Loading",
|
|
|
- "path" =>$ocean['fport_of_loading_exp']."/".$ocean['fport_of_loading'],"isArrival" =>$state >= 1 ? true : false);
|
|
|
+ "path" =>$ocean['fport_of_loading_exp']."/".$ocean['fport_of_loading_un'],"isArrival" =>$state >= 1 ? true : false);
|
|
|
$children = array();
|
|
|
if ($state < 1){
|
|
|
$children[] = array("label" =>"Departure(ETD)","date" =>$ocean['f_etd']);
|
|
|
@@ -1366,7 +1366,7 @@ class ocean_order {
|
|
|
|
|
|
//Port of Discharge
|
|
|
$port_of_Discharge_status = array("index" =>3,"label" =>"Port of Discharge",
|
|
|
- "path" =>$ocean['mport_of_discharge_exp']."/".$ocean['mport_of_discharge'],"isArrival" =>$state >= 2 ? true : false);
|
|
|
+ "path" =>$ocean['mport_of_discharge_exp']."/".$ocean['mport_of_discharge_un'],"isArrival" =>$state >= 2 ? true : false);
|
|
|
$children = array();
|
|
|
// if ($state < 2){
|
|
|
// //未发生前
|
|
|
@@ -1392,7 +1392,7 @@ class ocean_order {
|
|
|
|
|
|
//Place of Delivery
|
|
|
$place_of_Delivery_status = array("index" =>4,"label" =>"Place of Delivery",
|
|
|
- "path" =>$ocean['place_of_delivery_exp']."/".$ocean['place_of_delivery'],"isArrival" =>$state == 3 ? true : false);
|
|
|
+ "path" =>$ocean['place_of_delivery_exp']."/".$ocean['place_of_delivery_un'],"isArrival" =>$state == 3 ? true : false);
|
|
|
$children = array();
|
|
|
if ($state < 3){
|
|
|
//未发生前
|
