|
|
@@ -91,11 +91,13 @@ class ProductController extends BaseController
|
|
|
if ($showPage) {
|
|
|
$respond = ProductClass::getList("*", $where, "inTurn desc");
|
|
|
$respond['list'] = ProductClass::groupClassName($this->sjId, $respond['list']);
|
|
|
+ $respond['list'] = ProductClass::groupProductInfo($respond['list'] );
|
|
|
util::success($respond);
|
|
|
}
|
|
|
$data = ProductClass::getAllByCondition($where, "inTurn desc", "*");
|
|
|
|
|
|
$data = ProductClass::groupProductInfo($data);
|
|
|
+
|
|
|
if ($type == 'waring') {
|
|
|
//库存预警
|
|
|
$newData = [];
|