解决冲突

app/admin/controller/After.php

@@ -1176,6 +1176,7 @@ class After extends Base
             }
         }
         $supplier = Db::name("supplier")->where(["is_platform"=>1,"status"=>1,"is_del"=>0])->column("code,name");
+
         if(empty($supplier)){
             return error_show(1005,"未找到供应商仓库数据");
         }
@@ -1818,11 +1819,12 @@ class After extends Base
 //                Db::rollback();
 //                return error_show(1003,"未找到咨询单信息");
 //            }
-            $supplier_temp_info = Db::name('supplier')
-                ->field('id,person,personid')
-                ->where('code',$old_cgd['supplierNo'])
-                ->findOrEmpty();
-
+//            $supplier_temp_info = Db::name('supplier')
+//                ->field('id,person,personid')
+//                ->where('code',$old_cgd['supplierNo'])
+//                ->findOrEmpty();
+	    $user= new \app\admin\common\User();
+        $supplier_temp_info =$user->handle("sInfo",["code"=>$old_cgd['supplierNo']]);
             $data = array_merge($old_sale, [
                 'id' => null,
                 "orderCode" => $orderCode,
@@ -1868,8 +1870,8 @@ class After extends Base
                 'returnCode' => $info['returnCode'],
 //                'total_price' => round($sale_price * $good_num, 2),
 //                'workNo'=>$workNo,
-                'cgderid' => $supplier_temp_info['personid'],
-                'cgder' => $supplier_temp_info['person'],//采购员(供应商负责人)
+                'cgderid' => $supplier_temp_info['data']['personid']??0,
+                'cgder' => $supplier_temp_info['data']['person']??"",//采购员(供应商负责人)
                 'good_createrid' => $zxinfo['createrid'],
                 'good_creater' => $zxinfo['creater'],//商品创建人
             ]);
@@ -2113,9 +2115,11 @@ class After extends Base
 
     private function createCgd($data,array &$standing_book_da=[]){
         $cgdCode = makeNo("CG");
-        $supplier=Db::name("supplier")->where(["code"=>$data['supplierNo'],"is_del"=>0])->find();
-        if($supplier==false) throw new Exception('该供应商不存在');
-
+//        $supplier=Db::name("supplier")->where(["code"=>$data['supplierNo'],"is_del"=>0])->find();
+        $user= new \app\admin\common\User();
+        $supplier_temp =$user->handle("sInfo",["code"=>$data['supplierNo']]);
+        if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) throw new Exception('该供应商不存在');
+		$supplier=$supplier_temp['data'];
 
         $wsm= Db::name("warehouse_info")
             ->where(["supplierNo"=>$data["supplierNo"],"companyNo"=>$data['companyNo'],"wsm_type"=>2,"is_del"=>0])
@@ -2398,17 +2402,26 @@ class After extends Base
             'good_createrid' => $goodinfo['createrid'],
             'good_creater' => $goodinfo['creater'],//商品创建人
         ]);
-            $supplier_temp_info = Db::name('supplier')
-                ->field('id,person,personid')
-                ->where('code',$cgd['supplierNo'])
-                ->findOrEmpty();
+//            $supplier_temp_info = Db::name('supplier')
+//                ->field('id,person,personid')
+//                ->where('code',$cgd['supplierNo'])
+//                ->findOrEmpty();
+         $user= new \app\admin\common\User();
+        $supplier_temp =$user->handle("sInfo",["code"=>$cgd['supplierNo']]);
         }else{
-        	 $supplier_temp_info = Db::name('supplier')
-                ->field('id,person,personid')
-                ->where('code',$goodinfo['supplierNo'])
-                ->findOrEmpty();
+        $user= new \app\admin\common\User();
+        $supplier_temp =$user->handle("sInfo",["code"=>$goodinfo['supplierNo']]);
+//        	 $supplier_temp_info = Db::name('supplier')
+//                ->field('id,person,personid')
+//                ->where('code',$goodinfo['supplierNo'])
+//                ->findOrEmpty();
         }
 
+        $supplier_temp_info = [
+        	"id"=>$supplier_temp['data']['id']??0,
+            "person"=>$supplier_temp['data']['person']??'',
+            "personid"=>$supplier_temp['data']['personid']??0,
+            ];
 //        $addrlist = isset($this->post['addrlist']) && $this->post['addrlist'] !=="" ?$this->post['addrlist']:"";
         $send_num = 0;
 //        if($sendtype==1){

app/admin/controller/Allot.php

@@ -51,14 +51,15 @@ class Allot extends Base
 
         $out_supplierNo =isset($this->post['wsm_out_supplierNo']) &&$this->post['wsm_out_supplierNo'] !=="" ? trim($this->post['wsm_out_supplierNo']):"";
         if($out_supplierNo!=""){
-            $supplier = Db::name("supplier")->where(["code"=>$out_supplierNo])->find();
-            if(empty($supplier)){
-                return error_show(1004,"未找到出库供应商信息");
-            }
+//            $supplier = Db::name("supplier")->where(["code"=>$out_supplierNo])->find();
+//            if(empty($supplier)){
+//                return error_show(1004,"未找到出库供应商信息");
+//            }
             $wsmcode = Db::name("warehouse_info")->where(["is_del"=>0,"wsm_type"=>1,"supplierNo"=>$out_supplierNo])->column("wsm_code");
             //$condtion["a.c.wsm_code"] = $wsmcode;
             $where[]=['a.wsm_out',"in",$wsmcode];
         }
+
         $out_companyNo = isset($this->post['out_companyNo']) && $this->post['out_companyNo'] !== "" ? trim($this->post['out_companyNo']) : "";
         if ($out_companyNo !== "") {
 
@@ -71,10 +72,10 @@ class Allot extends Base
 
         $in_supplierNo =isset($this->post['wsm_in_supplierNo']) &&$this->post['wsm_in_supplierNo'] !=="" ? trim($this->post['wsm_in_supplierNo']):"";
         if($in_supplierNo!=""){
-            $supplier = Db::name("supplier")->where(["code"=>$in_supplierNo])->find();
-            if(empty($supplier)){
-                return error_show(1004,"未找到入库供应商信息");
-            }
+//            $supplier = Db::name("supplier")->where(["code"=>$in_supplierNo])->find();
+//            if(empty($supplier)){
+//                return error_show(1004,"未找到入库供应商信息");
+//            }
             $wsmcode = Db::name("warehouse_info")->where(["is_del"=>0,"wsm_type"=>1,"supplierNo"=>$in_supplierNo])->column("wsm_code");
             //$condtion["c.wsm_code"] = $wsmcode;
             $where[]=['a.wsm_in',"in",$wsmcode];
@@ -283,24 +284,29 @@ class Allot extends Base
         if(empty($stv)){
             return error_show(1002,"未找到仓库数据");
         }
-        $vr = Db::name('supplier')->where(['code'=>$stv['supplierNo'],'is_del'=>0])->field('name,code as rcode')->find();
-        if(empty($vr)){
-            return error_show(1001,"未找到供应商数据");
-        }
         $st = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_in'],'is_del'=>0])->field('supplierNo,wsm_code,name')->find();
         if(empty($st)){
             return error_show(1003,"未找到仓库数据");
         }
-        $var = Db::name('supplier')->where(['code'=>$st['supplierNo'],'is_del'=>0])->field('name,code')->find();
-        if(empty($var)){
-            return error_show(1004,"未找到供应商数据");
-        }
+		$user = new \app\admin\common\User();
+        $supplie=$user->handle("getCodeAndName",["code"=>[$stv['supplierNo'],$st['supplierNo']]]);
+		if($supplie['code']!=0 || empty($supplie['data'])) return error_show(1001,"未找到供应商数据");
+		$vr = ["name"=>$supplie['data'][$stv['supplierNo']],"code"=>$stv['supplierNo']];
+		$var = ["name"=>$supplie['data'][$st['supplierNo']],"code"=>$st['supplierNo']];
+//        $vr = Db::name('supplier')->where(['code'=>$stv['supplierNo'],'is_del'=>0])->field('name,code as rcode')->find();
+//        if(empty($vr)){
+//            return error_show(1001,"未找到供应商数据");
+//        }
+//        $var = Db::name('supplier')->where(['code'=>$st['supplierNo'],'is_del'=>0])->field('name,code')->find();
+//        if(empty($var)){
+//            return error_show(1004,"未找到供应商数据");
+//        }
         // var_dump(Db::name('supplier')->getLastSql());
         $str ['wsm_out_name']=$vr['name'];
         $str ['wsm_in_name']=$var['name'];
         $str ['ckc_name']=$stv['name'];
         $str ['ckr_name']=$st['name'];
-        $str['out_code']=$vr['rcode'];
+        $str['out_code']=$vr['code'];
         $str['in_code']=$var['code'];
 //        $str = Db::name('allot_stock')->alias('a')->join('warehouse_info b',"b.wsm_code=a.wsm_out","left")
 //            ->join('supplier c',"c.code=b.supplierNo","left")->field("c.name,c.code,")
@@ -830,10 +836,10 @@ public function vesio(){
         }
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !== "" ? trim($this->post['supplierNo']) : "";
         if ($supplierNo != "") {
-            $supplier = Db::name("supplier")->where(["code" => $supplierNo])->find();
-            if (empty($supplier)) {
-                return error_show(1004, "未找到供应商信息");
-            }
+//            $supplier = Db::name("supplier")->where(["code" => $supplierNo])->find();
+//            if (empty($supplier)) {
+//                return error_show(1004, "未找到供应商信息");
+//            }
             $wsmcode = Db::name("warehouse_info")->where(["is_del" => 0, "supplierNo" => $supplierNo])->column("wsm_code");
             $condtion[] = ['c.wsm_code', "in", $wsmcode];
         }

app/admin/controller/Base.php

@@ -201,8 +201,14 @@ class Base extends \app\BaseController
         }
 
         if ($isZx == 1) {
-            $supplier = Db::name("supplier")->where(["code" => $good['supplierNo']])->findOrEmpty();
-            if (empty($supplier)) throw new \Exception('非库存商品转库存失败');
+//            $supplier = Db::name("supplier")->where(["code" => $good['supplierNo']])->findOrEmpty();
+//
+//            if (empty($supplier)) throw new \Exception('非库存商品转库存失败');
+            $userCommon= new \app\admin\common\User();
+	        $supplier_temp =$userCommon->handle("sInfo",["code"=>$good['supplierNo']]);
+			 if ($supplier_temp['code']!=0 || empty($supplier_temp['data'])) throw new \Exception('查不到该供应商的记录');
+				$personid = $supplier_temp['data']['personid']??0;
+				$person_name = $supplier_temp['data']['person']??'';
             $good = [
                 'spuCode' => $spuCode,
                 'good_code' => $good['good_code'],
@@ -264,8 +270,8 @@ class Base extends \app\BaseController
                 'is_diff' => $good['is_diff'],
                 'config' => $good['config'],
                 'other_config' => $good['other_config'],
-                'chargerid' => $supplier['personid'] ?? $good['createrid'],
-                'charger' => $supplier['person'] ?? $good['creater'],//负责人跟创建人一致
+                'chargerid' => $personid ?? $good['createrid'],
+                'charger' => $person_name ?? $good['creater'],//负责人跟创建人一致
             ];
         } else {
             $good['id'] = null;

app/admin/controller/Brand.php

@@ -81,10 +81,10 @@ class Brand extends Base
         }
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] != "" ? trim($this->post['supplierNo']) : "";
         if($supplierNo!=""){
-            $gyscode = Db::name("supplier")->where(["code"=>$supplierNo])->find();
-            if(empty($gyscode)){
-                return error_show(1004,"未找到供应商信息");
-            }
+//            $gyscode = Db::name("supplier")->where(["code"=>$supplierNo])->find();
+//            if(empty($gyscode)){
+//                return error_show(1004,"未找到供应商信息");
+//            }
         $wsmcode = Db::name("brand_book")->where(["gyscode" => $supplierNo, "is_del" => 0])->column("brand_id");
         $where[] = ['b.id', "in", $wsmcode];
     }

