diff --git a/app/Http/Requests/V1/Receiving/StoreReceivingRequest.php b/app/Http/Requests/V1/Receiving/StoreReceivingRequest.php index 4cc2380..56594ee 100644 --- a/app/Http/Requests/V1/Receiving/StoreReceivingRequest.php +++ b/app/Http/Requests/V1/Receiving/StoreReceivingRequest.php @@ -24,6 +24,9 @@ public function rules(): array 'order_qty' => ['nullable', 'numeric', 'min:0'], 'order_unit' => ['nullable', 'string', 'max:20'], 'due_date' => ['nullable', 'date'], + 'receiving_qty' => ['nullable', 'numeric', 'min:0'], + 'receiving_date' => ['nullable', 'date'], + 'lot_no' => ['nullable', 'string', 'max:50'], 'status' => ['nullable', 'string', 'in:order_completed,shipping,inspection_pending,receiving_pending'], 'remark' => ['nullable', 'string', 'max:1000'], ]; diff --git a/app/Http/Requests/V1/Receiving/UpdateReceivingRequest.php b/app/Http/Requests/V1/Receiving/UpdateReceivingRequest.php index 93a5789..61e2de9 100644 --- a/app/Http/Requests/V1/Receiving/UpdateReceivingRequest.php +++ b/app/Http/Requests/V1/Receiving/UpdateReceivingRequest.php @@ -23,7 +23,7 @@ public function rules(): array 'order_qty' => ['sometimes', 'numeric', 'min:0'], 'order_unit' => ['nullable', 'string', 'max:20'], 'due_date' => ['nullable', 'date'], - 'status' => ['sometimes', 'string', 'in:order_completed,shipping,inspection_pending,receiving_pending,completed'], + 'status' => ['sometimes', 'string', 'in:order_completed,shipping,inspection_pending,receiving_pending,completed,inspection_completed'], 'remark' => ['nullable', 'string', 'max:1000'], 'receiving_qty' => ['nullable', 'numeric', 'min:0'], 'receiving_date' => ['nullable', 'date'], diff --git a/app/Services/ReceivingService.php b/app/Services/ReceivingService.php index b2eeab6..ed005c6 100644 --- a/app/Services/ReceivingService.php +++ b/app/Services/ReceivingService.php @@ -194,10 +194,13 @@ public function store(array $data): Receiving $receiving->item_name = $data['item_name']; $receiving->specification = $data['specification'] ?? null; $receiving->supplier = $data['supplier']; - $receiving->order_qty = $data['order_qty']; + $receiving->order_qty = $data['order_qty'] ?? null; $receiving->order_unit = $data['order_unit'] ?? 'EA'; $receiving->due_date = $data['due_date'] ?? null; - $receiving->status = $data['status'] ?? 'order_completed'; + $receiving->receiving_qty = $data['receiving_qty'] ?? null; + $receiving->receiving_date = $data['receiving_date'] ?? null; + $receiving->lot_no = $data['lot_no'] ?? null; + $receiving->status = $data['status'] ?? 'receiving_pending'; $receiving->remark = $data['remark'] ?? null; // options 필드 처리 (제조사, 수입검사 등 확장 필드)