|
|
@@ -2651,8 +2651,8 @@ class ocean_order {
|
|
|
//处理basicInfo信息数据 --改为前端一样 同步 KLN_ocean
|
|
|
//$vessel = utils::outDisplayForMerge($ocean['f_vessel'],$ocean['m_vessel']);
|
|
|
//$voyage = utils::outDisplayForMerge($ocean['f_voyage'],$ocean['m_voyage']);
|
|
|
- $$vessel = utils::outDisplayForMerge($ocean['f_vessel'],$ocean['oo_vessel']);
|
|
|
- $$voyage = utils::outDisplayForMerge($ocean['f_voyage'],$ocean['oo_voyage']);
|
|
|
+ $vessel = utils::outDisplayForMerge($ocean['f_vessel'],$ocean['oo_vessel']);
|
|
|
+ $voyage = utils::outDisplayForMerge($ocean['f_voyage'],$ocean['oo_voyage']);
|
|
|
|
|
|
$basicInfo = array("MAWB/MBL No." =>$ocean['m_bol'],"HAWB/HBOL" => $ocean['h_bol'],"Carrier_Booking_No" =>$ocean['booking_no'],
|
|
|
"PO_NO" =>$ocean['_po_no'],"Vessel/Airline" =>$vessel,"Voyage/Filght" =>$voyage,
|
