Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Report.php

@@ -757,7 +757,7 @@ class Report extends Base
 
         if (!$val_params->check($param)) return error_show(1004, $val_params->getError());
 
-        $where = [];
+        $where = [['po.is_del','=',0]];
 
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['po.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
         if ($param['status'] != '') $where[] = ['po.status', '=', $param['status']];
@@ -777,7 +777,7 @@ class Report extends Base
             ->field('po.cgdNo,po.addtime,po.supplierNo,po.supplier_name,po.good_name,gb.is_stock,po.good_num,po.nake_fee,po.total_fee,po.status,po.send_status,po.wsend_num,"" creater,"" creater_name,b.company,po.cgder_id,po.cgder,"" name,"" send_time,on.orderCode,po.order_type,po.bkcode,po.spuCode')
             ->leftJoin('business b', 'b.companyNo=po.companyNo')
             ->leftJoin('order_num on', 'on.cgdNo=po.cgdNo')
-            ->leftJoin('good_basic gb', 'gb.spuCode=po.spuCode')
+            ->leftJoin('good_basic gb', 'gb.spuCode=po.spuCode AND gb.is_del=0')
             ->where($where)
             ->page($param['page'], $param['size'])
             ->order('po.addtime', 'desc')