SamProject/sam-api
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 견적서 options 필드 저장 누락 문제 해결

Browse Source 
- QuoteUpdateRequest에 detail_items, price_adjustment_data validation 규칙 추가
- QuoteService에서 options 병합 시 array_merge 사용하여 기존 데이터 보존
- Laravel FormRequest의 validated()가 규칙 미정의 필드를 필터링하는 이슈 해결

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
권혁성
2026-01-16 15:36:01 +09:00
parent 8bac207274
commit 49d632b16b
2 changed files with 106 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
app/Http/Requests/Quote/QuoteUpdateRequest.php
View File

@@ -81,6 +81,99 @@ public function rules(): array
'calculation_inputs' => 'nullable|array',
'calculation_inputs.*' => 'nullable',
// 견적 옵션 (summary_items, expense_items, price_adjustments)
'options' => 'nullable|array',
// 견적 요약 정보
'options.summary_items' => 'nullable|array',
'options.summary_items.*.id' => 'required|string',
'options.summary_items.*.name' => 'required|string|max:100',
'options.summary_items.*.quantity' => 'nullable|numeric|min:0',
'options.summary_items.*.unit' => 'nullable|string|max:20',
'options.summary_items.*.material_cost' => 'nullable|numeric|min:0',
'options.summary_items.*.labor_cost' => 'nullable|numeric|min:0',
'options.summary_items.*.total_cost' => 'nullable|numeric|min:0',
'options.summary_items.*.remarks' => 'nullable|string|max:500',
// 공과 상세
'options.expense_items' => 'nullable|array',
'options.expense_items.*.id' => 'required|string',
'options.expense_items.*.name' => 'required|string|max:100',
'options.expense_items.*.amount' => 'nullable|numeric|min:0',
// 단가 조정 (레거시)
'options.price_adjustments' => 'nullable|array',
'options.price_adjustments.*.id' => 'nullable|string',
'options.price_adjustments.*.category' => 'nullable|string|max:50',
'options.price_adjustments.*.unit_price' => 'nullable|numeric|min:0',
'options.price_adjustments.*.coating' => 'nullable|numeric|min:0',
'options.price_adjustments.*.batting' => 'nullable|numeric|min:0',
'options.price_adjustments.*.box_reinforce' => 'nullable|numeric|min:0',
'options.price_adjustments.*.painting' => 'nullable|numeric|min:0',
'options.price_adjustments.*.total' => 'nullable|numeric|min:0',
// 품목 단가 조정 (신규 구조)
'options.price_adjustment_data' => 'nullable|array',
'options.price_adjustment_data.caulking' => 'nullable|array',
'options.price_adjustment_data.rail' => 'nullable|array',
'options.price_adjustment_data.bottom' => 'nullable|array',
'options.price_adjustment_data.boxReinforce' => 'nullable|array',
'options.price_adjustment_data.shaft' => 'nullable|array',
'options.price_adjustment_data.painting' => 'nullable|array',
'options.price_adjustment_data.motor' => 'nullable|array',
'options.price_adjustment_data.controller' => 'nullable|array',
// 견적 상세 항목 (detail_items)
'options.detail_items' => 'nullable|array',
'options.detail_items.*.id' => 'required|string',
'options.detail_items.*.no' => 'nullable|integer',
'options.detail_items.*.name' => 'nullable|string|max:100',
'options.detail_items.*.material' => 'nullable|string|max:100',
'options.detail_items.*.width' => 'nullable|numeric|min:0',
'options.detail_items.*.height' => 'nullable|numeric|min:0',
'options.detail_items.*.quantity' => 'nullable|numeric|min:0',
'options.detail_items.*.box' => 'nullable|numeric|min:0',
'options.detail_items.*.assembly' => 'nullable|numeric|min:0',
'options.detail_items.*.coating' => 'nullable|numeric|min:0',
'options.detail_items.*.batting' => 'nullable|numeric|min:0',
'options.detail_items.*.mounting' => 'nullable|numeric|min:0',
'options.detail_items.*.fitting' => 'nullable|numeric|min:0',
'options.detail_items.*.controller' => 'nullable|numeric|min:0',
'options.detail_items.*.width_construction' => 'nullable|numeric|min:0',
'options.detail_items.*.height_construction' => 'nullable|numeric|min:0',
'options.detail_items.*.material_cost' => 'nullable|numeric|min:0',
'options.detail_items.*.labor_cost' => 'nullable|numeric|min:0',
'options.detail_items.*.quantity_price' => 'nullable|numeric|min:0',
'options.detail_items.*.expense_quantity' => 'nullable|numeric|min:0',
'options.detail_items.*.expense_total' => 'nullable|numeric|min:0',
'options.detail_items.*.total_cost' => 'nullable|numeric|min:0',
'options.detail_items.*.other_cost' => 'nullable|numeric|min:0',
'options.detail_items.*.margin_cost' => 'nullable|numeric|min:0',
'options.detail_items.*.total_price' => 'nullable|numeric|min:0',
'options.detail_items.*.unit_price' => 'nullable|numeric|min:0',
'options.detail_items.*.expense' => 'nullable|numeric|min:0',
'options.detail_items.*.margin_rate' => 'nullable|numeric|min:0',
'options.detail_items.*.unit_quantity' => 'nullable|numeric|min:0',
'options.detail_items.*.expense_result' => 'nullable|numeric|min:0',
'options.detail_items.*.margin_actual' => 'nullable|numeric|min:0',
// 계산 필드
'options.detail_items.*.calc_weight' => 'nullable|numeric',
'options.detail_items.*.calc_area' => 'nullable|numeric',
'options.detail_items.*.calc_steel_screen' => 'nullable|numeric',
'options.detail_items.*.calc_caulking' => 'nullable|numeric',
'options.detail_items.*.calc_rail' => 'nullable|numeric',
'options.detail_items.*.calc_bottom' => 'nullable|numeric',
'options.detail_items.*.calc_box_reinforce' => 'nullable|numeric',
'options.detail_items.*.calc_shaft' => 'nullable|numeric',
'options.detail_items.*.calc_unit_price' => 'nullable|numeric',
'options.detail_items.*.calc_expense' => 'nullable|numeric',
// 조정단가 필드
'options.detail_items.*.adjusted_caulking' => 'nullable|numeric',
'options.detail_items.*.adjusted_rail' => 'nullable|numeric',
'options.detail_items.*.adjusted_bottom' => 'nullable|numeric',
'options.detail_items.*.adjusted_box_reinforce' => 'nullable|numeric',
'options.detail_items.*.adjusted_shaft' => 'nullable|numeric',
'options.detail_items.*.adjusted_painting' => 'nullable|numeric',
'options.detail_items.*.adjusted_motor' => 'nullable|numeric',
'options.detail_items.*.adjusted_controller' => 'nullable|numeric',
// 품목 배열 (전체 교체)
'items' => 'nullable|array',
'items.*.item_id' => 'nullable|integer',

