Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/material/ReceivingManagement/ReceivingDetail.tsx
This commit is contained in:
2026-01-29 14:03:21 +09:00

View File

@@ -16,14 +16,15 @@
import { useState, useCallback, useEffect } from 'react';
import { useRouter } from 'next/navigation';
import { Upload, FileText, Search } from 'lucide-react';
import { Upload, FileText, Search, X } from 'lucide-react';
import { FileDropzone } from '@/components/ui/file-dropzone';
import { ItemSearchModal } from '@/components/quotes/ItemSearchModal';
import { SupplierSearchModal } from './SupplierSearchModal';
import { InspectionModalV2 } from '@/app/[locale]/(protected)/quality/qms/components/InspectionModalV2';
import { Button } from '@/components/ui/button';
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import { SupplierSearchModal } from './SupplierSearchModal';
import {
Select,
SelectContent,
@@ -111,7 +112,10 @@ export function ReceivingDetail({ id, mode = 'view' }: Props) {
// 폼 데이터 (등록/수정 모드용)
const [formData, setFormData] = useState<Partial<ReceivingDetailType>>(INITIAL_FORM_DATA);
// 모달 상태
// 업로드된 파일 상태 (File 객체)
const [uploadedFile, setUploadedFile] = useState<File | null>(null);
// 수입검사 성적서 모달 상태
const [isInspectionModalOpen, setIsInspectionModalOpen] = useState(false);
const [isItemSearchOpen, setIsItemSearchOpen] = useState(false);
const [isSupplierSearchOpen, setIsSupplierSearchOpen] = useState(false);