|
@@ -7,9 +7,11 @@ use App\Facilitator;
|
|
|
use App\DischargeTask;
|
|
use App\DischargeTask;
|
|
|
use App\Filters\DischargeTaskFilters;
|
|
use App\Filters\DischargeTaskFilters;
|
|
|
use App\Http\Requests\DischargeTask\DischargeTaskRequest;
|
|
use App\Http\Requests\DischargeTask\DischargeTaskRequest;
|
|
|
|
|
+use App\Imports\DischargeTaskCostEntryImport;
|
|
|
use App\Imports\DischargeTaskImport;
|
|
use App\Imports\DischargeTaskImport;
|
|
|
use App\Owner;
|
|
use App\Owner;
|
|
|
use App\Role;
|
|
use App\Role;
|
|
|
|
|
+use App\Services\DischargeTaskService;
|
|
|
use App\Services\OwnerService;
|
|
use App\Services\OwnerService;
|
|
|
use App\Services\UserService;
|
|
use App\Services\UserService;
|
|
|
use App\Warehouse;
|
|
use App\Warehouse;
|
|
@@ -84,6 +86,7 @@ class DischargeTaskController extends Controller
|
|
|
$result = app('DischargeTaskService')->updateDischargeTask($dischargeTask, $request->all());
|
|
$result = app('DischargeTaskService')->updateDischargeTask($dischargeTask, $request->all());
|
|
|
|
|
|
|
|
if ($result['success']) $this->success($result['data']);
|
|
if ($result['success']) $this->success($result['data']);
|
|
|
|
|
+
|
|
|
else $this->error($result['message'] ?? '操作异常,请刷新页面重试');
|
|
else $this->error($result['message'] ?? '操作异常,请刷新页面重试');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -137,7 +140,7 @@ class DischargeTaskController extends Controller
|
|
|
$dischargeTasks = DischargeTask::query()->with(['Facilitator', 'owner'])->filter($filters)->whereIn('owner_id', data_get($owners, '*.id'))->orderByDesc('id')->get();
|
|
$dischargeTasks = DischargeTask::query()->with(['Facilitator', 'owner'])->filter($filters)->whereIn('owner_id', data_get($owners, '*.id'))->orderByDesc('id')->get();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- $row = ['日期', '客户名称', '作业名称', '入库单号', '数量', '单位', '单价', '收费', '状态', '备注'];
|
|
|
|
|
|
|
+ $row = ['日期','仓库', '客户名称', '作业名称','入库单号', '数量', '单位', '单价', '收费', '状态', '备注'];
|
|
|
$json = app('DischargeTaskService')->getJson($dischargeTasks);
|
|
$json = app('DischargeTaskService')->getJson($dischargeTasks);
|
|
|
|
|
|
|
|
return Export::make($row, $json, "卸货任务");
|
|
return Export::make($row, $json, "卸货任务");
|
|
@@ -182,6 +185,30 @@ class DischargeTaskController extends Controller
|
|
|
return ['success' => true];
|
|
return ['success' => true];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ public function constEntryImportApi(Request $request): array
|
|
|
|
|
+ {
|
|
|
|
|
+ $this->gate('人事管理-卸货-成本录入');
|
|
|
|
|
+ $extension = $request->file()['file']->getClientOriginalExtension();
|
|
|
|
|
+ $flag = !in_array($extension, ['xlsx', 'xlsm', 'xltx', 'xltm', 'xls', 'xlt', 'ods', 'ots', 'slk', 'xml', 'gnumeric', 'htm', 'html', 'csv', 'tsv']);
|
|
|
|
|
+ if ($flag){
|
|
|
|
|
+ return ['success' => false, 'message' => '请检查导入文件是否符合要求'];
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ $extension[0] = strtoupper($extension[0]);
|
|
|
|
|
+
|
|
|
|
|
+ try {
|
|
|
|
|
+ Excel::import(new DischargeTaskCostEntryImport(), $request->file()['file']->path(), null, $extension);
|
|
|
|
|
+ } catch (\Exception $e) {
|
|
|
|
|
+ return ['success' => false, 'message' => ['请检查导入文件是否符合要求']];
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ $exception=Cache::get('exception');
|
|
|
|
|
+ $numbers=Cache::get('numbers');
|
|
|
|
|
+
|
|
|
|
|
+ if ($exception) return ['success' => false, 'errors' => $exception,'message' => $numbers];
|
|
|
|
|
+ return ['success' => true];
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
|
|
|
public function show(DischargeTask $dischargeTask)
|
|
public function show(DischargeTask $dischargeTask)
|
|
|
{
|
|
{
|