ad

app/admin/controller/Purch.php

@@ -64,12 +64,10 @@ class Purch extends Base
         }
         $good_name = isset($this->post['good_name']) && $this->post['good_name'] != "" ? trim($this->post['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 !== "") {
-            // $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']) : "";
@@ -79,10 +77,6 @@ class Purch extends Base
         }
         $wsm_supplierNo = isset($this->post['wsm_supplierNo']) && $this->post['wsm_supplierNo'] != "" ? trim($this->post['wsm_supplierNo']) : "";
         if ($wsm_supplierNo !== "") {
-//            $supplier = Db::name("supplier")->where(["code"=>$wsm_supplierNo])->find();
-//            if(empty($supplier)){
-//                return error_show(1004,"未找到供应商信息");
-//            }
             $wsmcode = Db::name("warehouse_info")->where(["is_del" => 0, "supplierNo" => $wsm_supplierNo])->column("wsm_code");
             $where[] = ['po.wsm_code', "in", $wsmcode];
         }
@@ -118,36 +112,7 @@ class Purch extends Base
 
         $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']];
-////            $whereor[]=["sip.personid","=",$this->uid];
-//            $whereor[]=["sip.personid","in",$role['write']];//最后的筛选条件
-////            $whereor[]=["po.cgder_id","=",$this->uid];
-//        }
-//		$role = $this->checkDataShare();
-//        if (!empty($role[DataGroupModel::$type_全部])) $where[] = ["sip.personid", "in", $role[DataGroupModel::$type_全部]];
-
         $userCommon = \app\admin\common\User::getIns();
-
-        //只有level2的账号过滤数据权限
-//        if ($this->level == 2) {
-//            $role = $this->checkDataShare();
-//            $hand = resign_hand_user($this->uid, 0);
-//            if (!empty($role[DataGroupModel::$type_全部])) {
-//                $arr = array_unique(array_merge($hand, $role[DataGroupModel::$type_全部]));
-//
-//                $supplierNos = Db::connect('mysql_sys')
-//                    ->name('supplier')
-//                    ->where(['is_del' => 0, 'personid' => $arr])
-//                    ->column('code');
-//
-//                $where[] = ['po.supplierNo', 'in', $supplierNos];
-//            }
-//        }
-
-
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["po.cgder_id", 'in', get_company_item_user_by_name($company_name)];
 
@@ -156,16 +121,10 @@ class Purch extends Base
 
         $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(!empty($role['platform']) ){
-//            $where[]=["po.platform_id","in",$role['platform']];
-//        }
-
         $count = Db::name("purchease_order")
             ->alias('po')
             ->leftJoin('order_num on', 'on.cgdNo=po.cgdNo')
-            ->leftJoin("depart_user u", "u.uid=po.cgder_id AND u.is_del=0")
-//            ->leftJoin('supplier sip', 'sip.code=po.supplierNo')
+//            ->leftJoin("depart_user u", "u.uid=po.cgder_id AND u.is_del=0")
             ->where($where)
             ->where(function ($query) use ($where) {
                 $query->whereOr([['po.order_type', '<>', 1], ['po.order_source', '=', 0]]);
@@ -175,7 +134,6 @@ class Purch extends Base
         $list = Db::name("purchease_order")
             ->alias('po')
             ->leftJoin('order_num on', 'on.cgdNo=po.cgdNo')
-//            ->leftJoin('supplier sip', 'sip.code=po.supplierNo')
             ->field('po.*,on.orderCode,"" supplier_cgderid,"" supplier_cgder')
             ->where($where)
             ->where(function ($query) use ($where) {
@@ -232,24 +190,10 @@ class Purch extends Base
             $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")
-////                    ->where(["a.wsm_code"=>$value['wsm_code']])->field("a.name as wsm_name,b.name,b.code")->find();
-//                $value['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
-//                $value['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
-//                $value['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
-//            }
-//			$supplierCgder =Db::name("supplier")->where(["code"=>$value['supplierNo']])->findOrEmpty();
-//            $value['supplier_cgderid'] = $supplierCgder['personid'] ??'';
-//            $value['supplier_cgder'] = $supplierCgder['person'] ??'';
-//            $cat_id = 0;
             if ($value['order_type'] == 3 || $value['order_type'] == 4) {
-//                $goon = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
+
                 $value["speclist"] =isset($goon_3_4[$value['spuCode']])? json_decode
-                ($goon_3_4[$value['spuCode']]['specinfo'],true):'';//isset($goon['specinfo'])&&$goon['specinfo']!=""?
-                // json_decode($goon['specinfo'],true):"";
+                ($goon_3_4[$value['spuCode']]['specinfo'],true):'';
                 //为了格式统一，缺了一个spec_value
                 if ($value['speclist'] != '') {
                     foreach ($value['speclist'] as &$v) {
@@ -260,7 +204,6 @@ class Purch extends Base
                 $cat_id =isset($goon_3_4[$value['spuCode']])?  $goon_3_4[$value['spuCode']]['cat_id']:0;
 
             } else {
-//                $goon =Db::name('good_basic')->field('cat_id')->where(['spuCode'=>$value['spuCode']])->find();
                 $spec = Db::name("good_spec")->where(["spuCode" => $value['spuCode'], "is_del" => 0])->select()->toArray();
                 $speclist = [];
                 if (!empty($spec)) {
@@ -283,11 +226,6 @@ class Purch extends Base
 
             if (!isset($cat_temp[$cat_id])) $cat_temp[$cat_id] = made($cat_id);
             $value['can'] = $cat_temp[$cat_id];
-
-            //采购单详情字段order_type 为1或者2时，取线上商品库 商品创建人   order_type 为3或者4时 取采购反馈的商品库 商品反馈人
-//            $value['cgder_id'] = $goon['createrid'];
-//            $value['cgder'] = $goon['creater'];
-
             $inorder = Db::name("purchease_in")
                 ->where(['cgdNo' => $value['cgdNo'], "is_del" => 0])
                 ->select()
@@ -295,16 +233,8 @@ class Purch extends Base
             $value['child'] = empty($inorder) ? [] : $inorder;
             $value['send_num'] -= $value['th_num'];
             $value['total_fee'] = round($value['total_fee'] - $value['th_fee'], 2);
-            //补充orderCode
-//            $value['orderCode']=isset($all_orderCodes[$value['cgdNo']])?$all_orderCodes[$value['cgdNo']]:'';
             $value['company_name'] = $item[$value['cgder_id']] ?? '';
-
             $value['has_account'] = (int)isset($account[$value['supplierNo']]);
-
-            //是否具有编辑权限
-//            $value['is_allow_update'] = 0;
-//            if (in_array($this->roleid, [1, 33]) || in_array($value['cgder_id'], $role[DataGroupModel::$type_可编辑])) $value['is_allow_update'] = 1;
-
             $data[] = $value;
         }
         return app_show(0, "获取成功", ["list" => $data, "count" => $count]);