Merge branch 'develop' of http://114.203.209.83:3000/SamProject/sam-api into develop

app/Http/Controllers/Api/V1/ChecklistTemplateController.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Helpers\ApiResponse;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\Quality\SaveChecklistTemplateRequest;
+use App\Services\ChecklistTemplateService;
+use Illuminate\Http\Request;
+
+class ChecklistTemplateController extends Controller
+{
+    public function __construct(private ChecklistTemplateService $service) {}
+
+    /**
+     * 템플릿 조회 (type별)
+     */
+    public function show(Request $request)
+    {
+        return ApiResponse::handle(function () use ($request) {
+            $type = $request->query('type', 'day1_audit');
+
+            return $this->service->getByType($type);
+        }, __('message.fetched'));
+    }
+
+    /**
+     * 템플릿 저장 (전체 덮어쓰기)
+     */
+    public function update(SaveChecklistTemplateRequest $request, int $id)
+    {
+        return ApiResponse::handle(function () use ($request, $id) {
+            return $this->service->save($id, $request->validated());
+        }, __('message.updated'));
+    }
+
+    /**
+     * 항목별 파일 목록 조회
+     */
+    public function documents(Request $request)
+    {
+        return ApiResponse::handle(function () use ($request) {
+            $templateId = (int) $request->query('template_id');
+            $subItemId = $request->query('sub_item_id');
+
+            return $this->service->getDocuments($templateId, $subItemId);
+        }, __('message.fetched'));
+    }
+
+    /**
+     * 파일 업로드
+     */
+    public function uploadDocument(Request $request)
+    {
+        $request->validate([
+            'template_id' => ['required', 'integer'],
+            'sub_item_id' => ['required', 'string', 'max:50'],
+            'file' => ['required', 'file', 'max:10240'], // 10MB
+        ]);
+
+        return ApiResponse::handle(function () use ($request) {
+            return $this->service->uploadDocument(
+                (int) $request->input('template_id'),
+                $request->input('sub_item_id'),
+                $request->file('file')
+            );
+        }, __('message.created'));
+    }
+
+    /**
+     * 파일 삭제
+     */
+    public function deleteDocument(int $id, Request $request)
+    {
+        return ApiResponse::handle(function () use ($id, $request) {
+            $replace = filter_var($request->query('replace', false), FILTER_VALIDATE_BOOLEAN);
+            $this->service->deleteDocument($id, $replace);
+
+            return 'success';
+        }, __('message.deleted'));
+    }
+}

app/Http/Controllers/Api/V1/FileStorageController.php

@@ -83,14 +83,25 @@ public function trash()
     }
 
     /**
-     * Download file
+     * Download file (attachment)
      */
     public function download(int $id)
     {
         $service = new FileStorageService;
         $file = $service->getFile($id);
 
-        return $file->download();
+        return $file->download(inline: false);
+    }
+
+    /**
+     * View file inline (이미지/PDF 브라우저에서 바로 표시)
+     */
+    public function view(int $id)
+    {
+        $service = new FileStorageService;
+        $file = $service->getFile($id);
+
+        return $file->download(inline: true);
     }
 
     /**

app/Http/Controllers/Api/V1/ItemsFileController.php

@@ -109,7 +109,7 @@ public function upload(int $id, ItemFileUploadRequest $request)
             $filePath = $directory.'/'.$storedName;
 
             // 파일 저장 (tenant 디스크)
-            Storage::disk('tenant')->putFileAs($directory, $uploadedFile, $storedName);
+            Storage::disk('r2')->putFileAs($directory, $uploadedFile, $storedName);
 
             // file_type 자동 분류 (MIME 타입 기반)
             $mimeType = $uploadedFile->getMimeType();

app/Http/Controllers/Api/V1/ShipmentController.php

@@ -8,13 +8,15 @@
 use App\Http\Requests\Shipment\ShipmentUpdateRequest;
 use App\Http\Requests\Shipment\ShipmentUpdateStatusRequest;
 use App\Services\ShipmentService;
+use App\Services\WorkOrderService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 class ShipmentController extends Controller
 {
     public function __construct(
-        private readonly ShipmentService $service
+        private readonly ShipmentService $service,
+        private readonly WorkOrderService $workOrderService
     ) {}
 
     /**
@@ -83,7 +85,7 @@ public function store(ShipmentStoreRequest $request): JsonResponse
     {
         $shipment = $this->service->store($request->validated());
 
-        return ApiResponse::success($shipment, __('message.created'), 201);
+        return ApiResponse::success($shipment, __('message.created'), [], 201);
     }
 
     /**
@@ -132,6 +134,22 @@ public function destroy(int $id): JsonResponse
         }
     }
 
+    /**
+     * 수주 기반 출하 생성
+     */
+    public function createFromOrder(int $orderId): JsonResponse
+    {
+        try {
+            $shipment = $this->workOrderService->createShipmentForOrder($orderId);
+
+            return ApiResponse::success($shipment, __('message.created'), [], 201);
+        } catch (\Symfony\Component\HttpKernel\Exception\BadRequestHttpException $e) {
+            return ApiResponse::error($e->getMessage(), 400);
+        } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $e) {
+            return ApiResponse::error(__('error.order.not_found'), 404);
+        }
+    }
+
     /**
      * LOT 옵션 조회
      */