发货申请单列表搜索发货时间优化

app/admin/controller/Sale.php

@@ -3229,11 +3229,12 @@ class Sale extends Base
 
         //发货时间筛选
         $start_sendtime = isset($this->post['start_sendtime']) && $this->post['start_sendtime'] !== "" ? $this->post['start_sendtime'] : "";
-        if ($start_sendtime != "") $where[] = ["a.sendtime", '>=', $start_sendtime];
-
         $end_sendtime = isset($this->post['end_sendtime']) && $this->post['end_sendtime'] !== "" ? $this->post['end_sendtime'] : "";
-        if ($end_sendtime != "") $where[] = ["a.sendtime", '<=', $end_sendtime];
 
+        if ($start_sendtime != "" && $end_sendtime != "") {
+            $where[] = ["a.sendtime", 'between', [$start_sendtime, $end_sendtime]];
+            $where[] = ["a.status", '>=', 2];//搜索发货时间时，要指定状态为已发货及之后的状态值(0待发货,1待库管发货,2已发货待收货,3已收货,4已全部退货',)
+        }
 
         $count = Db::name('order_out')
             ->alias('a')

app/admin/controller/SaleReport.php

@@ -826,7 +826,7 @@ class SaleReport extends Base
 
         $count = Db::name('consult_info')
             ->alias('ci')
-            ->leftJoin('consult_bids cb', 'cb.infoNo=ci.infoNo')
+            ->leftJoin('consult_bids cb', 'cb.infoNo=ci.infoNo AND cb.is_del=0')
             ->leftJoin('sale s', 's.zxNo=cb.bidNo AND s.is_del=0')
             ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo')
             ->leftJoin('company_item item', 'item.id=co.depart')
@@ -840,7 +840,7 @@ class SaleReport extends Base
         $data = Db::name('consult_info')
             ->alias('ci')
             ->field('ci.addtime,co.salesman,item.name,cb.infoNo,csi.companyName,ci.use_desc,ci.good_name,b.brand_name,ci.model,s.good_code,ci.cat_id,ci.budget_price,u.unit,ci.num,s.sale_price,ci.arrival_time,ci.is_addrs,ci.is_custom,ci.remark,ci.status,ci.bargain_code,csi.itemid,s.orderCode')
-            ->leftJoin('consult_bids cb', 'cb.infoNo=ci.infoNo')
+            ->leftJoin('consult_bids cb', 'cb.infoNo=ci.infoNo AND cb.is_del=0')
             ->leftJoin('sale s', 's.zxNo=cb.bidNo AND s.is_del=0')
             ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo')
             ->leftJoin('company_item item', 'item.id=co.depart')