|
|
@@ -413,14 +413,17 @@ class Good extends \app\BaseController
|
|
|
$total = ceil($count/$size);
|
|
|
$page = $total>=$page ? $page :$total;
|
|
|
$list = Db::name("good_log")->alias('a')
|
|
|
- ->join("good_stock b","b.id=a.id","left")
|
|
|
+ ->join("good_stock b","b.id=a.stock_id","left")
|
|
|
->where($where)->page($page,$size)->order("a.addtime desc")
|
|
|
- ->field("a.action_name,a.type,a.stock_name,a.stock,a.action_type,a.addtime,a.action_uid")->select();
|
|
|
+ ->field("a.action_name,a.type,a.stock_name,a.stock,a.action_type,a.addtime,a.action_uid,b.wsm_code")->select();
|
|
|
$data=[];
|
|
|
foreach ($list as $value){
|
|
|
$db = Db::name("depart_user")->where(['uid'=>$value['action_uid']])->column("itemid");
|
|
|
$item = Db::name("company_item")->where(['id'=>$db])->column("id,name");
|
|
|
+ $wsm = Db::name("warehouse_info")->alias("a")->Join("supplier b","a.supplierNo=b.code","left")->where
|
|
|
+ (['a.wsm_code'=>$value['wsm_code'],"a.is_del"=>0])->field("a.name as wsm_name,wsm_code,b.code,b.name")->find();
|
|
|
$value['item'] =$item;
|
|
|
+ $value['empty'] =$wsm;
|
|
|
$data[]=$value;
|
|
|
}
|
|
|
return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);
|
panlumeng