|
|
@@ -38,7 +38,7 @@ class ProductController extends BaseController
|
|
|
$pyNameItemIds = ItemClass::getItemIdsByPyName($py);
|
|
|
$itemIds = array_intersect($itemIds,$pyNameItemIds);
|
|
|
}
|
|
|
-
|
|
|
+ $shopId = $this->shopId;
|
|
|
//库存预警
|
|
|
if($type=='waring'){
|
|
|
//shopId 改为可以前端传,默认是当前shopId linqh 2021.1.26
|
|
|
@@ -52,10 +52,10 @@ class ProductController extends BaseController
|
|
|
}
|
|
|
|
|
|
|
|
|
- $itemInfoData = ProductClass::getProductInfoByItemIds($itemIds,$this->shopId);
|
|
|
+ $itemInfoData = ProductClass::getProductInfoByItemIds($itemIds,$shopId);
|
|
|
|
|
|
//常用的itemIds
|
|
|
- $oftenItemIds = ProductClass::getOftenItemIds($this->shopId);
|
|
|
+ $oftenItemIds = ProductClass::getOftenItemIds($shopId);
|
|
|
|
|
|
//组装数据: [{classId:'','className:'',child:[{itemInfoData}]}]
|
|
|
$data = ProductService::assembleData($classIds,$itemIdsInfo,$itemInfoData,$oftenItemIds);
|