app/admin/controller/Check.php

@@ -122,20 +122,26 @@ public function __construct(App $app)
             //品牌信息
             $brands = Db::name('brand')->whereIn('id', array_column($list, 'brand_id'))->where('is_del', 0)->column('brand_name', 'id');
             $units = Db::name('unit')->whereIn('id', array_column($list, 'good_unit'))->where('is_del', 0)->column('unit', 'id');
-            $business = Db::name('business')->whereIn('companyNo', array_column($list, 'companyNo'))->where('is_del', 0)->column('company', 'companyNo');
+//            $business = Db::name('business')->whereIn('companyNo', array_column($list, 'companyNo'))->where('is_del', 0)->column('company', 'companyNo');
+            $wsminfo =Db::name("warehouse_info")->whereIn("wsm_code",array_column($list, 'wsm_code'))->column("name,supplierNo","wsm_code");
+            $goodBasic =Db::name("good_basic")->whereIn("spuCode",array_column($list, 'spuCode'))->column("charger","spuCode");
 
+            $userCommon= new \app\admin\common\User();
+	        $supplier_temp =$userCommon->handle("getCodeAndName",["code"=>array_merge(array_column($list,
+	        'companyNo'),array_column($list, 'supplierNo'),array_column($wsminfo,"supplierNo"))]);
+	        $supplier=$supplier_temp['data']??[];
             foreach ($list as $key => $value) {
-                $supplier = Db::name("supplier")->where(["code" => $value['supplierNo']])->find();
-                $value['supplier_name'] = isset($supplier['name']) ? $supplier['name'] : "";
-                $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'] : "";
+//                $supplier = Db::name("supplier")->where(["code" => $value['supplierNo']])->find();
+                $value['supplier_name'] = $supplier[$value['supplierNo']]??"";
+//                $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'] =$wsminfo[$value['wsm_code']]['name']?? "";
+                $value['wsm_supplier'] = $supplier[$wsminfo[$value['wsm_code']]['supplierNo']]??"";
+                $value['wsm_supplierNo'] = $wsminfo[$value['wsm_code']]['supplierNo']?? "";
                 $value['can'] = isset($value['cat_id']) && $value['cat_id'] != 0 ? made($value['cat_id']) : [];
 
                 $value['brand_name'] = isset($brands[$value['brand_id']]) ? $brands[$value['brand_id']] : '';
                 $value['unit'] = isset($units[$value['good_unit']]) ? $units[$value['good_unit']] : '';
-                $value['companyName'] = isset($business[$value['companyNo']]) ? $business[$value['companyNo']] : '';
+                $value['companyName'] = $supplier[$value['companyNo']]??"";
                 $value['bninfo'] =Db::name("good_stock_info")->where([["stockid","=",$value['stock_id']],["balance_num",">",0]])->select()->toArray();
                 //规格信息
                 $spec = Db::name("good_spec")->where(["spuCode" => $value['spuCode'], "is_del" => 0])->select()->toArray();
@@ -154,7 +160,7 @@ public function __construct(App $app)
                     }
                 }
                 $value['specinfo'] = $speclist;
-                $value['cgder'] = isset($supplier['person']) ? $supplier['person'] : '';
+                $value['cgder'] =$goodBasic[$value['spuCode']]??"";
                 $value['company_name'] = $item[$value['createrid']]??'';
                 $data[] = $value;
             }
@@ -229,7 +235,7 @@ public function __construct(App $app)
         $count = Db::name('good_check')
             ->alias('a')
             ->join("warehouse_info b", "a.wsm_code = b.wsm_code", "left")
-            ->join("supplier v", "v.code=b.supplierNo", "left")
+//            ->join("supplier v", "v.code=b.supplierNo", "left")
             ->where($where)
             ->count();
         $total = ceil($count / $size);
@@ -237,13 +243,16 @@ public function __construct(App $app)
         $list = Db::name('good_check')
             ->alias('a')
             ->join("warehouse_info b", "a.wsm_code = b.wsm_code", "left")
-            ->join("supplier v", "v.code=b.supplierNo", "left")
-            ->field("a.status,a.apply_id,a.apply_name,a.type,a.addtime,a.wsm_code,a.check_code,b.name,a.id,v.name as 'caname',v.code")
+//            ->join("supplier v", "v.code=b.supplierNo", "left")
+            ->field("a.status,a.apply_id,a.apply_name,a.type,a.addtime,a.wsm_code,a.check_code,b.name,a.id,b.supplierNo as code")
             ->where($where)
             ->page($page, $size)
             ->order("a.id desc")
             ->select()
             ->toArray();
+             $userCommon= new \app\admin\common\User();
+	        $supplier_temp =$userCommon->handle("getCodeAndName",["code"=>array_column($list,"code")]);
+	        $supplier=$supplier_temp['data']??[];
         $data = [];
         foreach ($list as $key => $value) {
             $value['rename'] = '';
@@ -253,6 +262,7 @@ public function __construct(App $app)
                 // var_dump(Db::name("depart_user")->getLastSql());
                 $value['rename'] = implode(",", $depart);
             }
+            $value['name'] =$supplier[$value['code']]??"";
             //是否具有编辑权限
             $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;
@@ -270,8 +280,7 @@ public function __construct(App $app)
 	        return error_show(1002,"参数id不能为空");
 	    }
 	    $fo = Db::name('good_check')->alias('a')->join('warehouse_info b',"b.wsm_code=a.wsm_code","left")
-	        ->join('supplier c',"c.code=b.supplierNo","left")->field("c.name,c.code,a.*")
-	        ->where(['a.id'=>$id,'a.is_del'=>0])->find();
+			->field("a.*")->where(['a.id'=>$id,'a.is_del'=>0])->find();
 	    if(empty($fo)){
 	        return error_show(1003,"未找到盘点信息");
 	    }
@@ -353,11 +362,14 @@ public function __construct(App $app)
 	        return error_show(1002,"参数id不能为空");
 	    }
 	    $fo = Db::name('good_check')->alias('a')->join('warehouse_info b',"b.wsm_code=a.wsm_code","left")
-	        ->join('supplier c',"c.code=b.supplierNo","left")->field("c.name,c.code,a.*")
+			->field("b.supplierNo as code,a.*")
 	        ->where(['a.id'=>$id,'a.is_del'=>0])->find();
 	    if(empty($fo)){
 	        return error_show(1003,"未找到盘点信息");
 	    }
