细节优化

app/admin/controller/After.php

@@ -223,7 +223,7 @@ class After extends Base
         $param = $this->request->only([
             'page' => 1,
             'size' => 10,
-            'relaComNo'=>'',
+            'relaComNo' => '',
             'returnCode' => '',
             'outCode' => '',
             'status' => '',
@@ -238,6 +238,7 @@ class After extends Base
             'end' => '',
             'company_name' => '',
             'supplierNo' => '',
+            'order_source' => '',
         ], 'post', 'trim');
 
         $where = [['a.is_del', "=", 0]];
@@ -254,6 +255,7 @@ class After extends Base
         if ($param['apply_name'] != "") $where[] = ['a.apply_name', "like", "%{$param['apply_name']}%"];
         if ($param['start'] !== "") $where[] = ['a.addtime', ">=", $param['start']];
         if ($param['end'] !== "") $where[] = ['a.addtime', "<=", $param['end']];
+        if ($param['order_source'] !== "") $where[] = ['c.order_source', "=", $param['order_source']];
         if ($param['supplierNo'] !== "") {
             $spuCode = Db::name('good_basic')
                 ->where(['is_del' => 0, 'supplierNo' => $param['supplierNo']])
@@ -276,7 +278,7 @@ class After extends Base
         }
 
         //level3账号不允许看到库存品订单
-        if($this->level==3) $where[]=['c.is_stock','<>',1];
+        if ($this->level == 3) $where[] = ['c.is_stock', '<>', 1];
 //        $condition .="a.cgderid in {$hand} or a.person_id in {$hand} or a.apply_id in ("
 //        .implode(',',$role[DataGroupModel::$type_全部]).")";
 
@@ -301,7 +303,7 @@ class After extends Base
             ->where(function ($query) use ($condition) {
                 $query->whereOr($condition);
             })
-            ->field("a.*,b.return_wsm,b.contactor,b.mobile,b.addr,b.addr_code,b.post_code,b.post_company,b.post_fee,b.gys_remark")
+            ->field("a.*,b.return_wsm,b.contactor,b.mobile,b.addr,b.addr_code,b.post_code,b.post_company,b.post_fee,b.gys_remark,c.order_source,c.supplierNo")
             ->page($param['page'], $param['size'])
             ->order("a.addtime desc")
             ->select()
@@ -312,15 +314,16 @@ class After extends Base
         $item = get_company_name_by_uid($all_createrid);
 
         //获取客户信息
-        $all_customer_code = array_column($list, 'customer_code');
+//        $all_customer_code = array_column($list, 'customer_code');
 
         $userCommon = new \app\admin\common\User();
-        $customer_ = $userCommon->handle('getCodeAndName', ['code' => $all_customer_code]);
+        $customer_ = $userCommon->handle('getCodeAndName', ['code' => array_unique(array_merge(array_column($list, 'customer_code'), array_column($list, 'supplierNo')))]);
 
         $data = [];
         foreach ($list as $value) {
 
             $value['customer_name'] = $customer_['data'][$value['customer_code']] ?? '';
+            $value['supplierName'] = $customer_['data'][$value['supplierNo']] ?? '';
             $value['company_name'] = $item[$value['apply_id']] ?? '';
 
             //是否具有编辑权限

app/admin/controller/Orderback.php

@@ -20,54 +20,60 @@ class Orderback extends Base
         parent::__construct($app);
     }
 
