Merge branch 'master-new' into master-new-dev-wf

app/admin/controller/Good.php

@@ -1101,27 +1101,17 @@ class Good extends Base
                 ->alias("a")
                 ->where(['a.wsm_code'=>array_column($list,"wsm_code"),"a.is_del"=>0])
                 ->column("a.name as wsm_name","wsm_code");
-		$names = $userCommon->handle('getCodeAndName', ['code' =>array_merge(array_column($list,"compayNo"),array_column($list,"supplierNo"))]);
+		$names = $userCommon->handle('getCodeAndName', ['code' =>array_merge(array_column($list,"companyNo"),array_column($list,"supplierNo"))]);
 
         foreach ($list as &$value){
             $value['supplierName'] = $names['data'][$value['supplierNo']] ?? '';
             $value['company'] = $names['data'][$value['companyNo']] ?? '';
-
-//            $godd = Db::name("good")->field('id,good_name,cat_id,is_stock')->where(["spuCode" => $value['spuCode'], "is_del" => 0])->find();
-//            $value['good_name']=isset($godd['good_name'])? $godd['good_name']:"";
-//            $value['cat_id']=isset($godd['cat_id'])? $godd['cat_id']:"";
-//            $value['is_stock']=isset($godd['is_stock'])? $godd['is_stock']:"";
             $int = isset($value['cat_id']) && $value['cat_id'] != 0 ? made($value['cat_id']) : [];
             $value['wsm_name'] =$wsmcode[$value['wsm_code']]??"";
-//            $value['wsm_code'] =$wsm['wsm_code'];
-//            $value['code'] =$wsm['code'];
-//            $value['name'] =$wsm['name'];
             $value['action_type_cn'] =$this->acton[$value['action_type']];
             $value['item'] = $item[$value['action_uid']] ?? '';
             $value['can'] =$int;
-//            $value['company'] =$wsm['company']??'';
-//            $value['companyNo'] =$wsm['companyNo']??'';
-//            $data[]=$value;
+
         }
         return app_show(0,"获取成功",['list'=>$list,'count'=>$count]);
     }

app/admin/controller/Orderuse.php

@@ -91,6 +91,7 @@ class Orderuse extends Base
             'end' => '',
             'company_name' => '',
             'companyNo' => '',
+            'relaComNo' => '',
         ], 'post', 'trim');
 
 //        $page = isset($this->post['page']) && $this->post['page'] !== "" ? intval($this->post['page']) : "1";
@@ -114,6 +115,7 @@ class Orderuse extends Base
 //        $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($param['company_name'] !== "") $where[] = ["createrid", 'in', get_company_item_user_by_name($param['company_name'])];
         if ($param['companyNo'] !== "") $where[] = ["companyNo", '=', $param['companyNo']];
+        if ($param['relaComNo'] !== "") $where[] = ["companyNo", '=', $param['relaComNo']];
 
         $count = Db::name('order_use')
             ->where($where)

app/admin/controller/Resign.php

@@ -133,7 +133,7 @@ class Resign extends Base
 		$wsmsupplier = $names['data']??[];
         foreach ($list as $value){
             $value['wsm_name'] =isset($wsmcode[$value['wsm_code']]['wsm_name']) ? $wsmcode[$value['wsm_code']]['wsm_name']:"";
-            $value['wsm_supplier'] =$wsmsupplier[$wsmcode[$value['wsm_code']]['code']]??"";
+            $value['wsm_supplier'] = isset($wsmcode[$value['wsm_code']]['code'])? $wsmsupplier[$wsmcode[$value['wsm_code']]['code']]??"" :"";
             $value['wsm_supplierNo'] =$wsmcode[$value['wsm_code']]['code']??"";
             $value['companyName'] = $wsmsupplier[$value['companyNo']]??"";
             $value['supplierName'] = $wsmsupplier[$value['supplierNo']]??"";