|
|
@@ -3,6 +3,7 @@
|
|
|
namespace ghs\controllers;
|
|
|
|
|
|
use bizGhs\stock\classes\StockRecordClass;
|
|
|
+use common\components\dateUtil;
|
|
|
use common\components\util;
|
|
|
use Yii;
|
|
|
|
|
|
@@ -17,15 +18,16 @@ class StockController extends BaseController
|
|
|
{
|
|
|
$get = Yii::$app->request->get();
|
|
|
$itemId = $get['itemId']??0;
|
|
|
- $start_date = $get['start_date']??'';
|
|
|
- $end_date = $get['end_date']??'';
|
|
|
$where = ['itemId'=>$itemId,'shopId'=>$this->shopId];
|
|
|
|
|
|
- if($start_date && $end_date){
|
|
|
- $where['addTime'] = ['between',[$start_date,$end_date]];
|
|
|
+ $searchTime = $get['searchTime'] ?? '';
|
|
|
+ if (!empty($searchTime)) {
|
|
|
+ $startTime = $get['startTime'] ?? '';
|
|
|
+ $endTime = $get['endTime'] ?? '';
|
|
|
+ $period = dateUtil::formatTime($searchTime, $startTime, $endTime);
|
|
|
+ $where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
$list = StockRecordClass::getRecordList($where);
|
|
|
util::success($list);
|
|
|
}
|