{/* 10단계 계산 과정 */}
{debugSteps.length > 0 ? (
diff --git a/src/components/quotes/ItemSearchModal.tsx b/src/components/quotes/ItemSearchModal.tsx
index 31d811bd..f18d17f4 100644
--- a/src/components/quotes/ItemSearchModal.tsx
+++ b/src/components/quotes/ItemSearchModal.tsx
@@ -22,6 +22,8 @@ interface ItemSearchModalProps {
tabLabel?: string;
/** 품목 유형 필터 (예: 'RM', 'SF', 'FG') */
itemType?: string;
+ /** BOM 카테고리 필터 (material, motor, controller, steel, parts, inspection) */
+ bomCategory?: string;
}
// 검색어 유효성: 영문, 한글, 숫자 1자 이상
@@ -40,15 +42,17 @@ export function ItemSearchModal({
onSelectItem,
tabLabel,
itemType,
+ bomCategory,
}: ItemSearchModalProps) {
const handleFetchData = useCallback(async (query: string) => {
const data = await fetchItems({
search: query || undefined,
itemType: itemType as ItemType | undefined,
+ bom_category: bomCategory || undefined,
per_page: 50,
});
return data;
- }, [itemType]);
+ }, [itemType, bomCategory]);
const handleSelect = useCallback((item: ItemMaster) => {
onSelectItem({
diff --git a/src/components/quotes/LocationDetailPanel.tsx b/src/components/quotes/LocationDetailPanel.tsx
index 6ce3283e..14bdb580 100644
--- a/src/components/quotes/LocationDetailPanel.tsx
+++ b/src/components/quotes/LocationDetailPanel.tsx
@@ -38,6 +38,7 @@ import { ItemSearchModal } from "./ItemSearchModal";
import type { LocationItem } from "./QuoteRegistration";
import type { FinishedGoods } from "./actions";
import type { BomCalculationResultItem } from "./types";
+import { BOM_CATEGORY_ORDER, BOM_CATEGORY_LABELS } from "./types";
// 납품길이 옵션
const DELIVERY_LENGTH_OPTIONS = [
@@ -161,16 +162,34 @@ export function LocationDetailPanel({
const subtotals = location.bomResult.subtotals;
const tabs: TabDefinition[] = [];
+ const remaining = new Set(Object.keys(subtotals));
- Object.entries(subtotals).forEach(([key, value]) => {
+ // 고정 순서대로 탭 추가
+ for (const key of BOM_CATEGORY_ORDER) {
+ if (remaining.has(key)) {
+ const value = subtotals[key];
+ if (typeof value === "object" && value !== null) {
+ const obj = value as { name?: string };
+ tabs.push({
+ value: key,
+ label: BOM_CATEGORY_LABELS[key] || obj.name || key,
+ });
+ }
+ remaining.delete(key);
+ }
+ }
+
+ // 미정의 카테고리 뒤에 추가
+ for (const key of remaining) {
+ const value = subtotals[key];
if (typeof value === "object" && value !== null) {
const obj = value as { name?: string };
tabs.push({
value: key,
- label: obj.name || key,
+ label: BOM_CATEGORY_LABELS[key] || obj.name || key,
});
}
- });
+ }
// 기타 탭 추가
tabs.push({ value: "etc", label: "기타" });
@@ -751,6 +770,8 @@ export function LocationDetailPanel({
t.value === activeTab)?.label}
+ bomCategory={activeTab !== "etc" ? activeTab : undefined}
onSelectItem={async (item) => {
if (!location) return;
@@ -834,7 +855,6 @@ export function LocationDetailPanel({
totalPrice: updatedGrandTotal * location.quantity,
});
}}
- tabLabel={detailTabs.find((t) => t.value === activeTab)?.label}
/>
);
diff --git a/src/components/quotes/LocationListPanel.tsx b/src/components/quotes/LocationListPanel.tsx
index d919755d..c033827e 100644
--- a/src/components/quotes/LocationListPanel.tsx
+++ b/src/components/quotes/LocationListPanel.tsx
@@ -155,9 +155,31 @@ export function LocationListPanel({
const product = finishedGoods.find((fg) => fg.item_code === formData.productCode);
+ // 층/부호 자동 채움: 비어있으면 마지막 개소 기준으로 복제 스타일 적용
+ let autoFloor = formData.floor || "-";
+ let autoCode = formData.code || "-";
+ if (locations.length > 0 && !formData.floor && !formData.code) {
+ const lastLoc = locations[locations.length - 1];
+ autoFloor = lastLoc.floor || "-";
+ // 부호 +1: 접두어 + 숫자 패턴 분석
+ const codeMatch = lastLoc.code.match(/^(.*?)(\d+)$/);
+ if (codeMatch) {
+ const prefix = codeMatch[1];
+ const numLength = codeMatch[2].length;
+ let maxNum = 0;
+ locations.forEach((loc) => {
+ const m = loc.code.match(new RegExp(`^${prefix.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}(\\d+)$`));
+ if (m) maxNum = Math.max(maxNum, parseInt(m[1], 10));
+ });
+ autoCode = prefix + String(maxNum + 1).padStart(numLength, "0");
+ } else {
+ autoCode = lastLoc.code || "-";
+ }
+ }
+
const newLocation: Omit
= {
- floor: formData.floor || "-",
- code: formData.code || "-",
+ floor: autoFloor,
+ code: autoCode,
openWidth: parseFloat(formData.openWidth) || 0,
openHeight: parseFloat(formData.openHeight) || 0,
productCode: formData.productCode,
@@ -175,14 +197,11 @@ export function LocationListPanel({
const success = await onAddLocation(newLocation);
if (success) {
- // 폼 초기화 (일부 필드 유지)
+ // 폼 초기화 (층/부호만 초기화, 나머지 설정값 유지)
setFormData((prev) => ({
...prev,
floor: "",
code: "",
- openWidth: "",
- openHeight: "",
- quantity: "1",
}));
}
}, [formData, finishedGoods, onAddLocation]);
@@ -361,11 +380,19 @@ export function LocationListPanel({
- {finishedGoods.map((fg) => (
-
- {fg.item_code}
-
- ))}
+ {(() => {
+ // 기존 개소가 있으면 동일 모델 제품만 표시 (예: KSS01 → KSS01 변형만)
+ const existingCode = locations.length > 0 ? locations[0].productCode : null;
+ const existingModel = existingCode?.split('-')[1] ?? null; // FG-KSS01-... → KSS01
+ const filtered = existingModel
+ ? finishedGoods.filter((fg) => fg.item_code.split('-')[1] === existingModel)
+ : finishedGoods;
+ return filtered.map((fg) => (
+
+ {fg.item_code}
+
+ ));
+ })()}
diff --git a/src/components/quotes/QuoteFooterBar.tsx b/src/components/quotes/QuoteFooterBar.tsx
index c03608b0..19d9ce55 100644
--- a/src/components/quotes/QuoteFooterBar.tsx
+++ b/src/components/quotes/QuoteFooterBar.tsx
@@ -39,6 +39,10 @@ interface QuoteFooterBarProps {
onOrderView?: () => void;
/** 연결된 수주 ID (있으면 수주 보기, 없으면 수주등록) */
orderId?: number | null;
+ /** 수정 가능 여부 (생산지시 존재 시 false) */
+ isEditable?: boolean;
+ /** 연결된 수주에 생산지시 존재 여부 */
+ hasWorkOrders?: boolean;
/** 할인하기 */
onDiscount?: () => void;
/** 수식보기 */
@@ -68,6 +72,8 @@ export function QuoteFooterBar({
onOrderRegister,
onOrderView,
orderId,
+ isEditable = true,
+ hasWorkOrders = false,
onDiscount,
onFormulaView,
hasBomResult = false,
@@ -139,8 +145,8 @@ export function QuoteFooterBar({
)}
- {/* 수정 - view 모드에서만 표시, 수주 등록된 경우 숨김 */}
- {isViewMode && onEdit && !orderId && (
+ {/* 수정 - view 모드에서만 표시, 생산지시 존재 시 숨김 */}
+ {isViewMode && onEdit && isEditable && (