|
|
@@ -299,7 +299,7 @@ class destination_delivery {
|
|
|
|
|
|
$sqlWhere = ' where ' . common::searchExtendHand_KLN("ocean", $_SESSION["ONLINE_USER"]);
|
|
|
//兜底规则
|
|
|
- $sqlWhere .= " and eta >= now() - INTERVAL '6 months' and eta <= now() + INTERVAL '6 months'";
|
|
|
+ //$sqlWhere .= " and eta >= now() - INTERVAL '3 months' and eta <= now() + INTERVAL '1 months'";
|
|
|
$consignee = common::check_input($_POST ['consignee']);
|
|
|
if(!empty($consignee)){
|
|
|
$sqlWhere .= " and consignee ilike '".$consignee."%'";
|
|
|
@@ -809,7 +809,7 @@ class destination_delivery {
|
|
|
$sqlKNDDWhere = "and exists(select 1 from public.kln_ocean ". $sqlWhere_bk." and kln_ocean.serial_no = any(kln_destination_delivery.h_serial_no) limit 1)";
|
|
|
|
|
|
//兜底规则
|
|
|
- $sqlWhere .= " and eta >= now() - INTERVAL '3 months' and eta <= now() + INTERVAL '1 months'";
|
|
|
+ $sqlWhere .= " and eta >= now() - INTERVAL '3 months' and eta <= now() + INTERVAL '1 months' and 1<>1 ";
|
|
|
if(!empty($consignee)){
|
|
|
$sqlWhere .= " and consignee ilike '%".$consignee."%'";
|
|
|
}
|