|
@@ -202,21 +202,21 @@ class ProductController extends BaseController
|
|
|
$where['status'] = 2;
|
|
$where['status'] = 2;
|
|
|
$where['delStatus'] = 0;
|
|
$where['delStatus'] = 0;
|
|
|
$where['removeStatus'] = 0;
|
|
$where['removeStatus'] = 0;
|
|
|
- $field = 'id,py,name,classId,itemId,price,skPrice,stock';
|
|
|
|
|
|
|
+ $field = 'id,py,cover,name,cost,itemId,classId,addPrice,skPrice,discountPrice,skMore,variety,price,stock,presell';
|
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
|
|
|
} elseif ($requestType == 'stopList') {
|
|
} elseif ($requestType == 'stopList') {
|
|
|
//停用花材列表
|
|
//停用花材列表
|
|
|
$where['status'] = 2;
|
|
$where['status'] = 2;
|
|
|
$where['delStatus'] = 1;
|
|
$where['delStatus'] = 1;
|
|
|
$where['removeStatus'] = 0;
|
|
$where['removeStatus'] = 0;
|
|
|
- $field = 'id,py,name,classId,itemId,price,skPrice,stock';
|
|
|
|
|
|
|
+ $field = 'id,py,cover,name,cost,itemId,classId,addPrice,skPrice,discountPrice,skMore,variety,price,stock,presell';
|
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
|
|
|
} elseif ($requestType == 'removeList') {
|
|
} elseif ($requestType == 'removeList') {
|
|
|
//删除花材列表
|
|
//删除花材列表
|
|
|
$where['status'] = 2;
|
|
$where['status'] = 2;
|
|
|
$where['delStatus'] = 1;
|
|
$where['delStatus'] = 1;
|
|
|
$where['removeStatus'] = 1;
|
|
$where['removeStatus'] = 1;
|
|
|
- $field = 'id,py,name,classId,itemId,price,skPrice,stock';
|
|
|
|
|
|
|
+ $field = 'id,py,cover,name,cost,itemId,classId,addPrice,skPrice,discountPrice,skMore,variety,price,stock,presell';
|
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
|
|
|
} elseif ($requestType == 'check') {
|
|
} elseif ($requestType == 'check') {
|
|
|
//盘点花材列表
|
|
//盘点花材列表
|