+	    $userCommon = new \app\admin\common\User();
+        $tmp = $userCommon->handle('sInfo', ['code' => $fo['code']]);
+        $fo['name'] = $tmp['data']['name']??"";
 	    $fi = Db::name('check_item')->where(['check_code'=>$fo['check_code'],'is_del'=>0])->select();
 	    $fo['item']=$fi;
 	    if(empty($fo)){
@@ -572,12 +584,15 @@ public function __construct(App $app)
             ->where(['c.wsm_code'=>$fo['wsm_code'],"b.is_del"=>0,"c.is_del"=>0])->field("d.bnCode '商品批次号',b.spuCode'商品编码',
             b.good_name '商品名称',b.craft_desc '商品描述',b.brand_id '品牌',b.good_unit '单位',b.supplierNo '供应商编码','' as '供应商名称','' as  '一级分类','' as '二级分类','' as  '三级分类',
             b.addtime '新建时间',c.wsm_code '仓库编码','' as '仓库名称',c.usable_stock '可用总库存',d.balance_num '批次库存数','' as '盘点库存'")
-            ->select();
+            ->select()->toArray();
         $data=[];
+        $userCommon = new \app\admin\common\User();
+        $tmp = $userCommon->handle('getCodeAndName', ['code' => array_column($list,"供应商编码")]);
+        $supplier=$tmp['data']??[];
         foreach ($list as $key=>$value){
             $wsm = Db::name("warehouse_info")->where(['wsm_code'=>$value['仓库编码']])->find();
-            $supplier = Db::name("supplier")->where(["code"=>$value['供应商编码']])->find();
-            $value['供应商名称'] =isset($supplier['name']) ?$supplier['name'] :"";
+//            $supplier = Db::name("supplier")->where(["code"=>$value['供应商编码']])->find();
+            $value['供应商名称'] =$supplier[$value['供应商编码']]??"";
             $value['仓库名称'] =isset($wsm['name']) ?$wsm['name'] :"";
             $unit =Db::name("unit")->where(["id"=>$value['单位']])->find();
             $brand =Db::name("brand")->where(["id"=>$value['品牌']])->find();
@@ -600,7 +615,7 @@ public function __construct(App $app)
             return error_show(1002,"参数id不能为空");
         }
         $fo = Db::name('good_check')->alias('a')->join('warehouse_info b',"b.wsm_code=a.wsm_code","left")
-            ->join('supplier c',"c.code=b.supplierNo","left")->field("c.name,c.code,b.name,a.*")
+            ->field(",b.supplierNo as code,b.name,a.*")
             ->where(['a.id'=>$id,'a.is_del'=>0])->find();
         if(empty($fo)){
             return error_show(1003,"未找到盘点信息");

app/admin/controller/Consult.php

@@ -850,10 +850,12 @@ class Consult extends Base
 
         }
 
-        $supplier = Db::name('supplier')
-            ->field('id,person,personid')
-            ->where('code',$supplierNo)
-            ->findOrEmpty();
+//        $supplier = Db::name('supplier')
+//            ->field('id,person,personid')
+//            ->where('code',$supplierNo)
+//            ->findOrEmpty();
+	    $user= new \app\admin\common\User();
+        $supplier =$user->handle("sInfo",["code"=>$supplierNo]);
 
         $data=[
             "bidNo"=>$bidNo,
@@ -905,8 +907,8 @@ class Consult extends Base
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s"),
             'delivery_place'=>$delivery_place,//发货地
-            'cgder' => $supplier['person'] ?? '',
-            'cgderid' => $supplier['personid'] ?? 0,
+            'cgder' => $supplier['data']['person'] ?? '',
+            'cgderid' => $supplier['data']['personid'] ?? 0,
         ];
         Db::startTrans();
         try{
@@ -1014,8 +1016,10 @@ class Consult extends Base
         $info['unit'] = isset($unit['unit'])?$unit['unit']:'';
         $info['cat_info'] = made($info['cat_id'],[]);
         $info['noble_weight'] = $info['good_weight'];
-        $supplier = Db::name("supplier")->where(["code"=>$info['supplierNo']])->find();
-        $info['supplierName'] = isset($supplier['name'])?$supplier['name']:"";
+        $user= new \app\admin\common\User();
+        $supplier =$user->handle("getCodeAndName",["code"=>$info['supplierNo']]);
+//        $supplier = Db::name("supplier")->where(["code"=>$info['supplierNo']])->find();
+        $info['supplierName'] = isset($supplier['data'][$info['supplierNo']])?$supplier['data'][$info['supplierNo']]:"";
         if($info['brand_id']!=0){
             $brand=Db::name("brand")->where(["id"=>$info['brand_id']])->find();
             $info["brand_name"]=isset($brand['brand_name'])?$brand['brand_name']:"";
@@ -1815,8 +1819,12 @@ class Consult extends Base
             $info['origin_addr'] = $addr;
         }
         $info['supplierNo'] =$bidinfos['supplierNo'];
-        $supplier = Db::name("supplier")->where(["code"=>$info['supplierNo']])->find();
-        $info['supplier_name'] = isset($supplier['name'])?$supplier['name']:"";
+        $user= new \app\admin\common\User();
+        $supplier_temp =$user->handle("getCodeAndName",["code"=>$info['supplierNo']]);
+//        if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) throw new Exception('该供应商不存在');
+		$supplier=$supplier_temp['data']??[];
+//        $supplier = Db::name("supplier")->where(["code"=>$info['supplierNo']])->find();
+        $info['supplier_name'] = $supplier[$info['supplierNo']]??"";
         $info['pay_way'] =$bidinfos['pay_way'];
         $info['tax'] =$bidinfos['tax'];
         $info['send_way'] =$bidinfos['send_way'];
@@ -1907,13 +1915,17 @@ class Consult extends Base
         $page = $page >= $total ? $total : $page;
         $list =Db::name('consult_bids')->where($where)->page($page,$size)->select()->toArray();
         $data=[];
+        $user= new \app\admin\common\User();
+        $supplier_temp =$user->handle("getCodeAndName",["code"=>array_column($list,"supplierNo")]);
+//        if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) throw new Exception('该供应商不存在');
+		$supplier=$supplier_temp['data']??[];
         foreach ($list as $value){
             $catinfo = Db::name("cat")->where(["id"=>$value['cat_id']])->find();
             $value['can']= isset($value['cat_id']) && $value['cat_id'] !=0 ? made($value['cat_id']):[];
             $unit =Db::name("unit")->where(["id"=>$value['unit_id']])->find();
             $value['unit'] = isset($unit['unit'])?$unit['unit']:'';
-            $supplier = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
-            $value['supplierName'] = isset($supplier['name'])?$supplier['name']:"";
+//            $supplier = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
+            $value['supplierName'] = isset($supplier[$value['supplierNo']])?$supplier[$value['supplierNo']]:"";
             if($value['brand_id']!=0){
                 $brand=Db::name("brand")->where(["id"=>$value['brand_id']])->find();
                 $value["brand_name"]=isset($brand['brand_name'])?$brand['brand_name']:"";
@@ -2033,14 +2045,18 @@ class Consult extends Base
         }
         $list =Db::name('consult_bids')->where($where)->select();
         $data=[];
+        $user= new \app\admin\common\User();
+        $supplier_temp =$user->handle("getCodeAndName",["code"=>array_column($list,"supplierNo")]);
+//        if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) throw new Exception('该供应商不存在');
+		$supplier=$supplier_temp['data']??[];
         foreach ($list as $value){
             $catinfo = Db::name("cat")->where(["id"=>$value['cat_id']])->find();
 
             $value['can']= isset($value['cat_id']) && $value['cat_id'] !=0 ? made($value['cat_id']):[];
             $unit =Db::name("unit")->where(["id"=>$value['unit_id']])->find();
             $value['unit'] = isset($unit['unit'])?$unit['unit']:'';
-            $supplier = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
-            $value['supplierName'] = isset($supplier['name'])?$supplier['name']:"";
+//            $supplier = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
+            $value['supplierName'] = isset($supplier[$value['supplierNo']])?$supplier[$value['supplierNo']]:"";
             if($value['brand_id']!=0){
                 $brand=Db::name("brand")->where(["id"=>$value['brand_id']])->find();
                 $value["brand_name"]=isset($brand['brand_name'])?$brand['brand_name']:"";
@@ -2382,8 +2398,8 @@ class Consult extends Base
         $good_name = isset($this->post['good_name']) && $this->post['good_name'] !== "" ? trim($this->post['good_name']) : "";
         if ($good_name !== "") $where[] = ["cb.good_name", 'like', '%' . $good_name . '%'];
 
-        $supplierName = isset($this->post['supplierName']) && $this->post['supplierName'] !== "" ? trim($this->post['supplierName']) : "";
-        if ($supplierName !== "") $where[] = ["s.name", 'like', '%' . $supplierName . '%'];
+//        $supplierName = isset($this->post['supplierName']) && $this->post['supplierName'] !== "" ? trim($this->post['supplierName']) : "";
+//        if ($supplierName !== "") $where[] = ["s.name", 'like', '%' . $supplierName . '%'];
 
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !== "" ? trim($this->post['supplierNo']) : "";
         if ($supplierNo !== "") $where[] = ["cb.supplierNo", '=', $supplierNo];
@@ -2391,7 +2407,7 @@ class Consult extends Base
         $count = Db::name('consult_bids')
             ->alias('cb')
             ->leftJoin("consult_info c", "c.infoNo=cb.infoNo")
-            ->leftJoin('supplier s', 's.code=cb.supplierNo')
+//            ->leftJoin('supplier s', 's.code=cb.supplierNo')
             ->where($where)
             ->count();
 
@@ -2399,22 +2415,26 @@ class Consult extends Base
         $page = $page >= $total ? $total : $page;
         $list = Db::name('consult_bids')
             ->alias('cb')
-            ->field('cb.*,s.name supplierName')
+            ->field('cb.*')
             ->leftJoin("consult_info c", "c.infoNo=cb.infoNo")
-            ->leftJoin('supplier s', 's.code=cb.supplierNo')
+//            ->leftJoin('supplier s', 's.code=cb.supplierNo')
             ->where($where)
             ->page($page, $size)
             ->order('cb.addtime', 'desc')
             ->select()
             ->toArray();
         $data = [];
+        $user= new \app\admin\common\User();
+        $supplier_temp =$user->handle("getCodeAndName",["code"=>array_column($list,"supplierNo")]);
+//        if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) throw new Exception('该供应商不存在');
+		$supplier=$supplier_temp['data']??[];
         foreach ($list as $value) {
             $catinfo = Db::name("cat")->where(["id" => $value['cat_id']])->find();
             $value['can'] = isset($value['cat_id']) && $value['cat_id'] != 0 ? made($value['cat_id']) : [];
             $unit = Db::name("unit")->where(["id" => $value['unit_id']])->find();
             $value['unit'] = isset($unit['unit']) ? $unit['unit'] : '';
 //            $supplier = Db::name("supplier")->where(["code" => $value['supplierNo']])->find();
-//            $value['supplierName'] = isset($supplier['name']) ? $supplier['name'] : "";
+            $value['supplierName'] = isset($supplier[$value['supplierNo']]) ? $supplier[$value['supplierNo']] : "";
             if ($value['brand_id'] != 0) {
                 $brand = Db::name("brand")->where(["id" => $value['brand_id']])->find();
                 $value["brand_name"] = isset($brand['brand_name']) ? $brand['brand_name'] : "";

app/admin/controller/Good.php

@@ -969,7 +969,7 @@ class Good extends Base
             ->find();
         return app_show(0,"获取成功",$statlist);
     }
-
+	//废弃接口
     public function all(){
         $condtion=["a.is_del"=>0,"b.is_del"=>0];
         $wsmcode =isset($this->post['wsmcode']) &&$this->post['wsmcode'] !=="" ? trim($this->post['wsmcode']):"";
@@ -993,10 +993,10 @@ class Good extends Base
         }
         $supplierNo =isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
         if($supplierNo!=""){
-            $supplier = Db::name("supplier")->where(["code"=>$supplierNo])->find();
-            if(empty($supplier)){
-                return error_show(1004,"未找到供应商信息");
-            }
+//            $supplier = Db::name("supplier")->where(["code"=>$supplierNo])->find();
+//            if(empty($supplier)){
+//                return error_show(1004,"未找到供应商信息");
+//            }
             $condtion["a.gys_code"] = $supplierNo;
         }
 
@@ -1008,7 +1008,8 @@ class Good extends Base
         foreach ($list as $key=>$value){
             $stock = Db::name("good_stock")->where(["good_type_code"=>$value['type_code'],"is_del"=>0])->sum("usable_stock");
             $value['usable_stock']=$stock;
-            $supplier = Db::name("supplier")->where(["code"=>$value['gys_code']])->find();
+            //废弃
+            $supplier = Db::name("supplier")->where(["code"=>$value['gys_code']])->find();//废弃
             $value['supplier_name'] =isset($supplier['name']) ?$supplier['name'] :"";
             $data[]=$value;
         }

app/admin/controller/Goodup.php

@@ -290,8 +290,12 @@ class Goodup extends Base
         if($supplierNo==''){
             return error_show(1004,"参数supplierNo不能为空");
         }
-        $supplier =Db::name("supplier")->where(["code"=>$supplierNo])->findOrEmpty();
-        if(empty($supplier)) return error_show(1004,"供应商信息未找到");
+        $userCommon= new \app\admin\common\User();
+        $supplier_temp =$userCommon->handle("sInfo",["code"=>$supplierNo]);
+        if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1004,"供应商信息未找到");
+		$supplier=$supplier_temp['data']??[];
+//        $supplier =Db::name("supplier")->where(["code"=>$supplierNo])->findOrEmpty();
+//        if(empty($supplier)) return error_show(1004,"供应商信息未找到");
         $good_size = isset($this->post['good_size'])&&$this->post['good_size']!=""? trim($this->post['good_size']):"";
         if($good_size==''){
             return error_show(1004,"参数good_size不能为空");
@@ -656,9 +660,10 @@ class Goodup extends Base
         if($supplierNo==''){
             return error_show(1004,"参数supplierNo不能为空");
         }
-        $supplier =Db::name("supplier")->field('id,personid,person')->where(["code"=>$supplierNo])->findOrEmpty();
-        if(empty($supplier)) return error_show(1004,"供应商信息未找到");
-
+        $userCommon= new \app\admin\common\User();
+        $supplier_temp =$userCommon->handle("sInfo",["code"=>$supplierNo]);
+        if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1004,"供应商信息未找到");
+		$supplier=$supplier_temp['data']??[];
         $good_size = isset($this->post['good_size'])&&$this->post['good_size']!=""? trim($this->post['good_size']) :"";
         if($good_size==''){
             return error_show(1004,"参数good_size不能为空");
@@ -2094,9 +2099,10 @@ class Goodup extends Base
         if($supplierNo==''){
             return error_show(1004,"参数supplierNo不能为空");
         }
-        $supplier = Db::name("supplier")->field('id,personid,person')->where(["code" => $supplierNo])->findOrEmpty();
-        if (empty($supplier)) return error_show(1004, "供应商信息未找到");
-
+        $userCommon= new \app\admin\common\User();
+        $supplier_temp =$userCommon->handle("sInfo",["code"=>$supplierNo]);
+        if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1004,"供应商信息未找到");
+		$supplier=$supplier_temp['data']??[];
         $good_size = isset($this->post['good_size'])&&$this->post['good_size']!=""? trim($this->post['good_size']) :"";
         if($good_size==''){
             return error_show(1004,"参数good_size不能为空");

app/admin/controller/OrderImport.php

@@ -562,8 +562,11 @@ class OrderImport extends Base
         $data['unit'] = isset($unit['unit']) ? $unit['unit'] : '';
         $data['cat_info'] = made($data['cat_id'], []);
         $spec = Db::name("good_spec")->where(["spuCode" => $good_platform['spuCode'], "is_del" => 0])->select()->toArray();
-        $supplier = Db::name("supplier")->where(["code" => $data['supplierNo']])->find();
-        $data['supplierName'] = isset($supplier['name']) ? $supplier['name'] : "";
+        $userCommon = new \app\admin\common\User();
+        $supplier_temp = $userCommon->handle('getCodeAndName', ['code' => $data['supplierNo']]);
+//        $supplier = Db::name("supplier")->where(["code" => $data['supplierNo']])->find();
+        $supplier = $supplier_temp['data']??"";
+        $data['supplierName'] = isset($supplier[$data['supplierNo']]) ? $supplier[$data['supplierNo']] : "";
 
         $noble = Config::get('noble');
         $data['noble_name'] = isset($data['noble_metal']) && $data['noble_metal'] != 0 ? $noble[$data['noble_metal']] : "";

app/admin/controller/Purch.php

@@ -78,10 +78,10 @@ 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,"未找到供应商信息");
-            }
+//            $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];
         }
@@ -179,15 +179,28 @@ class Purch extends Base
         $all_createrid = array_column($list,'cgder_id');
         $item = get_company_name_by_uid($all_createrid);
         $data=[];
+        $wsmCodes = array_column($list,'wsm_code');
+         $wsmcode = Db::name("warehouse_info")->alias("a")
+                    ->where(["a.wsm_code"=>$wsmCodes])->column("a.name as wsm_name,a.supplierNo as code","wsm_code");
+          $userCommon = new \app\admin\common\User();
+          $wsmsupplier=[];
+         if(!empty($wsmcode)){
+            $names = $userCommon->handle('getCodeAndName', ['code' => array_column($wsmcode,"code")]);
+            $wsmsupplier = $names['data']??[];
+         }
+
         foreach ($list as $value){
-            $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']:"";
-            }
+        	     $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_supplierNo'] =$wsmcode[$value['wsm_code']]['code']??"";
+//            $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'] ??'';
@@ -520,12 +533,15 @@ class Purch extends Base
         $supplierNo = isset($this->post['supplierNo'])&&$this->post['supplierNo']!=""?trim($this->post['supplierNo'])
             :"";
         if($supplierNo!=""){
-            $supplier =Db::name("supplier")->where(['code'=>$supplierNo])->find();
-            if(empty($supplier)){
-                return error_show(1004,"未找到供应商信息");
-            }
+        	$userCommon = new \app\admin\common\User();
+                $supplier_temp = $userCommon->handle('getCodeAndName', ['code' => $supplierNo]);
+//            $supplier =Db::name("supplier")->where(['code'=>$supplierNo])->find();
+		 if($supplier_temp['code']!=0 || empty($supplier_temp['data']) )   return error_show(1004,"未找到供应商信息");
+//            if(empty($supplier)){
+//                return error_show(1004,"未找到供应商信息");
+//            }
             $data['supplierNo'] = $supplierNo;
-            $data['supplier_name'] = $supplier['name'];
+            $data['supplier_name'] = $supplier_temp['data'][$supplierNo]??"";
         }
         $remark = isset($this->post['remark'])&&$this->post['remark']!=""?trim($this->post['remark']):"";
         if($remark!=""){
@@ -606,18 +622,20 @@ class Purch extends Base
             }
 
             //供应商信息
-            $supplier_rs = Db::name('supplier')
-                ->field('id,name supplierName,code supplierNo,person,personid')
-                ->where(['is_del' => 0, 'code' => $param['supplierNo']])
-                ->find();
-
-
-            if (empty($supplier_rs)) throw new Exception('查不到该供应商的记录');
+//            $supplier_rs = Db::name('supplier')
+//                ->field('id,name supplierName,code supplierNo,person,personid')
+//                ->where(['is_del' => 0, 'code' => $param['supplierNo']])
+//                ->find();
+			$userCommon= new \app\admin\common\User();
+            $supplier_temp =$userCommon->handle("sInfo",["code"=>$param['supplierNo']]);
+
+            if ($supplier_temp['code']!=0 || empty($supplier_temp['data'])) throw new Exception('查不到该供应商的记录');
             else {
+            	$supplier_rs=$supplier_temp['data'];
                 $update['cgder_id'] = $supplier_rs['personid'];
                 $update['cgder'] = $supplier_rs['person'];
-                $update['supplierNo'] = $supplier_rs['supplierNo'];
-                $update['supplier_name'] = $supplier_rs['supplierName'];
+                $update['supplierNo'] = $supplier_rs['code'];
+                $update['supplier_name'] = $supplier_rs['name'];
             }
 
             //是否修改内容确定

app/admin/controller/Purchin.php

@@ -313,14 +313,28 @@ class Purchin extends Base
 //                        ->isEmpty();
 //                    if (!$res) throw new Exception('供应商已开通账号，只能由供应商端操作');
 
+//				}
+
+//                $personid = Db::name('supplier')
+//                    ->where('code', $cgdinfo['supplierNo'])
+//                    ->value('personid');
+//				$userCommon= new \app\admin\common\User();
+//	            $supplier_temp =$userCommon->handle("sInfo",["code"=>$cgdinfo['supplierNo']]);
+
+//                if ($supplier_temp['code']!=0 || empty($supplier_temp['data'])) throw new Exception('查不到该供应商的记录');
+//				$personid = $supplier_temp['data']['personid']??0;
+//				$person_name = $supplier_temp['data']['person']??'';
+//                if ($this->uid != $personid) throw new Exception('只能由供应商负责人操作');
 //                }
 
-                if ($this->level == 2) {
-                    $personid = Db::name('supplier')
-                        ->where('code', $cgdinfo['supplierNo'])
-                        ->value('personid');
-                    if ($this->uid != $personid) throw new Exception('只能由供应商负责人操作');
-                }
+            if ($this->level == 2) {
+                $person = Db::connect('mysql_sys')
+                    ->name('supplier')
+                    ->where('code', $cgdinfo['supplierNo'])
+                    ->field('person,personid')
+                    ->findOrEmpty();
+                if ($this->uid != $person['personid']) throw new Exception('只能由供应商负责人操作');
+            }
 
                 if($status==1){
                             Db::commit();
@@ -415,10 +429,10 @@ class Purchin extends Base
 //                                                ['orderCode','in',array_column($out,'orderCode')]
 //                                            ])->column('is_stock','orderCode');
 
-                                        $supplier = Db::name('supplier')
-                                            ->field('person,personid')
-                                            ->where(['code'=>$cgdinfo['supplierNo'],'is_del'=>0])
-                                            ->findOrEmpty();
+//                                        $supplier = Db::name('supplier')
+//                                            ->field('person,personid')
+//                                            ->where(['code'=>$cgdinfo['supplierNo'],'is_del'=>0])
+//                                            ->findOrEmpty();
 
                                         foreach ($out as $k => $v_outCode) {
                                             ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
@@ -454,9 +468,9 @@ class Purchin extends Base
                                                     "order_id" => $v_outCode['id'],
                                                     "order_status" => 1,
                                                     "before_status" => 0,
-                                                    'wait_id' => $supplier['personid'],
-                                                    'wait_name' => $supplier['person'],
-                                                    'holder_id' => $supplier['personid'],
+                                                    'wait_id' => $person['personid']??0,
+                                                    'wait_name' => $person['person']??'',
+                                                    'holder_id' =>$person['personid']??0,
                                                 ]);
                                             }
 
@@ -498,10 +512,10 @@ class Purchin extends Base
                         ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname],$order,"CGD", $cgdinfo['status'],$cgdinfo);
 
 
-                        $personid = Db::name('supplier')
-                            ->where('is_del',0)
-                            ->where('code',$cgdinfo['supplierNo'])
-                            ->value('personid');
+//                        $personid = Db::name('supplier')
+//                            ->where('is_del',0)
+//                            ->where('code',$cgdinfo['supplierNo'])
+//                            ->value('personid');
 
                         if($cgdinfo['status']==1 || $cgdinfo['status']==2){
 
@@ -520,11 +534,11 @@ class Purchin extends Base
 ////                                $process = ["order_code" => $cgdNo, "order_id" => $cgdinfo['id'], "order_status" => $cgdinfo['status'], "order_type" => 'CGD', "before_status" => $order['status'], 'holder_id' => $personid,'handle_user_list'=>implode(',', $uid)];
 //
 //                            }else{
-                            if (($this->level == 2) && ($this->uid != $personid)) throw new Exception('只能由供应商负责人操作');
+                            if (($this->level == 2) && ($this->uid != $person['personid'])) throw new Exception('只能由供应商负责人操作');
 //                            }
                         }//else $process = ["order_code" => $cgdNo, "order_id" => $cgdinfo['id'], "order_status" => $cgdinfo['status'], "order_type" => 'CGD', "before_status" => $order['status'], 'holder_id' => $personid];
                         
-                        ProcessOrder::AddProcess(['id'=>$this->uid,'nickname'=>$this->uname],["order_code" => $cgdNo, "order_id" => $cgdinfo['id'], "order_status" => $cgdinfo['status'], "order_type" => 'CGD', "before_status" => $order['status'], 'holder_id' => $personid]);
+                        ProcessOrder::AddProcess(['id'=>$this->uid,'nickname'=>$this->uname],["order_code" => $cgdNo, "order_id" => $cgdinfo['id'], "order_status" => $cgdinfo['status'], "order_type" => 'CGD', "before_status" => $order['status'], 'holder_id' => $person['personid']??0]);
                         Db::commit();
                         return app_show(0,'商品入库成功',["wsm_in_code"=>$wsm_in_code]);
                     }else{
@@ -562,7 +576,7 @@ class Purchin extends Base
             return error_show(1002,"未找到商品数据");
         }
         $cat= isset($goon['cat_id']) && $goon['cat_id'] !=0 ? made($goon['cat_id']):[];
