|
|
@@ -77,11 +77,10 @@ class ProductController extends BaseController
|
|
|
util::complete();
|
|
|
}
|
|
|
|
|
|
- //今天有入库的花材 ssh 20221024
|
|
|
+ //取出今天有入库的花材 ssh 20221024
|
|
|
public function actionStockIn()
|
|
|
{
|
|
|
$py = Yii::$app->request->get('py', '');
|
|
|
-
|
|
|
$classIds = ItemClassClass::getGhsItemClassAll($this->mainId);
|
|
|
$mainId = $this->mainId ?? 0;
|
|
|
$where['mainId'] = $mainId;
|
|
|
@@ -98,12 +97,9 @@ class ProductController extends BaseController
|
|
|
$ids = array_unique($ids);
|
|
|
$where['id'] = ['in', $ids];
|
|
|
$level = 1;
|
|
|
-
|
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], "*");
|
|
|
$itemInfoData = ProductClass::groupProductInfo($itemInfoData, $level);
|
|
|
-
|
|
|
$data = ProductService::assembleData($classIds, $itemInfoData, true);
|
|
|
-
|
|
|
util::success($data);
|
|
|
}
|
|
|
|