|
@@ -440,7 +440,7 @@ class ocean_order {
|
|
|
select regexp_split_to_table('Booking Confirmation,Cargo Pickup,Cargo Arrived at Origin,Departure,Arrived at Final Destination Port,Arrived at Final Destination', ','))
|
|
select regexp_split_to_table('Booking Confirmation,Cargo Pickup,Cargo Arrived at Origin,Departure,Arrived at Final Destination Port,Arrived at Final Destination', ','))
|
|
|
order by id desc limit 1) dd on true" . $sqlWhere;
|
|
order by id desc limit 1) dd on true" . $sqlWhere;
|
|
|
$rc = common::excuteOneSql($sql);
|
|
$rc = common::excuteOneSql($sql);
|
|
|
- error_log("sss:".$sql);
|
|
|
|
|
|
|
+ error_log("online_ocean:".$sql);
|
|
|
|
|
|
|
|
//Booked
|
|
//Booked
|
|
|
$sql = $this->getOcanOrderSearchSql("Booked",$sqlWhere);
|
|
$sql = $this->getOcanOrderSearchSql("Booked",$sqlWhere);
|
|
@@ -509,7 +509,6 @@ class ocean_order {
|
|
|
select regexp_split_to_table('Booking Confirmation,Cargo Pickup,Cargo Arrived at Origin,Departure,Arrived at Final Destination Port,Arrived at Final Destination', ','))
|
|
select regexp_split_to_table('Booking Confirmation,Cargo Pickup,Cargo Arrived at Origin,Departure,Arrived at Final Destination Port,Arrived at Final Destination', ','))
|
|
|
order by id desc limit 1) dd ON true ";
|
|
order by id desc limit 1) dd ON true ";
|
|
|
|
|
|
|
|
-
|
|
|
|
|
$sql = "SELECT order_from as _schemas,serial_no as __serial_no, serial_no,
|
|
$sql = "SELECT order_from as _schemas,serial_no as __serial_no, serial_no,
|
|
|
h_bol as _hbol, isf_bol as _isfbol,
|
|
h_bol as _hbol, isf_bol as _isfbol,
|
|
|
CASE
|
|
CASE
|
|
@@ -1265,7 +1264,7 @@ class ocean_order {
|
|
|
"eta" =>$ocean['f_eta'],"ata" =>"",
|
|
"eta" =>$ocean['f_eta'],"ata" =>"",
|
|
|
"vessel" =>$ocean['f_vessel'],"voyageNo" =>$ocean['f_voyage']));
|
|
"vessel" =>$ocean['f_vessel'],"voyageNo" =>$ocean['f_voyage']));
|
|
|
//不是直航
|
|
//不是直航
|
|
|
- if ($ocean['is_vessel_direct'] == "f"){
|
|
|
|
|
|
|
+ if ($ocean['is_vessel_direct'] <> "t"){
|
|
|
$routes[] = array("mode" =>"Sea", "origin" =>$ocean['mport_of_loading'],
|
|
$routes[] = array("mode" =>"Sea", "origin" =>$ocean['mport_of_loading'],
|
|
|
"destination" => $ocean['mport_of_discharge'],
|
|
"destination" => $ocean['mport_of_discharge'],
|
|
|
"etd" => $ocean['m_etd'],"atd" => "",
|
|
"etd" => $ocean['m_etd'],"atd" => "",
|
