|
|
@@ -1065,7 +1065,8 @@ class Good extends Base
|
|
|
$page = $total>=$param['page'] ? $param['page'] :$total;
|
|
|
$list = Db::name("good_log")
|
|
|
->alias('a')
|
|
|
- ->field("a.good_log_code,a.action_name,a.type,a.stock_name,a.stock,a.action_type,b.spuCode,a.addtime,a.action_uid,b.wsm_code,c.is_stock,c.good_name,c.cat_id")
|
|
|
+ ->field("a.good_log_code,a.action_name,a.type,a.stock_name,a.stock,a.action_type,b.spuCode,
|
|
|
+ a.addtime,a.action_uid,b.wsm_code,c.is_stock,c.good_name,c.cat_id,c.companyNo,c.supplierNo")
|
|
|
->leftJoin('good_stock b','b.id=a.stock_id')
|
|
|
->leftJoin('good c','c.spuCode=b.spuCode')
|
|
|
->where($where)
|
|
|
@@ -1088,34 +1089,30 @@ class Good extends Base
|
|
|
// }
|
|
|
|
|
|
$userCommon = new \app\admin\common\User();
|
|
|
-
|
|
|
- foreach ($list as &$value){
|
|
|
- $wsm = Db::name("warehouse_info")
|
|
|
+ $wsmcode = Db::name("warehouse_info")
|
|
|
->alias("a")
|
|
|
-// ->Join("supplier b","a.supplierNo=b.code","left")
|
|
|
-// ->Join("business bus","bus.companyNo=a.companyNo","left")
|
|
|
- ->where(['a.wsm_code'=>$value['wsm_code'],"a.is_del"=>0])
|
|
|
- ->field("a.name as wsm_name,wsm_code,b.code,b.name,bus.company,bus.companyNo")
|
|
|
- ->find();
|
|
|
+ ->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' => [$wsm['supplierNo'], $wsm['companyNo']]]);
|
|
|
- $wsm['supplierName'] = $names['data'][$wsm['supplierNo']] ?? '';
|
|
|
- $wsm['company'] = $names['data'][$wsm['companyNo']] ?? '';
|
|
|
+ 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'] =$wsm['wsm_name'];
|
|
|
- $value['wsm_code'] =$wsm['wsm_code'];
|
|
|
- $value['code'] =$wsm['code'];
|
|
|
- $value['name'] =$wsm['name'];
|
|
|
+ $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']??'';
|
|
|
+// $value['company'] =$wsm['company']??'';
|
|
|
+// $value['companyNo'] =$wsm['companyNo']??'';
|
|
|
// $data[]=$value;
|
|
|
}
|
|
|
return app_show(0,"获取成功",['list'=>$list,'count'=>$count]);
|
