完善生产查询与登录权限配置

2026-09-03 19:56:19 +08:00
parent 793f140a45
commit 02c8fb7021
438 changed files with 1595 additions and 573 deletions
@@ -679,13 +679,14 @@ final class DataEntryController extends Base

    #[OA\Get(path: '/produce/query/records', summary: '查询生产记录', tags: ['produce-web-query'])]
    #[DataResponse(description: '查询成功')]
-    #[AllowAnonymous(requireToken: false, requirePermission: false, description: '公共接口')]
    public function queryRecords(Request $request): Response
    {
        $recordType = trim((string) $request->input('record_type', 'scan'));
        $orderNo = trim((string) $request->input('order_no', ''));
        $keyword = trim((string) $request->input('keyword', ''));
        $userCode = trim((string) $request->input('user_code', ''));
+        $processId = (int) $request->input('process_id', 0);
+        $stepId = (int) $request->input('step_id', 0);
        $status = $request->input('status', '');
        $scanResult = $request->input('scan_result', '');
        $page = max(1, (int) $request->input('page', 1));
@@ -707,6 +708,8 @@ final class DataEntryController extends Base
        if ($recordType === 'scan') {
            $query->when($orderNo !== '', fn ($builder) => $builder->where('order_no', $orderNo));
            $query->when($userCode !== '', fn ($builder) => $builder->where('user_code', $userCode));
+            $query->when($processId > 0, fn ($builder) => $builder->where('process_id', $processId));
+            $query->when($stepId > 0, fn ($builder) => $builder->where('step_id', $stepId));
            $query->when($status !== '' && $status !== null, fn ($builder) => $builder->where('status_id', (int) $status));
            $query->when($scanResult !== '' && $scanResult !== null, fn ($builder) => $builder->where('scan_result', (int) $scanResult));
            $query->when($keyword !== '', fn ($builder) => $builder->where(function ($nested) use ($keyword) {
@@ -721,6 +724,8 @@ final class DataEntryController extends Base
        } elseif ($recordType === 'product') {
            $query->when($orderNo !== '', fn ($builder) => $builder->where('process_order_no', $orderNo));
            $query->when($userCode !== '', fn ($builder) => $builder->where('user_code', $userCode));
+            $query->when($processId > 0, fn ($builder) => $builder->where('process_id', $processId));
+            $query->when($stepId > 0, fn ($builder) => $builder->where('step_id', $stepId));
            $query->when($status !== '' && $status !== null, fn ($builder) => $builder->where('status_id', (int) $status));
            $query->when($scanResult !== '' && $scanResult !== null, fn ($builder) => $builder->where('scan_result', (int) $scanResult));
            $query->when($keyword !== '', fn ($builder) => $builder->where(function ($nested) use ($keyword) {
@@ -736,6 +741,8 @@ final class DataEntryController extends Base
        } elseif ($recordType === 'exception') {
            $query->when($orderNo !== '', fn ($builder) => $builder->where('order_no', $orderNo));
            $query->when($userCode !== '', fn ($builder) => $builder->where('user_code', $userCode));
+            $query->when($processId > 0, fn ($builder) => $builder->where('process_id', $processId));
+            $query->when($stepId > 0, fn ($builder) => $builder->where('step_id', $stepId));
            $query->when($status !== '' && $status !== null, fn ($builder) => $builder->where('status', (int) $status));
            $query->when($keyword !== '', fn ($builder) => $builder->where(function ($nested) use ($keyword) {
                $nested->where('order_no', 'like', "%{$keyword}%")
@@ -751,6 +758,8 @@ final class DataEntryController extends Base
            $query->orderByDesc('reported_at')->orderByDesc('id');
        } else {
            $query->when($orderNo !== '', fn ($builder) => $builder->where('order_no', $orderNo));
+            $query->when($processId > 0, fn ($builder) => $builder->where('process_id', $processId));
+            $query->when($stepId > 0, fn ($builder) => $builder->where('step_id', $stepId));
            $query->when($keyword !== '', fn ($builder) => $builder->where(function ($nested) use ($keyword) {
                $nested->where('repair_no', 'like', "%{$keyword}%")
                    ->orWhere('order_no', 'like', "%{$keyword}%")
@@ -772,7 +781,6 @@ final class DataEntryController extends Base

    #[OA\Get(path: '/produce/query/timeline', summary: '查询订单生产时间线', tags: ['produce-web-query'])]
    #[DataResponse(description: '查询成功')]
-    #[AllowAnonymous(requireToken: false, requirePermission: false, description: '公共接口')]
    public function queryTimeline(Request $request): Response
    {
        $orderNo = trim((string) $request->input('order_no', ''));
@@ -936,9 +944,12 @@ final class DataEntryController extends Base
            return Json::fail('用户编码不存在');
        }

+        $repairFlow = $this->getRepairFlowNodeNames();
+
        try {
-            $record = Db::transaction(function () use ($exceptionId, $repairResult, $categoryIds, $parts, $images, $operationFaultSteps, $responsibleOperators, $data, $member, $repairRecordService) {
+            $record = Db::transaction(function () use ($exceptionId, $repairResult, $categoryIds, $parts, $images, $operationFaultSteps, $responsibleOperators, $data, $member, $repairRecordService, $repairFlow) {
                $exception = ExceptionRecord::query()
+                    ->with(['process', 'step'])
                    ->lockForUpdate()
                    ->whereKey($exceptionId)
                    ->whereIn('status', [0, 1])
@@ -1062,6 +1073,10 @@ final class DataEntryController extends Base
                    'exception_reason' => (string) $exception->reason_name,
                    'exception_issue' => (string) ($exception->issue_name ?? ''),
                    'order_no' => (string) $exception->order_no,
+                    'process_id' => $repairFlow['process_id'],
+                    'step_id' => $repairFlow['step_id'],
+                    'process_name' => $repairFlow['process_name'],
+                    'step_name' => $repairFlow['step_name'],
                    'category_id' => $repairResult === 'assembly_mismatch' ? $categoryIds[0] : $primaryFault?->category_id,
                    'category_ids' => $repairResult === 'assembly_mismatch' ? $categoryIds : null,
                    'fault_description_id' => $primaryFault?->id,
@@ -1316,8 +1331,8 @@ final class DataEntryController extends Base
                'record_type_name' => '维修记录',
                'order_no' => (string) $item->order_no,
                'product_code' => (string) $item->product_code,
-                'process_name' => $this->getRepairFlowNodeNames()['process_name'],
-                'step_name' => $this->getRepairFlowNodeNames()['step_name'],
+                'process_name' => (string) ($item->process_name ?: '历史数据未记录'),
+                'step_name' => (string) ($item->step_name ?: '历史数据未记录'),
                'status_name' => '已维修',
                'result_name' => (string) $item->repair_result_name,
                'operator' => (string) $item->operator,
@@ -1349,8 +1364,10 @@ final class DataEntryController extends Base
        $step = $stepId > 0 ? ProcessStep::query()->withTrashed()->find($stepId) : null;

        return $this->repairFlowCache = [
-            'process_name' => (string) ($process?->process_name ?? ''),
-            'step_name' => (string) ($step?->step_name ?? ''),
+            'process_id' => $processId > 0 ? $processId : null,
+            'step_id' => $stepId > 0 ? $stepId : null,
+            'process_name' => (string) ($process?->process_name ?? '维修'),
+            'step_name' => (string) ($step?->step_name ?? '维修'),
        ];
    }

@@ -86,7 +86,6 @@ final class DataEntryController

    #[OA\Get(path: '/produce/query/records', summary: 'APP 查询生产记录', tags: ['produce-app'])]
    #[DataResponse(description: '查询成功')]
-    #[AllowAnonymous(requireToken: false, requirePermission: false, description: 'APP 公共接口')]
    public function queryRecords(Request $request): Response
    {
        return $this->delegate->queryRecords($request);
@@ -94,7 +93,6 @@ final class DataEntryController

    #[OA\Get(path: '/produce/query/timeline', summary: 'APP 查询订单生产时间线', tags: ['produce-app'])]
    #[DataResponse(description: '查询成功')]
-    #[AllowAnonymous(requireToken: false, requirePermission: false, description: 'APP 公共接口')]
    public function queryTimeline(Request $request): Response
    {
        return $this->delegate->queryTimeline($request);
@@ -224,4 +222,3 @@ final class DataEntryController
        return $this->delegate->productRecord($request);
    }
 }
-
@@ -21,7 +21,7 @@ class RepairRecord extends BaseModel
    protected $with = ['exception'];

    protected $fillable = [
-        'id', 'repair_no', 'exception_id', 'exception_reason', 'exception_issue', 'order_no', 'product_code', 'product_name', 'category_id', 'category_ids', 'category_name', 'category_names',
+        'id', 'repair_no', 'exception_id', 'exception_reason', 'exception_issue', 'order_no', 'product_code', 'product_name', 'process_id', 'step_id', 'process_name', 'step_name', 'category_id', 'category_ids', 'category_name', 'category_names',
        'fault_description_id', 'fault_description', 'repair_result', 'parts', 'images', 'operation_fault_steps', 'responsible_operators', 'operator', 'repaired_at',
        'remark', 'created_by', 'updated_by', 'created_at', 'updated_at', 'deleted_at',
    ];
@@ -33,6 +33,8 @@ class RepairRecord extends BaseModel
        'images' => 'array',
        'operation_fault_steps' => 'array',
        'responsible_operators' => 'array',
+        'process_id' => 'integer',
+        'step_id' => 'integer',
        'repaired_at' => 'integer',
        'created_at' => 'integer',
        'updated_at' => 'integer',
@@ -91,14 +91,20 @@ class WorkStatisticsService
        $connection = $model->getConnection();
        $table = $model->getTable();
        $exceptionTable = $exceptionModel->getTable();
-        $flow = $this->getRepairFlow();
        $query = $connection->table($table)
            ->leftJoin($exceptionTable, $exceptionTable . '.id', '=', $table . '.exception_id')
            ->whereBetween($table . '.repaired_at', [$start, $end])
            ->whereNull($table . '.deleted_at');

-        if (!$this->matchesRepairFlow($params, $flow)) {
-            $query->whereRaw('1 = 0');
+        foreach (['process_id', 'step_id'] as $field) {
+            if (($params[$field] ?? '') !== '') {
+                $query->where($table . '.' . $field, $params[$field]);
+            }
+        }
+        foreach (['process_name', 'step_name'] as $field) {
+            if (($params[$field] ?? '') !== '') {
+                $query->where($table . '.' . $field, 'like', '%' . $params[$field] . '%');
+            }
        }
        if (($params['user_code'] ?? '') !== '') {
            $query->where($exceptionTable . '.user_code', 'like', '%' . $params['user_code'] . '%');
@@ -109,8 +115,8 @@ class WorkStatisticsService

        return $query->select([$exceptionTable . '.user_code', $table . '.operator'])
            ->selectRaw($periodExpression($connection->getTablePrefix() . $table . '.repaired_at') . ' as period')
-            ->selectRaw('? as process_name', [$flow['process_name']])
-            ->selectRaw('? as step_name', [$flow['step_name']])
+            ->selectRaw("COALESCE(NULLIF({$connection->getTablePrefix()}{$table}.process_name, ''), '历史数据未记录') as process_name")
+            ->selectRaw("COALESCE(NULLIF({$connection->getTablePrefix()}{$table}.step_name, ''), '历史数据未记录') as step_name")
            ->selectRaw('COUNT(*) as amount')
            ->groupBy('user_code', 'operator', 'process_name', 'step_name', 'period');
    }