diff --git a/src/components/orders/OrderRegistration.tsx b/src/components/orders/OrderRegistration.tsx
index f30b801d..ad018d6c 100644
--- a/src/components/orders/OrderRegistration.tsx
+++ b/src/components/orders/OrderRegistration.tsx
@@ -62,7 +62,7 @@ import { ItemAddDialog, OrderItem } from "./ItemAddDialog";
 import { formatAmount } from "@/utils/formatAmount";
 import { cn } from "@/lib/utils";
 import { useDevFill } from "@/components/dev";
-import { generateOrderDataFull } from "@/components/dev/generators/orderData";
+import { generateOrderData } from "@/components/dev/generators/orderData";
 
 // 수주 폼 데이터 타입
 export interface OrderFormData {
@@ -220,22 +220,14 @@ export function OrderRegistration({
     }));
   }, [form.items, form.discountRate]);
 
-  // DevToolbar 자동 채우기
+  // DevToolbar 자동 채우기 (배송 정보만 - 기본정보는 견적에서 불러옴)
   useDevFill(
     'order',
     useCallback(() => {
-      const sampleData = generateOrderDataFull();
-
-      // 거래처 목록에서 실제 데이터 사용
-      if (clients.length > 0) {
-        const randomClient = clients[Math.floor(Math.random() * clients.length)];
-        sampleData.clientId = randomClient.id;
-        sampleData.clientName = randomClient.name;
-      }
-
-      setForm(sampleData);
-      toast.success('[Dev] 수주 폼이 자동으로 채워졌습니다.');
-    }, [clients])
+      const sampleData = generateOrderData();
+      setForm(prev => ({ ...prev, ...sampleData }));
+      toast.success('[Dev] 수주 배송정보가 자동으로 채워졌습니다.');
+    }, [])
   );
 
   // 견적 선택 핸들러