-        $info['cgder']=Db::name("supplier")->where(["code"=>$dom['supplierNo']])->value("person",'');
+        $info['cgder']=$dom['cgder'];
         $info['spuCode']=$dom['spuCode'];
         $info['good_name']=$dom['good_name'];
         $info['skuCode']=$dom['skuCode'];
@@ -713,7 +727,15 @@ class Purchin extends Base
         if($info['status']==4){
             return error_show(1004,"入库单已完成");
         }
+		 $cgdinfo=Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],"is_del"=>0])->find();
+         if(empty($cgdinfo)){
+            return error_show(1002,"未找到采购单数据");
+          }
         $remark = isset($this->post['remark'])&&$this->post['remark']!="" ? trim($this->post['remark']) :"";
+        $userCommon= new \app\admin\common\User();
+		$supplier_temp =$userCommon->handle("sInfo",["code"=>$cgdinfo['supplierNo']]);
+		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
+		$holder_id=$supplier_temp['data']['personid']??0;
         Db::startTrans();
         try{
             $order = ["order_code"=>$incode,"status"=>$info['status'],"action_remark"=>'',"action_type"=>"status"];
@@ -733,11 +755,6 @@ class Purchin extends Base
                 $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>'RKD',"before_status"=>$order['status'],'holder_id' => $info['apply_id'],"handle_user_list"=>$handle_user_list];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 if($status==0){
-                    $cgdinfo=Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],"is_del"=>0])->find();
-                    if(empty($cgdinfo)){
-                        Db::rollback();
-                        return error_show(1002,"未找到采购单数据");
-                    }
                     $order = ["order_code"=>$info['cgdNo'],"status"=>$cgdinfo['status'],"action_remark"=>'',"action_type"=>"edit"];
                     $cgdinfo['wsend_num']+=$info['send_num'];
                     $cgdinfo['send_num']-=$info['send_num'];
@@ -760,9 +777,6 @@ class Purchin extends Base
                             $is_stock = Db::name('good_basic')
                                 ->where(['is_del'=>0,'spuCode'=>$cgdinfo['spuCode']])
                                 ->value('is_stock');
-
-                            $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
-
                             if($is_stock==1){
                                 //库存品，推给31库管人员、41库管-张凯旋
                                 $uid = Db::name('user_role')
@@ -792,11 +806,11 @@ class Purchin extends Base
                     }
                 }
                 if($status==1){
-                    $cgdinfo=Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],"is_del"=>0])->find();
-                    if(empty($cgdinfo)){
-                        Db::rollback();
-                        return error_show(1002,"未找到采购单数据");
-                    }
+//                    $cgdinfo=Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],"is_del"=>0])->find();
+//                    if(empty($cgdinfo)){
+//                        Db::rollback();
+//                        return error_show(1002,"未找到采购单数据");
+//                    }
                     $order = ["order_code"=>$info['cgdNo'],"status"=>$cgdinfo['status'],"action_remark"=>'',"action_type"=>"edit"];
                     $cgdinfo['wsend_num']-=$info['send_num'];
                     $cgdinfo['send_num']+=$info['send_num'];
