commit code

main_new_version.php

@@ -74,7 +74,7 @@ switch ($action) {
         $sqlWhere = common::check_input($sqlWhere);
         $sqlWhere = " " . $sqlWhere;
         //online_order_status_date_new 与本地的区分，发布上去这去掉new
-        $list = common::excuteListSql("select * from public.online_order_status_date_new('$type'::text, 'eta'::text, 'etd'::text, $bdate, $edate, '$sqlWhere'::text, '$container_type'::text) "
+        $list = common::excuteListSql("select * from public.online_order_status_date('$type'::text, 'eta'::text, 'etd'::text, $bdate, $edate, '$sqlWhere'::text, '$container_type'::text) "
                         . "r (c bigint, e integer, b integer, d text)");              
         $key = "[";
         $value = "[";
@@ -398,9 +398,9 @@ switch ($action) {
             select * from rr order by sort, stime";
         $rss = common::excuteListSql($sql);
         //先固定死
-        $json = '[{"lng":"100.78594000","lat":"13.68521000","label":"Origin","infor":"LAT KRABANG, THAILAND","sort":"0","stime":null,"ptype":"por"},
-                  {"lng":"100.88333333","lat":"13.08333333","label":"Destination","infor":"LAEM CHABANG PORT,THAILAND","sort":"1","stime":null,"ptype":"pol"},
-                  {"lng":"-122.28640000","lat":"37.79784000","label":"Transfer","infor":"OAKLAND, CA, USA","sort":"2","stime":null,"ptype":"pod"}]';
+        // $json = '[{"lng":"100.78594000","lat":"13.68521000","label":"Origin","infor":"LAT KRABANG, THAILAND","sort":"0","stime":null,"ptype":"por"},
+        //           {"lng":"100.88333333","lat":"13.08333333","label":"Destination","infor":"LAEM CHABANG PORT,THAILAND","sort":"1","stime":null,"ptype":"pol"},
+        //           {"lng":"-122.28640000","lat":"37.79784000","label":"Transfer","infor":"OAKLAND, CA, USA","sort":"2","stime":null,"ptype":"pod"}]';
         $rss = json_decode($json,true);
         common::echo_json_encode(200, $rss);
         exit();

service/ocean_order.class.php

@@ -1265,7 +1265,7 @@ class ocean_order {
             "eta" =>$ocean['f_eta'],"ata" =>"",
             "vessel" =>$ocean['f_vessel'],"voyageNo" =>$ocean['f_voyage']));
         //不是直航
-        if ($ocean['is_vessel_direct'] <> "t"){
+        if ($ocean['is_vessel_direct'] == "f"){
             $routes[] = array("mode" =>"Sea", "origin" =>$ocean['mport_of_loading'],
                 "destination" => $ocean['mport_of_discharge'],
                 "etd" => $ocean['m_etd'],"atd" => "",

utils/common.class.php

@@ -1263,8 +1263,8 @@ class common {
                     null::timestamp without time zone as stime,''::text as ptype 
 				from vessel.vt_unlocode where lon<>0 and lat<>0 and lon is not null and lat is not null and uncode='".$orgin['origin']."'";
             $map = common::excuteObjectSql($map_sql);   
-            $json = '{"lng":"100.78594000","lat":"13.68521000","label":"'.$orgin['origin'].'","infor":"LAT KRABANG, THAILAND","sort":"0","stime":null,"ptype":"por"}';
-            $map = json_decode($json,true); 
+            // $json = '{"lng":"100.78594000","lat":"13.68521000","label":"'.$orgin['origin'].'","infor":"LAT KRABANG, THAILAND","sort":"0","stime":null,"ptype":"por"}';
+            // $map = json_decode($json,true); 
 
             $toporiginMap[] = array("qandl"=>array($map['lng']-$i*10,$map['lat']-$i*10),
                 "divIcon" => array("iconSize"=>0),
@@ -1288,8 +1288,8 @@ class common {
 				from vessel.vt_unlocode where lon<>0 and lat<>0 and lon is not null and lat is not null and uncode='".$agent['agent']."'";
             $map = common::excuteObjectSql($map_sql);  
 
-            $json = '{"lng":"100.78594000","lat":"13.68521000","label":"'.$agent['agent'].'","infor":"LAT KRABANG, THAILAND","sort":"0","stime":null,"ptype":"por"}';
-            $map = json_decode($json,true);
+            // $json = '{"lng":"100.78594000","lat":"13.68521000","label":"'.$agent['agent'].'","infor":"LAT KRABANG, THAILAND","sort":"0","stime":null,"ptype":"por"}';
+            // $map = json_decode($json,true);
 
             $toporiginMap[] = array("qandl"=>array($map['lng'],$map['lat']),
                 "divIcon" => array("iconSize"=>0),