-    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";
-        $where =[['a.is_del',"=",0]];
-        $thNo = isset($this->post['thNo']) && $this->post['thNo']!="" ? trim($this->post['thNo']):"";
-        if($thNo!=""){
-            $where[]=['a.thNo',"like", "%{$thNo}%"];
+    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";
+        $where = [['a.is_del', "=", 0]];
+        $thNo = isset($this->post['thNo']) && $this->post['thNo'] != "" ? trim($this->post['thNo']) : "";
+        if ($thNo != "") {
+            $where[] = ['a.thNo', "like", "%{$thNo}%"];
         }
-        $status = isset($this->post['status']) && $this->post['status']!=="" ? intval($this->post['status']):"";
-        if($status!==""){
+        $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status']) : "";
+        if ($status !== "") {
             // $where['status'] = $status;
-            $where[]=['a.status',"=", $status];
+            $where[] = ['a.status', "=", $status];
         }
-        $post_code= isset($this->post['post_code']) && $this->post['post_code']!="" ? trim($this->post['post_code']):"";
-        if($post_code!=""){
-            $where[]=['a.post_code',"like", "%{$post_code}%"];
+        $post_code = isset($this->post['post_code']) && $this->post['post_code'] != "" ? trim($this->post['post_code']) : "";
+        if ($post_code != "") {
+            $where[] = ['a.post_code', "like", "%{$post_code}%"];
         }
-        $post_compay = isset($this->post['post_compay']) && $this->post['post_compay']!="" ? trim($this->post['post_compay']):"";
-        if($post_compay!=""){
-            $where[]=['a.post_company',"=", $post_compay];
+        $post_compay = isset($this->post['post_compay']) && $this->post['post_compay'] != "" ? trim($this->post['post_compay']) : "";
+        if ($post_compay != "") {
+            $where[] = ['a.post_company', "=", $post_compay];
         }
-        $customer_code = isset($this->post['customer_code']) && $this->post['customer_code']!="" ? trim($this->post['customer_code']):"";
-        if($customer_code!=""){
-            $where[]=['a.customer_code',"like", "%{$customer_code}%"];
+        $customer_code = isset($this->post['customer_code']) && $this->post['customer_code'] != "" ? trim($this->post['customer_code']) : "";
+        if ($customer_code != "") {
+            $where[] = ['a.customer_code', "like", "%{$customer_code}%"];
         }
 
-        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
-        if($relaComNo!="") $where[]=['b.supplierNo','=', $relaComNo];
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
+        if ($relaComNo != "") $where[] = ['b.supplierNo', '=', $relaComNo];
 
-        $order_code = isset($this->post['order_code']) && $this->post['order_code']!="" ? trim($this->post['order_code']):"";
-        if($order_code!=""){
-            $where[]=['a.orderCode',"like", "%{$order_code}%"];
+        $order_code = isset($this->post['order_code']) && $this->post['order_code'] != "" ? trim($this->post['order_code']) : "";
+        if ($order_code != "") {
+            $where[] = ['a.orderCode', "like", "%{$order_code}%"];
         }
-        $out_code = isset($this->post['out_code']) && $this->post['out_code']!="" ? trim($this->post['out_code']):"";
-        if($out_code!=""){
-            $where[]=['a.outCode',"like", "%{$out_code}%"];
+        $out_code = isset($this->post['out_code']) && $this->post['out_code'] != "" ? trim($this->post['out_code']) : "";
+        if ($out_code != "") {
+            $where[] = ['a.outCode', "like", "%{$out_code}%"];
         }
-        $return_code = isset($this->post['return_code']) && $this->post['return_code']!="" ? trim($this->post['return_code']):"";
-        if($return_code!=""){
-            $where[]=['a.returnCode',"like", "%{$return_code}%"];
+        $return_code = isset($this->post['return_code']) && $this->post['return_code'] != "" ? trim($this->post['return_code']) : "";
+        if ($return_code != "") {
+            $where[] = ['a.returnCode', "like", "%{$return_code}%"];
         }
-        $start =isset($this->post['start'])&&$this->post['start']!='' ? $this->post['start']:"";
-        if($start!==""){
-            $where[]=['a.addtime',">=", $start];
+        $start = isset($this->post['start']) && $this->post['start'] != '' ? $this->post['start'] : "";
+        if ($start !== "") {
+            $where[] = ['a.addtime', ">=", $start];
         }
-        $end =isset($this->post['end'])&&$this->post['end']!='' ? $this->post['end']:"";
-        if($end!==""){
-            $where[]=['a.addtime',"<=", $end];
+        $end = isset($this->post['end']) && $this->post['end'] != '' ? $this->post['end'] : "";
+        if ($end !== "") {
+            $where[] = ['a.addtime', "<=", $end];
+        }
+
+        $order_source = $order_source = isset($this->post['order_source']) && $this->post['order_source'] != "" ? trim($this->post['order_source']) : "";
+        if ($order_source !== "") {
+            $where[] = ['b.order_source', "=", $order_source];
         }
 
         $supplierNo = $this->post['supplierNo'] ?? '';
@@ -78,7 +84,7 @@ class Orderback extends Base
             $where[] = ['b.good_code', 'in', $spuCode];
         }
 
-        $condition=[];
+        $condition = [];
 //        $role=$this->checkRole();
 //        if(!empty($role['write']) && $this->uid!=""){
 //            // $where[]=["a.apply_id","in",$role['write']];
@@ -102,13 +108,13 @@ class Orderback extends Base
 
 
         //供应商账号不允许看到库存品数据
-        if ($this->level == 3) $where[]=['b.is_stock','<>',1];
+        if ($this->level == 3) $where[] = ['b.is_stock', '<>', 1];
 //        if(!empty($role['platform']) ){
 //            $where[]=["platform_id","in",$role['platform']];
 //        }
         $count = Db::name("order_back")
             ->alias('a')
-            ->leftJoin('sale b','b.orderCode=a.orderCode AND b.is_del=0')
+            ->leftJoin('sale b', 'b.orderCode=a.orderCode AND b.is_del=0')
             ->where($where)
             ->where(function ($query) use ($condition) {
                 $query->whereOr($condition);
@@ -118,56 +124,57 @@ class Orderback extends Base
         $page = $page >= $total ? $total : $page;
         $list = Db::name("order_back")
             ->alias('a')
-            ->leftJoin('sale b','b.orderCode=a.orderCode AND b.is_del=0')
+            ->leftJoin('sale b', 'b.orderCode=a.orderCode AND b.is_del=0')
             ->where($where)
             ->where(function ($query) use ($condition) {
                 $query->whereOr($condition);
             })
-            ->field('a.*')
+            ->field('a.*,b.order_source,b.supplierNo')
             ->page($page, $size)
             ->order("a.addtime desc")
             ->select()
             ->toArray();
-        $data=[];
+        $data = [];
 
         $all_wsm = Db::name("warehouse_info")
             ->alias("a")
-            ->where(["a.wsm_code"=>array_column($list,'return_wsm')])
-            ->column("a.name,a.supplierNo",'a.wsm_code');//b.name,b.code
+            ->where(["a.wsm_code" => array_column($list, 'return_wsm')])
+            ->column("a.name,a.supplierNo", 'a.wsm_code');//b.name,b.code
 
         $userCommon = new \app\admin\common\User();
-        $names = $userCommon->handle('getCodeAndName', ['code' => array_merge(array_column($all_wsm,'supplierNo'),array_column($list,'customer_code'))]);
+        $names = $userCommon->handle('getCodeAndName', ['code' => array_unique(array_merge(array_column($all_wsm, 'supplierNo'), array_column($list, 'customer_code'), array_column($list, 'supplierNo')))]);
 
-        foreach ($list as $value){
-            $value['wsm_name']="";
-            $value['wsm_supplier']='';
-            $value['wsm_supplierNo']='';
-            if($value['return_wsm']!=""){
+        foreach ($list as $value) {
+            $value['wsm_name'] = "";
+            $value['wsm_supplier'] = '';
+            $value['wsm_supplierNo'] = '';
+            if ($value['return_wsm'] != "") {
 //                $wsmcode = Db::name("warehouse_info")
 //                    ->alias("a")
 ////                    ->leftJoin("supplier b","a.supplierNo=b.code")
 //                    ->where(["a.wsm_code"=>$value['return_wsm']])
 //                    ->field("a.name as wsm_name,a.supplierNo")//b.name,b.code
 //                    ->find();
-                $value['wsm_name'] =$all_wsm[$value['return_wsm']]['name']??'';//isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
-                $value['wsm_supplier'] =$names['data'][$all_wsm[$value['return_wsm']]['supplierNo']]??'';//isset($wsmcode['name']) ? $wsmcode['name']:"";
-                $value['wsm_supplierNo'] =$all_wsm[$value['return_wsm']]['supplierNo'];//isset($wsmcode['code']) ? $wsmcode['code']:"";
+                $value['wsm_name'] = $all_wsm[$value['return_wsm']]['name'] ?? '';//isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
+                $value['wsm_supplier'] = $names['data'][$all_wsm[$value['return_wsm']]['supplierNo']] ?? '';//isset($wsmcode['name']) ? $wsmcode['name']:"";
+                $value['wsm_supplierNo'] = $all_wsm[$value['return_wsm']]['supplierNo'];//isset($wsmcode['code']) ? $wsmcode['code']:"";
             }
-            $value['customer_name']='';
-            if($value['customer_code']!=''){
+            $value['customer_name'] = '';
+            if ($value['customer_code'] != '') {
 //                $customer = Db::name("customer_info")->where(['companyNo'=>$value['customer_code']])->find();
-                $value['customer_name']=$names['data'][$value['customer_code']]??'';//isset($customer['companyName'])?$customer['companyName']:'';
+                $value['customer_name'] = $names['data'][$value['customer_code']] ?? '';//isset($customer['companyName'])?$customer['companyName']:'';
             }
-            $inorder= Db::name("order_backinfo")->where(['thNo'=>$value['thNo'],"is_del"=>0])->select();
-            $value['child']=empty($inorder)? [] : $inorder;
+            $inorder = Db::name("order_backinfo")->where(['thNo' => $value['thNo'], "is_del" => 0])->select();
+            $value['child'] = empty($inorder) ? [] : $inorder;
+            $value['supplierName'] = $names['data'][$value['supplierNo']] ?? '';//isset($customer['companyName'])?$customer['companyName']:'';
 
             //是否具有编辑权限
 //            $value['is_allow_update'] = 0;
 //            if (in_array($this->roleid, [1, 33]) || in_array($value['apply_id'], $role[DataGroupModel::$type_可编辑])) $value['is_allow_update'] = 1;
 
-            $data[]=$value;
+            $data[] = $value;
         }
-        return app_show(0,"获取成功",["list"=>$data ,"count"=>$count]);
+        return app_show(0, "获取成功", ["list" => $data, "count" => $count]);
     }
 
     /**

app/admin/controller/Purch.php

@@ -118,6 +118,9 @@ class Purch extends Base
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
         if ($relaComNo !== "") $where[] = ['po.companyNo', '=', $relaComNo];
 
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
+        if ($relaComNo !== "") $where[] = ['po.companyNo', '=', $relaComNo];
+
 //		$whereor=[];
 //        if(!empty($role['write'])){
 ////            $whereor[]=["po.cgder_id","in",$role['write']];
@@ -193,11 +196,14 @@ class Purch extends Base
             ->where(["a.wsm_code" => $wsmCodes])
             ->column("a.name as wsm_name,a.supplierNo as code", "wsm_code");
 
-          $wsmsupplier=[];
-         if(!empty($wsmcode)){
-            $names = $userCommon->handle('getCodeAndName', ['code' => array_column($wsmcode,"code")]);
-            $wsmsupplier = $names['data']??[];
-         }
+//          $wsmsupplier=[];
+//         if(!empty($wsmcode)){
+//
+//
+//            $wsmsupplier = $names['data']??[];
+//         }
+
+        $names = $userCommon->handle('getCodeAndName', ['code' => array_unique(array_merge(array_column($wsmcode,"code"),array_column($list,"companyNo")))]);
 
         //补充供应商负责人(sip.personid as supplier_cgderid,sip.person as supplier_cgder)
         $person_list = $userCommon->handle('sGetList', ['more_code' => array_unique(array_column($list, 'supplierNo')), 'size' => $size]);
@@ -205,11 +211,13 @@ class Purch extends Base
 
         foreach ($list as $value){
             $value['wsm_name'] = isset($wsmcode[$value['wsm_code']]['wsm_name']) ? $wsmcode[$value['wsm_code']]['wsm_name'] : "";
-            $value['wsm_supplier'] = $wsmsupplier[$wsmcode[$value['wsm_code']]['code']] ?? "";
+            $value['wsm_supplier'] = $wsmsupplier['data'][$wsmcode[$value['wsm_code']]['code']] ?? "";
             $value['wsm_supplierNo'] = $wsmcode[$value['wsm_code']]['code'] ?? "";
 
             $value['supplier_cgderid'] = $person_list[$value['supplierNo']]['personid'] ?? '';
             $value['supplier_cgder'] = $person_list[$value['supplierNo']]['person'] ?? '';
+
+            $value['companyName'] = $names['data'][$value['companyNo']] ?? '';
 //            $value['wsm_name']="";
 //            if($value['wsm_code']!=""){
 ////                $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
@@ -1008,6 +1016,12 @@ class Purch extends Base
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["a.apply_id", 'in', get_company_item_user_by_name($company_name)];
 
+        $order_source = $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];
+        $is_stock = $order_source = isset($this->post['is_stock']) && $this->post['is_stock'] != "" ? intval($this->post['is_stock']) : "";
+        if ($is_stock !== "") $where[] = ['b.is_stock', "=", $is_stock];
+
+
 //        $role = $this->checkDataShare();
 //        if (!empty($role[DataGroupModel::$type_全部])) $where[] = ['a.apply_id', 'in', $role[DataGroupModel::$type_全部]];
          $role = $this->checkDataShare();
@@ -1030,7 +1044,7 @@ class Purch extends Base
             ->where($where)
             ->page($page,$size)
             ->order("a.addtime desc")
-            ->field("a.*,b.cat_id")
+            ->field("a.*,b.cat_id,b.order_source,b.is_stock")
             ->select()
             ->toArray();
 

app/admin/controller/Purchin.php

@@ -141,7 +141,7 @@ class Purchin extends Base
             ->where($where)
              ->where(function ($query)use ($condition){$query->whereOr($condition);})
             ->page($page,$size)
-            ->field("a.apply_name,a.sendtime,b.order_type,b.order_source,a.status,a.cgdNo,a.wsm_in_code,a.send_num,a.wsm_code,b.good_name,b.spuCode,a.post_company,a.post_code,a.post_fee,a.apply_id,a.wsm_num,a.error_num,a.wait_num,a.status,a.check_name,a.checkid,b.bkcode,b.supplierNo,'' cgder_id,'' cgder,b.good_createrid,b.good_creater,c.name wsm_name,c.supplierNo wsm_supplierNo")
+            ->field("a.apply_name,a.sendtime,b.order_type,b.order_source,a.status,a.cgdNo,a.wsm_in_code,a.send_num,a.wsm_code,b.good_name,b.spuCode,a.post_company,a.post_code,a.post_fee,a.apply_id,a.wsm_num,a.error_num,a.wait_num,a.status,a.check_name,a.checkid,b.bkcode,b.supplierNo,'' cgder_id,'' cgder,b.good_createrid,b.good_creater,c.name wsm_name,b.supplierNo,b.supplier_name,c.supplierNo wsm_supplierNo,b.companyNo")
             ->order("a.addtime desc")
             ->select()
             ->toArray();
@@ -151,7 +151,7 @@ class Purchin extends Base
 
         //获取采购单供应商和仓库供应商的名称
         $userCommon = new \app\admin\common\User();
-        $names = $userCommon->handle('getCodeAndName',['code'=>array_unique(array_merge(array_column($list,'supplierNo'),array_column($list,'wsm_supplierNo')))]);
+        $names = $userCommon->handle('getCodeAndName',['code'=>array_unique(array_merge(array_column($list,'companyNo'),array_column($list,'wsm_supplierNo')))]);
 
         $all_supplier = $userCommon->handle('sGetList',['more_code'=>array_column($list,'supplierNo'),'page'=>1,'size'=>$size]);
         $all_supplier_list = array_column($all_supplier['data']['list'],null,'code');
@@ -211,6 +211,7 @@ class Purchin extends Base
 //                ->find();
 //            $value['wsm_name'] = $wsmcode['wsm_name'];
             $value['wsm_supplier'] = $names['data'][$value['wsm_supplierNo']]??'';
+            $value['companyName'] = $names['data'][$value['companyNo']]??'';
 //            $value['wsm_supplierNo'] = $wsmcode['code'];
 
             $value['company_name'] = $item[$value['apply_id']]??'';
@@ -1440,6 +1441,11 @@ class Purchin extends Base
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] != "" ? trim($this->post['supplierNo']) : "";
         if ($supplierNo != '') $where[] = ['b.supplierNo', '=', $supplierNo];
 
+        $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];
+        $is_stock = isset($this->post['is_stock']) && $this->post['is_stock'] != "" ? intval($this->post['is_stock']) : "";
+        if ($is_stock != '') $where[] = ['c.is_stock', '=', $is_stock];
+
 //        $role = $this->checkDataShare();
 //        if (!empty($role[DataGroupModel::$type_全部])) $where[] = ["a.apply_id", "in", $role[DataGroupModel::$type_全部]];
 
@@ -1455,21 +1461,27 @@ class Purchin extends Base
 
         $count = Db::name('purchease_return')
             ->alias('a')
-            ->join("purchease_order b","b.cgdNo=a.cgdNo","left")
+            ->leftJoin("purchease_order b","b.cgdNo=a.cgdNo")
+            ->leftJoin("good_basic c","c.spuCode=b.spuCode")
             ->where($where)
             ->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name('purchease_return')
             ->alias('a')
-            ->join("purchease_order b","b.cgdNo=a.cgdNo","left")
+            ->leftJoin("purchease_order b","b.cgdNo=a.cgdNo")
+            ->leftJoin("good_basic c","c.spuCode=b.spuCode")
             ->where($where)
             ->page($page,$size)
-            ->field("a.*,b.spuCode,b.good_price,b.order_type,b.good_price,b.total_fee,b.good_name")
+            ->field("a.*,b.spuCode,b.good_price,b.order_type,b.good_price,b.total_fee,b.good_name,b.order_source,c.is_stock,b.supplierNo,b.supplier_name,b.companyNo")
             ->order("a.addtime desc")
             ->select()
             ->toArray();
         $data=[];
+
+        $userCommon = new \app\admin\common\User();
+        $names = $userCommon->handle('getCodeAndName',['code'=>array_unique(array_column($list,'companyNo'))]);
+
         foreach ($list as $value){
             if($value['order_type']==3){
                 $goon = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
@@ -1482,6 +1494,7 @@ class Purchin extends Base
             //是否具有编辑权限
 //            $value['is_allow_update'] = 0;
 //            if (in_array($this->roleid, [1, 33]) || in_array($value['apply_id'], $role[DataGroupModel::$type_可编辑])) $value['is_allow_update'] = 1;
+            $value['companyName'] = $names['data'][$value['companyNo']]??'';
 
             $data[]=$value;
         }

app/admin/controller/Reorder.php

@@ -460,6 +460,10 @@ class Reorder extends Base
             $where[] = ['b.good_code', "in", $spuCode];
         }
 
+        $order_source = $order_source = isset($this->post['order_source']) && $this->post['order_source'] != "" ? trim($this->post['order_source']) : "";
+        if ($order_source !== "") $where[] = ['b.order_source', "=", $order_source];
+
+
         $condition=[];
 //        $role=$this->checkRole();
 //        if(!empty($role['write']) && $this->uid!=""){
@@ -505,7 +509,7 @@ class Reorder extends Base
         $page = $total>=$page ? $page :$total;
         $list = Db::name("sale_return")
             ->alias('sr')
-            ->field('sr.*,b.skuCode,b.sale_price,b.good_num total_num,b.customer_code,b.supplierNo ')
+            ->field('sr.*,b.skuCode,b.sale_price,b.good_num total_num,b.customer_code,b.supplierNo ,b.order_source')
             ->leftJoin("sale b", "b.orderCode=sr.orderCode AND b.is_del=0")
             ->where($where)
             ->where(function ($query)use ($condition){$query->whereOr($condition);})

app/admin/controller/Sale.php

@@ -2253,6 +2253,10 @@ class Sale extends Base
 
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["s.apply_id", 'in', get_company_item_user_by_name($company_name)];
+
+        $order_source = isset($this->post['order_source']) && $this->post['order_source'] !== "" ? trim($this->post['order_source']) : "";
+        if ($order_source !== "") $where[] = ["s.order_source", '=', $order_source];
+
 //        if(!empty($role['platform']) ){
 //            $where[]=["s.platform_id","in",$role['platform']];
 //        }
@@ -2306,12 +2310,12 @@ class Sale extends Base
             $value['supplierName'] = '';
             if ($value['supplierNo'] != "") {
 //                $supplier = Db::name("business")->where(["companyNo" => $value['supplierNo']])->find();
-                $value['supplierName'] = $names[$value['supplierNo']]??'';//isset($supplier['company']) ? $supplier['company'] : "";
+                $value['supplierName'] = $names['data'][$value['supplierNo']]??'';//isset($supplier['company']) ? $supplier['company'] : "";
             }
             $value['customerName'] = '';
             if ($value['customer_code'] != "") {
 //                $supplier = Db::name("customer_info")->where(["companyNo" => $value['customer_code']])->find();
-                $value['customerName'] = $names[$value['customer_code']]??'';//isset($supplier['companyName']) ? $supplier['companyName'] : "";
+                $value['customerName'] = $names['data'][$value['customer_code']]??'';//isset($supplier['companyName']) ? $supplier['companyName'] : "";
             }
             $value['useage'] = "";
             if ($value['use_order'] != 0) {
@@ -3270,6 +3274,14 @@ class Sale extends Base
         if ($relaComNo !== "") {
             $where[] = ['c.supplierNo', "=", $relaComNo];
         }
+        $order_source = isset($this->post['order_source']) && $this->post['order_source'] != "" ? trim($this->post['order_source']) : "";
+        if ($order_source !== "") {
+            $where[] = ['c.order_source', "=", $order_source];
+        }
+        $is_stock = isset($this->post['is_stock']) && $this->post['is_stock'] != "" ? trim($this->post['is_stock']) : "";
+        if ($is_stock !== "") {
+            $where[] = ['c.is_stock', "=", $is_stock];
+        }
         //  $role=$this->checkRole();
 //        if(!empty($role['write'])){
 //            $where[]=["apply_id","in",$role['write']];
@@ -3295,7 +3307,7 @@ class Sale extends Base
         $page = $page >= $total ? intval($total) : $page;
         $list = Db::name('sale_diff')
             ->alias('a')
-            ->field("a.*,c.customer_code,'' companyName,c.skuCode,c.order_type,c.supplierNo,c.apply_id")
+            ->field("a.*,c.customer_code,'' companyName,c.skuCode,c.order_type,c.supplierNo,c.apply_id,c.order_source,c.is_stock")
             ->join("sale c", "c.orderCode=a.orderCode", "left")
 //            ->join("customer_info v", "v.companyNo=c.customer_code", "left")
             ->where($where)
@@ -3318,9 +3330,9 @@ class Sale extends Base
             }
             $value['can'] = isset($goon['cat_id']) && $goon['cat_id'] != 0 ? made($goon['cat_id']) : [];
 //            $wsm = Db::name("business")->where(['companyNo' => $value['supplierNo']])->find();
-            $value['supplierNo'] = $value['supplierNo'];//isset($wsm['companyNo']) ? $wsm['companyNo'] : "";
+//            $value['supplierNo'] = $value['supplierNo'];//isset($wsm['companyNo']) ? $wsm['companyNo'] : "";
             $value['supplierName'] = $names['data'][$value['supplierNo']] ?? '';//isset($wsm['company']) ? $wsm['company'] : "";
-            $value['companyName'] = $names['data'][$value['customer_code']] ?? '';//isset($wsm['company']) ? $wsm['company'] : "";
+            $value['customer_name'] = $names['data'][$value['customer_code']] ?? '';//isset($wsm['company']) ? $wsm['company'] : "";
 
             //是否具有编辑权限
             $value['is_allow_update'] = 0;