|
|
@@ -1093,27 +1093,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]);
|
|
|
}
|
