|
|
@@ -178,13 +178,13 @@ class ProductController extends BaseController
|
|
|
|
|
|
if ($warning == 1) {
|
|
|
//库存预警
|
|
|
- $field = 'id,py,cover,name,ratio,cost,addPrice,classId,skMore,itemId,smallUnit,smallRatio,presellDate,bigUnit,smallUnit,ratioType,variety,price,stock,stockWarning,discountPrice,presell,presellDate';
|
|
|
+ $field = 'id,py,cover,name,ratio,cost,addPrice,classId,skMore,skPrice,itemId,smallUnit,smallRatio,presellDate,bigUnit,smallUnit,ratioType,variety,price,stock,stockWarning,discountPrice,presell,presellDate';
|
|
|
$itemInfoData = Product::find()->where("mainId={$this->mainId}")
|
|
|
->andWhere('`stock`<`stockWarning`')
|
|
|
->andWhere("delStatus=0")
|
|
|
->select($field)->asArray()->all();
|
|
|
} else {
|
|
|
- $field = 'id,py,cover,name,ratio,cost,addPrice,classId,skMore,itemId,smallUnit,smallRatio,presellDate,bigUnit,smallUnit,ratioType,variety,price,stock,stockWarning,discountPrice,presell,presellDate';
|
|
|
+ $field = 'id,py,cover,name,ratio,cost,addPrice,classId,skMore,skPrice,itemId,smallUnit,smallRatio,presellDate,bigUnit,smallUnit,ratioType,variety,price,stock,stockWarning,discountPrice,presell,presellDate';
|
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
|
|
|
}
|
|
|
$itemInfoData = ProductClass::groupProductInfo($itemInfoData, $level);
|