13
app/Services/Quote/QuoteService.php
View File

@@ -301,6 +301,13 @@ public function update(int $id, array $data): Quote
// 수정 이력 생성
$this->createRevision($quote, $userId);
// 상태 변경: pending(견적대기) → draft(작성중)
// 현장설명회에서 자동 생성된 견적을 처음 수정하면 작성중 상태로 변경
$newStatus = $quote->status;
if ($quote->status === Quote::STATUS_PENDING) {
$newStatus = Quote::STATUS_DRAFT;
}
// 금액 재계산
$materialCost = (float) ($data['material_cost'] ?? $quote->material_cost);
$laborCost = (float) ($data['labor_cost'] ?? $quote->labor_cost);
@@ -312,6 +319,7 @@ public function update(int $id, array $data): Quote
// 업데이트
$quote->update([
'status' => $newStatus,
'receipt_date' => $data['receipt_date'] ?? $quote->receipt_date,
'author' => $data['author'] ?? $quote->author,
// 발주처 정보
@@ -349,6 +357,11 @@ public function update(int $id, array $data): Quote
'notes' => $data['notes'] ?? $quote->notes,
// 자동산출 입력값
'calculation_inputs' => $data['calculation_inputs'] ?? $quote->calculation_inputs,
// 견적 옵션 (summary_items, expense_items, price_adjustments, detail_items, price_adjustment_data)
// 기존 options와 새 options를 병합 (새 데이터가 기존 데이터를 덮어씀)
'options' => isset($data['options'])
? array_merge($quote->options ?? [], $data['options'])
: $quote->options,
// 감사
'updated_by' => $userId,
'current_revision' => $quote->current_revision + 1,