|
|
@@ -1425,7 +1425,7 @@ class destination_delivery {
|
|
|
ooc.consignee_id,
|
|
|
ooc.consignee,
|
|
|
ooc.booking_no,
|
|
|
- (select manifest_type from public.ocean o where o.serial_no = ooc.serial_no limit 1) as manifest_type,
|
|
|
+ ''::text as manifest_type,
|
|
|
dc_serial_no,
|
|
|
dc_country,
|
|
|
dc_kln_pic,
|
|
|
@@ -1459,7 +1459,7 @@ class destination_delivery {
|
|
|
ooc.consignee_id,
|
|
|
ooc.consignee,
|
|
|
ooc.booking_no,
|
|
|
- (select manifest_type from sfs.ocean o where o.serial_no = ooc.serial_no limit 1) as manifest_type,
|
|
|
+ ''::text as manifest_type,
|
|
|
dc_serial_no,
|
|
|
dc_country,
|
|
|
dc_kln_pic,
|
|
|
@@ -1493,7 +1493,7 @@ class destination_delivery {
|
|
|
ooc.consignee_id,
|
|
|
ooc.consignee,
|
|
|
ooc.booking_no,
|
|
|
- '' as manifest_type,
|
|
|
+ ''::text as manifest_type,
|
|
|
dc_serial_no,
|
|
|
dc_country,
|
|
|
dc_kln_pic,
|
|
|
@@ -1616,9 +1616,9 @@ class destination_delivery {
|
|
|
ooc.shipper,
|
|
|
ooc.consignee_id,
|
|
|
ooc.consignee,
|
|
|
- (select customer_name from public.ocean_extend ex where ex.serial_no = ooc.serial_no limit 1) as controlling_customer,
|
|
|
+ '' as controlling_customer,
|
|
|
ooc.booking_no,
|
|
|
- (select manifest_type from public.ocean o where o.serial_no = ooc.serial_no limit 1) as manifest_type,
|
|
|
+ '' as manifest_type,
|
|
|
ooc.agent,
|
|
|
ooc.order_from,
|
|
|
ooc.dest_op
|
|
|
@@ -1649,9 +1649,9 @@ class destination_delivery {
|
|
|
ooc.shipper,
|
|
|
ooc.consignee_id,
|
|
|
ooc.consignee,
|
|
|
- (select customer_name from ocean_extend ex where ex.serial_no = ooc.serial_no limit 1) as controlling_customer,
|
|
|
+ '' as controlling_customer,
|
|
|
ooc.booking_no,
|
|
|
- (select manifest_type from sfs.ocean o where o.serial_no = ooc.serial_no limit 1) as manifest_type,
|
|
|
+ '' as manifest_type,
|
|
|
ooc.agent,
|
|
|
ooc.order_from,
|
|
|
ooc.dest_op
|
|
|
@@ -1724,9 +1724,12 @@ class destination_delivery {
|
|
|
// Combine the data into an array of shipments
|
|
|
$shipments = [];
|
|
|
foreach ($h_bol as $index => $_h_bol) {
|
|
|
+ $manifest_type = common::excuteOneSql("select manifest_type from ".$order_from[$index].".ocean o where o.serial_no = '".$h_serial_no[$index]."' limit 1");
|
|
|
+ //$manifest_type[$index],
|
|
|
+ //为了优化总sql 改为在这里单个查询
|
|
|
$shipments[] = [
|
|
|
'booking_no' =>$booking_no[$index],
|
|
|
- 'manifest_type' => $manifest_type[$index],
|
|
|
+ 'manifest_type' => $manifest_type,
|
|
|
'h_bol' => $h_bol[$index],
|
|
|
'h_serial_no' => $h_serial_no[$index],
|
|
|
'order_from' => $order_from[$index],
|