@@ -807,7 +821,7 @@ class Purchin extends Base
                     if($up){
                         ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
 
-                        $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
+//                        $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
 
                         if($cgdinfo['status'] == 1  || $cgdinfo['status']==2){
 //                            $orderinfo = Db::name('sale')
@@ -846,11 +860,11 @@ class Purchin extends Base
                     }
                 }
                 if($status==4){
-                    $cgdinfo=Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],"is_del"=>0])->find();
-                    if(empty($cgdinfo)){
-                        Db::rollback();
-                        return error_show(1002,"未找到采购单数据");
-                    }
+//                    $cgdinfo=Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],"is_del"=>0])->find();
+//                    if(empty($cgdinfo)){
+//                        Db::rollback();
+//                        return error_show(1002,"未找到采购单数据");
+//                    }
                     $order = ["order_code"=>$info['cgdNo'],"status"=>$cgdinfo['status'],"action_remark"=>'',"action_type"=>"edit"];
                     $cgdinfo['wsend_num']-=$info['send_num'];
                     $cgdinfo['send_num']+=$info['send_num'];
@@ -863,7 +877,7 @@ class Purchin extends Base
                         return error_show(1002,"发货失败");
                     }
                     ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
-                    $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
+//                    $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
                     if($cgdinfo['status']==1 || $cgdinfo['status']==2){
 //                        $orderinfo = Db::name('sale')
 //                            ->alias('a')
@@ -994,6 +1008,14 @@ class Purchin extends Base
             return error_show($result['code'],$result['message']);
         }
         $userinfo = $result['data'];
+         $cgdinfo=Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],"is_del"=>0])->find();
+            if(empty($cgdinfo)){
+                return error_show(1002,"未找到采购单数据");
+            }
+        $userCommon= new \app\admin\common\User();
+		$supplier_temp =$userCommon->handle("sInfo",["code"=>$cgdinfo['supplierNo']]);
+		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
+		$holder_id=$supplier_temp['data']['personid']??0;
         Db::startTrans();
        try{
            $sto = ["order_code"=>$incode,"status"=>$info['status'],"action_remark"=>'',"action_type"=>"edit"];
@@ -1004,11 +1026,6 @@ class Purchin extends Base
         $info['updatetime'] = date("Y-m-d H:i:s");
         $up= Db::name("purchease_in")->save($info);
         if($up){
-            $cgdinfo=Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],"is_del"=>0])->find();
-            if(empty($cgdinfo)){
-                Db::rollback();
-                return error_show(1002,"未找到采购单数据");
-            }
              //库存品，推给31库管人员、41库管-张凯旋
                         $uid = Db::name('user_role')
                             ->where([
@@ -1031,7 +1048,7 @@ class Purchin extends Base
                 }
                 ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
 
-                $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
+//                $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
                 if($cgdinfo['status']==1 || $cgdinfo['status']==2){
                     $is_stock = Db::name('good_basic')
                         ->where(['is_del'=>0,'spuCode'=>$cgdinfo['spuCode']])
@@ -1192,7 +1209,6 @@ class Purchin extends Base
         }
         $cgdinfo=Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],"is_del"=>0])->find();
         if(empty($cgdinfo)){
-            Db::rollback();
             return error_show(1002,"未找到采购单数据");
         }
         $post_code = isset($this->post['post_code']) &&$this->post['post_code']!=="" ? trim($this->post['post_code']):"" ;
@@ -1211,6 +1227,10 @@ class Purchin extends Base
             "status"=>1,
             "updatetime"=>date("Y-m-d H:i:s")
         ];
+        $userCommon= new \app\admin\common\User();
+		$supplier_temp =$userCommon->handle("sInfo",["code"=>$cgdinfo['supplierNo']]);
+		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
+		$holder_id=$supplier_temp['data']['personid']??0;
         Db::startTrans();
         try{
             $up =Db::name("purchease_return")->where($return)->save($data);
@@ -1309,7 +1329,7 @@ class Purchin extends Base
                         return error_show(1004,"采购单数量更新失败");
                     }
                     ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
-                    $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
+//                    $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
 
                     if($cgdinfo['status']==1 || $cgdinfo['status']==2){
 //                        $orderinfo = Db::name('sale')

app/admin/controller/Report.php

@@ -127,14 +127,17 @@ class Report extends Base
         //产品
         $rs_temp_good = Db::name('good')
             ->alias('g')
-            ->field('"" 一级分类,"" 二级分类, g.cat_id 三级分类,g.good_name 商品名称,g.good_type 商品类型,g.brand_id 商品品牌,\'\' 型号,g.origin_place 产地,g.good_unit 计量单位,g.weight 重量g,\'\' 响应时间,g.lead_time 供货周期,g.good_size 商品尺寸,g.packing_size 装箱尺寸,g.packing_way 包装方式,g.packing_spec 装箱规格,g.packing_list 包装清单,g.delivery_place 发货地,g.delivery_day 物流时间,gp.skuCode 商品编码,s.name 供应商名称,g.creater 采购员,g.spuCode')
+            ->field('"" 一级分类,"" 二级分类, g.cat_id 三级分类,g.good_name 商品名称,g.good_type 商品类型,g.brand_id 商品品牌,\'\' 型号,g.origin_place 产地,g.good_unit 计量单位,g.weight 重量g,\'\' 响应时间,g.lead_time 供货周期,g.good_size 商品尺寸,g.packing_size 装箱尺寸,g.packing_way 包装方式,g.packing_spec 装箱规格,g.packing_list 包装清单,g.delivery_place 发货地,g.delivery_day 物流时间,gp.skuCode 商品编码,g.supplierNo 供应商名称,g.creater 采购员,g.spuCode')
             ->where($where_good)
             ->leftJoin('good_platform gp', 'gp.spuCode=g.spuCode')
-            ->leftJoin('supplier s', 's.code=g.supplierNo')
+//            ->leftJoin('supplier s', 's.code=g.supplierNo')
             ->order('g.id')
             ->select()
             ->toArray();
-
+        $supplerArr=array_column($rs_temp_good,"供应商名称");
+         $userCommon = new \app\admin\common\User();
+         $supplier_temp = $userCommon->handle('getCodeAndName', ['code' => $supplerArr]);
+         $supplier=$supplier_temp['data']??[];
         $all_good_type = [0 => '非定制商品', 1 => '定制商品'];
         $all_brand = Db::name('brand')->whereIn('id', array_column($rs_temp_good, '商品品牌'))->where('is_del', 0)->column('brand_name', 'id');
         $all_cat = Db::name('cat')
@@ -153,7 +156,7 @@ class Report extends Base
             $value['一级分类'] = isset($all_cat[$value['三级分类']]['cat_name_1']) ? $all_cat[$value['三级分类']]['cat_name_1'] : '';
             $value['二级分类'] = isset($all_cat[$value['三级分类']]['cat_name_2']) ? $all_cat[$value['三级分类']]['cat_name_2'] : '';
             $value['三级分类'] = isset($all_cat[$value['三级分类']]['cat_name_3']) ? $all_cat[$value['三级分类']]['cat_name_3'] : '';
-
+			$value['供应商名称']= $supplier[$value['供应商名称']]??"";
             $temp = explode(',', $value['产地']);
             $value['产地'] = GetAddr(json_encode(['provice_code' => isset($temp[0]) ? $temp[0] : '', 'city_code' => isset($temp[1]) ? $temp[1] : '', 'area_code' => isset($temp[2]) ? $temp[2] : '']));
             $value['计量单位'] = isset($all_unit[$value['计量单位']]) ? $all_unit[$value['计量单位']] : '';

app/admin/controller/Resign.php

@@ -125,16 +125,17 @@ class Resign extends Base
         $data=[];
         $all_createrid = array_column($list,'apply_id');
         $item = get_company_name_by_uid($all_createrid);
+        $userCommon = new \app\admin\common\User();
         foreach ($list as $value){
             $value['wsm_name']="";
             $value['wsm_supplier']="";
             $value['wsm_supplierNo']="";
             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']:"";
+	            $wsmcode = Db::name("warehouse_info")->where(["wsm_code"=>$value['wsm_code']])->field("name as wsm_name,supplierNo")->find();
+				$tmpd = $userCommon->handle('getCodeAndName', ['code' =>$wsmcode['supplierNo']]);
+	            $value['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
+	            $value['wsm_supplier'] =$tmpd['data'][$wsmcode['supplierNo']]??"";
+	            $value['wsm_supplierNo'] =$wsmcode['supplierNo']??"";
             }
             $value['file_name'] ='';
             if($value['file_url']){
@@ -142,11 +143,6 @@ class Resign extends Base
                 $value['file_name'] =substr($file,0,strripos($file,"_"));
             }
             $value['company_name'] = $item[$value['apply_id']]??'';
-
-            //是否具有编辑权限
-//            $value['is_allow_update'] = 0;
-//            if (in_array($this->roleid, $super_roleid) || in_array($value['apply_id'], $role[DataGroupModel::$type_可编辑])) $value['is_allow_update'] = 1;
-
             $data[]=$value;
         }
         return app_show(0,"获取成功",["count"=>$count,"list"=>$data]);
@@ -178,8 +174,11 @@ class Resign extends Base
         if($good==false){
             return error_show(1004,"未找到商品数据");
         }
-        $supplier=Db::name("supplier")->where("code","=",$good['supplierNo'])->find();
-        if($supplier==false)  return error_show(1004,"未找到供应商数据");
+        $userCommon= new \app\admin\common\User();
+		$supplier_temp =$userCommon->handle("sInfo",["code"=>$good['supplierNo']]);
+		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"商品供应商不存在");
+		$holder_id=$supplier_temp['data']['personid']??0;
+		$holder_name=$supplier_temp['data']['person']??0;
 //        $bk= Db::name("purchease")->where([["spuCode","=",$good_code],["status","<>",2],["is_del","=",0]])->find();
 //        if($bk!=false) return error_show(1004,"存在未完成备库单数据");
 //        $cgd =Db::name("purchease_order")->where([["spuCode","=",$good_code],["status","in",[0,1]],["is_del","=",0]])->find();
@@ -237,7 +236,7 @@ class Resign extends Base
         $in = Db::name("purchease")->insert($info,true);
         if($in>0){
             //备库单，推给供应商负责人
-            $order = ["order_type" => 'BHD', "order_code" => $bk_code, "order_id" => $in, "order_status" => 1, "before_status" => 1, 'wait_id' => $supplier['personid'], 'wait_name' => $supplier['person']];
+            $order = ["order_type" => 'BHD', "order_code" => $bk_code, "order_id" => $in, "order_status" => 1, "before_status" => 1, 'wait_id' => $holder_id, 'wait_name' => $holder_name];
             ProcessOrder::AddProcess(['id' => $this->uid, 'nickname' => $this->uname], $order);
             $ste = ["order_code" => $bk_code, "status" => 0, "action_remark" => '', "action_type" => "create"];
             ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], $ste, "BHD", 1, $info);
@@ -272,6 +271,11 @@ class Resign extends Base
         if(empty($info)){
             return error_show(1002,'未找到数据');
         }
+        $userCommon= new \app\admin\common\User();
+		$supplier_temp =$userCommon->handle("sInfo",["code"=>$info['supplierNo']]);
+		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"供应商不存在");
+		$holder_id=$supplier_temp['data']['personid']??0;
+		$holder_name=$supplier_temp['data']['person']??0;
 //        $data = GetUserInfo($this->post['token']);
 //        if((!empty($data) && $data['code']!=0) ||empty($data) ){
 //            return error_show($data['code'],$data['message']);
