code

main_new_version.php

@@ -471,8 +471,9 @@ switch ($action) {
                                     when a.code='IFFDEP' then 'Departed'
                                     when a.code='IFFARR' then 'Arrived'
                                     when a.code='IFFAFD' then 'Completed'
-                                    else 'Created' END as status,act_date,act_time,description,timezone
+                                    else 'Created' END as status,act_date,act_time,_dd.description,timezone
                             from  ocean_milestone a 
+                                    left join LATERAL (select sno,description  from  milestone where code=a.code and project_no = '*' limit 1) _dd on true
                     where a.serial_no=online_ocean.serial_no 
                         and a.code in (select regexp_split_to_table('IFFBCF,IFFCPU,IFFREC,IFFDEP,IFFARR,IFFAFD', ','))
                         and a.act_date is not null

service/ocean_booking.class.php

@@ -228,7 +228,7 @@ class ocean_booking {
             if (!isset($_POST["transport_mode"])){
                 //代表初始
                 $TransportList = array(
-                    array("name"=>"Ocean Freight","number"=>intval($rc),"checked"=>true,"icon"=>"#icon-icon_ocean_b"));
+                    array("name"=>"Ocean Freight","number"=>intval($rc),"checked"=>false,"icon"=>"#icon-icon_ocean_b"));
             }else{
                 if (strtolower($_POST["transport_mode"]) == "all") {
                     $TransportList = array(

service/ocean_order.class.php

@@ -491,7 +491,7 @@ class ocean_order {
             if (!isset($_POST["transport_mode"])){
                 //代表初始
                 $TransportList = array(
-                    array("name"=>"Ocean Freight","number"=>intval($rc),"checked"=>true,"icon"=>"#icon-icon_ocean_b"));
+                    array("name"=>"Ocean Freight","number"=>intval($rc),"checked"=>false,"icon"=>"#icon-icon_ocean_b"));
             }else{
                 if (strtolower($_POST["transport_mode"]) == "all") {
                     $TransportList = array(

utils/common.class.php

@@ -1539,10 +1539,11 @@ class common {
 
         //Milestones 数据信息待定
         $Milestones_data = array();
-        $Milestones_data_arr = common::excuteListSql("select description,act_date||' '||act_time as date_time, remark,timezone from  ocean_milestone a 
+        $Milestones_data_arr = common::excuteListSql("select dd.description,act_date||' '||act_time as date_time, remark,timezone from  ocean_milestone a 
+                    left join LATERAL (select sno,description  from  milestone where code=a.code and project_no = '*' limit 1) dd on true
 		 			where a.serial_no='".$ocean["serial_no"]."' 
                         and act_date is not null  
-                    order by id");           
+                    order by dd.sno asc, id asc");           
         foreach($Milestones_data_arr as $mda){
             $Milestones_data[] = array("milestones"=>$mda['description'],"date_time"=>$mda['date_time'],"timezone" =>$mda['timezone'],
                 "locations" => "", "remarks" =>$mda['remark']);