Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/GoodOfflineLog.php

@@ -16,10 +16,13 @@ class GoodOfflineLog extends Base
         $param = $this->request->only(['start_date' => '', "spuCode"=>'',"good_name"=>'','end_date' => '', 'creater' => '', 'page' => 1,'size' => 15], 'post', 'trim');
 
         $where = [];
-        if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['addtime', 'between', [$param['start_date'], $param['end_date']]];
-        if ($param['creater'] != '') $where[] = ['creater', 'like', '%' . $param['creater'] . '%'];
-		if ($param['spuCode'] != '') $where[] = ['spuCode', 'like', '%' . $param['spuCode'] . '%'];
-        if ($param['good_name'] != '') $where[] = ['good_name', 'like', '%' . $param['good_name'] . '%'];
+        if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['a.addtime', 'between', [$param['start_date'], $param['end_date']]];
+        if ($param['creater'] != '') $where[] = ['a.creater', 'like', '%' . $param['creater'] . '%'];
+		if ($param['spuCode'] != '') $where[] = ['a.spuCode', 'like', '%' . $param['spuCode'] . '%'];
+        if ($param['good_name'] != '') $where[] = ['a.good_name', 'like', '%' . $param['good_name'] . '%'];
+        if ($param['companyNo'] != '') $where[] = ['b.companyNo', 'like', '%' . $param['companyNo'] . '%'];
+        if ($param['supplierNo'] != '') $where[] = ['b.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
+        if ($param['relaComNo'] != '') $where[] = ['b.companyNo|b.supplierNo', 'like', '%' . $param['relaComNo'] . '%'];
 //        $role = $this->checkDataShare();
 //        if (!empty($role[DataGroupModel::$type_全部])) $where[] = ["createrid", "in", $role[DataGroupModel::$type_全部]];
 
@@ -33,9 +36,10 @@ class GoodOfflineLog extends Base
             }
         }
 
-        $count = Db::name('good_offline_log')->where($where)->count('id');
-        $list = Db::name('good_offline_log')
-            ->field('id,spuCode,good_name,creater,addtime,createrid')
+        $count = Db::name('good_offline_log')->alias("a")->where($where)->count('id');
+        $list = Db::name('good_offline_log')->alias("a")
+            ->field('a.id,a.spuCode,a.good_name,a.creater,a.addtime,a.createrid,b.companyNo,b.supplierNo')
+            ->leftJoin("good_basic b","a.spuCode=b.spuCode")
             ->where($where)
             ->order('addtime', 'desc')
             ->page($param['page'], $param['size'])
@@ -46,7 +50,12 @@ class GoodOfflineLog extends Base
 //            })
             ->select()
             ->toArray();
-
+        $userCommon=new \app\admin\common\User();
+		 $supplierInfo = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'companyNo'),array_column($list,'supplierNo'))]);
+		 foreach ($list as &$value){
+		 	$value['companyName'] = $supplierInfo["data"][$value['companyNo']]??"";
+		 	$value['supplierName'] = $supplierInfo["data"][$value['supplierNo']]??"";
+		 }
         return app_show(0, "获取成功", ['list' => $list, 'count' => $count]);
 
     }

app/admin/controller/Goodup.php

@@ -1170,9 +1170,10 @@ class Goodup extends Base
         $names = $userCommon->handle('getCodeAndName', ['code' => [$data['supplierNo'], $data['companyNo']]]);
 
 //        $supplier = Db::name("supplier")->where(["code"=>$data['supplierNo']])->find();
-        $data['supplierName'] = $names[$data['supplierNo']] ?? '';//isset($supplier['name'])?$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['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();