ADD Air

service/ocean_order.class.php

@@ -1726,7 +1726,14 @@ class ocean_order {
         $data['routes'] = $routes;
         
         //处理marksAndDescription
-        $marksAndDescription = array("marks"=>$ocean['marks'],"description"=>$ocean['description'],"remark"=>$ocean['remark']);
+        $notes = common::excuteListSql("select notes from station_data.ocean_notes on2 where serial_no='".$ocean["serial_no"]."' and type_code = 'AO'");
+        $remark = "";
+        foreach($notes as $note){
+            if(!empty($note['notes'])){
+                $remark.=$note['notes']."\r\n";
+            }
+        }
+        $marksAndDescription = array("marks"=>$ocean['marks'],"description"=>$ocean['description'],"remark"=>$remark);
         $data['marksAndDescription'] = $marksAndDescription;
 
         return $data;    
@@ -1865,7 +1872,14 @@ class ocean_order {
         $data['routes'] = $routes;
         
         //处理marksAndDescription
-        $marksAndDescription = array("marks"=>$ocean['marks'],"description"=>$ocean['description'],"remark"=>$ocean['remark']);
+        $notes = common::excuteListSql("select notes from station_data.air_notes on2 where serial_no='".$ocean["serial_no"]."' and type_code = 'AO'");
+        $remark = "";
+        foreach($notes as $note){
+            if(!empty($note['notes'])){
+                $remark.=$note['notes']."\r\n";
+            }
+        }
+        $marksAndDescription = array("marks"=>$ocean['marks'],"description"=>$ocean['description'],"remark"=>$remark);
         $data['marksAndDescription'] = $marksAndDescription;
         return $data;    
     }