|
@@ -63,7 +63,7 @@ class Good extends \app\BaseController
|
|
|
$page>=ceil($count/$size) ? $page=ceil($count/$size) :"";
|
|
|
$list = Db::name("good_type")->alias("b")->join("good a","a.good_code = b.good_code","left")
|
|
|
->where($condtion)->field("b.id,a.good_code,a.good_name,a.good_desc,a.brand,a.original_price,a.cg_saler,a.good_type,a.market_fee,a.gys_code,a.unit,
|
|
|
- a.sort_f,a.sort_s,a.sort_t,b.color,b.material,b.specs,b.is_main,b.type_code,b.attribute,b.status as bstatus,a.addtime,a.updatetime")
|
|
|
+ a.sort_f,a.sort_s,a.sort_t,b.color,b.material,b.specs,b.is_main,b.type_code,b.attribute,b.status as bstatus,a.addtime,a.updatetime,a.cat_id")
|
|
|
->page($page,$size)->select();
|
|
|
$data=[];
|
|
|
foreach ($list as $key=>$value){
|
|
@@ -71,8 +71,10 @@ class Good extends \app\BaseController
|
|
|
$value['usable_stock']=$stock;
|
|
|
$supplier = Db::name("supplier")->where(["code"=>$value['gys_code']])->find();
|
|
|
$value['supplier_name'] =isset($supplier['name']) ?$supplier['name'] :"";
|
|
|
+ $value['can']= isset($value['cat_id']) && $value['cat_id'] !=0 ? made($value['cat_id']):[];
|
|
|
$data[]=$value;
|
|
|
}
|
|
|
+
|
|
|
return app_show(0,"获取成功",["list"=>$data,"count"=>$count]);
|
|
|
}
|
|
|
public function SetWarn(){
|