@@ -293,11 +297,11 @@ class Resign extends Base
         unset($info['id']);
         $in = Db::name("purchease")->insert($info,true);
         if($in>0){
-            $supplier = Db::name('supplier')
-                ->field('id,person,personid')
-                ->where('code', $info['supplierNo'])
-                ->findOrEmpty();
-            $order = ["order_type" => 'BHD', "order_code" => $bk_code, "order_id" => $in, "order_status" => 1, "before_status" => 1, 'wait_id' => $supplier['personid'], 'wait_name' => $supplier['person']];
+//            $supplier = Db::name('supplier')
+//                ->field('id,person,personid')
+//                ->where('code', $info['supplierNo'])
+//                ->findOrEmpty();
+            $order = ["order_type" => 'BHD', "order_code" => $bk_code, "order_id" => $in, "order_status" => 1, "before_status" => 1, 'wait_id' =>$holder_id, 'wait_name' =>$holder_name];
             ProcessOrder::AddProcess(['id' => $this->uid, 'nickname' => $this->uname], $order);
             $ste = ["order_code"=>$bk_code,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
             ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname],$ste,"BHD",1,$info);
@@ -335,23 +339,22 @@ class Resign extends Base
             $file= basename($info['file_url']);
             $info['file_name'] =substr($file,0,strripos($file,"_"));
         }
