|
@@ -1361,13 +1361,13 @@ class Good extends Base
|
|
|
->leftJoin('good_platform gp', 'gp.skuCode=gl.skuCode AND gp.is_del=0')
|
|
|
->leftJoin('platform p', 'p.id=gp.platform_code AND p.is_del=0')
|
|
|
->leftJoin('good gb', 'gb.spuCode=gp.spuCode AND gb.is_del=0')
|
|
|
- ->leftJoin("depart_user u", "u.uid=gb.createrid AND u.is_del=0")
|
|
|
+// ->leftJoin("depart_user u", "u.uid=gb.createrid AND u.is_del=0")
|
|
|
->where($where)
|
|
|
->count('gl.id');
|
|
|
|
|
|
$list = Db::name('good_ladder')
|
|
|
->alias('gl')
|
|
|
- ->field('gl.id,gl.skuCode,gp.spuCode,p.platform_name,gb.good_thumb_img,gb.good_name,gb.cat_id,gb.good_type,gb.is_stock,gb.brand_id,gp.plat_code,gl.min_num moq,gl.sale_price,gb.creater purchase,gb.createrid,gb.companyNo')
|
|
|
+ ->field('gl.id,gl.skuCode,gp.spuCode,p.platform_name,gb.good_thumb_img,gb.good_name,gb.cat_id,gb.good_type,gb.is_stock,gb.brand_id,gp.plat_code,gl.min_num moq,gl.sale_price,gb.creater ,"" purchase,gb.createrid,gb.companyNo,gb.companyName,gb.supplierNo')
|
|
|
->leftJoin('good_platform gp', 'gp.skuCode=gl.skuCode AND gp.is_del=0')
|
|
|
->leftJoin('platform p', 'p.id=gp.platform_code AND p.is_del=0')
|
|
|
->leftJoin('good_basic gb', 'gb.spuCode=gp.spuCode AND gb.is_del=0')
|
|
@@ -1387,8 +1387,12 @@ class Good extends Base
|
|
|
->column('brand_name', 'id');
|
|
|
|
|
|
$userCommon = new \app\admin\common\User();
|
|
|
- $names = $userCommon->handle('getCodeAndName', ['code' => array_column($list, 'companyNo')]);
|
|
|
- $all_company = $names['data'];
|
|
|
+ $temp = $userCommon->handle('sGetList',['more_code'=>array_column($list,'supplierNo')]);
|
|
|
+ $person = array_column($temp['data']['list'],'person','code');
|
|
|
+// $names = $userCommon->handle('getCodeAndName', ['code' => array_column($list, 'companyNo')]);
|
|
|
+// $all_company = $names['data'];
|
|
|
+
|
|
|
+
|
|
|
|
|
|
// $all_company = Db::name('business')
|
|
|
// ->where('is_del', 0)
|
|
@@ -1398,11 +1402,12 @@ class Good extends Base
|
|
|
foreach ($list as &$value) {
|
|
|
$value['cat_info'] = made($value['cat_id'], []);
|
|
|
$value['brand_name'] = isset($all_brand[$value['brand_id']]) ? $all_brand[$value['brand_id']] : '';
|
|
|
- $value['company'] = isset($all_company[$value['companyNo']]) ? $all_company[$value['companyNo']] : '';
|
|
|
+// $value['company'] = isset($all_company[$value['companyNo']]) ? $all_company[$value['companyNo']] : '';
|
|
|
$value['stock_total'] = Db::name("good_stock")
|
|
|
->where(['spuCode' => $value['spuCode'], "is_del" => 0])
|
|
|
->sum("usable_stock");
|
|
|
$value['company_name'] = $item[$value['createrid']]??'';
|
|
|
+ $value['purchase'] = $person[$value['supplierNo']] ?? '';//供应商负责人
|
|
|
}
|
|
|
|
|
|
return app_show(0, "获取成功", ['list' => $list, 'count' => $count]);
|