|
@@ -30,6 +30,8 @@ class StockController extends BaseController
|
|
|
$where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
|
|
$where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
|
|
|
}
|
|
}
|
|
|
$list = StockRecordClass::getRecordList($where);
|
|
$list = StockRecordClass::getRecordList($where);
|
|
|
|
|
+ $typeList = StockRecordClass::getTypeName();
|
|
|
|
|
+ $list['typeList'] = $typeList;
|
|
|
util::success($list);
|
|
util::success($list);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -51,6 +53,8 @@ class StockController extends BaseController
|
|
|
$where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
|
|
$where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
|
|
|
}
|
|
}
|
|
|
$list = StockRecordClass::getRecordList($where);
|
|
$list = StockRecordClass::getRecordList($where);
|
|
|
|
|
+ $typeList = StockRecordClass::getTypeName();
|
|
|
|
|
+ $list['typeList'] = $typeList;
|
|
|
util::success($list);
|
|
util::success($list);
|
|
|
}
|
|
}
|
|
|
|
|
|