部分细节优化

app/admin/controller/Good.php

@@ -747,10 +747,12 @@ class Good extends Base
         return app_show(0,"获取成功",["list"=>$data,"count"=>$count]);
     }
 
+    //库存统计
     public function GetStockGod(){
         $page = isset($this->post['page']) &&$this->post['page'] !=="" ? intval($this->post['page']):1;
         $size = isset($this->post['size']) &&$this->post['size'] !=="" ? intval($this->post['size']):10;
-        $condition = [["b.is_del","=",0],["c.usable_stock",">",0],["a.wsm_type","<>",2]];
+//        $condition = [["b.is_del","=",0],["c.usable_stock",">",0],["a.wsm_type","<>",2]];
+        $condition = [["b.is_del", "=", 0], ["a.wsm_type", "<>", 2]];//库存为0的也要显示出来
         $type_code = isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
         if($type_code!==""){
             $condition[]=["b.spuCode","like","%{$type_code}%"];

app/admin/controller/Purch.php

@@ -23,6 +23,7 @@ class Purch extends Base
         $this->noble=\think\facade\Config::get("noble");
     }
 
+    //采购单列表
     public function  list(){
         $page = isset($this->post['page']) && $this->post['page'] !=="" ? intval($this->post['page']):"1";
         $size = isset($this->post['size']) && $this->post['size'] !=="" ? intval($this->post['size']):"10";
@@ -109,6 +110,12 @@ class Purch extends Base
             //$where['lasttime'] = Db::raw(" <= '{$last_end}'");
             $where[]=['on.orderCode',"like", '%'.$orderCode.'%'];
         }
+
+        //筛选供应商名称
+        $supplier_name = isset($this->post['supplier_name']) && $this->post['supplier_name'] != "" ? $this->post['supplier_name'] : "";
+        if ($supplier_name != '') $where[] = ['po.supplier_name', 'like', '%' . $supplier_name . '%'];
+
+
 //		$whereor=[];
 //        if(!empty($role['write'])){
 ////            $whereor[]=["po.cgder_id","in",$role['write']];

app/admin/controller/Reorder.php

@@ -398,6 +398,7 @@ class Reorder extends Base
         }
     }
 
+    //退货单列表
     public function list(){
         $page = isset($this->post['page']) && $this->post['page'] !=="" ? intval($this->post['page']):"1";
         $size = isset($this->post['size']) && $this->post['size'] !=="" ? intval($this->post['size']):"10";
@@ -426,6 +427,17 @@ class Reorder extends Base
         if($end!==""){
             $where[]=['sr.addtime',"<=", $end.' 23:59:59'];
         }
+        //商品成本编码搜索
+        $good_code = isset($this->post['good_code']) && $this->post['good_code'] != "" ? trim($this->post['good_code']) : "";
+        if ($good_code != "") {
+            $where[] = ['sr.good_code', "like", "%{$good_code}%"];
+        }
+        //商品上线编码搜索
+        $skuCode = isset($this->post['skuCode']) && $this->post['skuCode'] != "" ? trim($this->post['skuCode']) : "";
+        if ($skuCode != "") {
+            $where[] = ['b.skuCode', "like", "%{$skuCode}%"];
+        }
+
         $condition=[];
 //        $role=$this->checkRole();
 //        if(!empty($role['write']) && $this->uid!=""){
@@ -452,13 +464,20 @@ class Reorder extends Base
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["sr.apply_id", 'in', get_company_item_user_by_name($company_name)];
 
-        $count=Db::name("sale_return")->alias('sr')->where($where)->where(function ($query)use ($condition){$query->whereOr($condition);})->count();
+        $count=Db::name("sale_return")
+            ->alias('sr')
+            ->leftJoin("depart_user u", "u.uid=sr.apply_id AND u.is_del=0")
+            ->leftJoin("sale b", "b.orderCode=sr.orderCode AND b.is_del=0")
+            ->where($where)
+            ->where(function ($query)use ($condition){$query->whereOr($condition);})
+            ->count('sr.id');
         $total = ceil($count/$size);
         $page = $total>=$page ? $page :$total;
         $list = Db::name("sale_return")
             ->alias('sr')
-            ->field('sr.*,u.itemid')
+            ->field('sr.*,u.itemid,b.skuCode,b.sale_price,b.good_num total_num ')
             ->leftJoin("depart_user u", "u.uid=sr.apply_id AND u.is_del=0")
+            ->leftJoin("sale b", "b.orderCode=sr.orderCode AND b.is_del=0")
             ->where($where)
             ->where(function ($query)use ($condition){$query->whereOr($condition);})
             ->order("addtime desc")
@@ -472,10 +491,10 @@ class Reorder extends Base
                 $error = Db::name("result_info")->where(["result_code"=>$value['error_code']])->find();
                 $value['error_msg']= isset($error['result'])?$error['result']:"";
             }
-            $order =Db::name("sale")->where(["orderCode"=>$value['orderCode'],"is_del"=>0])->find();
-            $value['sale_price'] = isset($order['sale_price']) ?$order['sale_price']:0;
+//            $order =Db::name("sale")->where(["orderCode"=>$value['orderCode'],"is_del"=>0])->find();
+//            $value['sale_price'] = isset($order['sale_price']) ?$order['sale_price']:0;
             $value['return_total'] =$value['sale_price']*$value['num'] ;
-            $value['total_num'] =$order['good_num'] ;
+//            $value['total_num'] =$order['good_num'] ;
             $value['company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
 
             //是否具有编辑权限
@@ -484,7 +503,7 @@ class Reorder extends Base
 
             $data[]=$value ;
         }
-        return app_show(0,"获取成功",['list'=>$data,"count"=>$count]);
+        return app_show(0,"获取成功",["count"=>$count,'list'=>$data]);
     }
 
     public function info(){

app/admin/route/app.php

@@ -176,7 +176,7 @@ Route::rule("goodstatus","admin/Good/SetStatus");
 Route::rule("goodstat","admin/Good/Stat");//库存概况
 Route::rule("goodstock","admin/Good/GetStock");
 Route::rule("goodall","admin/Good/all");
-Route::rule("getstockgod","admin/Good/GetStockGod");
+Route::rule("getstockgod","admin/Good/GetStockGod");//库存统计
 Route::rule("getstockwsm","admin/Good/GetStockWsm");//库存统计
 Route::rule("getstockbet","admin/Good/GetStockBet");
 Route::rule("goodloglist","admin/Good/loglist");
@@ -284,7 +284,7 @@ Route::rule('goldlist','admin/Gold/list');
 Route::rule('goldadd','admin/Gold/add');
 Route::rule('gold','admin/Gold/GetByType');
 
-Route::rule('reorderlist','admin/Reorder/list');
+Route::rule('reorderlist','admin/Reorder/list');//退货单列表
 Route::rule('reordercreate','admin/Reorder/create');
 Route::rule('reorderinfo','admin/Reorder/info');
 Route::rule('reorderdel','admin/Reorder/delete');