-
+        $userCommon = new \app\admin\common\User();
         if($info['wsm_code']!=""){
-            $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
-                ->where(["a.wsm_code"=>$info['wsm_code']])->field("a.name as wsm_name,b.name,b.code")->find();
+            $wsmcode = Db::name("warehouse_info")->where(["wsm_code"=>$info['wsm_code']])->field("name as wsm_name,supplierNo")->find();
+			$tmpd = $userCommon->handle('getCodeAndName', ['code' =>$wsmcode['supplierNo']]);
             $info['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
-            $info['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
-            $info['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
+            $info['wsm_supplier'] =$tmpd['data'][$wsmcode['supplierNo']]??"";
+            $info['wsm_supplierNo'] =$wsmcode['supplierNo']??"";
         }
-        $supplier =Db::name("supplier")->where(["code"=>$info['supplierNo']])->find();
-        $info['supplier_name'] = isset($supplier['name'])?$supplier['name']:"";
+//        $supplier =Db::name("supplier")->where(["code"=>$info['supplierNo']])->find();
 
-        $userCommon = new \app\admin\common\User();
-        $tmp = $userCommon->handle('getCodeAndName', ['code' => $info['companyNo']]);
+        $tmp = $userCommon->handle('getCodeAndName', ['code' =>[$info['companyNo'],$info['supplierNo']]]);
         if (!isset($tmp['code']) || $tmp['code'] != 0) return json_show($tmp['code'], $tmp['message'], $tmp['data']);
 
 //        $company =Db::name("business")->where(["companyNo"=>$info['companyNo']])->find();
         $info['company_name'] = $tmp['data'][$info['companyNo']] ?? '';
+        $info['supplier_name'] = $tmp['data'][$info['supplierNo']] ?? '';
         $info['can']=$int;
         return app_show(0,"获取成功",$info);
     }
@@ -454,6 +457,11 @@ class Resign extends Base
         if(empty($info)){
             return error_show(1002,'未找到数据');
         }
+        $userCommon= new \app\admin\common\User();
+		$supplier_temp =$userCommon->handle("sInfo",["code"=>$info['supplierNo']]);
+		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
+		$holder_id=$supplier_temp['data']['personid']??0;
+		$holder_name=$supplier_temp['data']['person']??0;
         $status = isset($this->post['status'])&&$this->post['status']!=='' ? intval($this->post['status']) : "";
         if($status===""){
             return error_show(1001,'status不能为空');
@@ -465,11 +473,7 @@ class Resign extends Base
         if($up){
 
             if($status==1){
-                $supplier = Db::name('supplier')
-                    ->field('id,person,personid')
-                    ->where('code', $info['supplierNo'])
-                    ->findOrEmpty();
-                $order = ["order_type" => 'BHD', "order_code" => $info['bk_code'], "order_id" => $info['id'], "order_status" => $status, "before_status" => $temp,'wait_id' => $supplier['personid'], 'wait_name' => $supplier['person']];
+                $order = ["order_type" => 'BHD', "order_code" => $info['bk_code'], "order_id" => $info['id'], "order_status" => $status, "before_status" => $temp,'wait_id' => $holder_id, 'wait_name' => $holder_name];
             }else $order = ["order_type" => 'BHD', "order_code" => $info['bk_code'], "order_id" => $info['id'], "order_status" => $status, "before_status" => $temp, 'holder_id' => $info['apply_id']];
             $order = ["order_type" => 'BHD', "order_code" => $info['bk_code'], "order_id" => $info['id'], "order_status" => $status, "before_status" => $temp, 'holder_id' => $info['apply_id']];
             ProcessOrder::AddProcess($this->post['token'],$order);
@@ -482,7 +486,7 @@ class Resign extends Base
         }
     }
 
-
+	//废弃
     public  function addFeed(){
         $token = isset($this->post['token']) ? trim($this->post['token']) : "";
         if($token==""){
@@ -523,7 +527,7 @@ class Resign extends Base
         if($supplierNo==""){
             return error_show(1002,'参数supplierNo 不能为空');
         }
-        $supplie = Db::name("supplier")->where(['code'=>$supplierNo,"is_del"=>0])->find();
+        $supplie = Db::name("supplier")->where(['code'=>$supplierNo,"is_del"=>0])->find();//废弃
         if(empty($supplie)){
             return error_show(1002,'未找到供应商');
         }
@@ -651,7 +655,7 @@ class Resign extends Base
             $feed['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
         }
         if($feed['supplier']!=""){
-            $supplie = Db::name("supplier")->where(['code'=>$feed['supplier'],"is_del"=>0])->find();
+            $supplie = Db::name("supplier")->where(['code'=>$feed['supplier'],"is_del"=>0])->find();//废弃
             $feed['supplier_name'] =isset($supplie['name']) ? $supplie['name']:"";
         }
         return app_show(0,"获取成功",$feed);
@@ -671,6 +675,11 @@ class Resign extends Base
             return error_show(1001,'参数status 不能为空');
         }
         $remark = isset($this->post['remark'])&& $this->post['remark']!=='' ? trim($this->post['remark']) : "";
+        $userCommon= new \app\admin\common\User();
+		$supplier_temp =$userCommon->handle("sInfo",["code"=>$feed['supplierNo']]);
+		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"供应商不存在");
+		$holder_id=$supplier_temp['data']['personid']??0;
+		$holder_name=$supplier_temp['data']['person']??0;
         Db::startTrans();
         try{
             $tem =$feed['status'];
@@ -680,11 +689,11 @@ class Resign extends Base
             $up = Db::name("purchease")->update($feed);
             if($up){
                 if ($feed['status'] == 1) {
-                    $supplier = Db::name('supplier')
-                        ->field('id,person,personid')
-                        ->where('code', $feed['supplierNo'])
-                        ->findOrEmpty();
-                    $order = ["order_type" => 'BHD', "order_code" => $feed['bk_code'], "order_id" => $feed['id'], "order_status" => $feed['status'], "before_status" => $tem, 'holder_id' => $feed['apply_id'], 'wait_id' => $supplier['personid'], 'wait_name' => $supplier['person']];
+//                    $supplier = Db::name('supplier')
+//                        ->field('id,person,personid')
+//                        ->where('code', $feed['supplierNo'])
+//                        ->findOrEmpty();
+                    $order = ["order_type" => 'BHD', "order_code" => $feed['bk_code'], "order_id" => $feed['id'], "order_status" => $feed['status'], "before_status" => $tem, 'holder_id' => $feed['apply_id'], 'wait_id' => $holder_id, 'wait_name' => $holder_name];
                 } else $order = ["order_type" => 'BHD', "order_code" => $feed['bk_code'], "order_id" => $feed['id'], "order_status" => $feed['status'], "before_status" => $tem, 'holder_id' => $feed['apply_id']];
                 ProcessOrder::AddProcess($this->post['token'], $order);
                 $ste = ["order_code"=>$feed['bk_code'],"status"=>$tem,"action_remark"=>'',"action_type"=>"edit"];
@@ -708,7 +717,7 @@ class Resign extends Base
                     ProcessOrder::AddProcess($this->post['token'],$order);
                     $ste = ["order_code"=>$feed['bk_code'],"status"=>$pe,"action_remark"=>'',"action_type"=>"status"];
                     ActionLog::logAdd($this->post['token'],$ste,"FKD",$feed['status'],$purse);
-                    $supplier = Db::name("supplier")->where(["code"=>$purse['supplier']])->find();
+                    $supplier = Db::name("supplier")->where(["code"=>$purse['supplier']])->find(); //废弃
                     $inw = makeNo("CG");
                     $goodinfo=Db::name('good_basic')
                         ->field('id,createrid,creater')
@@ -752,7 +761,8 @@ class Resign extends Base
                     $in= Db::name("purchease_order")->insert($data,true);
                     if($in>0){
                         //当采购单是节点0待与供应商确认，推给供应商负责人
-                        if(!isset($supplier)) $supplier = Db::name("supplier")->where(["code"=>$purse['supplier']])->find();
+                        if(!isset($supplier)) $supplier = Db::name("supplier")->where(["code"=>$purse['supplier']]) //废弃
+                        ->find(); //废弃
                         $order=["order_type"=>'CGD',"order_code"=>$data['cgdNo'],"order_id"=>$in, "order_status"=>$data['status'],"before_status"=>0,'wait_id'=>$supplier['personid'],'wait_name'=>$supplier['person']];
                         ProcessOrder::AddProcess($this->post['token'],$order);
                         $ste = ["order_code"=>$inw,"status"=>$data['status'],"action_remark"=>'',"action_type"=>"create"];
@@ -829,13 +839,17 @@ class Resign extends Base
         if($wsminfo==false){
             return error_show(1004,"未找到仓库数据");
         }
+        $userCommon= new \app\admin\common\User();
+		$supplier_temp =$userCommon->handle("sInfo",["code"=>$info['supplierNo']]);
+		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"供应商不存在");
+		$holder_id=$supplier_temp['data']['personid']??0;
+		$holder_name=$supplier_temp['data']['person']??0;
         $info['wsm_code']=$wsm;
         $old_info_status = $info['status'];
         $info['status']=1;
         $info['updatetime']=date("y-m-d H;i:s");
         $up =Db::name("purchease")->save($info);
         if($up){
-
             //修改状态，添加待办
             ActionLog::logAdd($this->post['token'], [
                 "order_code" => $info['bk_code'],//销售单code
@@ -844,19 +858,18 @@ class Resign extends Base
                 "action_type" => "edit"//新建create，编辑edit，更改状态status
             ], "BHD", $info['status'], $info);
 
-            $supplier = Db::name('supplier')
-                ->field('id,person,personid')
-                ->where('code', $info['supplierNo'])
-                ->findOrEmpty();
+//            $supplier = Db::name('supplier')
+//                ->field('id,person,personid')
+//                ->where('code', $info['supplierNo'])
+//                ->findOrEmpty();
             ProcessOrder::AddProcess($this->post['token'], [
                 "order_type" => 'BHD',
                 "order_code" => $info['bk_code'],//销售单code
                 "order_id" => $info['id'],
                 "order_status" => $info['status'],
                 "before_status"=>$old_info_status,
-                //'holder_id' => $info['apply_id'],
-                'wait_id' => $supplier['personid'],
-                'wait_name' => $supplier['person'],
+                'wait_id' => $holder_id,
+                'wait_name' => $holder_name,
             ]);
 
             return app_show(0,"备库单仓库选择成功");
@@ -887,10 +900,16 @@ class Resign extends Base
         if($good==false){
             return error_show(1004,"未找到商品数据");
         }
-        $supplier=Db::name("supplier")->where(["code"=>$info['supplierNo'],"is_del"=>0])->find();
-        if($supplier==false){
-            return error_show(1004,"未找到供应商数据");
-        }
+//        $supplier=Db::name("supplier")->where(["code"=>$info['supplierNo'],"is_del"=>0])->find();
+//        if($supplier==false){
+//            return error_show(1004,"未找到供应商数据");
+//        }
+        $userCommon= new \app\admin\common\User();
+		$supplier_temp =$userCommon->handle("sInfo",["code"=>$info['supplierNo']]);
+		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"未找到供应商数据");
+		$supplierName=$supplier_temp['data']['name']??'';
+		$personid=$supplier_temp['data']['personid']??'';
+		$person=$supplier_temp['data']['person']??'';
         $goodnake =Db::name("good_nake")->where([["spuCode","=",$info['spuCode']],["is_del","=",0],["min_num","<=",
             $info['good_num']]])->order("min_num desc")->find();
         if($goodnake==false){
@@ -901,7 +920,6 @@ class Resign extends Base
         if($good['is_gold_price']==1 && $top_cat_id==6){
             $gold = Db::name("gold_price1")->where(["type"=>$good['noble_metal'],"is_del"=>0,"status"=>1])->order("addtime desc")
                 ->find();
-          //  $weight =  $good['noble_weight']*$info['good_num'];
             $sale_price =  round($good['demo_fee'] / $info['good_num'] + $good['open_fee'] / $info['good_num'] + $good['noble_weight'] * $gold["price"] + $goodnake['cost_fee'] * $good['noble_weight']  + $goodnake['package_fee'] +  $goodnake['mark_fee'] + $goodnake['cert_fee'] +$goodnake['nake_fee'] + $goodnake['delivery_fee'],2);
             $total_price = round($info['good_num']*$sale_price,2);
         }else{
@@ -933,7 +951,7 @@ class Resign extends Base
             "diff_fee"=>"0",
             "gold_price"=>"0",
             "supplierNo"=>$info['supplierNo'],
-            "supplier_name"=>$supplier['name'],
+            "supplier_name"=>$supplierName,
             "companyNo"=>$info['companyNo'],
             "send_status"=>1,
             "send_num"=>"0",
@@ -981,7 +999,7 @@ class Resign extends Base
                         $order = ["order_code" =>  $cgdCode, "status" => 0, "action_remark" => '', "action_type" => "create"];
                         GoodLog::LogAdd($this->post['token'], $good_data, 'CGD');
                         ActionLog::logAdd($this->post['token'], $order, "CGD", 0, $good);
-                        $process = ["order_code" => $cgdCode, "order_id" => $up, "order_status" => $cg['status'], "order_type" => 'CGD',"before_status"=>0,'holder_id'=>$supplier['personid'],'wait_id'=>$supplier['personid'],'wait_name'=>$supplier['person']];
+                        $process = ["order_code" => $cgdCode, "order_id" => $up, "order_status" => $cg['status'], "order_type" => 'CGD',"before_status"=>0,'holder_id'=>$personid,'wait_id'=>$personid,'wait_name'=>$person];
                         ProcessOrder::AddProcess($this->post['token'], $process);
                         $info['wsm_code'] = $wsm_code;
                         $old_info_status = $info['status'];

app/admin/controller/Sale.php

@@ -166,13 +166,19 @@ class Sale extends Base
         } else {
             $sale_price = 0;
         }
-        $supplier_info = Db::name('supplier')
-            ->field('id,person,personid')
-            ->where('code',$ct['supplierNo'])
-            ->findOrEmpty();
-
+//        $supplier_info = Db::name('supplier')
+//            ->field('id,person,personid')
+//            ->where('code',$ct['supplierNo'])
+//            ->findOrEmpty();
+        $userCommon= new \app\admin\common\User();
+		$supplier_temp =$userCommon->handle("sInfo",["code"=>$ct['supplierNo']]);
+		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
+		$holder_id=$supplier_temp['data']['personid']??0;
+		$holder_name=$supplier_temp['data']['person']??'';
+		$supplier_name=$supplier_temp['data']['name']??'';
         $cgd = [
             "supplierNo" => $ct['supplierNo'],
+            "supplierName" => $supplier_name,
             "companyNo" => $supplierNo,
             "orderCode" => $orderCode,
             "spuCode" => $ct['spuCode'],
@@ -194,8 +200,8 @@ class Sale extends Base
             "gold_price" => isset($ct['cgd_gold_price']) ? $ct['cgd_gold_price'] : 0,
             "order_type" => $is_stock == 1 ? 1 : 2,
             "order_source" => 1,//1直接下单
-            "createrid" =>$supplier_info['personid'],
-            "creater" =>$supplier_info['person'],
+            "createrid" =>$holder_id,
+            "creater" =>$holder_name,
             'send_way' => 2,
             'good_createrid' => $goodinfo['createrid'],
             'good_creater' => $goodinfo['creater'],//商品创建人
@@ -258,8 +264,8 @@ class Sale extends Base
                 "updatetime" => date("Y-m-d H:i:s"),
                 'total_price' => round($sale_price * $good_num, 2),
                 'proof_id' => $proof_id,
-                'cgderid' => $supplier_info['personid'],
-                'cgder' => $supplier_info['person'],//采购员(供应商负责人)
+                'cgderid' => $holder_id,
+                'cgder' => $holder_name,//采购员(供应商负责人)
                 'good_createrid' => $goodinfo['createrid'],
                 'good_creater' => $goodinfo['creater'],//商品创建人
             ];
@@ -419,18 +425,18 @@ class Sale extends Base
                                     //节点1待库管发货
                                     if($data['is_stock']==0){
                                         //非库存品，推给供应商负责人
-                                        $supp = Db::name('supplier')
-                                            ->field('person,personid')
-                                            ->where('code',$ct['supplierNo'])
-                                            ->findOrEmpty();
+//                                        $supp = Db::name('supplier')
+//                                            ->field('person,personid')
+//                                            ->where('code',$ct['supplierNo'])
+//                                            ->findOrEmpty();
                                         ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri], [
                                             "order_type" => 'CKD',
                                             "order_code" => $outCode,//出库单号
                                             "order_id" => $ou,
                                             "order_status" => $out['status'],
                                             "before_status" => $out['status'],
-                                            'wait_id'=>$supp['personid'],
-                                            'wait_name'=>$supp['person'],
+                                            'wait_id'=>$holder_id,
+                                            'wait_name'=>$holder_name,
                                         ]);
                                     }else{
                                         //库存品,推给31库管和41库管-张凯旋
@@ -488,22 +494,22 @@ class Sale extends Base
     public function createCgd($data, array &$standing_book_da = [])
     {
         $cgdCode = makeNo("CG");
-        $supplier = Db::name("supplier")->where(["code" => $data['supplierNo'], "is_del" => 0])->find();
-        if ($supplier == false) {
-            return false;
-        }
+//        $supplier = Db::name("supplier")->where(["code" => $data['supplierNo'], "is_del" => 0])->find();
+//        if ($supplier == false) {
+//            return false;
+//        }
         $wsm = Db::name("warehouse_info")->where(["supplierNo" => $data["supplierNo"], "companyNo" => $data['companyNo'], "wsm_type" => 2, "is_del" => 0])->find();
         if ($wsm == false) {
             $wsm_code = makeNo("WSM");
             $inwsm = [
                 "wsm_code" => $wsm_code,
-                "name" => $supplier['name'],
+                "name" => $data['supplierName'],
                 "wsm_type" => 2,
-                "supplierNo" => $supplier['code'],
+                "supplierNo" => $data['supplierNo'],
                 "addr" => "",
                 "addrs_code" => "",
-                "contactor" => $data['order_type'] == 1 ? $supplier['personid'] : $data['createrid'],
-                "contactor_name" => $data['order_type'] == 1 ? $supplier['person'] : $data['creater'],
+                "contactor" => $data['createrid'] ,
+                "contactor_name" => $data['creater'] ,
                 "mobile" => "",
                 "position" => "",
                 "companyNo" => $data['companyNo'],
@@ -547,7 +553,7 @@ class Sale extends Base
             "diff_weight" => "0",
             "diff_fee" => "0",
             "supplierNo" => $data['supplierNo'],
-            "supplier_name" => $supplier['name'],
+            "supplier_name" => $data['supplierName'],
             "companyNo" => $data['companyNo'],
             "send_status" => 1,
             "send_num" => 0,
@@ -582,9 +588,9 @@ class Sale extends Base
                 "order_id" => $up,
                 "order_status" => $cg['status'],
                 "before_status" => 0,
-                'holder_id' => $supplier['personid'],
-                'wait_id'=>$supplier['personid'],
-                'wait_name'=>$supplier['person'],
+                'holder_id' => $data['createrid'],
+                'wait_id'=>$data['createrid'],
+                'wait_name'=>$data['creater'],
             ]);
 
             $standing_book_da = array_merge($standing_book_da, [
@@ -670,6 +676,7 @@ class Sale extends Base
         if ($addrlist == "" || empty($addrlist) || !is_array($addrlist)) {
             return error_show(1004, "参数addrlist不能为空");
         }
+        $userCommon= new \app\admin\common\User();
         Db::startTrans();
         try {
 
@@ -860,19 +867,25 @@ class Sale extends Base
                                 ];
                             }else{
                                 //推给供应商负责人
-                                $supplier = Db::name('supplier')
-                                    ->field('person,personid')
-                                    ->where('code',$cgdinfo['supplierNo'])
-                                    ->findOrEmpty();
+//                                $supplier = Db::name('supplier')
+//                                    ->field('person,personid')
+//                                    ->where('code',$cgdinfo['supplierNo'])
+//                                    ->findOrEmpty();
+
+								$supplier_temp =$userCommon->handle("sInfo",["code"=>$cgdinfo['supplierNo']]);
+								if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
+								$holder_id=$supplier_temp['data']['personid']??0;
+								$holder_name=$supplier_temp['data']['person']??'';
+								$supplier_name=$supplier_temp['data']['name']??'';
                                 $process = [
                                     "order_type" => 'CKD',
                                     "order_code" => $outCode,//出库单号
                                     "order_id" => $ou,
                                     "order_status" => $status,
                                     "before_status" => 0,
-                                    'wait_id'=>$supplier['personid'],
-                                    'wait_name'=>$supplier['person'],
-                                    'holder_id'=>$supplier['personid'],
+                                    'wait_id'=>$holder_id,
+                                    'wait_name'=>$holder_name,
+                                    'holder_id'=>$holder_id,
                                 ];
                             }
                         }
@@ -1553,12 +1566,20 @@ class Sale extends Base
             return false;
         }
         $orderCode = makeNo("QR");
-        $supplier_temp_info = Db::name('supplier')
-            ->field('id,person,personid')
-            ->where('code',$goodinfo['supplierNo'])
-            ->findOrEmpty();
+//        $supplier_temp_info = Db::name('supplier')
+//            ->field('id,person,personid')
+//            ->where('code',$goodinfo['supplierNo'])
+//            ->findOrEmpty();
+        $userCommon= new \app\admin\common\User();
+		$supplier_temp =$userCommon->handle("sInfo",["code"=>$goodinfo['supplierNo']]);
+		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
+		$holder_id=$supplier_temp['data']['personid']??0;
+		$holder_name=$supplier_temp['data']['person']??'';
+		$supplierName=$supplier_temp['data']['name']??'';
+
 		 $cgd = [
             "supplierNo" => $goodinfo['supplierNo'],
+            "supplierName" => $supplierName,
             "companyNo" => $data['companyNo'],
             "spuCode" => $data['spuCode'],
             "skuCode" => "",
@@ -1575,8 +1596,8 @@ class Sale extends Base
             "nake_fee" => $goodinfo['nake_fee'],
             "good_num" => $data['good_num'],
             "delivery_fee" => $goodinfo['delivery_fee'],
-            "createrid" =>$supplier_temp_info['personid'],
-            "creater" =>$supplier_temp_info['person'],
+            "createrid" =>$holder_id,
+            "creater" =>$holder_name,
             "weight" => $goodinfo['good_weight'],
             "gold_price" => $goodinfo['gold_price'],
             "good_type" => 1,
@@ -1625,8 +1646,8 @@ class Sale extends Base
             "addtime" => date("Y-m-d H:i:s"),
             "updatetime" => date("Y-m-d H:i:s"),
             'total_price' => round($data['sale_price'] * $data['good_num'], 2),
-            'cgderid' => $supplier_temp_info['personid'],
-            'cgder' => $supplier_temp_info['person'],//采购员(供应商负责人)
+            'cgderid' => $holder_id,
+            'cgder' => $holder_name,//采购员(供应商负责人)
             'good_createrid' => $goodinfo['createrid'],
             'good_creater' => $goodinfo['creater'],//商品创建人
         ];
@@ -1791,8 +1812,8 @@ class Sale extends Base
                             "order_status" => 0,
                             "before_status" => 0,
                             'holder_id'=>$data['rm'],
-                            'wait_id'=>$supplier_temp_info['personid'],
-                            'wait_name'=>$supplier_temp_info['person'],
+                            'wait_id'=>$holder_id,
+                            'wait_name'=>$holder_name,
                         ]);
                         $order['send_num'] += $value['receipt_quantity'];
                         $order['wsend_num'] -= $value['receipt_quantity'];
@@ -1873,11 +1894,14 @@ class Sale extends Base
         $orderCode = makeNo("QR");
 
 
-        $supplier_temp_info = Db::name('supplier')
-            ->field('id,person,personid')
-            ->where('code',$good['supplierNo'])
-            ->findOrEmpty();
-
+//        $supplier_temp_info = Db::name('supplier')
+//            ->field('id,person,personid')
+//            ->where('code',$good['supplierNo'])
+//            ->findOrEmpty();
+		$userCommon= new \app\admin\common\User();
+		$supplier_temp =$userCommon->handle("sInfo",["code"=>$good['supplierNo']]);
+		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"供应商不存在");
+		$supplier_temp_info = $supplier_temp['data'];
         $datas = [
             "orderCode" => $orderCode,
             "good_code" => $data['spuCode'],
@@ -1944,6 +1968,7 @@ class Sale extends Base
             ]);
             $cgd = [
                 "supplierNo" => $good['supplierNo'],
+                "supplierName" => $supplier_temp_info['name'],
                 "companyNo" => $data['companyNo'],
                 "orderCode" => $orderCode,
                 "spuCode" => $good['spuCode'],
@@ -3012,7 +3037,7 @@ class Sale extends Base
                             ->column('uid');
                         $order = ["order_type" => "CKD", "order_code" => $outCode, "order_id" => $datainfo, "order_status" => $data['status'], "before_status" => 0, 'handle_user_list' => implode(',', $uids)];
                     }else{
-                        //推给供应商负责人
+                        //推给供应商负责人 ###todo::接口废弃
                         $supplier = Db::name('supplier')
                             ->alias('a')
                             ->field('a.id,a.person,a.personid')
@@ -3093,7 +3118,7 @@ class Sale extends Base
 
                 $order = [];
                 if ($status == 1) {
-                    //推给供应商负责人
+                    //推给供应商负责人#todo::接口废弃
                     if ($dr['is_stock'] == 0) {
                         $supplier = Db::name('supplier')
                             ->alias('a')
@@ -3580,8 +3605,8 @@ class Sale extends Base
                         $condition .= " a.apply_id in (" . implode(',', $arr) . ")";
                     }
                 }
-                $personid = Db::name('supplier')->field('id')->where(['is_del' => 0, 'personid' => $hand])->findOrEmpty();
-                if ($personid) {
+//                $personid = Db::name('supplier')->field('id')->where(['is_del' => 0, 'personid' => $hand])->findOrEmpty();
+                if (!empty($hand)) {
                     if ($condition != '') $condition .= " or ";
                     $condition .= "(b.is_stock=0 and sip.personid in ($uidarr))";
                 }
@@ -3637,6 +3662,8 @@ class Sale extends Base
 
         $all_createrid = array_column($list,'apply_id');
         $item = get_company_name_by_uid($all_createrid);
+		$user= new \app\admin\common\User();
+        $supplier =$user->handle("getCodeAndName",["code"=>array_merge(array_column($list,"supplierNo"),array_column($list,"wsm_supplierNo"))]);
 
         $userCommon = new \app\admin\common\User();
         $names = $userCommon->handle('getCodeAndName',['code'=>array_column($list,'customer_code')]);
@@ -3647,12 +3674,15 @@ class Sale extends Base
             $value['companyName'] = $names['data'][$value['customer_code']]??'';
 
             if($value['order_type']==1 && $value['wsm_code']==''){
-            	$wsmcode = Db::name("good")->alias("a")
-            	->leftJoin("supplier b","a.supplierNo=b.code")
-            	->where(["a.spuCode"=>$value['good_code']])->field("'' wsm_name,b.name,b.code")->find();
+//            	$wsmcode = Db::name("good")->alias("a")
+//            	->leftJoin("supplier b","a.supplierNo=b.code")
+//            	->where(["a.spuCode"=>$value['good_code']])->field("'' wsm_name,b.name,b.code")->find();
+            $value['wsm_supplierNo'] =$value['supplierNo'];
+            $value['wsm_supplier'] = $supplier['data'][$value['supplierNo']]??"";
             }else{
-            	 $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c", "k.supplierNo=c.code")
-                ->where(["k.wsm_code" => $value['wsm_code']])->field("k.name as wsm_name,c.name,c.code")->find();
+//            	 $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c", "k.supplierNo=c.code")
+//                ->where(["k.wsm_code" => $value['wsm_code']])->field("k.name as wsm_name,c.name,c.code")->find();
+            $value['wsm_supplier'] = $supplier['data'][$value['wsm_supplierNo']]??"";
             }
             $addr = Db::name("order_addr")->where(["id" => $value['addrid']])->find();
             if($addr){
@@ -3668,10 +3698,7 @@ class Sale extends Base
             } else {
                 $goon = Db::name('good_platform')->field('a.id,b.cat_id')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')->where(['a.skuCode' => $value['skuCode']])->find();
             }
-            $value['wsm_name'] = isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name'] : "";
-            $value['wsm_supplierNo'] = isset($wsmcode['code']) ? $wsmcode['code'] : "";
-            $value['wsm_supplier'] = isset($wsmcode['name']) ? $wsmcode['name'] : "";
-            $value['wsm_has_account'] = (int)isset(checkHasAccountBySupplierNos([$wsmcode['code']])[$wsmcode['code']]);
+            $value['wsm_has_account'] = (int)isset(checkHasAccountBySupplierNos([$wsmcode['wsm_supplierNo']])[$wsmcode['wsm_supplierNo']]);
             $value['addr'] = isset($addr['addr']) ?  $addr['addr_cn'].$addr['addr'] : "";
             $value['contactor'] = isset($addr['contactor']) ? $addr['contactor'] : "";
             $value['mobile'] = isset($addr['mobile']) ? $addr['mobile'] : "";
@@ -3983,11 +4010,17 @@ class Sale extends Base
                             $process = ["order_type" => 'CKD', "order_code" => $data['outCode'], "order_id" => $datainfo, "order_status" => $data['status'], "before_status" => 0, 'holder_id' => $data['apply_id'], 'handle_user_list' => implode(',', $uids)];
                         } else{
                             //推给供应商负责人
-                            $supplier = Db::name('supplier')
-                                ->field('person,personid')
-                                ->where('code', $cgd['supplierNo'])
-                                ->findOrEmpty();
-                            $process = ["order_type" => 'CKD', "order_code" => $data['outCode'], "order_id" => $datainfo, "order_status" => $data['status'], "before_status" => 0, 'holder_id' => $data['apply_id'], 'wait_id' => $supplier['personid'], 'wait_name' => $supplier['person'],];
+//                            $supplier = Db::name('supplier')
+//                                ->field('person,personid')
+//                                ->where('code', $cgd['supplierNo'])
+//                                ->findOrEmpty();
+                            $userCommon= new \app\admin\common\User();
+							$supplier_temp =$userCommon->handle("sInfo",["code"=>$cgd['supplierNo']]);
+							if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
+							$holder_id=$supplier_temp['data']['personid']??0;
+							$holder_name=$supplier_temp['data']['personid']??0;
+                            $process = ["order_type" => 'CKD', "order_code" => $data['outCode'], "order_id" =>
+                            $datainfo, "order_status" => $data['status'], "before_status" => 0, 'holder_id' => $data['apply_id'], 'wait_id' => $holder_id, 'wait_name' => $holder_name,];
                         }
                     }
                     if (empty($process)) $process = ["order_type" => 'CKD', "order_code" => $data['outCode'], "order_id" => $datainfo, "order_status" => $data['status'], "before_status" => 0, 'holder_id' => $data['apply_id']];
