采购单列表筛选判断全等，前端报表-订单报表增加分类字段

app/admin/controller/Purch.php

@@ -29,7 +29,7 @@ class Purch extends Base
         $size = isset($this->post['size']) && $this->post['size'] !=="" ? intval($this->post['size']):"10";
         $where = [['po.is_del', "=", 0]];
         $bkcode = isset($this->post['bk_code']) && $this->post['bk_code']!="" ? trim($this->post['bk_code']):"";
-        if($bkcode!=""){
+        if($bkcode!==""){
             $where[]=['po.bkcode',"like", "%{$bkcode}%"];
         }
         $status = isset($this->post['status']) && $this->post['status']!=="" ? intval($this->post['status']):"";
@@ -38,23 +38,23 @@ class Purch extends Base
             $where[]=['po.status',"=", $status];
         }
         $cgdNo = isset($this->post['cgdNo']) && $this->post['cgdNo']!="" ? trim($this->post['cgdNo']) :"";
-        if($cgdNo!=""){
+        if($cgdNo!==""){
             //$where['cgdNo'] = Db::Raw("like '%{$cgdNo}%'");
             $where[]=['po.cgdNo',"like", "%{$cgdNo}%"];
         }
 
         $apply_name = isset($this->post['apply_name']) && $this->post['apply_name']!="" ? trim($this->post['apply_name']):"";
-        if($apply_name!=""){
+        if($apply_name!==""){
             // $where['cgder'] =Db::Raw("like '%{$apply_name}%'");
             $where[]=['po.cgder',"like", "%{$apply_name}%"];
         }
         $wsm_code = isset($this->post['wsm_code']) && $this->post['wsm_code']!="" ? trim($this->post['wsm_code']):"";
-        if($wsm_code!=""){
+        if($wsm_code!==""){
             // $where['wsm_code'] = $wsm_code;
             $where[]=['po.wsm_code',"=", $wsm_code];
         }
         $wsm_in_code = isset($this->post['wsm_in_code']) && $this->post['wsm_in_code']!="" ? trim($this->post['wsm_in_code']):"";
-        if($wsm_in_code!=""){
+        if($wsm_in_code!==""){
             $incode = Db::name("purchease_in")->where(["wsm_in_code"=>Db::raw(" like %{$wsm_in_code}%"),"is_del"=>0])->column("cgdNo");
             if(empty($incode)){
                 return error_show(1004,"未找到有关入库单信息");
@@ -62,22 +62,22 @@ class Purch extends Base
             $where[]=['po.cgdNo',"in", $incode];
         }
         $good_name = isset($this->post['good_name']) && $this->post['good_name']!="" ? trim($this->post['good_name']):"";
-        if($good_name!=""){
+        if($good_name!==""){
             //$where['good_name'] = Db::raw(" like %{$good_name}%");
             $where[]=['po.good_name',"like", "%{$good_name}%"];
         }
         $good_code = isset($this->post['good_code']) && $this->post['good_code']!="" ? trim($this->post['good_code']) :"";
-        if($good_code!=""){
+        if($good_code!==""){
             // $where['good_code'] = Db::raw(" like %{$good_code}%");
             $where[]=['po.spuCode',"like", "%{$good_code}%"];
         }
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo']!="" ? trim($this->post['supplierNo']) :"";
-        if($supplierNo!=""){
+        if($supplierNo!==""){
             // $where['good_code'] = Db::raw(" like %{$good_code}%");
             $where[]=['po.supplierNo',"like", "%{$supplierNo}%"];
         }
         $wsm_supplierNo = isset($this->post['wsm_supplierNo']) && $this->post['wsm_supplierNo']!="" ? trim($this->post['wsm_supplierNo']) :"";
-        if($wsm_supplierNo!=""){
+        if($wsm_supplierNo!==""){
             $supplier = Db::name("supplier")->where(["code"=>$wsm_supplierNo])->find();
             if(empty($supplier)){
                 return error_show(1004,"未找到供应商信息");
@@ -86,27 +86,27 @@ class Purch extends Base
             $where[]=['po.wsm_code',"in", $wsmcode];
         }
         $start = isset($this->post['start']) && $this->post['start']!="" ?$this->post['start']:"";
-        if($start!=""){
+        if($start!==""){
             // $where['addtime'] = Db::raw(" >= '{$start}'");
             $where[]=['po.addtime',">=", $start." 00:00:00"];
         }
         $end = isset($this->post['end']) && $this->post['end']!="" ?$this->post['end']:"";
-        if($end!=""){
+        if($end!==""){
             $where[]=['po.addtime',"<=", $end." 23:59:59"];
         }
         $last_start = isset($this->post['last_start']) && $this->post['last_start']!="" ?$this->post['last_start']:"";
-        if($last_start!=""){
+        if($last_start!==""){
             //$where['lasttime'] = Db::raw(" >= '{$last_start}'");
             $where[]=['po.lasttime',">=", $last_start." 00:00:00"];
 
         }
         $last_end = isset($this->post['last_end']) && $this->post['last_end']!="" ?$this->post['last_end']:"";
-        if($last_end!=""){
+        if($last_end!==""){
             //$where['lasttime'] = Db::raw(" <= '{$last_end}'");
             $where[]=['po.lasttime',"<=", $last_end." 23:59:59"];
         }
         $orderCode = isset($this->post['orderCode']) && $this->post['orderCode']!="" ?$this->post['orderCode']:"";
-        if($orderCode!=""){
+        if($orderCode!==""){
             //$where['lasttime'] = Db::raw(" <= '{$last_end}'");
             $where[]=['on.orderCode',"like", '%'.$orderCode.'%'];
         }
@@ -116,7 +116,7 @@ class Purch extends Base
         if ($supplier_name != '') $where[] = ['po.supplier_name', 'like', '%' . $supplier_name . '%'];
 
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
-        if ($relaComNo != "") $where[] = ['po.supplierNo|po.companyNo', '=', $relaComNo];
+        if ($relaComNo !== "") $where[] = ['po.supplierNo|po.companyNo', '=', $relaComNo];
 
 //		$whereor=[];
 //        if(!empty($role['write'])){
@@ -140,10 +140,10 @@ class Purch extends Base
         if ($company_name !== "") $where[] = ["po.cgder_id", 'in', get_company_item_user_by_name($company_name)];
 
         $order_type = isset($this->post['order_type']) && $this->post['order_type'] !== "" ? intval($this->post['order_type']) : "";
-        if ($order_type != "") $where[] = ["po.order_type", '=', $order_type];
+        if ($order_type !== "") $where[] = ["po.order_type", '=', $order_type];
 
         $order_source = isset($this->post['order_source']) && $this->post['order_source'] !== "" ? intval($this->post['order_source']) : "";
-        if ($order_source != "") $where[] = ["po.order_source", '=', $order_source];
+        if ($order_source !== "") $where[] = ["po.order_source", '=', $order_source];
 
 //        if(!empty($role['platform']) ){
 //            $where[]=["po.platform_id","in",$role['platform']];

app/admin/controller/Purchin.php

@@ -27,58 +27,58 @@ class Purchin extends Base
         $size = isset($this->post['size']) && $this->post['size'] !==""? intval($this->post['size']):"10";
         $where =[['a.is_del',"=",0],['b.is_del',"=",0]];
         $wsm_in_code=isset($this->post['wsm_in_code']) && $this->post['wsm_in_code']!==""? trim($this->post['wsm_in_code']) :"";
-        if($wsm_in_code!=""){
+        if($wsm_in_code!==""){
             $where[]=["a.wsm_in_code",'like',"%$wsm_in_code%"];
         }
         $cgdNo= isset($this->post['cgdNo']) && $this->post['cgdNo'] !==""? trim($this->post['cgdNo']) :"";
-        if($cgdNo!=""){
+        if($cgdNo!==""){
             $where[]=['a.cgdNo','like',"%$cgdNo%"];
         }
         $apply_name = isset($this->post['apply_name']) && $this->post['apply_name'] !==""? trim($this->post['apply_name']):"";
-        if($apply_name!=""){
+        if($apply_name!==""){
             $where[]=['a.apply_name','like',"%$apply_name%"];
         }
         $apply_id= isset($this->post['apply_id']) && $this->post['apply_id'] !==""? trim($this->post['apply_id']):"";
-        if($apply_id!=""){
+        if($apply_id!==""){
             $where[]=['a.apply_id','=',$apply_id];
         }
         $status= isset($this->post['status']) && $this->post['status'] !==""? trim($this->post['status']):"";
-        if($status!=""){
+        if($status!==""){
             $where[]=['a.status','=',$status];
         }
         $start= isset($this->post['start']) && $this->post['start'] !== "" ? $this->post['start']:"";
-        if ($start !="") {
+        if ($start !=="") {
             $where[]= ["a.sendtime",'>=',$start];
         }
         $end = isset($this->post['end']) && $this->post['end'] !== "" ? $this->post['end'] :"";
-        if($end !=""){
+        if($end !==""){
             $where[]= ["a.sendtime",'<=',$end];
         }
         $order_type=isset($this->post['order_type']) && $this->post['order_type']!==""? intval($this->post['order_type']):"";
-        if($order_type !=""){
+        if($order_type !==""){
             $where[]= ["b.order_type",'=',$order_type];
         }
         $order_source=isset($this->post['order_source']) && $this->post['order_source']!==""? intval($this->post['order_source']):"";
-        if($order_source !="")  $where[]= ["b.order_source",'=',$order_source];
+        if($order_source !=="")  $where[]= ["b.order_source",'=',$order_source];
 
         $good_type_code=isset($this->post['good_type_code']) && $this->post['good_type_code']!==""? trim($this->post['good_type_code']):"";
-        if($good_type_code !=""){
+        if($good_type_code !==""){
             $where[]= ["b.spuCode",'like',"%$good_type_code%"];
         }
         $good_name=isset($this->post['good_name']) && $this->post['good_name']!==""? trim($this->post['good_name']):"";
-        if($good_name !=""){
+        if($good_name !==""){
             $where[]= ["b.good_name",'like',"%$good_name%"];
         }
         $supplie=isset($this->post['supplier']) && $this->post['supplier']!==""? trim($this->post['supplier']):"";
-        if($supplie !=""){
+        if($supplie !==""){
             $where[]= ["b.supplierNo",'like',"%$supplie%"];
         }
         $wsm_code=isset($this->post['wsm_code']) && $this->post['wsm_code']!==""? trim($this->post['wsm_code']):"";
-        if($wsm_code !=""){
+        if($wsm_code !==""){
             $where[]= ["a.wsm_code",'=',$wsm_code];
         }
         $supplierNo =isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
-        if($supplierNo!=""){
+        if($supplierNo!==""){
             $supplier = Db::name("supplier")->where(["code"=>$supplierNo])->find();
             if(empty($supplier)){
                 return error_show(1004,"未找到供应商信息");
@@ -103,7 +103,7 @@ class Purchin extends Base
         if ($company_name !== "") $where[] = ["a.apply_id", 'in', get_company_item_user_by_name($company_name)];
 
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
-        if($relaComNo!='') $where[]=['b.supplierNo|b.companyNo','=', $relaComNo];
+        if($relaComNo!=='') $where[]=['b.supplierNo|b.companyNo','=', $relaComNo];
 
         //$count = Db::name('purchease_in')->alias('a')->join("purchease_order b","b.cgdNo=a.cgdNo","left")
         $count = Db::name('purchease_in')

app/admin/controller/SaleReport.php

@@ -293,14 +293,14 @@ class SaleReport extends Base
 
         $data = Db::name('sale')
             ->alias('s')
-            ->field('s.apply_name,s.addtime,s.orderCode,csi.companyName,s.good_name,s.good_num,s.sale_price,s.total_price,s.is_stock,s.order_type,csi.itemid,s.good_code,s.apply_id')
+            ->field('s.apply_name,s.addtime,s.orderCode,csi.companyName,s.good_name,s.good_num,s.sale_price,s.total_price,s.is_stock,s.order_type,csi.itemid,s.good_code,s.apply_id,s.cat_id')
             ->leftJoin('customer_info csi', 'csi.companyNo=s.customer_code')
             ->where($where)
             ->page($param['page'], $param['size'])
             ->order('s.addtime', 'desc')
             ->cursor();
 
-        $list = [];
+        $list = $cat_tmp = [];
         foreach ($data as $value) {
 
             if (!empty($value['itemid'])) {
@@ -315,6 +315,8 @@ class SaleReport extends Base
             $value['is_stock'] = isset($this->all_stock[$value['is_stock']]) ? $this->all_stock[$value['is_stock']] : '';
             $value['order_type'] = isset($this->all_order_type[$value['order_type']]) ? $this->all_order_type[$value['order_type']] : '';
             $value['creater_company'] = get_company_name_by_uid($value['apply_id']);//获取创建人的所属部门
+            if (!isset($cat_tmp[$value['cat_id']])) $cat_tmp[$value['cat_id']] = implode('/', array_column(made($value['cat_id']), 'name'));
+            $value['cat_name'] = $cat_tmp[$value['cat_id']];
 
             $list[] = $value;
         }
@@ -333,13 +335,13 @@ class SaleReport extends Base
 
         $data = Db::name('sale')
             ->alias('s')
-            ->field('s.apply_name 创建人,"" 创建人所属部门,s.addtime 下单时间,s.orderCode 订单号,"" 一级企业,"" 二级企业,csi.companyName 客户名称,s.good_name 商品名称,s.good_num 数量,"" 单位,s.sale_price 单价,s.total_price 金额,s.is_stock 是否库存,s.order_type 订单类型,csi.itemid,s.good_code,s.apply_id')
+            ->field('s.apply_name 创建人,"" 创建人所属部门,s.addtime 下单时间,s.orderCode 订单号,"" 一级企业,"" 二级企业,csi.companyName 客户名称,s.good_name 商品名称,s.good_num 数量,"" 单位,s.sale_price 单价,s.total_price 金额,s.is_stock 是否库存,s.order_type 订单类型,csi.itemid,s.good_code,s.apply_id,s.cat_id')
             ->leftJoin('customer_info csi', 'csi.companyNo=s.customer_code')
             ->where($where)
             ->order('s.addtime', 'desc')
             ->cursor();
 
-        $list = [];
+        $list = $cat_tmp = [];
         foreach ($data as $value) {
 
             if (!empty($value['itemid'])) {
@@ -367,9 +369,13 @@ class SaleReport extends Base
 
             $value['创建人所属部门'] = get_company_name_by_uid($value['apply_id']);//获取创建人的所属部门
 
+            if (!isset($cat_tmp[$value['cat_id']])) $cat_tmp[$value['cat_id']] = implode('/', array_column(made($value['cat_id']), 'name'));
+            $value['分类名称'] = $cat_tmp[$value['cat_id']];
+
             unset($value['itemid']);
             unset($value['apply_id']);
             unset($value['good_code']);
+            unset($value['cat_id']);
 
             $list[] = $value;
         }
@@ -1702,7 +1708,7 @@ class SaleReport extends Base
 
             $list[] = $value;
         }
-        
+
         if (empty($list)) $list[] = '没有相关可导出的数据';
         excelSave('无地址销售订单列表' . date('YmdHis'), array_keys($list[0]), $list);