备货申请单详情优化，上线商品详情优化

app/admin/controller/Goodup.php

@@ -1392,13 +1392,14 @@ class Goodup extends Base
         $spec = Db::name("good_spec")->where(["spuCode"=>$supcode,"is_del"=>0])->select()->toArray();
 
         $userCommon = new \app\admin\common\User();
-        $names = $userCommon->handle('getCodeAndName', ['code' => [$data['supplierNo'], $data['companyNo']]]);
+        $sinfo = $userCommon->handle('sInfo',['code'=>$data['supplierNo']]);
+//        $names = $userCommon->handle('getCodeAndName', ['code' => [$data['supplierNo'], $data['companyNo']]]);
 
 //        $supplier = Db::name("supplier")->where(["code"=>$data['supplierNo']])->find();
-        $data['supplierName'] = $names['data'][$data['supplierNo']] ?? '';//isset($supplier['name'])
+//        $data['supplierName'] = $names['data'][$data['supplierNo']] ?? '';//isset($supplier['name'])
         //?$supplier['name']:"";
 //        $company = Db::name("business")->where(["companyNo"=>$data['companyNo']])->find();
-        $data['company'] = $names['data'][$data['companyNo']] ?? ''; //isset($company['company'])?$company['company']:"";
+//        $data['company'] = $names['data'][$data['companyNo']] ?? ''; //isset($company['company'])?$company['company']:"";
         $data['field_change'] = $data['field_change']!=''?json_decode($data['field_change']):"";
         if($data['brand_id']!=0){
             $brand=Db::name("brand")->where(["id"=>$data['brand_id']])->find();
@@ -1446,8 +1447,8 @@ class Goodup extends Base
         }
         $data["nakelist"]=$nakearry;
 
-        $data['cgderid'] = $supplier['personid'] ?? '';
-        $data['cgder'] = $supplier['person'] ?? '';
+        $data['cgderid'] = $sinfo['data']['personid'] ?? '';
+        $data['cgder'] = $sinfo['data']['person'] ?? '';
         return app_show(0,"获取成功",$data);
     }
 

app/admin/controller/Resign.php

@@ -313,7 +313,7 @@ class Resign extends Base
             $file= basename($info['file_url']);
             $info['file_name'] =substr($file,0,strripos($file,"_"));
         }
-        $userCommon = new \app\admin\common\User();
+//        $userCommon = new \app\admin\common\User();
         if($info['wsm_code']!=""){
             $wsmcode = Db::name("warehouse_info")->where(["wsm_code"=>$info['wsm_code']])->field("name as wsm_name,supplierNo,supplierName")->find();
 //			$tmpd = $userCommon->handle('getCodeAndName', ['code' =>$wsmcode['supplierNo']]);
@@ -326,8 +326,8 @@ class Resign extends Base
 //        $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']);
 
-        $sinfo = $userCommon->handle('sInfo', ['code' => $info['supplierNo']]);
-        $info['person'] = $sinfo['data']['person'] ?? '';
+//        $sinfo = $userCommon->handle('sInfo', ['code' => $info['supplierNo']]);
+//        $info['person'] = $sinfo['data']['person'] ?? '';
 
 //        $company =Db::name("business")->where(["companyNo"=>$info['companyNo']])->find();
 //        $info['company_name'] = $info['companyName'] ?? '';