|
@@ -1284,6 +1284,9 @@ class ocean_order {
|
|
|
|
|
|
|
|
//处理ocean_reference
|
|
//处理ocean_reference
|
|
|
$ref_no = array();
|
|
$ref_no = array();
|
|
|
|
|
+ if(!empty($ocean['_invoice_no'])){
|
|
|
|
|
+ $ref_no[] = array("label"=>"Invoice No.","value"=>$ocean['_invoice_no']);
|
|
|
|
|
+ }
|
|
|
$ref_arr = common::excuteListSql("select * from ocean_reference where ref_code <> 'PO'
|
|
$ref_arr = common::excuteListSql("select * from ocean_reference where ref_code <> 'PO'
|
|
|
and COALESCE(ref_value,'')<>''
|
|
and COALESCE(ref_value,'')<>''
|
|
|
AND ref_value IS NOT NULL
|
|
AND ref_value IS NOT NULL
|
|
@@ -2220,6 +2223,7 @@ class ocean_order {
|
|
|
(select time_zone from public.city_timezone where uncode = oo.final_desination_uncode limit 1) as _fd_timezone,
|
|
(select time_zone from public.city_timezone where uncode = oo.final_desination_uncode limit 1) as _fd_timezone,
|
|
|
(select uncity from $order_from.ports where uncode = oo.final_desination_uncode limit 1) as _pd_uncity,
|
|
(select uncity from $order_from.ports where uncode = oo.final_desination_uncode limit 1) as _pd_uncity,
|
|
|
po_no as _po_no,
|
|
po_no as _po_no,
|
|
|
|
|
+ invoice_no as _invoice_no,
|
|
|
CASE
|
|
CASE
|
|
|
WHEN ((m_iffbcf is not null or m_iffbcf is null) and m_iffcpu is null and m_iffrec is null and m_iffdep is null and m_iffarr is null and m_iffdel is null) THEN 'Created'::text
|
|
WHEN ((m_iffbcf is not null or m_iffbcf is null) and m_iffcpu is null and m_iffrec is null and m_iffdep is null and m_iffarr is null and m_iffdel is null) THEN 'Created'::text
|
|
|
WHEN ((m_iffcpu is not null or m_iffrec is not null) and m_iffdep is null and m_iffarr is null and m_iffdel is null) THEN 'Cargo Received'::text
|
|
WHEN ((m_iffcpu is not null or m_iffrec is not null) and m_iffdep is null and m_iffarr is null and m_iffdel is null) THEN 'Cargo Received'::text
|