mirror of
https://gitee.com/hzchunfen/erp.git
synced 2025-12-01 14:40:44 +00:00
Merge branch 'feature' into yezhenman
This commit is contained in:
commit
b9ee4638d5
79
app/Console/Commands/Inventory.php
Normal file
79
app/Console/Commands/Inventory.php
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Console\Commands;
|
||||||
|
|
||||||
|
use Illuminate\Console\Command;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use App\Models\DailyStockRecord;
|
||||||
|
use App\Models\GoodsSku;
|
||||||
|
use App\Models\Log;
|
||||||
|
|
||||||
|
class Inventory extends Command
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* The name and signature of the console command.
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $signature = 'timing:inventory';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The console command description.
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $description = '定时盘点';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new command instance.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execute the console command.
|
||||||
|
*
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
public function handle()
|
||||||
|
{
|
||||||
|
DB::beginTransaction();
|
||||||
|
try {
|
||||||
|
// 数据库存储过程,7点定时执行
|
||||||
|
$skus = GoodsSku::query()->get(['id', 'stock', 'two_days_ago_num', 'yesterday_num']);
|
||||||
|
$data = [];
|
||||||
|
$date = date('Y-m-d');
|
||||||
|
foreach ($skus as $sku) {
|
||||||
|
$data[] = [
|
||||||
|
'sku_id' => $sku->id,
|
||||||
|
'day' => $date,
|
||||||
|
];
|
||||||
|
GoodsSku::where('id', $sku->id)->update([
|
||||||
|
'stock' => $sku->stock + $sku->two_days_ago_num + $sku->yesterday_num,
|
||||||
|
'yesterday_num' => $sku->stock,
|
||||||
|
'two_days_ago_num' => $sku->two_days_ago_num + $sku->yesterday_num,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
$log = new Log();
|
||||||
|
$log->module = 'goods';
|
||||||
|
$log->action = 'PATCH';
|
||||||
|
$log->target_type = 'goods_sku';
|
||||||
|
$log->target_id = 0;
|
||||||
|
$log->target_field = 'timingInventory';
|
||||||
|
$log->user_id = 1;
|
||||||
|
$record = new DailyStockRecord();
|
||||||
|
$record->batchInsert($data);
|
||||||
|
$log->message = '成功';
|
||||||
|
DB::commit();
|
||||||
|
} catch (\Exception $exception) {
|
||||||
|
$log->message = '失败';
|
||||||
|
DB::rollBack();
|
||||||
|
}
|
||||||
|
$log->save();
|
||||||
|
$this->info($log->message);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Console\Commands;
|
namespace App\Console\Commands;
|
||||||
|
|
||||||
|
use App\Models\User;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Spatie\Permission\Models\Permission;
|
use Spatie\Permission\Models\Permission;
|
||||||
use Spatie\Permission\Models\Role;
|
use Spatie\Permission\Models\Role;
|
||||||
@ -39,9 +40,12 @@ class UpdateSuperPermissions extends Command
|
|||||||
*/
|
*/
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
$role = Role::query()->where('name', '超级管理员')->find(1);
|
$roleName = '超级管理员';
|
||||||
|
$role = Role::query()->where('name', $roleName)->find(1);
|
||||||
$permissions = Permission::query()->get();
|
$permissions = Permission::query()->get();
|
||||||
$role->syncPermissions($permissions);
|
$role->syncPermissions($permissions);
|
||||||
|
$user = User::query()->find(1);
|
||||||
|
$user->assignRole($role);
|
||||||
$this->info('更新成功');
|
$this->info('更新成功');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
75
app/Exports/GoodsSkusExport.php
Normal file
75
app/Exports/GoodsSkusExport.php
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Exports;
|
||||||
|
|
||||||
|
use App\Models\Log;
|
||||||
|
use Maatwebsite\Excel\Concerns\FromCollection;
|
||||||
|
use Maatwebsite\Excel\Concerns\ShouldAutoSize;
|
||||||
|
use App\Models\GoodsSku;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
|
class GoodsSkusExport implements FromCollection, ShouldAutoSize
|
||||||
|
{
|
||||||
|
private $data;
|
||||||
|
private $type;
|
||||||
|
|
||||||
|
public function __construct($type)
|
||||||
|
{
|
||||||
|
$this->type = $type;
|
||||||
|
$this->data = $this->createData();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return \Illuminate\Support\Collection
|
||||||
|
*/
|
||||||
|
public function collection()
|
||||||
|
{
|
||||||
|
return new Collection($this->data);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function createData()
|
||||||
|
{
|
||||||
|
$headTitle = [
|
||||||
|
'商品编码',
|
||||||
|
'商品名称',
|
||||||
|
'商品种类',
|
||||||
|
'商品品牌',
|
||||||
|
'规格编码',
|
||||||
|
'规格名称',
|
||||||
|
'成本',
|
||||||
|
'库存',
|
||||||
|
];
|
||||||
|
$inventoryTime = strtotime(date('Y-m-d 07:00:00'));
|
||||||
|
$ids = Log::query()->where('target_type', 'sku')
|
||||||
|
->where('target_field', $this->type)
|
||||||
|
->where('created_at', '>', $inventoryTime)
|
||||||
|
->pluck('sku_id')
|
||||||
|
->toArray();
|
||||||
|
$data = GoodsSku::query()
|
||||||
|
->when($ids, function ($query, $ids) {
|
||||||
|
return $query->whereIn('id', $ids);
|
||||||
|
})
|
||||||
|
->with(['goods' => function ($query) {
|
||||||
|
$query->with(['type:id,name', 'brand:id,name']);
|
||||||
|
}])
|
||||||
|
->get()
|
||||||
|
->toArray();
|
||||||
|
if (empty($data)) {
|
||||||
|
return [$headTitle];
|
||||||
|
}
|
||||||
|
$bodyData = [];
|
||||||
|
foreach ($data as $item) {
|
||||||
|
$arr[0] = $item['goods']['goods_code'];
|
||||||
|
$arr[1] = $item['goods']['title'];
|
||||||
|
$arr[2] = $item['goods']['type']['name'];
|
||||||
|
$arr[3] = $item['goods']['brand']['name'];
|
||||||
|
$arr[4] = $item['goods']['sku_code'];
|
||||||
|
$arr[5] = $item['goods']['title'];
|
||||||
|
$arr[6] = $item['goods']['cost'];
|
||||||
|
$arr[7] = $item['goods']['stock'];
|
||||||
|
$bodyData[] = $arr;
|
||||||
|
}
|
||||||
|
unset($arr);
|
||||||
|
return [$headTitle, $bodyData];
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -2,10 +2,12 @@
|
|||||||
|
|
||||||
namespace App\Http\Controllers\Goods;
|
namespace App\Http\Controllers\Goods;
|
||||||
|
|
||||||
|
use App\Exports\GoodsSkusExport;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use App\Http\Requests\GoodsRequest;
|
use App\Http\Requests\GoodsRequest;
|
||||||
use App\Http\Requests\GoodsSkuRequest;
|
use App\Http\Requests\GoodsSkuRequest;
|
||||||
use App\Models\Goods;
|
use App\Models\Goods;
|
||||||
|
use App\Models\Log;
|
||||||
use App\Models\Log as LogModel;
|
use App\Models\Log as LogModel;
|
||||||
use App\Utils\FormatUtils;
|
use App\Utils\FormatUtils;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
@ -23,7 +25,6 @@ class GoodsSkusController extends Controller
|
|||||||
{
|
{
|
||||||
public function __construct(Request $request)
|
public function __construct(Request $request)
|
||||||
{
|
{
|
||||||
// $this->middleware(['role:super-admin','permission:publish articles|edit articles']);
|
|
||||||
$this->log = new LogModel([
|
$this->log = new LogModel([
|
||||||
'module' => 'goods',
|
'module' => 'goods',
|
||||||
'action' => $request->getMethod(),
|
'action' => $request->getMethod(),
|
||||||
@ -36,9 +37,20 @@ class GoodsSkusController extends Controller
|
|||||||
$goods = Goods::query()->filter()->get()->toArray();
|
$goods = Goods::query()->filter()->get()->toArray();
|
||||||
$goodsIds = array_column($goods, 'id');
|
$goodsIds = array_column($goods, 'id');
|
||||||
// 状态变更时间查询,日志
|
// 状态变更时间查询,日志
|
||||||
|
$ids = [];
|
||||||
|
if ($request->get('keyword_type', '') && $request->get('keyword_value', '')) {
|
||||||
|
$ids = Log::query()->where('target_type', 'sku')
|
||||||
|
->where('target_field', $request->keyword_type)
|
||||||
|
->whereBetween('created_at', explode(' - ', $request->keyword_value))
|
||||||
|
->pluck('sku_id')
|
||||||
|
->toArray();
|
||||||
|
}
|
||||||
$day = FormatUtils::date();
|
$day = FormatUtils::date();
|
||||||
$goodsSkus = GoodsSku::query()
|
$goodsSkus = GoodsSku::query()
|
||||||
->whereIn('goods_id', $goodsIds)
|
->whereIn('goods_id', $goodsIds)
|
||||||
|
->when($ids, function ($query, $ids) {
|
||||||
|
return $query->whereIn('id', $ids);
|
||||||
|
})
|
||||||
->filter()
|
->filter()
|
||||||
->with(['goods' => function ($query) {
|
->with(['goods' => function ($query) {
|
||||||
$query->with(['type:id,name', 'brand:id,name']);
|
$query->with(['type:id,name', 'brand:id,name']);
|
||||||
@ -132,11 +144,13 @@ class GoodsSkusController extends Controller
|
|||||||
'user_id' => $request->user()->id
|
'user_id' => $request->user()->id
|
||||||
];
|
];
|
||||||
// 成本
|
// 成本
|
||||||
$goodsSku = GoodsSku::query()->where('id', $sku['id'])->first(['id', 'cost']);
|
$goodsSku = GoodsSku::query()->where('id', $sku['id'])->first(['id', 'cost', 'stock', 'num']);
|
||||||
$costLog['target_field'] = 'cost';
|
$costLog['target_field'] = 'cost';
|
||||||
$costLog['before_update'] = $goodsSku->cost;
|
$costLog['before_update'] = $goodsSku->cost;
|
||||||
$goodsSku->cost = $sku['cost'];
|
$goodsSku->cost = $sku['cost'];
|
||||||
$goodsSku->reference_price = $sku['cost'] * 1.5;
|
$goodsSku->reference_price = $sku['cost'] * 1.5;
|
||||||
|
$goodsSku->stock += $sku['arrived_today_num'];
|
||||||
|
$goodsSku->num += $sku['arrived_today_num'];
|
||||||
$goodsSku->save();
|
$goodsSku->save();
|
||||||
$costLog['after_update'] = $goodsSku->cost;
|
$costLog['after_update'] = $goodsSku->cost;
|
||||||
$logs[] = $costLog;
|
$logs[] = $costLog;
|
||||||
@ -144,7 +158,7 @@ class GoodsSkusController extends Controller
|
|||||||
$record = DailyStockRecord::query()->where('sku_id', $sku['id'])->where('day', FormatUtils::date())->first(['id', 'arrived_today_num']);
|
$record = DailyStockRecord::query()->where('sku_id', $sku['id'])->where('day', FormatUtils::date())->first(['id', 'arrived_today_num']);
|
||||||
$arrivedLog['target_field'] = 'arrived_today_num';
|
$arrivedLog['target_field'] = 'arrived_today_num';
|
||||||
$arrivedLog['before_update'] = $record->arrived_today_num;
|
$arrivedLog['before_update'] = $record->arrived_today_num;
|
||||||
$record->arrived_today_num = $sku['arrived_today_num'];
|
$record->arrived_today_num += $sku['arrived_today_num'];
|
||||||
$record->save();
|
$record->save();
|
||||||
$arrivedLog['after_update'] = $record->arrived_today_num;
|
$arrivedLog['after_update'] = $record->arrived_today_num;
|
||||||
$logs[] = $arrivedLog;
|
$logs[] = $arrivedLog;
|
||||||
@ -206,7 +220,7 @@ class GoodsSkusController extends Controller
|
|||||||
$update = reset($skus);
|
$update = reset($skus);
|
||||||
DB::beginTransaction();
|
DB::beginTransaction();
|
||||||
try {
|
try {
|
||||||
$sku = GoodsSku::query()->where('id', $update['id'])->get(['id', 'two_days_ago_num', 'yesterday_num']);
|
$sku = GoodsSku::query()->where('id', $update['id'])->get(['id', 'two_days_ago_num', 'yesterday_num', 'num', 'stock']);
|
||||||
$record = DailyStockRecord::query()
|
$record = DailyStockRecord::query()
|
||||||
->where('sku_id', $sku->id)
|
->where('sku_id', $sku->id)
|
||||||
->where('day', FormatUtils::date())
|
->where('day', FormatUtils::date())
|
||||||
@ -214,10 +228,12 @@ class GoodsSkusController extends Controller
|
|||||||
$this->setBeforeUpdate([
|
$this->setBeforeUpdate([
|
||||||
'two_days_ago_num' => $sku->two_days_ago_num,
|
'two_days_ago_num' => $sku->two_days_ago_num,
|
||||||
'yesterday_num' => $sku->yesterday_num,
|
'yesterday_num' => $sku->yesterday_num,
|
||||||
|
'num' => $sku->num,
|
||||||
'arrived_today_num' => $record->arrived_today_num,
|
'arrived_today_num' => $record->arrived_today_num,
|
||||||
]);
|
]);
|
||||||
$sku->two_days_ago_num = $update['two_days_ago_num'];
|
$sku->two_days_ago_num = $update['two_days_ago_num'];
|
||||||
$sku->yesterday_num = $update['two_days_ago_num'];
|
$sku->yesterday_num = $update['yesterday_num'];
|
||||||
|
$sku->num = $update['two_days_ago_num'] + $update['yesterday_num'] + $sku->stock;
|
||||||
$sku->save();
|
$sku->save();
|
||||||
$record->arrived_today_num = $update['arrived_today_num'];
|
$record->arrived_today_num = $update['arrived_today_num'];
|
||||||
$record->save();
|
$record->save();
|
||||||
@ -283,12 +299,21 @@ class GoodsSkusController extends Controller
|
|||||||
->where('sku_id', $id)
|
->where('sku_id', $id)
|
||||||
->where('day', FormatUtils::date())
|
->where('day', FormatUtils::date())
|
||||||
->first(['id', 'loss_num']);
|
->first(['id', 'loss_num']);
|
||||||
$this->log->message = $request->input('reason', '');
|
$this->log->message = $request->get('reason');
|
||||||
|
$this->setBeforeUpdate($model->loss_num);
|
||||||
|
$model->loss_num += $request->loss_num;
|
||||||
} else {
|
} else {
|
||||||
$model = GoodsSku::query()->find($id);
|
$model = GoodsSku::query()->find($id);
|
||||||
|
$this->setBeforeUpdate($model->$updateField);
|
||||||
|
if ('reserve' === $updateField) {
|
||||||
|
$changeNum = $model->reserve - $request->reserve;
|
||||||
|
$model->stock += $changeNum;
|
||||||
|
$model->reserve = $request->reserve;
|
||||||
|
$model->num += $changeNum;
|
||||||
|
} else {
|
||||||
|
$model->$updateField = $request->$updateField;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$this->setBeforeUpdate($model->$updateField);
|
|
||||||
$model->$updateField = $request->$updateField;
|
|
||||||
$model->save();
|
$model->save();
|
||||||
$this->setAfterUpdate($model->$updateField);
|
$this->setAfterUpdate($model->$updateField);
|
||||||
$this->addLog($id, $updateField);
|
$this->addLog($id, $updateField);
|
||||||
@ -315,4 +340,11 @@ class GoodsSkusController extends Controller
|
|||||||
|
|
||||||
return response($this->res, $this->res['httpCode']);
|
return response($this->res, $this->res['httpCode']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function export(Request $request)
|
||||||
|
{
|
||||||
|
$type = $request->get('exportType');
|
||||||
|
ob_end_clean();
|
||||||
|
return Excel::download(new GoodsSkusExport($type), $type, '.xlsx');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,6 +6,8 @@ use App\Http\Controllers\Controller;
|
|||||||
use App\Models\Log as LogModel;
|
use App\Models\Log as LogModel;
|
||||||
use App\Models\Menu;
|
use App\Models\Menu;
|
||||||
use App\Http\Resources\MenusResource;
|
use App\Http\Resources\MenusResource;
|
||||||
|
use App\Models\User;
|
||||||
|
use App\Utils\ArrayUtils;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Validator;
|
use Illuminate\Support\Facades\Validator;
|
||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
@ -22,10 +24,18 @@ class MenusController extends Controller
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function index()
|
public function index(Request $request)
|
||||||
{
|
{
|
||||||
$menus = Menu::query()->get();
|
$permissions = $request->user()->getPermissionsViaRoles()->toArray();
|
||||||
$menus = FormatUtils::formatTreeData($menus, 0);
|
$permissions = array_column($permissions, 'name');
|
||||||
|
$menus = Menu::query()->get()->toArray();
|
||||||
|
$hasPermissionMenus = [];
|
||||||
|
foreach ($menus as $menu) {
|
||||||
|
if (in_array($menu['code'], $permissions, true)) {
|
||||||
|
$hasPermissionMenus[] = $menu;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$menus = FormatUtils::formatTreeData($hasPermissionMenus, 0);
|
||||||
|
|
||||||
return MenusResource::collection($menus);
|
return MenusResource::collection($menus);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,6 +4,8 @@ namespace App\Http\Controllers\Permission;
|
|||||||
|
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use App\Models\Log as LogModel;
|
use App\Models\Log as LogModel;
|
||||||
|
use App\Utils\ArrayUtils;
|
||||||
|
use App\Utils\FormatUtils;
|
||||||
use Spatie\Permission\Models\Permission;
|
use Spatie\Permission\Models\Permission;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Validator;
|
use Illuminate\Support\Facades\Validator;
|
||||||
@ -23,9 +25,15 @@ class PermissionsController extends Controller
|
|||||||
|
|
||||||
public function index()
|
public function index()
|
||||||
{
|
{
|
||||||
$permissions = Permission::query()->get();
|
$permissions = Permission::query()->get()->toArray();
|
||||||
|
$permissions = ArrayUtils::index($permissions, 'name');
|
||||||
|
$routes = include(resource_path('lang/zh-CN/permission.php'));
|
||||||
|
foreach ($routes as $key => &$route) {
|
||||||
|
$route['id'] = $permissions[$key]['id'];
|
||||||
|
}
|
||||||
|
$routes = FormatUtils::formatTreeData($routes, 0);
|
||||||
|
|
||||||
return PermissionsResource::collection($permissions);
|
return PermissionsResource::collection($routes);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function store(Request $request)
|
public function store(Request $request)
|
||||||
|
|||||||
@ -63,6 +63,7 @@ class Kernel extends HttpKernel
|
|||||||
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
|
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
|
||||||
'role' => \Spatie\Permission\Middlewares\RoleMiddleware::class,
|
'role' => \Spatie\Permission\Middlewares\RoleMiddleware::class,
|
||||||
'permission' => \Spatie\Permission\Middlewares\PermissionMiddleware::class,
|
'permission' => \Spatie\Permission\Middlewares\PermissionMiddleware::class,
|
||||||
|
'check.permissions' => \App\Http\Middleware\CheckPermissions::class,
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
38
app/Http/Middleware/CheckPermissions.php
Normal file
38
app/Http/Middleware/CheckPermissions.php
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Http\Middleware;
|
||||||
|
|
||||||
|
use Closure;
|
||||||
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
|
class CheckPermissions
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Handle an incoming request.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Http\Request $request
|
||||||
|
* @param \Closure $next
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
public function handle($request, Closure $next)
|
||||||
|
{
|
||||||
|
// 获取当前路由名称
|
||||||
|
$currentRouteName = Route::currentRouteName();
|
||||||
|
// 引入当前守卫的权限文件
|
||||||
|
$routes = include(resource_path('lang/zh-CN/permission.php'));
|
||||||
|
if (is_array($routes) && array_key_exists($currentRouteName, $routes)) {
|
||||||
|
$permissions = $request->user()->getPermissionsViaRoles()->toArray();
|
||||||
|
$permissions = array_column($permissions, 'name');
|
||||||
|
if (in_array($currentRouteName, $permissions, true)) {
|
||||||
|
return $next($request);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$res = [
|
||||||
|
'httpCode' => 403,
|
||||||
|
'errorCode' => 403403,
|
||||||
|
'errorMessage' => '您没有使用此功能的权限',
|
||||||
|
];
|
||||||
|
return response($res, 403);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -87,7 +87,7 @@ class Log extends Model
|
|||||||
|
|
||||||
public function setUserIdAttribute($value)
|
public function setUserIdAttribute($value)
|
||||||
{
|
{
|
||||||
$this->attributes['user_id'] = Auth::id();
|
$this->attributes['user_id'] = Auth::id() ?: $value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function add($targetId = 0, $targetField = '')
|
public function add($targetId = 0, $targetField = '')
|
||||||
|
|||||||
@ -43,4 +43,9 @@ class User extends Authenticatable
|
|||||||
{
|
{
|
||||||
$this->attributes['password'] = Hash::make($value);
|
$this->attributes['password'] = Hash::make($value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function isRoot()
|
||||||
|
{
|
||||||
|
return $this->name === 'erpAdmin';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -76,6 +76,10 @@ return [
|
|||||||
'isCName' => false, // 是否使用自定义域名,true: 则Storage.url()会使用自定义的cdn或域名生成文件url, false: 则使用外部节点生成url
|
'isCName' => false, // 是否使用自定义域名,true: 则Storage.url()会使用自定义的cdn或域名生成文件url, false: 则使用外部节点生成url
|
||||||
'debug' => true
|
'debug' => true
|
||||||
],
|
],
|
||||||
|
'root' => [
|
||||||
|
'driver' => 'local',
|
||||||
|
'root' => '/'
|
||||||
|
]
|
||||||
],
|
],
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|||||||
@ -20,6 +20,7 @@ class CreateDailyStockRecordsTable extends Migration
|
|||||||
$table->unsignedInteger('arrived_today_num')->default(0)->comment('今日到货');
|
$table->unsignedInteger('arrived_today_num')->default(0)->comment('今日到货');
|
||||||
$table->unsignedInteger('loss_num')->default(0)->comment('损耗');
|
$table->unsignedInteger('loss_num')->default(0)->comment('损耗');
|
||||||
$table->unsignedInteger('inventory')->default(0)->comment('库存盘点');
|
$table->unsignedInteger('inventory')->default(0)->comment('库存盘点');
|
||||||
|
$table->unique('sku_id', 'day');
|
||||||
$table->timestamps();
|
$table->timestamps();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@ -24,6 +24,7 @@ class CreateLogsTable extends Migration
|
|||||||
$table->text('after_update')->nullable()->comment('更新后数据');
|
$table->text('after_update')->nullable()->comment('更新后数据');
|
||||||
$table->text('message')->nullable()->comment('备注信息');
|
$table->text('message')->nullable()->comment('备注信息');
|
||||||
$table->bigInteger('user_id')->comment('操作人id');
|
$table->bigInteger('user_id')->comment('操作人id');
|
||||||
|
$table->index(['target_type', 'target_id', 'target_field']);
|
||||||
$table->timestamps();
|
$table->timestamps();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@ -12,17 +12,11 @@ class PermissionsTableSeeder extends Seeder
|
|||||||
*/
|
*/
|
||||||
public function run()
|
public function run()
|
||||||
{
|
{
|
||||||
DB::table('permissions')->insert([
|
$routes = include(resource_path('lang/zh-CN/permission.php'));
|
||||||
['name' => 'GOODS_MANAGE', 'guard_name' => 'api'],
|
$data = [];
|
||||||
['name' => 'GOODS_LIST', 'guard_name' => 'api'],
|
foreach ($routes as $key => $route) {
|
||||||
['name' => 'GOODS_TYPE', 'guard_name' => 'api'],
|
$data[] = ['name' => $key, 'guard_name' => 'api'];
|
||||||
['name' => 'GOODS_BRAND', 'guard_name' => 'api'],
|
}
|
||||||
['name' => 'SHOP_MANAGE', 'guard_name' => 'api'],
|
DB::table('permissions')->insert($data);
|
||||||
['name' => 'USER_MANAGE', 'guard_name' => 'api'],
|
|
||||||
['name' => 'SYSTEM_MANAGE', 'guard_name' => 'api'],
|
|
||||||
['name' => 'ROLE_MANAGE', 'guard_name' => 'api'],
|
|
||||||
['name' => 'PERMISSION_MANAGE', 'guard_name' => 'api'],
|
|
||||||
['name' => 'SYSTEM_LOG', 'guard_name' => 'api'],
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
234
resources/lang/zh-CN/permission.php
Normal file
234
resources/lang/zh-CN/permission.php
Normal file
@ -0,0 +1,234 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
return [
|
||||||
|
// 商品管理
|
||||||
|
'GOODS_MANAGE' => [
|
||||||
|
'id' => 1,
|
||||||
|
'name' => '商品管理',
|
||||||
|
'parent_id' => 0,
|
||||||
|
],
|
||||||
|
'GOODS_LIST' => [
|
||||||
|
'id' => 2,
|
||||||
|
'name' => '商品列表',
|
||||||
|
'parent_id' => 1,
|
||||||
|
],
|
||||||
|
'goods.index' => [
|
||||||
|
'id' => 20,
|
||||||
|
'name' => '商品列表',
|
||||||
|
'parent_id' => 2,
|
||||||
|
],
|
||||||
|
'goods.store' => [
|
||||||
|
'id' => 21,
|
||||||
|
'name' => '新增商品',
|
||||||
|
'parent_id' => 2,
|
||||||
|
],
|
||||||
|
'goods_skus.index' => [
|
||||||
|
'id' => 22,
|
||||||
|
'name' => '规格列表',
|
||||||
|
'parent_id' => 2,
|
||||||
|
],
|
||||||
|
'goods_skus.store' => [
|
||||||
|
'id' => 23,
|
||||||
|
'name' => '新增规格',
|
||||||
|
'parent_id' => 2,
|
||||||
|
],
|
||||||
|
'goods_skus.show' => [
|
||||||
|
'id' => 24,
|
||||||
|
'name' => '规格查看',
|
||||||
|
'parent_id' => 2,
|
||||||
|
],
|
||||||
|
'goods_skus.udpate' => [
|
||||||
|
'id' => 25,
|
||||||
|
'name' => '规格更新',
|
||||||
|
'parent_id' => 2,
|
||||||
|
],
|
||||||
|
'goods_sku.batch_update' => [
|
||||||
|
'id' => 26,
|
||||||
|
'name' => '上新/盘点',
|
||||||
|
'parent_id' => 2,
|
||||||
|
],
|
||||||
|
'goods_sku.single_update' => [
|
||||||
|
'id' => 27,
|
||||||
|
'name' => '字段更新',
|
||||||
|
'parent_id' => 2,
|
||||||
|
],
|
||||||
|
'GOODS_TYPE' => [
|
||||||
|
'id' => 3,
|
||||||
|
'name' => '商品种类',
|
||||||
|
'parent_id' => 1,
|
||||||
|
],
|
||||||
|
'goods_types.index' => [
|
||||||
|
'id' => 30,
|
||||||
|
'name' => '列表',
|
||||||
|
'parent_id' => 3,
|
||||||
|
],
|
||||||
|
'goods_types.store' => [
|
||||||
|
'id' => 31,
|
||||||
|
'name' => '新增',
|
||||||
|
'parent_id' => 3,
|
||||||
|
],
|
||||||
|
'goods_types.show' => [
|
||||||
|
'id' => 32,
|
||||||
|
'name' => '查看',
|
||||||
|
'parent_id' => 3,
|
||||||
|
],
|
||||||
|
'goods_types.update' => [
|
||||||
|
'id' => 33,
|
||||||
|
'name' => '更新',
|
||||||
|
'parent_id' => 3,
|
||||||
|
],
|
||||||
|
'goods_types.destroy' => [
|
||||||
|
'id' => 34,
|
||||||
|
'name' => '删除',
|
||||||
|
'parent_id' => 3,
|
||||||
|
],
|
||||||
|
'GOODS_BRAND' => [
|
||||||
|
'id' => 4,
|
||||||
|
'name' => '商品品牌',
|
||||||
|
'parent_id' => 1,
|
||||||
|
],
|
||||||
|
'goods_brands.index' => [
|
||||||
|
'id' => 40,
|
||||||
|
'name' => '列表',
|
||||||
|
'parent_id' => 4,
|
||||||
|
],
|
||||||
|
'goods_brands.store' => [
|
||||||
|
'id' => 41,
|
||||||
|
'name' => '新增',
|
||||||
|
'parent_id' => 4,
|
||||||
|
],
|
||||||
|
'goods_brands.show' => [
|
||||||
|
'id' => 42,
|
||||||
|
'name' => '查看',
|
||||||
|
'parent_id' => 4,
|
||||||
|
],
|
||||||
|
'goods_brands.update' => [
|
||||||
|
'id' => 43,
|
||||||
|
'name' => '更新',
|
||||||
|
'parent_id' => 4,
|
||||||
|
],
|
||||||
|
'goods_brands.destroy' => [
|
||||||
|
'id' => 44,
|
||||||
|
'name' => '删除',
|
||||||
|
'parent_id' => 4,
|
||||||
|
],
|
||||||
|
// 店铺管理
|
||||||
|
'SHOP_MANAGE' => [
|
||||||
|
'id' => 5,
|
||||||
|
'name' => '店铺管理',
|
||||||
|
'parent_id' => 0,
|
||||||
|
],
|
||||||
|
'shops.index' => [
|
||||||
|
'id' => 50,
|
||||||
|
'name' => '列表',
|
||||||
|
'parent_id' => 5,
|
||||||
|
],
|
||||||
|
'shops.store' => [
|
||||||
|
'id' => 51,
|
||||||
|
'name' => '新增',
|
||||||
|
'parent_id' => 5,
|
||||||
|
],
|
||||||
|
'shops.show' => [
|
||||||
|
'id' => 52,
|
||||||
|
'name' => '查看',
|
||||||
|
'parent_id' => 5,
|
||||||
|
],
|
||||||
|
'shops.update' => [
|
||||||
|
'id' => 53,
|
||||||
|
'name' => '更新',
|
||||||
|
'parent_id' => 5,
|
||||||
|
],
|
||||||
|
'shops.destroy' => [
|
||||||
|
'id' => 54,
|
||||||
|
'name' => '删除',
|
||||||
|
'parent_id' => 5,
|
||||||
|
],
|
||||||
|
// 用户管理
|
||||||
|
'USER_MANAGE' => [
|
||||||
|
'id' => 6,
|
||||||
|
'name' => '用户管理',
|
||||||
|
'parent_id' => 0,
|
||||||
|
],
|
||||||
|
'user.index' => [
|
||||||
|
'id' => 60,
|
||||||
|
'name' => '列表',
|
||||||
|
'parent_id' => 6,
|
||||||
|
],
|
||||||
|
'user.store' => [
|
||||||
|
'id' => 61,
|
||||||
|
'name' => '新增',
|
||||||
|
'parent_id' => 6,
|
||||||
|
],
|
||||||
|
'user.show' => [
|
||||||
|
'id' => 62,
|
||||||
|
'name' => '查看',
|
||||||
|
'parent_id' => 6,
|
||||||
|
],
|
||||||
|
'user.update' => [
|
||||||
|
'id' => 63,
|
||||||
|
'name' => '更新',
|
||||||
|
'parent_id' => 6,
|
||||||
|
],
|
||||||
|
'user.destroy' => [
|
||||||
|
'id' => 64,
|
||||||
|
'name' => '删除',
|
||||||
|
'parent_id' => 6,
|
||||||
|
],
|
||||||
|
// 系统管理
|
||||||
|
'SYSTEM_MANAGE' => [
|
||||||
|
'id' => 7,
|
||||||
|
'name' => '系统管理',
|
||||||
|
'parent_id' => 0,
|
||||||
|
],
|
||||||
|
'ROLE_MANAGE' => [
|
||||||
|
'id' => 8,
|
||||||
|
'name' => '角色管理',
|
||||||
|
'parent_id' => 7,
|
||||||
|
],
|
||||||
|
'role.index' => [
|
||||||
|
'id' => 80,
|
||||||
|
'name' => '列表',
|
||||||
|
'parent_id' => 8,
|
||||||
|
],
|
||||||
|
'role.store' => [
|
||||||
|
'id' => 81,
|
||||||
|
'name' => '新增',
|
||||||
|
'parent_id' => 8,
|
||||||
|
],
|
||||||
|
'role.show' => [
|
||||||
|
'id' => 82,
|
||||||
|
'name' => '查看',
|
||||||
|
'parent_id' => 8,
|
||||||
|
],
|
||||||
|
'role.update' => [
|
||||||
|
'id' => 83,
|
||||||
|
'name' => '更新',
|
||||||
|
'parent_id' => 8,
|
||||||
|
],
|
||||||
|
'role.permission' => [
|
||||||
|
'id' => 84,
|
||||||
|
'name' => '设置权限',
|
||||||
|
'parent_id' => 8,
|
||||||
|
],
|
||||||
|
'PERMISSION_MANAGE' => [
|
||||||
|
'id' => 9,
|
||||||
|
'name' => '权限管理',
|
||||||
|
'parent_id' => 7,
|
||||||
|
],
|
||||||
|
'permissions.index' => [
|
||||||
|
'id' => 90,
|
||||||
|
'name' => '列表',
|
||||||
|
'parent_id' => 9,
|
||||||
|
],
|
||||||
|
// 系统日志
|
||||||
|
'SYSTEM_LOG' => [
|
||||||
|
'id' => 10,
|
||||||
|
'name' => '系统日志',
|
||||||
|
'parent_id' => 0,
|
||||||
|
],
|
||||||
|
'logs.index' => [
|
||||||
|
'id' => 100,
|
||||||
|
'name' => '列表',
|
||||||
|
'parent_id' => 10,
|
||||||
|
],
|
||||||
|
];
|
||||||
BIN
resources/templates/goods_skus_import.xlsx
Normal file
BIN
resources/templates/goods_skus_import.xlsx
Normal file
Binary file not shown.
@ -16,7 +16,7 @@ use App\Http\Controllers\Goods\GoodsSkusController;
|
|||||||
| is assigned the "api" middleware group. Enjoy building your API!
|
| is assigned the "api" middleware group. Enjoy building your API!
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
Route::middleware('auth:api')->group(function () {
|
Route::middleware(['auth:api', 'check.permissions'])->group(function () {
|
||||||
// 用户
|
// 用户
|
||||||
Route::resource('users', 'User\UsersController', ['only' => ['index', 'store', 'show', 'update', 'destroy']]);
|
Route::resource('users', 'User\UsersController', ['only' => ['index', 'store', 'show', 'update', 'destroy']]);
|
||||||
// 商品种类
|
// 商品种类
|
||||||
@ -33,17 +33,20 @@ Route::middleware('auth:api')->group(function () {
|
|||||||
Route::patch('single/goods_skus/{id}', [GoodsSkusController::class, 'updateField'])->name('goods_sku.single_update');
|
Route::patch('single/goods_skus/{id}', [GoodsSkusController::class, 'updateField'])->name('goods_sku.single_update');
|
||||||
// 店铺
|
// 店铺
|
||||||
Route::resource('shops', 'Shop\ShopsController', ['only' => ['index', 'store', 'show', 'update', 'destroy']]);
|
Route::resource('shops', 'Shop\ShopsController', ['only' => ['index', 'store', 'show', 'update', 'destroy']]);
|
||||||
Route::get('shop_platforms', [ShopsController::class, 'getPlatList'])->name('plat.list');
|
|
||||||
// 角色
|
// 角色
|
||||||
Route::resource('roles', 'Role\RolesController', ['only' => ['index', 'store', 'show', 'update']]);
|
Route::resource('roles', 'Role\RolesController', ['only' => ['index', 'store', 'show', 'update']]);
|
||||||
Route::post('roles/{id}/permissions', [RolesController::class, 'addPermissions'])->name('role.permission');
|
Route::post('roles/{id}/permissions', [RolesController::class, 'addPermissions'])->name('role.permission');
|
||||||
// 权限
|
// 权限
|
||||||
Route::resource('permissions', 'Permission\PermissionsController', ['only' => ['index', 'store', 'show', 'update', 'destroy']]);
|
Route::resource('permissions', 'Permission\PermissionsController', ['only' => ['index',
|
||||||
// 菜单
|
|
||||||
Route::resource('menus', 'Menu\MenusController', ['only' => ['index',
|
|
||||||
// 'store', 'show', 'update', 'destroy'
|
// 'store', 'show', 'update', 'destroy'
|
||||||
]]);
|
]]);
|
||||||
Route::post('upload', [UploadController::class, 'store'])->name('upload.file');
|
Route::post('upload', [UploadController::class, 'store'])->name('upload.file');
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::post('/auth/login', [LoginController::class, 'login'])->name('auth.login');
|
Route::post('/auth/login', [LoginController::class, 'login'])->name('auth.login');
|
||||||
|
|
||||||
|
// 菜单
|
||||||
|
Route::resource('menus', 'Menu\MenusController', ['only' => ['index',
|
||||||
|
// 'store', 'show', 'update', 'destroy'
|
||||||
|
]])->middleware('auth:api');
|
||||||
|
Route::get('shop_platforms', [ShopsController::class, 'getPlatList'])->name('plat.list')->middleware('auth:api');
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
use App\Http\Controllers\Goods\GoodsSkusController;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Web Routes
|
| Web Routes
|
||||||
@ -26,3 +28,5 @@ Route::get('/login', function () {
|
|||||||
Route::get('/register', function () {
|
Route::get('/register', function () {
|
||||||
return view('welcome');
|
return view('welcome');
|
||||||
})->name('register');
|
})->name('register');
|
||||||
|
|
||||||
|
Route::get('goods_skus/export', [GoodsSkusController::class, 'export'])->name('goods_skus.export')->middleware('check.permissions');
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user