@@ -4603,8 +4636,12 @@ class Sale extends Base
             $price = Db::name("gold_price1")->where(["type" => $order['metal_id'], "status" => 1, "is_del" => 0])->order("addtime desc")->find();
 
         }
-        $supplier = Db::name("supplier")->where(["code" => $order['supplierNo']])->find();
-        $order['supplier_name'] = isset($supplier['name']) ? $supplier['name'] : "";
+                	$userCommon = new \app\admin\common\User();
+                $supplier_temp = $userCommon->handle('getCodeAndName', ['code' => $order['supplierNo']]);
+//            $supplier =Db::name("supplier")->where(['code'=>$supplierNo])->find();
+//		 if($supplier_temp['code']!=0 || empty($supplier_temp['data']) )   return error_show(1004,"未找到供应商信息");
+//        $supplier = Db::name("supplier")->where(["code" => $order['supplierNo']])->find();
+        $order['supplier_name'] = $supplier_temp['data'][$order['supplierNo']]??"";
 //        $palt =Db::name("platform")->where(["id"=>$order['platform_id']])->find();
 //        $order['platform_name']=isset($palt['platform_name']) ? $palt['platform_name']:"";
         $order["gold_price"] = isset($price['price']) ? $price['price'] : 0;
@@ -4656,7 +4693,7 @@ class Sale extends Base
             ->leftJoin("purchease_order po", "po.cgdNo=os.cgdNo AND po.is_del=0")
             ->select()
             ->toArray();
-
+		$userCommon = new \app\admin\common\User();
         foreach ($list as &$value) {
 
             if ($value['order_type'] == 3) {
@@ -4686,8 +4723,11 @@ class Sale extends Base
                     }
                 }
             }
+
+            $supplier_temp = $userCommon->handle('sInfo', ['code' =>$value['供应商编号']]);
+            $supplier=$supplier_temp['data']??[];
             $value['供应商编号'] = $good['supplierNo']??"";
-            $supplier= Db::name("supplier")->where(["code"=>$value['供应商编号']])->field("name,person")->find();
+//            $supplier= Db::name("supplier")->where(["code"=>$value['供应商编号']])->field("name,person")->find();
             $value['供应商名称'] =  $supplier['name']??"";
             $value['采购员'] = $supplier['person']??"";
             $good_unit = isset($good['good_unit']) ? $good['good_unit'] : 0;