31 files changed, 7527 insertions, 6454 deletions
diff --git a/.env.development b/.env.development
index df02cd91..4355596c 100644
--- a/.env.development
+++ b/.env.development
@@ -5,12 +5,12 @@ DB_POOL_MAX=4 # 풀 개수로, 일반적으로 (코어개수 * 1~2) 개 설정,
 # === 보안 설정 ===
 JWT_SECRET=dujin2tdofj1241.m
 NEXTAUTH_SECRET=dujinsejinnejinojin1020202310245jldfmoi2eqjldsajfoadmmdlfjmomc.mv0qp3jem.alsmfmc.jl
-NEXT_PUBLIC_URL=http://43.203.251.114:3000
-NEXT_PUBLIC_BASE_URL=http://43.203.251.114:3001
-NEXTAUTH_URL=http://43.203.251.114:3000
+NEXT_PUBLIC_URL=http://3.36.92.165:3000
+NEXT_PUBLIC_BASE_URL=http://3.36.92.165:3001
+NEXTAUTH_URL=http://3.36.92.165:3000
 
 # === 운영 DMZ용 변수 ===
-NEXT_PUBLIC_DMZ_URL=http://43.203.251.114:3000
+NEXT_PUBLIC_DMZ_URL=http://3.36.92.165:3000
 
 # === 이메일 설정 ===
 Email_Host=email-smtp.ap-northeast-2.amazonaws.com
@@ -28,8 +28,8 @@ NEXT_PUBLIC_MUI_KEY=da30586e1f20b93856a9783012fc9258Tz04ODI0MyxFPTE3NDQ0NTM2Nzgw
 NEXT_PUBLIC_PDFTRON_WEBVIEW_KEY=demo:1757039735954:607627ca03000000009fbe27d193c6a4a10041a3102a62c7e804521034
 NEXT_PUBLIC_PDFTRON_SERVER_KEY=demo:1740034881027:6175a0fc0300000000f155d153480e5ba091f17922a109cbd7cf6e40b3
 # 메시어스 SPREAD JS
-NEXT_PUBLIC_SPREAD_LICENSE="43.203.251.114|60.101.108.100|evcp.dtsolution.io,261619561743613#B1ZaK2ycWtEd7Z4S0FENYlXOQhWRsd7M92GewBlQGV5Qu3WcZdESRJmZup4RwljYzoEettkToRFeZJ5LnBlRhdWSDZHbtdVTQBnZttiWHhWTntScoV6LtF6YrknUa9mVyV6RkljTWtCZ5ETZr24bLpnaXd4cUlXOuhTQvMWV8MWU524K5sWRiZnVzUjTPpESrMzaxJUdMlFVntiVLtkd4hVVax6K8sEMQBFdFRUekB7QwU7LsFWQC3Ed7gEWpd7bRtSOy26cJ56LE96T5REbqJ7bl36dEZXewcUR9wWR8lWZax4RSdUSL5mZ9cmWxFWTlRlTGhjUypGZvI4UplEMJdGSy9UVj54dJREWpl4QvR6bzdFN7sCcMBlZxgTTWt4cJpURyRkI0IyUiwiIBZTMxE4QzQjI0ICSiwyNyATMwgzN9ITM0IicfJye#4Xfd5nIIlkSCJiOiMkIsICOx8idgMlSgQWYlJHcTJiOi8kI1tlOiQmcQJCLiATN8IjMwACNyYDM5IDMyIiOiQncDJCLiQjM7ATNyAjMiojIwhXRiwiIvlmLu3Wa4VHbvNHdk9CcjZXZsADMx8COwEjLxATMuAjNsQTMx8SM5IjLzAjMuMDNiojIz5GRiwiIYWI1oO00UaI1wuY1US90iojIh94QiwiIzEjNzQzNxYTN9EjNxYjMiojIklkIs4XXiQXZlh6U4J7bwVmUiwiI4JXYoNUY4FGRiwiIlxmYhRFdvZXaQJCLiQXZlh6U4RnbhdkIbpjInxmZiwSZzxWYmpjIyNHZisnOiwmbBJye0ICRiwiI34TUYlDTrEGTjlnQtR4L52yK4UjbZNzcDlzYsFWdw96VEhTdVx4RrlGat3SRnRXcjpTNfh"
-NEXT_PUBLIC_DESIGNER_LICENSE="43.203.251.114|60.101.108.100|evcp.dtsolution.io,261619561743613#B1ZaK2ycWtEd7Z4S0FENYlXOQhWRsd7M92GewBlQGV5Qu3WcZdESRJmZup4RwljYzoEettkToRFeZJ5LnBlRhdWSDZHbtdVTQBnZttiWHhWTntScoV6LtF6YrknUa9mVyV6RkljTWtCZ5ETZr24bLpnaXd4cUlXOuhTQvMWV8MWU524K5sWRiZnVzUjTPpESrMzaxJUdMlFVntiVLtkd4hVVax6K8sEMQBFdFRUekB7QwU7LsFWQC3Ed7gEWpd7bRtSOy26cJ56LE96T5REbqJ7bl36dEZXewcUR9wWR8lWZax4RSdUSL5mZ9cmWxFWTlRlTGhjUypGZvI4UplEMJdGSy9UVj54dJREWpl4QvR6bzdFN7sCcMBlZxgTTWt4cJpURyRkI0IyUiwiIBZTMxE4QzQjI0ICSiwyNyATMwgzN9ITM0IicfJye#4Xfd5nIIlkSCJiOiMkIsICOx8idgMlSgQWYlJHcTJiOi8kI1tlOiQmcQJCLiATN8IjMwACNyYDM5IDMyIiOiQncDJCLiQjM7ATNyAjMiojIwhXRiwiIvlmLu3Wa4VHbvNHdk9CcjZXZsADMx8COwEjLxATMuAjNsQTMx8SM5IjLzAjMuMDNiojIz5GRiwiIYWI1oO00UaI1wuY1US90iojIh94QiwiIzEjNzQzNxYTN9EjNxYjMiojIklkIs4XXiQXZlh6U4J7bwVmUiwiI4JXYoNUY4FGRiwiIlxmYhRFdvZXaQJCLiQXZlh6U4RnbhdkIbpjInxmZiwSZzxWYmpjIyNHZisnOiwmbBJye0ICRiwiI34TUYlDTrEGTjlnQtR4L52yK4UjbZNzcDlzYsFWdw96VEhTdVx4RrlGat3SRnRXcjpTNfh"
+NEXT_PUBLIC_SPREAD_LICENSE="3.36.92.165|60.101.108.100|evcp.dtsolution.io,261619561743613#B1ZaK2ycWtEd7Z4S0FENYlXOQhWRsd7M92GewBlQGV5Qu3WcZdESRJmZup4RwljYzoEettkToRFeZJ5LnBlRhdWSDZHbtdVTQBnZttiWHhWTntScoV6LtF6YrknUa9mVyV6RkljTWtCZ5ETZr24bLpnaXd4cUlXOuhTQvMWV8MWU524K5sWRiZnVzUjTPpESrMzaxJUdMlFVntiVLtkd4hVVax6K8sEMQBFdFRUekB7QwU7LsFWQC3Ed7gEWpd7bRtSOy26cJ56LE96T5REbqJ7bl36dEZXewcUR9wWR8lWZax4RSdUSL5mZ9cmWxFWTlRlTGhjUypGZvI4UplEMJdGSy9UVj54dJREWpl4QvR6bzdFN7sCcMBlZxgTTWt4cJpURyRkI0IyUiwiIBZTMxE4QzQjI0ICSiwyNyATMwgzN9ITM0IicfJye#4Xfd5nIIlkSCJiOiMkIsICOx8idgMlSgQWYlJHcTJiOi8kI1tlOiQmcQJCLiATN8IjMwACNyYDM5IDMyIiOiQncDJCLiQjM7ATNyAjMiojIwhXRiwiIvlmLu3Wa4VHbvNHdk9CcjZXZsADMx8COwEjLxATMuAjNsQTMx8SM5IjLzAjMuMDNiojIz5GRiwiIYWI1oO00UaI1wuY1US90iojIh94QiwiIzEjNzQzNxYTN9EjNxYjMiojIklkIs4XXiQXZlh6U4J7bwVmUiwiI4JXYoNUY4FGRiwiIlxmYhRFdvZXaQJCLiQXZlh6U4RnbhdkIbpjInxmZiwSZzxWYmpjIyNHZisnOiwmbBJye0ICRiwiI34TUYlDTrEGTjlnQtR4L52yK4UjbZNzcDlzYsFWdw96VEhTdVx4RrlGat3SRnRXcjpTNfh"
+NEXT_PUBLIC_DESIGNER_LICENSE="3.36.92.165|60.101.108.100|evcp.dtsolution.io,261619561743613#B1ZaK2ycWtEd7Z4S0FENYlXOQhWRsd7M92GewBlQGV5Qu3WcZdESRJmZup4RwljYzoEettkToRFeZJ5LnBlRhdWSDZHbtdVTQBnZttiWHhWTntScoV6LtF6YrknUa9mVyV6RkljTWtCZ5ETZr24bLpnaXd4cUlXOuhTQvMWV8MWU524K5sWRiZnVzUjTPpESrMzaxJUdMlFVntiVLtkd4hVVax6K8sEMQBFdFRUekB7QwU7LsFWQC3Ed7gEWpd7bRtSOy26cJ56LE96T5REbqJ7bl36dEZXewcUR9wWR8lWZax4RSdUSL5mZ9cmWxFWTlRlTGhjUypGZvI4UplEMJdGSy9UVj54dJREWpl4QvR6bzdFN7sCcMBlZxgTTWt4cJpURyRkI0IyUiwiIBZTMxE4QzQjI0ICSiwyNyATMwgzN9ITM0IicfJye#4Xfd5nIIlkSCJiOiMkIsICOx8idgMlSgQWYlJHcTJiOi8kI1tlOiQmcQJCLiATN8IjMwACNyYDM5IDMyIiOiQncDJCLiQjM7ATNyAjMiojIwhXRiwiIvlmLu3Wa4VHbvNHdk9CcjZXZsADMx8COwEjLxATMuAjNsQTMx8SM5IjLzAjMuMDNiojIz5GRiwiIYWI1oO00UaI1wuY1US90iojIh94QiwiIzEjNzQzNxYTN9EjNxYjMiojIklkIs4XXiQXZlh6U4J7bwVmUiwiI4JXYoNUY4FGRiwiIlxmYhRFdvZXaQJCLiQXZlh6U4RnbhdkIbpjInxmZiwSZzxWYmpjIyNHZisnOiwmbBJye0ICRiwiI34TUYlDTrEGTjlnQtR4L52yK4UjbZNzcDlzYsFWdw96VEhTdVx4RrlGat3SRnRXcjpTNfh"
 # SPREAD JS 내부망 eVCP 개발 (개발 배포시 이 키로 대체)
 # NEXT_PUBLIC_SPREAD_LICENSE="60.101.108.100,674672615555322#B1dbvNkSiJXZDRFRYJVQHFWa6Y6KTVGV5cVWSRVWVlHejFlcvFWUFdGVzVVZVtEcsNjNvo5aHhjcSNVd6kzNvQUT9tCSxEXU6RzRrh5SxsUYqZjertEU7RWQu3yaDNXT5JmRIh7R6YnSGZlMDhkRqB7MIlTYvUWQFFzYulTTm3ENINEV7FWZMl4Q5cXSy96KthkVC3USvYXa8FnbtJWZFdlVSFmYwsEMKRkQxp6TRdGMLdVOTR7TMJEWiRGa6JncDRlWShTN9glc8FmQkBzdvMkUthHUoJGbOJGatVmUxtkRTVmeUlVWxJDN7kXQ6oHUwhEciZXNNJVOPBzc83UaTNmZVZ6aIxUcQdmcOJiOiMlIsICNzgTN5YTQyIiOigkIsYDM6gDN6YjM0IicfJye35XX3JCSJpkQiojIDJCLigTMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiIyQzMxkDMgQjM7ATNyAjMiojI4J7QiwiIwATMugDMx8SMwEjLwYjI0IyctRkIsIShXyetzqekkyesEyOvCyuI0ISYONkIsIiMyMTN5UTNxYjM7YDN7YjI0ICZJJCL35lI4VWZoNFdy3GclJlIsICdyFGaDFGdhRkIsISZsJWYUR7b6lGUiwiI4VWZoNFd49WYHJyW0IyZsZmIsU6csFmZ0IiczRmI1pjIs9WQisnOiQkIsISP3cXVw2meRZ4Yys4YB3UeaJkck9GWjhHUMVlU4gUcndlS63EWCB7YZh7bHBlVwBHe5kVcvEzc5N5aBZUZlJ6SpZHTHRFVjd5dxs6Yuh"
 # NEXT_PUBLIC_DESIGNER_LICENSE="Designer-514482759413237#B1IdxRUVvQnMkFkYVBzLjRzZohUVWZnSiJWUO9WS4pnMLp5KJZ7dX3CelFlW53STTlkdLlzdYBFV6lzTLRGUKVWOU3UbR3GUXFWZxJ5K8lzTnpVcEBHT5p4Yqt6RvEXaTtWMrRmUWpGW5x6dZlzVM5GRjZXMNVGdKxUZptGVUlUWiRnZ7cnTndkWsRGZllTcDpXeVpWRIV5M9BDVkBFNElWUCd5ZzcUWLNjYPNXOl9ESVJTQ756MFlFWzcmcGFDcXt6dDdnV4YmejJHSnNUc6t4MxcXNzQkU9kFSBRGa73WNEtyR6MkZzsEbvRVVHdHWYVlMr2UTGFmZI3mWIdUTihWb43WY78Eaz3SV9d6UzU4R7V5YjJiOiMlIsISMFBjQ8kDRiojIIJCLxITMzUjN5cTN0IicfJye35XX3JCSJpkQiojIDJCLigTMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiI9QTOwMDMgEjM7ATNyAjMiojI4J7QiwiIw8CMuAjLw2icl96ZpNXZkJiOiMXbEJCLikCjGyOoEyOshyOngyOsxqOKFeJ15Or0RSK1xSI12KI1iojIh94QiwiI7MjMzEDN9UzNygDN4ETNiojIklkIs4XXiQXZlh6U4J7bwVmUiwiI4JXYoNUY4FGRiwiIlxmYhRFdvZXaQJCLiQXZlh6U4RnbhdkIbpjInxmZiwSZ5JHd0IiczRmI1pjIs9WQisnOiQkIsISP3E4N82mcKVkdBZ7butkQQNXcMJWNnVVMxE6aUZ4QXBldnZWcrAXM9lmS9FDbp9ERUV7Q9IndiNHd0plb7pmd5debKh"
@@ -199,4 +199,7 @@ DOLCE_LOCAL_UPLOAD_ABSOLUTE_DIRECTORY="/evcp/data/dolce"
 
 # 권한관리
 SKIP_ORACLE_PERMISSION_CHECK=true # 화면 조회 권한 확인 여부
-CHECK_NONSAP_AUTH_HOC=false # 서버액션 고차컴포넌트가 실제로 인가에 따라 실행을 막을지를 결정하는 환경변수 (권한 셋업이 되기 전까지는 false)
-\ No newline at end of file
+CHECK_NONSAP_AUTH_HOC=false # 서버액션 고차컴포넌트가 실제로 인가에 따라 실행을 막을지를 결정하는 환경변수 (권한 셋업이 되기 전까지는 false)
+
+# 도로명 주소 API 키-품질(1208 최겸)
+JUSO_API_KEY=U01TX0FVVEgyMDI1MTIwODE4MjI1NTExNjU0NTA=
+\ No newline at end of file
diff --git a/.env.production b/.env.production
index 0ad720c0..ebd1cc5a 100644
--- a/.env.production
+++ b/.env.production
@@ -28,8 +28,8 @@ NEXT_PUBLIC_MUI_KEY=da30586e1f20b93856a9783012fc9258Tz04ODI0MyxFPTE3NDQ0NTM2Nzgw
 NEXT_PUBLIC_PDFTRON_WEBVIEW_KEY=demo:1757039735954:607627ca03000000009fbe27d193c6a4a10041a3102a62c7e804521034
 NEXT_PUBLIC_PDFTRON_SERVER_KEY=demo:1740034881027:6175a0fc0300000000f155d153480e5ba091f17922a109cbd7cf6e40b3
 # 메시어스 SPREAD JS
-NEXT_PUBLIC_SPREAD_LICENSE="43.203.251.114|60.101.108.100|evcp.dtsolution.io,261619561743613#B1ZaK2ycWtEd7Z4S0FENYlXOQhWRsd7M92GewBlQGV5Qu3WcZdESRJmZup4RwljYzoEettkToRFeZJ5LnBlRhdWSDZHbtdVTQBnZttiWHhWTntScoV6LtF6YrknUa9mVyV6RkljTWtCZ5ETZr24bLpnaXd4cUlXOuhTQvMWV8MWU524K5sWRiZnVzUjTPpESrMzaxJUdMlFVntiVLtkd4hVVax6K8sEMQBFdFRUekB7QwU7LsFWQC3Ed7gEWpd7bRtSOy26cJ56LE96T5REbqJ7bl36dEZXewcUR9wWR8lWZax4RSdUSL5mZ9cmWxFWTlRlTGhjUypGZvI4UplEMJdGSy9UVj54dJREWpl4QvR6bzdFN7sCcMBlZxgTTWt4cJpURyRkI0IyUiwiIBZTMxE4QzQjI0ICSiwyNyATMwgzN9ITM0IicfJye#4Xfd5nIIlkSCJiOiMkIsICOx8idgMlSgQWYlJHcTJiOi8kI1tlOiQmcQJCLiATN8IjMwACNyYDM5IDMyIiOiQncDJCLiQjM7ATNyAjMiojIwhXRiwiIvlmLu3Wa4VHbvNHdk9CcjZXZsADMx8COwEjLxATMuAjNsQTMx8SM5IjLzAjMuMDNiojIz5GRiwiIYWI1oO00UaI1wuY1US90iojIh94QiwiIzEjNzQzNxYTN9EjNxYjMiojIklkIs4XXiQXZlh6U4J7bwVmUiwiI4JXYoNUY4FGRiwiIlxmYhRFdvZXaQJCLiQXZlh6U4RnbhdkIbpjInxmZiwSZzxWYmpjIyNHZisnOiwmbBJye0ICRiwiI34TUYlDTrEGTjlnQtR4L52yK4UjbZNzcDlzYsFWdw96VEhTdVx4RrlGat3SRnRXcjpTNfh"
-NEXT_PUBLIC_DESIGNER_LICENSE="43.203.251.114|60.101.108.100|evcp.dtsolution.io,261619561743613#B1ZaK2ycWtEd7Z4S0FENYlXOQhWRsd7M92GewBlQGV5Qu3WcZdESRJmZup4RwljYzoEettkToRFeZJ5LnBlRhdWSDZHbtdVTQBnZttiWHhWTntScoV6LtF6YrknUa9mVyV6RkljTWtCZ5ETZr24bLpnaXd4cUlXOuhTQvMWV8MWU524K5sWRiZnVzUjTPpESrMzaxJUdMlFVntiVLtkd4hVVax6K8sEMQBFdFRUekB7QwU7LsFWQC3Ed7gEWpd7bRtSOy26cJ56LE96T5REbqJ7bl36dEZXewcUR9wWR8lWZax4RSdUSL5mZ9cmWxFWTlRlTGhjUypGZvI4UplEMJdGSy9UVj54dJREWpl4QvR6bzdFN7sCcMBlZxgTTWt4cJpURyRkI0IyUiwiIBZTMxE4QzQjI0ICSiwyNyATMwgzN9ITM0IicfJye#4Xfd5nIIlkSCJiOiMkIsICOx8idgMlSgQWYlJHcTJiOi8kI1tlOiQmcQJCLiATN8IjMwACNyYDM5IDMyIiOiQncDJCLiQjM7ATNyAjMiojIwhXRiwiIvlmLu3Wa4VHbvNHdk9CcjZXZsADMx8COwEjLxATMuAjNsQTMx8SM5IjLzAjMuMDNiojIz5GRiwiIYWI1oO00UaI1wuY1US90iojIh94QiwiIzEjNzQzNxYTN9EjNxYjMiojIklkIs4XXiQXZlh6U4J7bwVmUiwiI4JXYoNUY4FGRiwiIlxmYhRFdvZXaQJCLiQXZlh6U4RnbhdkIbpjInxmZiwSZzxWYmpjIyNHZisnOiwmbBJye0ICRiwiI34TUYlDTrEGTjlnQtR4L52yK4UjbZNzcDlzYsFWdw96VEhTdVx4RrlGat3SRnRXcjpTNfh"
+NEXT_PUBLIC_SPREAD_LICENSE="3.36.92.165|60.101.108.100|evcp.dtsolution.io,261619561743613#B1ZaK2ycWtEd7Z4S0FENYlXOQhWRsd7M92GewBlQGV5Qu3WcZdESRJmZup4RwljYzoEettkToRFeZJ5LnBlRhdWSDZHbtdVTQBnZttiWHhWTntScoV6LtF6YrknUa9mVyV6RkljTWtCZ5ETZr24bLpnaXd4cUlXOuhTQvMWV8MWU524K5sWRiZnVzUjTPpESrMzaxJUdMlFVntiVLtkd4hVVax6K8sEMQBFdFRUekB7QwU7LsFWQC3Ed7gEWpd7bRtSOy26cJ56LE96T5REbqJ7bl36dEZXewcUR9wWR8lWZax4RSdUSL5mZ9cmWxFWTlRlTGhjUypGZvI4UplEMJdGSy9UVj54dJREWpl4QvR6bzdFN7sCcMBlZxgTTWt4cJpURyRkI0IyUiwiIBZTMxE4QzQjI0ICSiwyNyATMwgzN9ITM0IicfJye#4Xfd5nIIlkSCJiOiMkIsICOx8idgMlSgQWYlJHcTJiOi8kI1tlOiQmcQJCLiATN8IjMwACNyYDM5IDMyIiOiQncDJCLiQjM7ATNyAjMiojIwhXRiwiIvlmLu3Wa4VHbvNHdk9CcjZXZsADMx8COwEjLxATMuAjNsQTMx8SM5IjLzAjMuMDNiojIz5GRiwiIYWI1oO00UaI1wuY1US90iojIh94QiwiIzEjNzQzNxYTN9EjNxYjMiojIklkIs4XXiQXZlh6U4J7bwVmUiwiI4JXYoNUY4FGRiwiIlxmYhRFdvZXaQJCLiQXZlh6U4RnbhdkIbpjInxmZiwSZzxWYmpjIyNHZisnOiwmbBJye0ICRiwiI34TUYlDTrEGTjlnQtR4L52yK4UjbZNzcDlzYsFWdw96VEhTdVx4RrlGat3SRnRXcjpTNfh"
+NEXT_PUBLIC_DESIGNER_LICENSE="3.36.92.165|60.101.108.100|evcp.dtsolution.io,261619561743613#B1ZaK2ycWtEd7Z4S0FENYlXOQhWRsd7M92GewBlQGV5Qu3WcZdESRJmZup4RwljYzoEettkToRFeZJ5LnBlRhdWSDZHbtdVTQBnZttiWHhWTntScoV6LtF6YrknUa9mVyV6RkljTWtCZ5ETZr24bLpnaXd4cUlXOuhTQvMWV8MWU524K5sWRiZnVzUjTPpESrMzaxJUdMlFVntiVLtkd4hVVax6K8sEMQBFdFRUekB7QwU7LsFWQC3Ed7gEWpd7bRtSOy26cJ56LE96T5REbqJ7bl36dEZXewcUR9wWR8lWZax4RSdUSL5mZ9cmWxFWTlRlTGhjUypGZvI4UplEMJdGSy9UVj54dJREWpl4QvR6bzdFN7sCcMBlZxgTTWt4cJpURyRkI0IyUiwiIBZTMxE4QzQjI0ICSiwyNyATMwgzN9ITM0IicfJye#4Xfd5nIIlkSCJiOiMkIsICOx8idgMlSgQWYlJHcTJiOi8kI1tlOiQmcQJCLiATN8IjMwACNyYDM5IDMyIiOiQncDJCLiQjM7ATNyAjMiojIwhXRiwiIvlmLu3Wa4VHbvNHdk9CcjZXZsADMx8COwEjLxATMuAjNsQTMx8SM5IjLzAjMuMDNiojIz5GRiwiIYWI1oO00UaI1wuY1US90iojIh94QiwiIzEjNzQzNxYTN9EjNxYjMiojIklkIs4XXiQXZlh6U4J7bwVmUiwiI4JXYoNUY4FGRiwiIlxmYhRFdvZXaQJCLiQXZlh6U4RnbhdkIbpjInxmZiwSZzxWYmpjIyNHZisnOiwmbBJye0ICRiwiI34TUYlDTrEGTjlnQtR4L52yK4UjbZNzcDlzYsFWdw96VEhTdVx4RrlGat3SRnRXcjpTNfh"
 # SPREAD JS 내부망 eVCP 개발 (개발 배포시 이 키로 대체)
 # NEXT_PUBLIC_SPREAD_LICENSE="60.101.108.100,674672615555322#B1dbvNkSiJXZDRFRYJVQHFWa6Y6KTVGV5cVWSRVWVlHejFlcvFWUFdGVzVVZVtEcsNjNvo5aHhjcSNVd6kzNvQUT9tCSxEXU6RzRrh5SxsUYqZjertEU7RWQu3yaDNXT5JmRIh7R6YnSGZlMDhkRqB7MIlTYvUWQFFzYulTTm3ENINEV7FWZMl4Q5cXSy96KthkVC3USvYXa8FnbtJWZFdlVSFmYwsEMKRkQxp6TRdGMLdVOTR7TMJEWiRGa6JncDRlWShTN9glc8FmQkBzdvMkUthHUoJGbOJGatVmUxtkRTVmeUlVWxJDN7kXQ6oHUwhEciZXNNJVOPBzc83UaTNmZVZ6aIxUcQdmcOJiOiMlIsICNzgTN5YTQyIiOigkIsYDM6gDN6YjM0IicfJye35XX3JCSJpkQiojIDJCLigTMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiIyQzMxkDMgQjM7ATNyAjMiojI4J7QiwiIwATMugDMx8SMwEjLwYjI0IyctRkIsIShXyetzqekkyesEyOvCyuI0ISYONkIsIiMyMTN5UTNxYjM7YDN7YjI0ICZJJCL35lI4VWZoNFdy3GclJlIsICdyFGaDFGdhRkIsISZsJWYUR7b6lGUiwiI4VWZoNFd49WYHJyW0IyZsZmIsU6csFmZ0IiczRmI1pjIs9WQisnOiQkIsISP3cXVw2meRZ4Yys4YB3UeaJkck9GWjhHUMVlU4gUcndlS63EWCB7YZh7bHBlVwBHe5kVcvEzc5N5aBZUZlJ6SpZHTHRFVjd5dxs6Yuh"
 # NEXT_PUBLIC_DESIGNER_LICENSE="Designer-514482759413237#B1IdxRUVvQnMkFkYVBzLjRzZohUVWZnSiJWUO9WS4pnMLp5KJZ7dX3CelFlW53STTlkdLlzdYBFV6lzTLRGUKVWOU3UbR3GUXFWZxJ5K8lzTnpVcEBHT5p4Yqt6RvEXaTtWMrRmUWpGW5x6dZlzVM5GRjZXMNVGdKxUZptGVUlUWiRnZ7cnTndkWsRGZllTcDpXeVpWRIV5M9BDVkBFNElWUCd5ZzcUWLNjYPNXOl9ESVJTQ756MFlFWzcmcGFDcXt6dDdnV4YmejJHSnNUc6t4MxcXNzQkU9kFSBRGa73WNEtyR6MkZzsEbvRVVHdHWYVlMr2UTGFmZI3mWIdUTihWb43WY78Eaz3SV9d6UzU4R7V5YjJiOiMlIsISMFBjQ8kDRiojIIJCLxITMzUjN5cTN0IicfJye35XX3JCSJpkQiojIDJCLigTMuYHITpEIkFWZyB7UiojIOJyebpjIkJHUiwiI9QTOwMDMgEjM7ATNyAjMiojI4J7QiwiIw8CMuAjLw2icl96ZpNXZkJiOiMXbEJCLikCjGyOoEyOshyOngyOsxqOKFeJ15Or0RSK1xSI12KI1iojIh94QiwiI7MjMzEDN9UzNygDN4ETNiojIklkIs4XXiQXZlh6U4J7bwVmUiwiI4JXYoNUY4FGRiwiIlxmYhRFdvZXaQJCLiQXZlh6U4RnbhdkIbpjInxmZiwSZ5JHd0IiczRmI1pjIs9WQisnOiQkIsISP3E4N82mcKVkdBZ7butkQQNXcMJWNnVVMxE6aUZ4QXBldnZWcrAXM9lmS9FDbp9ERUV7Q9IndiNHd0plb7pmd5debKh"
@@ -203,3 +203,5 @@ DOLCE_LOCAL_UPLOAD_ABSOLUTE_DIRECTORY="/evcp/data/dolce"
 SKIP_ORACLE_PERMISSION_CHECK=true # 화면 조회 권한 확인 여부
 CHECK_NONSAP_AUTH_HOC=false # 서버액션 고차컴포넌트가 실제로 인가에 따라 실행을 막을지를 결정하는 환경변수 (권한 셋업이 되기 전까지는 false)
 
+# 도로명 주소 API 키-운영(1208 최겸)
+JUSO_API_KEY=U01TX0FVVEgyMDI1MTIwODE1MzkwMTExNjU0NDE=
+\ No newline at end of file
diff --git a/app/[lng]/evcp/(evcp)/(procurement)/pq_new/[vendorId]/[submissionId]/page.tsx b/app/[lng]/evcp/(evcp)/(procurement)/pq_new/[vendorId]/[submissionId]/page.tsx
index 8e3006cc..93302f87 100644
--- a/app/[lng]/evcp/(evcp)/(procurement)/pq_new/[vendorId]/[submissionId]/page.tsx
+++ b/app/[lng]/evcp/(evcp)/(procurement)/pq_new/[vendorId]/[submissionId]/page.tsx
@@ -157,6 +157,7 @@ export default async function PQReviewPage(props: PQReviewPageProps) {
               vendorId={vendorId}
               pqSubmission={pqSubmission}
               vendorInfo={vendorInfo}
+              vendorCountry={pqSubmission.vendorCountry}
             />
           </TabsContent>
           
diff --git a/app/[lng]/partners/(partners)/pq_new/[id]/page.tsx b/app/[lng]/partners/(partners)/pq_new/[id]/page.tsx
index f298cc77..8fbf15db 100644
--- a/app/[lng]/partners/(partners)/pq_new/[id]/page.tsx
+++ b/app/[lng]/partners/(partners)/pq_new/[id]/page.tsx
@@ -3,6 +3,7 @@ import Link from "next/link";
 import { getServerSession } from "next-auth/next";
 import { authOptions } from "@/app/api/auth/[...nextauth]/route";
 import { Button } from "@/components/ui/button";
+import { Badge } from "@/components/ui/badge";
 import { ArrowLeft, LogIn } from "lucide-react";
 import { Shell } from "@/components/shell";
 import { getPQById, getPQDataByVendorId } from "@/lib/pq/service";
@@ -159,6 +160,24 @@ export default async function PQEditPage(props: PQEditPageProps) {
           </Alert>
         )} */}
 
+        <div className="rounded-lg border p-4 space-y-2">
+          <h3 className="text-sm font-semibold">PQ 품목</h3>
+          {Array.isArray(pqSubmission.pqItems) && pqSubmission.pqItems.length > 0 ? (
+            <div className="flex flex-wrap gap-2">
+              {pqSubmission.pqItems.map((item: any, idx: number) => (
+                <Badge key={idx} variant="outline">
+                  {item?.itemName || item?.itemCode || "품목"}
+                  {item?.itemCode ? ` (${item.itemCode})` : ""}
+                </Badge>
+              ))}
+            </div>
+          ) : pqSubmission.pqItems ? (
+            <div className="text-sm">{String(pqSubmission.pqItems)}</div>
+          ) : (
+            <p className="text-sm text-muted-foreground">지정된 PQ 품목이 없습니다.</p>
+          )}
+        </div>
+
         {/* PQ 입력 컴포넌트 */}
           <PQInputTabs
             data={pqData}
@@ -171,6 +190,7 @@ export default async function PQEditPage(props: PQEditPageProps) {
               status: pqSubmission.status,
               type: pqSubmission.type
             }}
+            vendorCountry={pqSubmission.vendorCountry}
             />
       </Shell>
     );
diff --git a/app/[lng]/partners/(partners)/pq_new/page.tsx b/app/[lng]/partners/(partners)/pq_new/page.tsx
index fb77ce0e..b6cc3535 100644
--- a/app/[lng]/partners/(partners)/pq_new/page.tsx
+++ b/app/[lng]/partners/(partners)/pq_new/page.tsx
@@ -65,6 +65,31 @@ function getFormattedDate(date: Date | null) {
   }).format(new Date(date));
 }
 
+function renderPQItems(pqItems: unknown) {
+  if (!pqItems) return "-";
+
+  if (typeof pqItems === "string") {
+    return pqItems || "-";
+  }
+
+  if (Array.isArray(pqItems)) {
+    if (pqItems.length === 0) return "-";
+
+    return (
+      <div className="flex flex-wrap gap-1">
+        {pqItems.map((item: any, idx: number) => (
+          <Badge key={idx} variant="outline">
+            {item?.itemName || item?.itemCode || ""}
+            {item?.itemCode ? ` (${item.itemCode})` : ""}
+          </Badge>
+        ))}
+      </div>
+    );
+  }
+
+  return "-";
+}
+
 export default async function PQListPage({ params }: IndexPageProps) {
   // 캐시 비활성화
   noStore();
@@ -212,6 +237,7 @@ export default async function PQListPage({ params }: IndexPageProps) {
                 <TableHead>유형</TableHead>
                 <TableHead>PQ 번호</TableHead>
                 <TableHead>프로젝트</TableHead>
+                <TableHead>PQ 품목</TableHead>
                 <TableHead>상태</TableHead>
                 <TableHead>요청일</TableHead>
                 <TableHead>제출일</TableHead>
@@ -222,7 +248,7 @@ export default async function PQListPage({ params }: IndexPageProps) {
             <TableBody>
               {pqList.length === 0 ? (
                 <TableRow>
-                  <TableCell colSpan={8} className="text-center py-8 text-muted-foreground">
+                  <TableCell colSpan={9} className="text-center py-8 text-muted-foreground">
                     요청된 PQ가 없습니다.
                   </TableCell>
                 </TableRow>
@@ -251,6 +277,9 @@ export default async function PQListPage({ params }: IndexPageProps) {
                         {pq.projectName || "-"}
                       </TableCell>
                       <TableCell>
+                        {renderPQItems(pq.pqItems)}
+                      </TableCell>
+                      <TableCell>
                         {getStatusBadge(pq.status)}
                       </TableCell>
                       <TableCell>
diff --git a/app/api/juso/route.ts b/app/api/juso/route.ts
new file mode 100644
index 00000000..258e51d3
--- /dev/null
+++ b/app/api/juso/route.ts
@@ -0,0 +1,69 @@
+"use server";
+
+import { NextRequest, NextResponse } from "next/server";
+
+const JUSO_URL = "https://business.juso.go.kr/addrlink/addrLinkUrl.do";
+
+export async function GET() {
+  const confmKey = process.env.JUSO_API_KEY || "";
+  const returnUrl = `${process.env.NEXT_PUBLIC_BASE_URL || ""}/api/juso`;
+  const resultType = "4";
+
+  const html = `
+    <!doctype html>
+    <html lang="ko">
+    <head><meta charset="utf-8" /></head>
+    <body onload="document.getElementById('jusoForm').submit();">
+      <form id="jusoForm" name="jusoForm" method="post" action="${JUSO_URL}">
+        <input type="hidden" name="confmKey" value="${confmKey}" />
+        <input type="hidden" name="returnUrl" value="${returnUrl}" />
+        <input type="hidden" name="resultType" value="${resultType}" />
+      </form>
+    </body>
+    </html>
+  `;
+
+  return new NextResponse(html, {
+    status: 200,
+    headers: { "Content-Type": "text/html; charset=utf-8" },
+  });
+}
+
+export async function POST(req: NextRequest) {
+  const formData = await req.formData();
+
+  const zipNo = String(formData.get("zipNo") || "");
+  const roadAddrPart1 = String(formData.get("roadAddrPart1") || "");
+  const roadAddrPart2 = String(formData.get("roadAddrPart2") || "");
+  const addrDetail = String(formData.get("addrDetail") || "");
+
+  const origin = process.env.NEXT_PUBLIC_BASE_URL || "*";
+
+  const script = `
+    <script>
+      (function() {
+        try {
+          const payload = {
+            zipNo: ${JSON.stringify(zipNo)},
+            roadAddrPart1: ${JSON.stringify(roadAddrPart1)},
+            roadAddrPart2: ${JSON.stringify(roadAddrPart2)},
+            addrDetail: ${JSON.stringify(addrDetail)}
+          };
+          if (window.opener && !window.opener.closed) {
+            window.opener.postMessage({ type: "JUSO_SELECTED", payload }, "${origin}");
+          }
+        } catch (e) {
+          console.error(e);
+        } finally {
+          window.close();
+        }
+      })();
+    </script>
+  `;
+
+  return new NextResponse(script, {
+    status: 200,
+    headers: { "Content-Type": "text/html; charset=utf-8" },
+  });
+}
+
diff --git a/components/pq-input/pq-input-tabs.tsx b/components/pq-input/pq-input-tabs.tsx
index df911d5e..6c9a1254 100644
--- a/components/pq-input/pq-input-tabs.tsx
+++ b/components/pq-input/pq-input-tabs.tsx
@@ -152,6 +152,7 @@ export function PQInputTabs({
   projectData,
   isReadOnly = false,
   currentPQ, // 추가: 현재 PQ Submission 정보
+  vendorCountry,
 }: {
   data: PQGroupData[]
   vendorId: number
@@ -163,6 +164,7 @@ export function PQInputTabs({
     status: string;
     type: string;
   } | null
+  vendorCountry?: string | null
 }) {
 
   const [isSaving, setIsSaving] = React.useState(false)
@@ -208,6 +210,33 @@ export function PQInputTabs({
     })
   }
 
+  // 벤더 내자/외자 판별 (국가 코드 기반)
+  const isDomesticVendor = React.useMemo(() => {
+    if (!vendorCountry) return null; // null 이면 필터 미적용
+    return vendorCountry === "KR" || vendorCountry === "한국";
+  }, [vendorCountry]);
+
+  // 벤더 유형에 따라 PQ 항목 필터링
+  const filteredData: PQGroupData[] = React.useMemo(() => {
+    // 벤더 타입 정보가 없으면 전체 노출
+    if (isDomesticVendor === null) return data;
+
+    const filterItemByType = (item: any) => {
+      const itemType = item.type || "내외자";
+      if (itemType === "내외자") return true;
+      if (itemType === "내자") return isDomesticVendor === true;
+      if (itemType === "외자") return isDomesticVendor === false;
+      return true;
+    };
+
+    return data
+      .map((group) => ({
+        ...group,
+        items: group.items.filter(filterItemByType),
+      }))
+      .filter((group) => group.items.length > 0);
+  }, [data, isDomesticVendor]);
+
   // 필터링 함수
   const shouldShowItem = (isSaved: boolean) => {
     if (filterOptions.showAll) return true;
@@ -223,7 +252,7 @@ export function PQInputTabs({
   function createInitialFormValues(): PQFormValues {
     const answers: PQFormValues["answers"] = []
 
-    data.forEach((group) => {
+    filteredData.forEach((group) => {
       // 그룹 내 아이템들을 코드 순서로 정렬
       const sortedItems = sortByCode(group.items)
       
@@ -383,7 +412,7 @@ export function PQInputTabs({
     try {
       const answerData = form.getValues(`answers.${answerIndex}`)
       const criteriaId = answerData.criteriaId
-      const item = data.flatMap(group => group.items).find(item => item.criteriaId === criteriaId)
+      const item = filteredData.flatMap(group => group.items).find(item => item.criteriaId === criteriaId)
       const inputFormat = item?.inputFormat || "TEXT"
       // Validation
       // 모든 항목은 필수로 처리 (isRequired 제거됨)
@@ -723,7 +752,14 @@ export function PQInputTabs({
         {/* 프로젝트 정보 섹션 */}
         {renderProjectInfo()}
 
-        <Tabs defaultValue={data[0]?.groupName || ""} className="w-full">
+        {filteredData.length === 0 ? (
+          <div className="rounded-md border border-dashed p-6 text-sm text-muted-foreground">
+            표시할 PQ 항목이 없습니다. (벤더 내/외자 구분 필터 적용)
+          </div>
+        ) : (
+        <>
+
+        <Tabs defaultValue={filteredData[0]?.groupName || ""} className="w-full">
           {/* Top Controls - Sticky Header */}
           <div className="sticky top-0 z-10 bg-background border-b border-border mb-4 pb-4">
             {/* Item Count Display */}
@@ -810,7 +846,7 @@ export function PQInputTabs({
 
             <div className="flex justify-between items-center">
               <TabsList className="grid grid-cols-4">
-                {data.map((group) => {
+                {filteredData.map((group) => {
                   const colorClasses = getTabColorClasses(group.groupName)
                   return (
                     <TabsTrigger
@@ -880,7 +916,7 @@ export function PQInputTabs({
           </div>
 
           {/* Render each group */}
-          {data.map((group) => (
+          {filteredData.map((group) => (
             <TabsContent key={group.groupName} value={group.groupName}>
               {/* 2-column grid */}
               <div className="grid grid-cols-1 lg:grid-cols-2 gap-6 pb-4">
@@ -958,6 +994,46 @@ export function PQInputTabs({
                         </CardHeader>
 
                           <CardContent className="pt-3 space-y-3 h-full flex flex-col">
+                            {/* 기준 첨부 파일 */}
+                            {item.criteriaAttachments && item.criteriaAttachments.length > 0 && (
+                              <div className="space-y-2">
+                                <FormLabel>기준 첨부파일</FormLabel>
+                                <FileList>
+                                  {item.criteriaAttachments.map((file, idx) => (
+                                    <FileListItem key={idx}>
+                                      <FileListHeader>
+                                        <FileListIcon />
+                                        <FileListInfo>
+                                          <FileListName>{file.fileName}</FileListName>
+                                          {file.fileSize && (
+                                            <FileListDescription>{prettyBytes(file.fileSize)}</FileListDescription>
+                                          )}
+                                        </FileListInfo>
+                                        <FileListAction
+                                          onClick={async () => {
+                                            try {
+                                              const { downloadFile } = await import('@/lib/file-download')
+                                              await downloadFile(file.filePath, file.fileName, { showToast: true })
+                                            } catch (error) {
+                                              console.error('다운로드 오류:', error)
+                                              toast({
+                                                title: "다운로드 실패",
+                                                description: "파일 다운로드 중 오류가 발생했습니다.",
+                                                variant: "destructive"
+                                              })
+                                            }
+                                          }}
+                                        >
+                                          <Download className="h-4 w-4" />
+                                          <span className="sr-only">Download</span>
+                                        </FileListAction>
+                                      </FileListHeader>
+                                    </FileListItem>
+                                  ))}
+                                </FileList>
+                              </div>
+                            )}
+
                             {/* 프로젝트별 추가 필드 (contractInfo, additionalRequirement) */}
                             {projectId && contractInfo && (
                               <div className="space-y-1">
@@ -1379,6 +1455,8 @@ export function PQInputTabs({
             </TabsContent>
           ))}
         </Tabs>
+        </>
+        )}
       </form>
 
       {/* Confirmation Dialog */}
@@ -1395,7 +1473,7 @@ export function PQInputTabs({
           </DialogHeader>
 
           <div className="space-y-4 max-h-[600px] overflow-y-auto ">
-            {data.map((group, groupIndex) => (
+            {filteredData.map((group, groupIndex) => (
               <div key={groupIndex}>
                 {group.items.map((item) => {
                   const answerObj = form
diff --git a/components/pq-input/pq-review-wrapper.tsx b/components/pq-input/pq-review-wrapper.tsx
index 1e172744..efb078e0 100644
--- a/components/pq-input/pq-review-wrapper.tsx
+++ b/components/pq-input/pq-review-wrapper.tsx
@@ -21,9 +21,10 @@ import {
   DialogTitle
 } from "@/components/ui/dialog"
 import { useToast } from "@/hooks/use-toast"
-import { CheckCircle, AlertCircle, Paperclip, Square } from "lucide-react"
+import { CheckCircle, AlertCircle, Paperclip, Square, Download } from "lucide-react"
 import { PQGroupData } from "@/lib/pq/service"
 import { approvePQAction, rejectPQAction, updateSHICommentAction, approveQMReviewAction, rejectQMReviewAction, requestPqSupplementAction } from "@/lib/pq/service"
+import { FileList, FileListHeader, FileListInfo, FileListItem, FileListName, FileListDescription, FileListAction, FileListIcon } from "@/components/ui/file-list"
 // import * as ExcelJS from 'exceljs';
 // import { saveAs } from "file-saver";
 
@@ -49,13 +50,15 @@ interface PQReviewWrapperProps {
   vendorId: number
   pqSubmission: PQSubmission
   vendorInfo?: any // 협력업체 정보 (선택사항)
+  vendorCountry?: string | null
 }
 
 export function PQReviewWrapper({
   pqData,
   vendorId,
   pqSubmission,
-  vendorInfo
+  vendorInfo,
+  vendorCountry,
 }: PQReviewWrapperProps) {
   const router = useRouter()
   const { toast } = useToast()
@@ -96,6 +99,32 @@ export function PQReviewWrapper({
       return 0
     })
   }
+
+  // 벤더 내자/외자 판별 (국가 코드 기반)
+  const isDomesticVendor = React.useMemo(() => {
+    if (!vendorCountry) return null; // 정보 없으면 필터 미적용
+    return vendorCountry === "KR" || vendorCountry === "한국";
+  }, [vendorCountry]);
+
+  // 벤더 유형에 따라 PQ 항목 필터링
+  const filteredData: PQGroupData[] = React.useMemo(() => {
+    if (isDomesticVendor === null) return pqData;
+
+    const filterItemByType = (item: any) => {
+      const itemType = item.type || "내외자";
+      if (itemType === "내외자") return true;
+      if (itemType === "내자") return isDomesticVendor === true;
+      if (itemType === "외자") return isDomesticVendor === false;
+      return true;
+    };
+
+    return pqData
+      .map((group) => ({
+        ...group,
+        items: group.items.filter(filterItemByType),
+      }))
+      .filter((group) => group.items.length > 0);
+  }, [pqData, isDomesticVendor]);
   
 
   // 기존 SHI 코멘트를 로컬 상태에 초기화
@@ -482,8 +511,14 @@ export function PQReviewWrapper({
   
   return (
     <div className="space-y-6">
+      {filteredData.length === 0 && (
+        <div className="rounded-md border border-dashed p-4 text-sm text-muted-foreground">
+          표시할 PQ 항목이 없습니다. (벤더 내/외자 구분 필터 적용)
+        </div>
+      )}
+
       {/* 그룹별 PQ 항목 표시 */}
-      {pqData.map((group) => (
+      {filteredData.map((group) => (
         <div key={group.groupName} className="space-y-4">
           <h3 className="text-lg font-medium">{group.groupName}</h3>
           
@@ -530,6 +565,43 @@ export function PQReviewWrapper({
                   </div>
                 </CardHeader>
                 <CardContent className="space-y-4">
+                  {item.criteriaAttachments && item.criteriaAttachments.length > 0 && (
+                    <div className="space-y-2">
+                      <p className="text-sm font-medium">기준 첨부파일</p>
+                      <FileList>
+                        {item.criteriaAttachments.map((file) => (
+                          <FileListItem key={file.attachId}>
+                            <FileListHeader>
+                              <FileListIcon />
+                              <FileListInfo>
+                                <FileListName>{file.fileName}</FileListName>
+                                {file.fileSize && (
+                                  <FileListDescription>{file.fileSize} bytes</FileListDescription>
+                                )}
+                              </FileListInfo>
+                              <FileListAction
+                                onClick={async () => {
+                                  try {
+                                    const { downloadFile } = await import('@/lib/file-download')
+                                    await downloadFile(file.filePath, file.fileName, { showToast: true })
+                                  } catch (error) {
+                                    toast({
+                                      title: "다운로드 실패",
+                                      description: "파일 다운로드 중 오류가 발생했습니다.",
+                                      variant: "destructive"
+                                    })
+                                  }
+                                }}
+                              >
+                                <Download className="h-4 w-4" />
+                                <span className="sr-only">Download</span>
+                              </FileListAction>
+                            </FileListHeader>
+                          </FileListItem>
+                        ))}
+                      </FileList>
+                    </div>
+                  )}
                   {/* 프로젝트별 추가 정보 */}
                   {pqSubmission.projectId && item.contractInfo && (
                     <div className="space-y-1">
diff --git a/components/signup/join-form.tsx b/components/signup/join-form.tsx
index 6885279a..c6281b24 100644
--- a/components/signup/join-form.tsx
+++ b/components/signup/join-form.tsx
@@ -910,6 +910,32 @@ function CompleteVendorForm({
 }: VendorStepProps) {
   const [isSubmitting, setIsSubmitting] = useState(false);
   const { toast } = useToast();
+  const effectiveCountry = data.country || accountData.country || "";
+  const isKR = effectiveCountry === "KR";
+
+  useEffect(() => {
+    const handleMessage = (event: MessageEvent) => {
+      if (!event.data || event.data.type !== "JUSO_SELECTED") return;
+      const { zipNo, roadAddrPart1, roadAddrPart2, addrDetail } = event.data.payload || {};
+      const combinedAddress = [roadAddrPart1, roadAddrPart2].filter(Boolean).join(" ").trim();
+      onChange(prev => ({
+        ...prev,
+        postalCode: zipNo || prev.postalCode,
+        address: combinedAddress || prev.address,
+        addressDetail: addrDetail || prev.addressDetail,
+      }));
+    };
+    window.addEventListener("message", handleMessage);
+    return () => window.removeEventListener("message", handleMessage);
+  }, [onChange]);
+
+  const handleJusoSearch = () => {
+    window.open(
+      "/api/juso",
+      "jusoSearch",
+      "width=570,height=420,scrollbars=yes,resizable=yes"
+    );
+  };
 
   // 담당자 관리 함수들
   const addContact = () => {
@@ -1259,13 +1285,28 @@ function CompleteVendorForm({
 
           {/* 주소 */}
           <div>
-            <label className="block text-sm font-medium mb-1">
-              {t('address')} <span className="text-red-500">*</span>
-            </label>
+            <div className="flex items-center justify-between gap-2 mb-1">
+              <label className="block text-sm font-medium">
+                {t('address')} <span className="text-red-500">*</span>
+              </label>
+              {isKR && (
+                <Button
+                  type="button"
+                  variant="secondary"
+                  size="sm"
+                  onClick={handleJusoSearch}
+                  disabled={isSubmitting}
+                >
+                  주소 검색
+                </Button>
+              )}
+            </div>
             <Input
               value={data.address}
               onChange={(e) => handleInputChange('address', e.target.value)}
               disabled={isSubmitting}
+              readOnly={isKR}
+              className={cn(isKR && "bg-muted text-muted-foreground")}
             />
           </div>
 
@@ -1291,6 +1332,8 @@ function CompleteVendorForm({
               value={data.postalCode}
               onChange={(e) => handleInputChange('postalCode', e.target.value)}
               disabled={isSubmitting}
+              readOnly={isKR}
+              className={cn(isKR && "bg-muted text-muted-foreground")}
               placeholder="우편번호를 입력해주세요"
             />
           </div>
diff --git a/config/vendorInvestigationsColumnsConfig.ts b/config/vendorInvestigationsColumnsConfig.ts
index ab5291a4..7d74d8e0 100644
--- a/config/vendorInvestigationsColumnsConfig.ts
+++ b/config/vendorInvestigationsColumnsConfig.ts
@@ -28,6 +28,7 @@ export type VendorInvestigationsViewRaw = {
   vendorCode: string
   
   // PQ 정보
+  pqType: "GENERAL" | "PROJECT" | "NON_INSPECTION" | null
   pqItems: string | null | Array<{itemCode: string, itemName: string}>
   pqNumber: string | null
 
@@ -100,6 +101,12 @@ export const vendorInvestigationsColumnsConfig: VendorInvestigationsColumnConfig
     group: "실사",
   },
   {
+    id: "pqType",
+    label: "PQ 유형",
+    excelHeader: "PQ 유형",
+    group: "실사",
+  },
+  {
     id: "pqNumber",
     label: "PQ 번호",
     excelHeader: "PQ 번호",
diff --git a/db/schema/basicContractDocumnet.ts b/db/schema/basicContractDocumnet.ts
index e571c7e0..5edc9836 100644
--- a/db/schema/basicContractDocumnet.ts
+++ b/db/schema/basicContractDocumnet.ts
@@ -7,6 +7,7 @@ import { rfqLastVendorResponses } from './rfqVendor';
 import { rfqLastDetails } from './rfqLast';
 import { generalContracts } from './generalContract';
 import { legalWorks } from './legal';
+import { vendorPQSubmissions } from './pq';
 
 export const basicContractTemplates = pgTable('basic_contract_templates', {
   id: integer("id").primaryKey().generatedAlwaysAsIdentity(),
@@ -42,6 +43,10 @@ export const basicContract = pgTable('basic_contract', {
   biddingCompanyId: integer('bidding_company_id').references(() => biddingCompanies.id),
   rfqCompanyId: integer('rfq_company_id').references(() => rfqLastDetails.id),
   generalContractId: integer('general_contract_id').references(() => generalContracts.id),
+  pqSubmissionId: integer('pq_submission_id').references(() => vendorPQSubmissions.id, {
+    onDelete: "cascade",
+    onUpdate: "cascade",
+  }),
   requestedBy: integer('requested_by').references(() => users.id),
   
   // 상태값을 더 세분화
@@ -88,6 +93,8 @@ export const basicContractView = pgView('basic_contract_view').as((qb) => {
       vendorId: sql<number | null>`${basicContract.vendorId}`.as('vendor_id'),
       requestedBy: sql<number | null>`${basicContract.requestedBy}`.as('requested_by'),
       status: sql<string>`${basicContract.status}`.as('basic_contract_status'),
+      pqSubmissionId: sql<number | null>`${basicContract.pqSubmissionId}`.as('pq_submission_id'),
+      pqNumber: sql<string | null>`${vendorPQSubmissions.pqNumber}`.as('pq_number'),
 
       //견적,입찰, 계약
       rfqCompanyId: sql<number | null>`${basicContract.rfqCompanyId}`.as('rfq_company_id'),
@@ -156,7 +163,8 @@ export const basicContractView = pgView('basic_contract_view').as((qb) => {
     .from(basicContract)
     .leftJoin(vendors, eq(basicContract.vendorId, vendors.id))
     .leftJoin(users, eq(basicContract.requestedBy, users.id))
-    .leftJoin(basicContractTemplates, eq(basicContract.templateId, basicContractTemplates.id));
+    .leftJoin(basicContractTemplates, eq(basicContract.templateId, basicContractTemplates.id))
+    .leftJoin(vendorPQSubmissions, eq(basicContract.pqSubmissionId, vendorPQSubmissions.id));
 });
 
 // 타입 정의
diff --git a/db/schema/compliance.ts b/db/schema/compliance.ts
index 09d945d1..efad9bf0 100644
--- a/db/schema/compliance.ts
+++ b/db/schema/compliance.ts
@@ -82,11 +82,12 @@ export const complianceResponseFiles = pgTable('compliance_response_files', {
   uploadedAt: timestamp('uploaded_at').defaultNow(),
 });
 
-// 7. 레드플래그 담당자 관리
+// 7. 담당자 관리(레드플래그, 준법, 안전)
 export const redFlagManagers = pgTable('red_flag_managers', {
   id: serial('id').primaryKey(),
   purchasingManagerId: integer('purchasing_manager_id').references(() => users.id), // 구매기획 담당자
   complianceManagerId: integer('compliance_manager_id').references(() => users.id), // 준법 담당자
+  hseManagerId: integer('hse_manager_id').references(() => users.id), // 안전(HSE) 담당자
   createdAt: timestamp('created_at').defaultNow(),
   updatedAt: timestamp('updated_at').defaultNow(),
 });
@@ -158,6 +159,10 @@ export const redFlagManagersRelations = relations(redFlagManagers, ({ one }) =>
     fields: [redFlagManagers.complianceManagerId],
     references: [users.id],
   }),
+  hseManager: one(users, {
+    fields: [redFlagManagers.hseManagerId],
+    references: [users.id],
+  }),
 }));
 
 // 타입 정의
diff --git a/db/schema/pq.ts b/db/schema/pq.ts
index a9d92953..68c58613 100644
--- a/db/schema/pq.ts
+++ b/db/schema/pq.ts
@@ -63,6 +63,23 @@ export const pqCriterias = pgTable("pq_criterias", {
     .notNull()
     .default("TEXT"),
 
+  // 내자/외자/내외자 구분 (nullable, 기본값: 내외자)
+  type: varchar("type", { length: 20 }).default("내외자"),
+
+  createdAt: timestamp("created_at").defaultNow().notNull(),
+  updatedAt: timestamp("updated_at").defaultNow().notNull(),
+});
+
+// PQ 기준 첨부파일
+export const pqCriteriasAttachments = pgTable("pq_criterias_attachments", {
+  id: serial("id").primaryKey(),
+  pqCriteriaId: integer("pq_criteria_id")
+    .notNull()
+    .references(() => pqCriterias.id, { onDelete: "cascade", onUpdate: "cascade" }),
+  fileName: varchar("file_name", { length: 255 }).notNull(),
+  originalFileName: varchar("original_file_name", { length: 255 }),
+  filePath: varchar("file_path", { length: 1024 }).notNull(),
+  fileSize: integer("file_size"),
   createdAt: timestamp("created_at").defaultNow().notNull(),
   updatedAt: timestamp("updated_at").defaultNow().notNull(),
 });
@@ -419,6 +436,7 @@ export const vendorInvestigationsView = pgView(
       
       // PQ 정보
       pqItems: vendorPQSubmissions.pqItems,
+      pqType: vendorPQSubmissions.type,
       pqNumber: vendorPQSubmissions.pqNumber,
       
       // User names and emails instead of just IDs
diff --git a/lib/bidding/service.ts b/lib/bidding/service.ts
index ed20ad0c..840173c2 100644
--- a/lib/bidding/service.ts
+++ b/lib/bidding/service.ts
@@ -3255,20 +3255,23 @@ export async function increaseRoundOrRebid(biddingId: number, userId: string | u
             eq(biddingDocuments.documentType, 'company_proposal')
           )
         ))
-
+      console.log('existingDocuments', existingDocuments)
       if (existingDocuments.length > 0) {
         for (const doc of existingDocuments) {
           try {
             // 기존 파일 경로 확인 및 Buffer로 읽기
             const { readFile, access, constants } = await import('fs/promises')
-            const { join } = await import('path')
+            const path = await import('path')
 
             // 파일 경로 정규화
-            const oldFilePath = doc.filePath.startsWith('/uploads/')
-              ? join(process.cwd(), 'public', doc.filePath)
-              : doc.filePath.startsWith('/')
-              ? join(process.cwd(), 'public', doc.filePath)
-              : doc.filePath
+            // 1) 절대 경로면 그대로 사용
+            // 2) /api/files/... 처럼 public 하위 상대 경로면 cwd/public 기준으로 변환
+            // 3) 그 외 문자열은 그대로 시도 (기존 저장 경로)
+            let oldFilePath = doc.filePath
+
+            if (!path.isAbsolute(oldFilePath)) {
+              oldFilePath = path.join(process.cwd(), 'public', oldFilePath.replace(/^\/+/, ''))
+            }
 
             // 파일 존재 여부 확인
             try {
diff --git a/lib/compliance/services.ts b/lib/compliance/services.ts
index 2856cb0a..03c19952 100644
--- a/lib/compliance/services.ts
+++ b/lib/compliance/services.ts
@@ -1148,6 +1148,7 @@ export async function getRedFlagManagers() {
       with: {
         purchasingManager: true,
         complianceManager: true,
+        hseManager: true,
       },
       orderBy: [desc(redFlagManagers.createdAt)],
     });
@@ -1163,6 +1164,7 @@ export async function getRedFlagManagers() {
 export async function createRedFlagManagers(data: {
   purchasingManagerId: number | null;
   complianceManagerId: number | null;
+  hseManagerId: number | null;
 }) {
   try {
     const [newManager] = await db
@@ -1170,6 +1172,7 @@ export async function createRedFlagManagers(data: {
       .values({
         purchasingManagerId: data.purchasingManagerId,
         complianceManagerId: data.complianceManagerId,
+        hseManagerId: data.hseManagerId,
       })
       .returning();
 
@@ -1187,6 +1190,7 @@ export async function updateRedFlagManagers(
   data: {
     purchasingManagerId?: number | null;
     complianceManagerId?: number | null;
+    hseManagerId?: number | null;
   }
 ) {
   try {
@@ -1220,6 +1224,7 @@ export async function getOrCreateRedFlagManagers() {
     await createRedFlagManagers({
       purchasingManagerId: null,
       complianceManagerId: null,
+      hseManagerId: null,
     });
 
     // 다시 relations를 포함해서 조회
diff --git a/lib/compliance/table/compliance-survey-templates-toolbar.tsx b/lib/compliance/table/compliance-survey-templates-toolbar.tsx
index 3e5f7f4d..31231d45 100644
--- a/lib/compliance/table/compliance-survey-templates-toolbar.tsx
+++ b/lib/compliance/table/compliance-survey-templates-toolbar.tsx
@@ -35,7 +35,7 @@ export function ComplianceSurveyTemplatesToolbarActions({ table }: ComplianceSur
       <ComplianceTemplateCreateDialog templates={templates} />
 
       {/** 2) 레드플래그 담당자 관리 */}
-      <RedFlagManagersDialog />
+      <RedFlagManagersDialog mode="redflag" />
 
       {/** 3) Export 버튼 */}
       <Button
diff --git a/lib/compliance/table/red-flag-managers-dialog.tsx b/lib/compliance/table/red-flag-managers-dialog.tsx
index 08244f9e..79076989 100644
--- a/lib/compliance/table/red-flag-managers-dialog.tsx
+++ b/lib/compliance/table/red-flag-managers-dialog.tsx
@@ -21,7 +21,13 @@ import {
   updateRedFlagManagers 
 } from "@/lib/compliance/services";
 
-export function RedFlagManagersDialog() {
+type ManagerDialogMode = "redflag" | "hse";
+
+interface RedFlagManagersDialogProps {
+  mode?: ManagerDialogMode;
+}
+
+export function RedFlagManagersDialog({ mode = "redflag" }: RedFlagManagersDialogProps) {
   const [open, setOpen] = React.useState(false);
   const [isLoading, setIsLoading] = React.useState(false);
   const [isFetching, setIsFetching] = React.useState(false);
@@ -31,6 +37,7 @@ export function RedFlagManagersDialog() {
   const [managerId, setManagerId] = React.useState<number | null>(null);
   const [purchasingManager, setPurchasingManager] = React.useState<UserSelectItem[]>([]);
   const [complianceManager, setComplianceManager] = React.useState<UserSelectItem[]>([]);
+  const [hseManager, setHseManager] = React.useState<UserSelectItem[]>([]);
 
   // 다이얼로그 열릴 때 현재 담당자 정보 가져오기
   React.useEffect(() => {
@@ -79,6 +86,22 @@ export function RedFlagManagersDialog() {
             domain: cm.domain,
           }]);
         }
+
+        // 안전(HSE) 담당자 설정
+        if (managers.hseManager) {
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          const hm: any = managers.hseManager;
+          setHseManager([{
+            id: hm.id,
+            name: hm.name,
+            email: hm.email,
+            epId: hm.epId,
+            deptCode: hm.deptCode,
+            deptName: hm.deptName,
+            imageUrl: hm.imageUrl,
+            domain: hm.domain,
+          }]);
+        }
       }
     } catch (error) {
       console.error("Error loading red flag managers:", error);
@@ -96,12 +119,22 @@ export function RedFlagManagersDialog() {
 
     setIsLoading(true);
     try {
-      await updateRedFlagManagers(managerId, {
-        purchasingManagerId: purchasingManager[0]?.id || null,
-        complianceManagerId: complianceManager[0]?.id || null,
-      });
+      const payload: {
+        purchasingManagerId?: number | null;
+        complianceManagerId?: number | null;
+        hseManagerId?: number | null;
+      } = {};
 
-      toast.success("레드플래그 담당자가 저장되었습니다.");
+      if (mode === "redflag") {
+        payload.purchasingManagerId = purchasingManager[0]?.id || null;
+        payload.complianceManagerId = complianceManager[0]?.id || null;
+      } else if (mode === "hse") {
+        payload.hseManagerId = hseManager[0]?.id || null;
+      }
+
+      await updateRedFlagManagers(managerId, payload);
+
+      toast.success("담당자 설정이 저장되었습니다.");
       setOpen(false);
       router.refresh();
     } catch (error) {
@@ -117,17 +150,19 @@ export function RedFlagManagersDialog() {
       <DialogTrigger asChild>
         <Button variant="outline" size="sm">
           <AlertCircle className="mr-2 h-4 w-4 text-red-600" />
-          레드플래그 담당자
+          {mode === "hse" ? "안전(HSE) 담당자" : "레드플래그 담당자"}
         </Button>
       </DialogTrigger>
       <DialogContent className="sm:max-w-[600px]">
         <DialogHeader>
           <DialogTitle className="flex items-center gap-2">
             <AlertCircle className="h-5 w-5 text-red-600" />
-            레드플래그 담당자 관리
+            {mode === "hse" ? "안전(HSE) 담당자 관리" : "레드플래그 담당자 관리"}
           </DialogTitle>
           <DialogDescription>
-            레드플래그 발생 시 알림을 받을 담당자를 지정합니다.
+            {mode === "hse"
+              ? "PQ 제출 및 안전 관련 알림을 받을 담당자를 지정합니다."
+              : "레드플래그 발생 시 알림을 받을 담당자를 지정합니다."}
           </DialogDescription>
         </DialogHeader>
 
@@ -139,43 +174,67 @@ export function RedFlagManagersDialog() {
           </div>
         ) : (
           <div className="space-y-6 py-4">
-            {/* 구매기획 담당자 */}
-            <div className="space-y-2">
-              <Label htmlFor="purchasing-manager" className="flex items-center gap-2">
-                <Users className="h-4 w-4" />
-                구매기획 담당자
-              </Label>
-              <UserSelector
-                selectedUsers={purchasingManager}
-                onUsersChange={setPurchasingManager}
-                singleSelect={true}
-                placeholder="구매기획 담당자를 검색하세요..."
-                domainFilter={{ type: "exclude", domains: ["partners"] }}
-                closeOnSelect={true}
-              />
-              <p className="text-xs text-muted-foreground">
-                레드플래그 발생 시 알림을 받을 구매기획 담당자를 지정합니다.
-              </p>
-            </div>
+            {mode === "redflag" && (
+              <>
+                {/* 구매기획 담당자 */}
+                <div className="space-y-2">
+                  <Label htmlFor="purchasing-manager" className="flex items-center gap-2">
+                    <Users className="h-4 w-4" />
+                    구매기획 담당자
+                  </Label>
+                  <UserSelector
+                    selectedUsers={purchasingManager}
+                    onUsersChange={setPurchasingManager}
+                    singleSelect={true}
+                    placeholder="구매기획 담당자를 검색하세요..."
+                    domainFilter={{ type: "exclude", domains: ["partners"] }}
+                    closeOnSelect={true}
+                  />
+                  <p className="text-xs text-muted-foreground">
+                    레드플래그 발생 시 알림을 받을 구매기획 담당자를 지정합니다.
+                  </p>
+                </div>
 
-            {/* 준법 담당자 */}
-            <div className="space-y-2">
-              <Label htmlFor="compliance-manager" className="flex items-center gap-2">
-                <Users className="h-4 w-4" />
-                준법 담당자
-              </Label>
-              <UserSelector
-                selectedUsers={complianceManager}
-                onUsersChange={setComplianceManager}
-                singleSelect={true}
-                placeholder="준법 담당자를 검색하세요..."
-                domainFilter={{ type: "exclude", domains: ["partners"] }}
-                closeOnSelect={true}
-              />
-              <p className="text-xs text-muted-foreground">
-                레드플래그 발생 시 알림을 받을 준법 담당자를 지정합니다.
-              </p>
-            </div>
+                {/* 준법 담당자 */}
+                <div className="space-y-2">
+                  <Label htmlFor="compliance-manager" className="flex items-center gap-2">
+                    <Users className="h-4 w-4" />
+                    준법 담당자
+                  </Label>
+                  <UserSelector
+                    selectedUsers={complianceManager}
+                    onUsersChange={setComplianceManager}
+                    singleSelect={true}
+                    placeholder="준법 담당자를 검색하세요..."
+                    domainFilter={{ type: "exclude", domains: ["partners"] }}
+                    closeOnSelect={true}
+                  />
+                  <p className="text-xs text-muted-foreground">
+                    레드플래그 발생 시 알림을 받을 준법 담당자를 지정합니다.
+                  </p>
+                </div>
+              </>
+            )}
+
+            {mode === "hse" && (
+              <div className="space-y-2">
+                <Label htmlFor="hse-manager" className="flex items-center gap-2">
+                  <Users className="h-4 w-4" />
+                  안전(HSE) 담당자
+                </Label>
+                <UserSelector
+                  selectedUsers={hseManager}
+                  onUsersChange={setHseManager}
+                  singleSelect={true}
+                  placeholder="안전(HSE) 담당자를 검색하세요..."
+                  domainFilter={{ type: "exclude", domains: ["partners"] }}
+                  closeOnSelect={true}
+                />
+                <p className="text-xs text-muted-foreground">
+                  PQ 제출 및 안전 관련 알림을 받을 담당자를 지정합니다.
+                </p>
+              </div>
+            )}
           </div>
         )}
 
diff --git a/lib/evaluation/service.ts b/lib/evaluation/service.ts
index 122d0777..9a6075bb 100644
--- a/lib/evaluation/service.ts
+++ b/lib/evaluation/service.ts
@@ -37,7 +37,7 @@ import { revalidatePath } from "next/cache"
 import { DEPARTMENT_CODE_LABELS } from "@/types/evaluation"
 import { getServerSession } from "next-auth"
 import { authOptions } from "@/app/api/auth/[...nextauth]/route"
-import { AttachmentDetail, EvaluationDetailResponse } from "@/types/evaluation-form"
+import { AttachmentDetail, EvaluationDetailResponse, EvaluationDetailData } from "@/types/evaluation-form"
 import { headers } from 'next/headers';
 
 export async function getPeriodicEvaluations(input: GetEvaluationsSchema) {
@@ -1045,46 +1045,49 @@ export async function unfinalizeEvaluations(evaluationIds: number[]) {
 }
 
 
-// 평가 상세 정보 타입
-export interface EvaluationDetailData {
-  // 리뷰어 정보
-  reviewerEvaluationId: number
-  reviewerName: string
-  reviewerEmail: string
-  departmentCode: string
-  departmentName: string
-  isCompleted: boolean
-  completedAt: Date | null
-  reviewerComment: string | null
-
-  // 평가 항목별 상세
-  evaluationItems: {
-    // 평가 기준 정보
-    criteriaId: number
-    category: string
-    category2: string
-    item: string
-    classification: string
-    range: string | null
-    remarks: string | null
-    scoreType: string
-
-    // 선택된 옵션 정보 (fixed 타입인 경우)
-    selectedDetailId: number | null
-    selectedDetail: string | null
-
-    // 점수 및 의견
-    score: number | null
-    comment: string | null
-  }[]
-}
+// 평가 상세 정보 타입은 types/evaluation-form.ts에서 import
 
 
 /**
  * 특정 정기평가의 상세 정보를 조회합니다
  */
-export async function getEvaluationDetails(periodicEvaluationId: number): Promise<EvaluationDetailResponse> {
+export async function getEvaluationDetails(periodicEvaluationId: number | string): Promise<EvaluationDetailResponse> {
   try {
+    // 집계 뷰(id가 "년도_벤더ID" 형태 문자열)에서 호출될 수 있으므로 문자열을 실제 정기평가 id로 해석
+    if (typeof periodicEvaluationId === "string") {
+      const [yearStr, vendorIdStr] = periodicEvaluationId.split("_")
+      const evaluationYear = Number(yearStr)
+      const vendorId = Number(vendorIdStr)
+
+      if (Number.isNaN(evaluationYear) || Number.isNaN(vendorId)) {
+        throw new Error("잘못된 평가 식별자입니다")
+      }
+
+      const fallback = await db
+        .select({
+          id: periodicEvaluations.id,
+          finalizedAt: periodicEvaluations.finalizedAt,
+          updatedAt: periodicEvaluations.updatedAt,
+        })
+        .from(periodicEvaluations)
+        .innerJoin(evaluationTargets, eq(periodicEvaluations.evaluationTargetId, evaluationTargets.id))
+        .where(
+          and(
+            eq(evaluationTargets.vendorId, vendorId),
+            eq(evaluationTargets.evaluationYear, evaluationYear)
+          )
+        )
+        // 확정된 평가를 우선, 없으면 최신 수정 순
+        .orderBy(desc(periodicEvaluations.finalizedAt), desc(periodicEvaluations.updatedAt))
+        .limit(1)
+
+      if (fallback.length === 0) {
+        throw new Error("해당 업체/연도의 평가를 찾을 수 없습니다")
+      }
+
+      periodicEvaluationId = fallback[0].id
+    }
+
     // 1. 평가 기본 정보 조회
     const evaluationInfo = await db
       .select({
@@ -1194,12 +1197,17 @@ export async function getEvaluationDetails(periodicEvaluationId: number): Promis
     const attachmentsByReviewerId = new Map<number, AttachmentDetail[]>()
 
     attachmentsData.forEach(attachment => {
+      // 필수 필드가 없으면 건너뛰기
+      if (!attachment.attachmentId || !attachment.evaluationDetailId || !attachment.reviewerEvaluationId) {
+        return
+      }
+
       const attachmentInfo: AttachmentDetail = {
         id: attachment.attachmentId,
-        originalFileName: attachment.originalFileName,
-        storedFileName: attachment.storedFileName,
-        publicPath: attachment.publicPath,
-        fileSize: attachment.fileSize,
+        originalFileName: attachment.originalFileName || "",
+        storedFileName: attachment.storedFileName || "",
+        publicPath: attachment.publicPath || "",
+        fileSize: attachment.fileSize || 0,
         mimeType: attachment.mimeType || undefined,
         fileExtension: attachment.fileExtension || undefined,
         description: attachment.description || undefined,
@@ -1225,6 +1233,11 @@ export async function getEvaluationDetails(periodicEvaluationId: number): Promis
     const reviewerDetailsMap = new Map<number, EvaluationDetailData>()
 
     reviewerDetailsRaw.forEach(row => {
+      // reviewerEvaluationId가 null이면 건너뛰기
+      if (!row.reviewerEvaluationId) {
+        return
+      }
+
       if (!reviewerDetailsMap.has(row.reviewerEvaluationId)) {
         const reviewerAttachments = attachmentsByReviewerId.get(row.reviewerEvaluationId) || []
 
@@ -1233,7 +1246,7 @@ export async function getEvaluationDetails(periodicEvaluationId: number): Promis
           reviewerName: row.reviewerName || "",
           reviewerEmail: row.reviewerEmail || "",
           departmentCode: row.departmentCode || "",
-          departmentName: DEPARTMENT_CODE_LABELS[row.departmentCode as keyof typeof DEPARTMENT_CODE_LABELS] || row.departmentCode || "",
+          departmentName: (row.departmentCode && DEPARTMENT_CODE_LABELS[row.departmentCode as keyof typeof DEPARTMENT_CODE_LABELS]) || row.departmentCode || "",
           isCompleted: row.isCompleted || false,
           completedAt: row.completedAt,
           reviewerComment: row.reviewerComment,
@@ -1241,7 +1254,7 @@ export async function getEvaluationDetails(periodicEvaluationId: number): Promis
 
           // 📎 리뷰어별 첨부파일 통계
           totalAttachments: reviewerAttachments.length,
-          totalAttachmentSize: reviewerAttachments.reduce((sum, att) => sum + att.fileSize, 0),
+          totalAttachmentSize: reviewerAttachments.reduce((sum, att) => sum + (att.fileSize || 0), 0),
           questionsWithAttachments: new Set(reviewerAttachments.map(att =>
             attachmentsData.find(a => a.attachmentId === att.id)?.criteriaId
           ).filter(Boolean)).size,
@@ -1249,8 +1262,11 @@ export async function getEvaluationDetails(periodicEvaluationId: number): Promis
       }
 
       // 평가 항목이 있는 경우에만 추가
-      if (row.criteriaId && row.detailId) {
-        const reviewer = reviewerDetailsMap.get(row.reviewerEvaluationId)!
+      if (row.criteriaId && row.detailId && row.reviewerEvaluationId) {
+        const reviewer = reviewerDetailsMap.get(row.reviewerEvaluationId)
+        if (!reviewer) {
+          return
+        }
         const itemAttachments = attachmentsByDetailId.get(row.detailId) || []
 
         reviewer.evaluationItems.push({
@@ -1270,7 +1286,7 @@ export async function getEvaluationDetails(periodicEvaluationId: number): Promis
           // 📎 항목별 첨부파일 정보
           attachments: itemAttachments,
           attachmentCount: itemAttachments.length,
-          attachmentTotalSize: itemAttachments.reduce((sum, att) => sum + att.fileSize, 0),
+          attachmentTotalSize: itemAttachments.reduce((sum, att) => sum + (att.fileSize || 0), 0),
         })
       }
     })
@@ -1278,7 +1294,7 @@ export async function getEvaluationDetails(periodicEvaluationId: number): Promis
     // 📎 6. 전체 첨부파일 통계 계산
     const attachmentStats = {
       totalFiles: attachmentsData.length,
-      totalSize: attachmentsData.reduce((sum, att) => sum + att.fileSize, 0),
+      totalSize: attachmentsData.reduce((sum, att) => sum + (att.fileSize || 0), 0),
       reviewersWithAttachments: attachmentsByReviewerId.size,
       questionsWithAttachments: new Set(attachmentsData.map(att => att.criteriaId).filter(Boolean)).size,
     }
@@ -1299,7 +1315,6 @@ export async function getEvaluationDetails(periodicEvaluationId: number): Promis
         id: evaluationTargets.id,
         vendorId: evaluationTargets.vendorId,
         evaluationYear: evaluationTargets.evaluationYear,
-        evaluationRound: evaluationTargets.evaluationRound,
         division: evaluationTargets.division,
       })
       .from(evaluationTargets)
@@ -1310,7 +1325,7 @@ export async function getEvaluationDetails(periodicEvaluationId: number): Promis
     if (currentEvaluationTarget.length > 0) {
       const target = currentEvaluationTarget[0]
       
-      // 같은 업체, 같은 년도, 같은 라운드의 다른 division 평가가 있는지 확인
+      // 같은 업체, 같은 년도의 다른 division 평가가 있는지 확인
       const siblingEvaluations = await db
         .select({
           periodicEvaluationId: periodicEvaluations.id,
@@ -1323,13 +1338,12 @@ export async function getEvaluationDetails(periodicEvaluationId: number): Promis
         .where(
           and(
             eq(evaluationTargets.vendorId, target.vendorId),
-            eq(evaluationTargets.evaluationYear, target.evaluationYear),
-            eq(evaluationTargets.evaluationRound, target.evaluationRound || "")
+            eq(evaluationTargets.evaluationYear, target.evaluationYear)
           )
         )
 
       // 조선과 해양 평가가 모두 있는지 확인
-      const shipbuilding = siblingEvaluations.find(e => e.division === "SHIPBUILDING")
+      const shipbuilding = siblingEvaluations.find(e => e.division === "SHIP" || e.division === "SHIPBUILDING")
       const offshore = siblingEvaluations.find(e => e.division === "PLANT")
 
       if (shipbuilding && offshore) {
@@ -1363,8 +1377,20 @@ export async function getEvaluationDetails(periodicEvaluationId: number): Promis
       }
     }
 
+    if (!evaluationInfo[0]) {
+      throw new Error("평가 정보를 찾을 수 없습니다")
+    }
+
+    const info = evaluationInfo[0]
     return {
-      evaluationInfo: evaluationInfo[0],
+      evaluationInfo: {
+        id: info.id,
+        vendorName: info.vendorName || "",
+        vendorCode: info.vendorCode || "",
+        evaluationYear: info.evaluationYear || 0,
+        division: info.division || "",
+        status: info.status,
+      },
       reviewerDetails: Array.from(reviewerDetailsMap.values()),
       attachmentStats,
       consolidatedInfo,
diff --git a/lib/evaluation/table/evaluation-details-dialog.tsx b/lib/evaluation/table/evaluation-details-dialog.tsx
index fe7c204a..e89c9473 100644
--- a/lib/evaluation/table/evaluation-details-dialog.tsx
+++ b/lib/evaluation/table/evaluation-details-dialog.tsx
@@ -141,6 +141,12 @@ export function EvaluationDetailsDialog({
 
   if (!evaluation) return null
 
+  // 일부 뷰 타입에는 점수/등급 필드가 없을 수 있어 안전하게 접근
+  const evaluationScore = (evaluation as any)?.evaluationScore as number | null | undefined
+  const evaluationGrade = (evaluation as any)?.evaluationGrade as string | null | undefined
+  const finalScore = (evaluation as any)?.finalScore as number | null | undefined
+  const finalGrade = (evaluation as any)?.finalGrade as string | null | undefined
+
   return (
     <TooltipProvider>
       <Dialog open={open} onOpenChange={onOpenChange}>
@@ -192,14 +198,14 @@ export function EvaluationDetailsDialog({
                   {/* 평가점수/등급 */}
                   <div className="flex items-center gap-2">
                     <span className="text-muted-foreground">평가점수/등급:</span>
-                    {evaluation.evaluationScore ? (
+                    {evaluationScore ? (
                       <div className="flex items-center gap-1">
                         <span className="font-bold text-blue-600">
-                          {Number(evaluation.evaluationScore).toFixed(1)}점
+                          {Number(evaluationScore).toFixed(1)}점
                         </span>
-                        {evaluation.evaluationGrade && (
+                        {evaluationGrade && (
                           <Badge variant="default" className="text-xs h-5">
-                            {evaluation.evaluationGrade}
+                            {evaluationGrade}
                           </Badge>
                         )}
                       </div>
@@ -211,14 +217,14 @@ export function EvaluationDetailsDialog({
                   {/* 확정점수/등급 */}
                   <div className="flex items-center gap-2">
                     <span className="text-muted-foreground">확정점수/등급:</span>
-                    {evaluation.finalScore ? (
+                    {finalScore ? (
                       <div className="flex items-center gap-1">
                         <span className="font-bold text-green-600">
-                          {Number(evaluation.finalScore).toFixed(1)}점
+                          {Number(finalScore).toFixed(1)}점
                         </span>
-                        {evaluation.finalGrade && (
+                        {finalGrade && (
                           <Badge variant="default" className="bg-green-600 text-xs h-5">
-                            {evaluation.finalGrade}
+                            {finalGrade}
                           </Badge>
                         )}
                       </div>
@@ -301,7 +307,6 @@ export function EvaluationDetailsDialog({
                     </div>
                   </div>
                 )}
-
                 </CardContent>
             </Card>
           </DialogHeader>
diff --git a/lib/evaluation/vendor-submission-service.ts b/lib/evaluation/vendor-submission-service.ts
index c06a9d2a..e7d236ad 100644
--- a/lib/evaluation/vendor-submission-service.ts
+++ b/lib/evaluation/vendor-submission-service.ts
@@ -107,36 +107,44 @@ export interface VendorSubmissionDetail {
 export async function getVendorSubmissionDetails(periodicEvaluationId: number): Promise<VendorSubmissionDetail | null> {
   try {
     // 1. 제출 정보 조회
-    const submissionResult = await db
-      .select({
-        // 제출 기본 정보
-        id: evaluationSubmissions.id,
-        submissionId: evaluationSubmissions.submissionId,
-        evaluationYear: evaluationSubmissions.evaluationYear,
-        evaluationRound: evaluationSubmissions.evaluationRound,
-        submissionStatus: evaluationSubmissions.submissionStatus,
-        submittedAt: evaluationSubmissions.submittedAt,
-        reviewedAt: evaluationSubmissions.reviewedAt,
-        reviewedBy: evaluationSubmissions.reviewedBy,
-        reviewComments: evaluationSubmissions.reviewComments,
-        averageEsgScore: evaluationSubmissions.averageEsgScore,
-        
-        // 진행률 통계
-        totalGeneralItems: evaluationSubmissions.totalGeneralItems,
-        completedGeneralItems: evaluationSubmissions.completedGeneralItems,
-        totalEsgItems: evaluationSubmissions.totalEsgItems,
-        completedEsgItems: evaluationSubmissions.completedEsgItems,
-        
-        // 협력업체 정보
-        vendorId: vendors.id,
-        companyId: evaluationSubmissions.companyId,
-        vendorCode: vendors.vendorCode,
-        vendorName: vendors.vendorName,
-        vendorEmail: vendors.email,
-        vendorCountry: vendors.country,
-      })
-      .from(evaluationSubmissions)
-      .innerJoin(vendors, eq(evaluationSubmissions.companyId, vendors.id))
+    //    - 우선 현재 periodicEvaluationId 로 검색
+    //    - 없으면 같은 업체/년도/라운드의 다른 division 제출 건을 검색해 표시(조선/해양 동시 제출 지원)
+    const submissionSelect = {
+      // 제출 기본 정보
+      id: evaluationSubmissions.id,
+      submissionId: evaluationSubmissions.submissionId,
+      evaluationYear: evaluationSubmissions.evaluationYear,
+      evaluationRound: evaluationSubmissions.evaluationRound,
+      submissionStatus: evaluationSubmissions.submissionStatus,
+      submittedAt: evaluationSubmissions.submittedAt,
+      reviewedAt: evaluationSubmissions.reviewedAt,
+      reviewedBy: evaluationSubmissions.reviewedBy,
+      reviewComments: evaluationSubmissions.reviewComments,
+      averageEsgScore: evaluationSubmissions.averageEsgScore,
+      
+      // 진행률 통계
+      totalGeneralItems: evaluationSubmissions.totalGeneralItems,
+      completedGeneralItems: evaluationSubmissions.completedGeneralItems,
+      totalEsgItems: evaluationSubmissions.totalEsgItems,
+      completedEsgItems: evaluationSubmissions.completedEsgItems,
+      
+      // 협력업체 정보
+      vendorId: vendors.id,
+      companyId: evaluationSubmissions.companyId,
+      vendorCode: vendors.vendorCode,
+      vendorName: vendors.vendorName,
+      vendorEmail: vendors.email,
+      vendorCountry: vendors.country,
+    }
+
+    const buildSubmissionQuery = () =>
+      db
+        .select(submissionSelect)
+        .from(evaluationSubmissions)
+        .innerJoin(vendors, eq(evaluationSubmissions.companyId, vendors.id))
+
+    // 1-1. 현재 periodicEvaluationId 로 우선 조회
+    let submissionResult = await buildSubmissionQuery()
       .where(
         and(
           eq(evaluationSubmissions.periodicEvaluationId, periodicEvaluationId),
@@ -145,6 +153,37 @@ export async function getVendorSubmissionDetails(periodicEvaluationId: number):
       )
       .limit(1)
 
+    // 1-2. 없으면 같은 업체/년도의 다른 division 제출을 fallback
+    if (submissionResult.length === 0) {
+      const evaluationContext = await db
+        .select({
+          vendorId: evaluationTargets.vendorId,
+          evaluationYear: evaluationTargets.evaluationYear,
+        })
+        .from(periodicEvaluations)
+        .innerJoin(evaluationTargets, eq(periodicEvaluations.evaluationTargetId, evaluationTargets.id))
+        .where(eq(periodicEvaluations.id, periodicEvaluationId))
+        .limit(1)
+
+      const context = evaluationContext[0]
+
+      if (!context || !context.vendorId || !context.evaluationYear) {
+        return null
+      }
+
+      // 같은 업체/년도의 다른 division 제출 찾기 (가장 최근 제출 우선)
+      submissionResult = await buildSubmissionQuery()
+        .where(
+          and(
+            eq(evaluationSubmissions.companyId, context.vendorId),
+            eq(evaluationSubmissions.evaluationYear, context.evaluationYear),
+            eq(evaluationSubmissions.isActive, true)
+          )
+        )
+        .orderBy(desc(evaluationSubmissions.submittedAt), desc(evaluationSubmissions.createdAt))
+        .limit(1)
+    }
+
     if (submissionResult.length === 0) {
       return null // 제출 내용이 없음
     }
diff --git a/lib/pq/pq-criteria/add-pq-dialog.tsx b/lib/pq/pq-criteria/add-pq-dialog.tsx
index 660eb360..1752f503 100644
--- a/lib/pq/pq-criteria/add-pq-dialog.tsx
+++ b/lib/pq/pq-criteria/add-pq-dialog.tsx
@@ -38,6 +38,10 @@ import {
 
 import { useToast } from "@/hooks/use-toast"
 import { createPqCriteria } from "../service"
+import { uploadPqCriteriaFileAction } from "@/lib/pq/service"
+import { Dropzone, DropzoneInput, DropzoneZone, DropzoneUploadIcon, DropzoneTitle, DropzoneDescription } from "@/components/ui/dropzone"
+import { FileList, FileListHeader, FileListInfo, FileListItem, FileListName, FileListDescription, FileListAction } from "@/components/ui/file-list"
+import { X, Loader2 } from "lucide-react"
 
 // PQ 생성을 위한 Zod 스키마 정의
 const createPqSchema = z.object({
@@ -48,7 +52,7 @@ const createPqSchema = z.object({
   description: z.string().optional(),
   remarks: z.string().optional(),
   inputFormat: z.string().default("TEXT"),
-
+  type: z.string().optional(),
 });
 
 type CreatePqFormType = z.infer<typeof createPqSchema>;
@@ -74,6 +78,12 @@ const inputFormatOptions = [
   { value: "TEXT_FILE", label: "텍스트 + 파일" },
 ];
 
+const typeOptions = [
+  { value: "내자", label: "내자" },
+  { value: "외자", label: "외자" },
+  { value: "내외자", label: "내외자" },
+];
+
 interface AddPqDialogProps {
   pqListId: number;
 }
@@ -81,6 +91,10 @@ interface AddPqDialogProps {
 export function AddPqDialog({ pqListId }: AddPqDialogProps) {
   const [open, setOpen] = React.useState(false)
   const [isSubmitting, setIsSubmitting] = React.useState(false)
+  const [isUploading, setIsUploading] = React.useState(false)
+  const [uploadedFiles, setUploadedFiles] = React.useState<
+    { fileName: string; url: string; size?: number; originalFileName?: string }[]
+  >([])
   const router = useRouter()
   const { toast } = useToast()
 
@@ -95,7 +109,7 @@ export function AddPqDialog({ pqListId }: AddPqDialogProps) {
       description: "",
       remarks: "",
       inputFormat: "TEXT",
-
+      type: "내외자",
     },
   })
   const formState = form.formState
@@ -105,7 +119,10 @@ export function AddPqDialog({ pqListId }: AddPqDialogProps) {
       setIsSubmitting(true)
 
       // 서버 액션 호출
-      const result = await createPqCriteria(pqListId, data)
+      const result = await createPqCriteria(pqListId, {
+        ...data,
+        attachments: uploadedFiles,
+      })
 
       if (!result.success) {
         toast({
@@ -124,6 +141,7 @@ export function AddPqDialog({ pqListId }: AddPqDialogProps) {
 
       // 모달 닫고 폼 리셋
       form.reset()
+      setUploadedFiles([])
       setOpen(false)
 
       // 페이지 새로고침
@@ -144,10 +162,34 @@ export function AddPqDialog({ pqListId }: AddPqDialogProps) {
   function handleDialogOpenChange(nextOpen: boolean) {
     if (!nextOpen) {
       form.reset()
+      setUploadedFiles([])
     }
     setOpen(nextOpen)
   }
 
+  const handleUpload = async (files: File[]) => {
+    try {
+      setIsUploading(true)
+      for (const file of files) {
+        const uploaded = await uploadPqCriteriaFileAction(file)
+        setUploadedFiles((prev) => [...prev, uploaded])
+      }
+      toast({
+        title: "업로드 완료",
+        description: "첨부파일이 업로드되었습니다.",
+      })
+    } catch (error) {
+      console.error(error)
+      toast({
+        title: "업로드 실패",
+        description: "첨부파일 업로드 중 오류가 발생했습니다.",
+        variant: "destructive",
+      })
+    } finally {
+      setIsUploading(false)
+    }
+  }
+
   return (
     <Dialog open={open} onOpenChange={handleDialogOpenChange}>
       <DialogTrigger asChild>
@@ -253,6 +295,33 @@ export function AddPqDialog({ pqListId }: AddPqDialogProps) {
                 )}
               />
 
+              {/* Type 필드 */}
+              <FormField
+                control={form.control}
+                name="type"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>내/외자 구분</FormLabel>
+                    <Select onValueChange={field.onChange} value={field.value}>
+                      <FormControl>
+                        <SelectTrigger>
+                          <SelectValue placeholder="구분을 선택하세요" />
+                        </SelectTrigger>
+                      </FormControl>
+                      <SelectContent>
+                        {typeOptions.map((option) => (
+                          <SelectItem key={option.value} value={option.value}>
+                            {option.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                    <FormDescription>미선택 시 기본값은 내외자입니다.</FormDescription>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
               {/* Input Format 필드 */}
               <FormField
                 control={form.control}
@@ -279,6 +348,76 @@ export function AddPqDialog({ pqListId }: AddPqDialogProps) {
                 )}
               />
 
+              {/* 첨부 파일 업로드 */}
+              <div className="space-y-2">
+                <div className="flex items-center justify-between">
+                  <FormLabel>첨부 파일</FormLabel>
+                  {isUploading && (
+                    <div className="flex items-center text-xs text-muted-foreground">
+                      <Loader2 className="mr-1 h-3 w-3 animate-spin" /> 업로드 중...
+                    </div>
+                  )}
+                </div>
+                <Dropzone
+                  maxSize={6e8}
+                  onDropAccepted={(files) => handleUpload(files)}
+                  onDropRejected={() =>
+                    toast({
+                      title: "업로드 실패",
+                      description: "파일 크기/형식을 확인하세요.",
+                      variant: "destructive",
+                    })
+                  }
+                  disabled={isUploading}
+                >
+                  {() => (
+                    <FormItem>
+                      <DropzoneZone className="flex justify-center h-28">
+                        <FormControl>
+                          <DropzoneInput />
+                        </FormControl>
+                        <div className="flex items-center gap-4">
+                          <DropzoneUploadIcon />
+                          <div className="grid gap-0.5">
+                            <DropzoneTitle>파일을 드래그하거나 클릭하여 업로드</DropzoneTitle>
+                            <DropzoneDescription>PDF, 이미지, 문서 (최대 600MB)</DropzoneDescription>
+                          </div>
+                        </div>
+                      </DropzoneZone>
+                      <FormDescription>기준 문서 첨부가 필요한 경우 업로드하세요.</FormDescription>
+                    </FormItem>
+                  )}
+                </Dropzone>
+
+                {uploadedFiles.length > 0 && (
+                  <div className="space-y-2">
+                    <p className="text-sm font-medium">첨부된 파일 ({uploadedFiles.length})</p>
+                    <FileList>
+                      {uploadedFiles.map((file, idx) => (
+                        <FileListItem key={idx}>
+                          <FileListHeader>
+                            <FileListInfo>
+                              <FileListName>{file.originalFileName || file.fileName}</FileListName>
+                              {file.size && (
+                                <FileListDescription>{`${file.size} bytes`}</FileListDescription>
+                              )}
+                            </FileListInfo>
+                            <FileListAction
+                              onClick={() =>
+                                setUploadedFiles((prev) => prev.filter((_, i) => i !== idx))
+                              }
+                            >
+                              <X className="h-4 w-4" />
+                              <span className="sr-only">Remove</span>
+                            </FileListAction>
+                          </FileListHeader>
+                        </FileListItem>
+                      ))}
+                    </FileList>
+                  </div>
+                )}
+              </div>
+
               {/* Description 필드 */}
               <FormField
                 control={form.control}
diff --git a/lib/pq/pq-criteria/update-pq-sheet.tsx b/lib/pq/pq-criteria/update-pq-sheet.tsx
index fb298e9b..6aeb689f 100644
--- a/lib/pq/pq-criteria/update-pq-sheet.tsx
+++ b/lib/pq/pq-criteria/update-pq-sheet.tsx
@@ -41,6 +41,10 @@ import { Textarea } from "@/components/ui/textarea"
 import { updatePqCriteria } from "../service"
 import { groupOptions } from "./add-pq-dialog"
 import { Checkbox } from "@/components/ui/checkbox"
+import { uploadPqCriteriaFileAction, getPqCriteriaAttachments } from "@/lib/pq/service"
+import { Dropzone, DropzoneInput, DropzoneZone, DropzoneUploadIcon, DropzoneTitle, DropzoneDescription } from "@/components/ui/dropzone"
+import { FileList, FileListHeader, FileListInfo, FileListItem, FileListName, FileListDescription, FileListAction } from "@/components/ui/file-list"
+import { X, Loader2 } from "lucide-react"
 
 // PQ 수정을 위한 Zod 스키마 정의
 const updatePqSchema = z.object({
@@ -52,6 +56,7 @@ const updatePqSchema = z.object({
   inputFormat: z.string().default("TEXT"),
 
   subGroupName: z.string().optional(),
+  type: z.string().optional(),
 });
 
 type UpdatePqSchema = z.infer<typeof updatePqSchema>;
@@ -67,6 +72,12 @@ const inputFormatOptions = [
   { value: "TEXT_FILE", label: "텍스트 + 파일" }
 ];
 
+const typeOptions = [
+  { value: "내자", label: "내자" },
+  { value: "외자", label: "외자" },
+  { value: "내외자", label: "내외자" },
+];
+
 interface UpdatePqSheetProps
   extends React.ComponentPropsWithRef<typeof Sheet> {
   pq: {
@@ -79,11 +90,16 @@ interface UpdatePqSheetProps
     inputFormat: string;
   
     subGroupName: string | null;
+    type?: string | null;
   } | null
 }
 
 export function UpdatePqSheet({ pq, ...props }: UpdatePqSheetProps) {
   const [isUpdatePending, startUpdateTransition] = React.useTransition()
+  const [isUploading, setIsUploading] = React.useState(false)
+  const [attachments, setAttachments] = React.useState<
+    { fileName: string; url: string; size?: number; originalFileName?: string }[]
+  >([])
   const router = useRouter()
 
   const form = useForm<UpdatePqSchema>({
@@ -97,6 +113,7 @@ export function UpdatePqSheet({ pq, ...props }: UpdatePqSheetProps) {
       inputFormat: pq?.inputFormat ?? "TEXT",
 
       subGroupName: pq?.subGroupName ?? "",
+      type: pq?.type ?? "내외자",
     },
   })
 
@@ -112,15 +129,51 @@ export function UpdatePqSheet({ pq, ...props }: UpdatePqSheetProps) {
         inputFormat: pq.inputFormat ?? "TEXT",
   
         subGroupName: pq.subGroupName ?? "",
+        type: pq.type ?? "내외자",
       });
+
+      // 기존 첨부 로드
+      getPqCriteriaAttachments(pq.id).then((res) => {
+        if (res.success && res.data) {
+          setAttachments(
+            res.data.map((a) => ({
+              fileName: a.fileName,
+              url: a.filePath,
+              size: a.fileSize ?? undefined,
+              originalFileName: a.originalFileName || a.fileName,
+            }))
+          )
+        } else {
+          setAttachments([])
+        }
+      })
     }
   }, [pq, form]);
 
+  const handleUpload = async (files: File[]) => {
+    try {
+      setIsUploading(true)
+      for (const file of files) {
+        const uploaded = await uploadPqCriteriaFileAction(file)
+        setAttachments((prev) => [...prev, uploaded])
+      }
+      toast.success("첨부파일이 업로드되었습니다")
+    } catch (error) {
+      console.error(error)
+      toast.error("첨부파일 업로드에 실패했습니다")
+    } finally {
+      setIsUploading(false)
+    }
+  }
+
   function onSubmit(input: UpdatePqSchema) {
     startUpdateTransition(async () => {
       if (!pq) return
   
-      const result = await updatePqCriteria(pq.id, input)
+      const result = await updatePqCriteria(pq.id, {
+        ...input,
+        attachments,
+      })
   
       if (!result.success) {
         toast.error(result.message || "PQ 항목 수정에 실패했습니다")
@@ -231,6 +284,33 @@ export function UpdatePqSheet({ pq, ...props }: UpdatePqSheetProps) {
               )}
             />
 
+            {/* Type 필드 */}
+            <FormField
+              control={form.control}
+              name="type"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>내/외자 구분</FormLabel>
+                  <Select onValueChange={field.onChange} value={field.value}>
+                    <FormControl>
+                      <SelectTrigger>
+                        <SelectValue placeholder="구분을 선택하세요" />
+                      </SelectTrigger>
+                    </FormControl>
+                    <SelectContent>
+                      {typeOptions.map((option) => (
+                        <SelectItem key={option.value} value={option.value}>
+                          {option.label}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                  <FormDescription>미선택 시 기본값은 내외자입니다.</FormDescription>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
             {/* Input Format 필드 */}
             <FormField
               control={form.control}
@@ -257,6 +337,72 @@ export function UpdatePqSheet({ pq, ...props }: UpdatePqSheetProps) {
               )}
             />
 
+            {/* 첨부 파일 업로드 */}
+            <div className="space-y-2">
+              <div className="flex items-center justify-between">
+                <FormLabel>첨부 파일</FormLabel>
+                {isUploading && (
+                  <div className="flex items-center text-xs text-muted-foreground">
+                    <Loader2 className="mr-1 h-3 w-3 animate-spin" /> 업로드 중...
+                  </div>
+                )}
+              </div>
+              <Dropzone
+                maxSize={6e8}
+                onDropAccepted={(files) => handleUpload(files)}
+                onDropRejected={() =>
+                  toast.error("파일 크기/형식을 확인하세요.")
+                }
+                disabled={isUploading}
+              >
+                {() => (
+                  <FormItem>
+                    <DropzoneZone className="flex justify-center h-24">
+                      <FormControl>
+                        <DropzoneInput />
+                      </FormControl>
+                      <div className="flex items-center gap-4">
+                        <DropzoneUploadIcon />
+                        <div className="grid gap-0.5">
+                          <DropzoneTitle>파일을 드래그하거나 클릭하여 업로드</DropzoneTitle>
+                          <DropzoneDescription>PDF, 이미지, 문서 (최대 600MB)</DropzoneDescription>
+                        </div>
+                      </div>
+                    </DropzoneZone>
+                    <FormDescription>기준 문서 첨부가 필요한 경우 업로드하세요.</FormDescription>
+                  </FormItem>
+                )}
+              </Dropzone>
+
+              {attachments.length > 0 && (
+                <div className="space-y-2">
+                  <p className="text-sm font-medium">첨부된 파일 ({attachments.length})</p>
+                  <FileList>
+                    {attachments.map((file, idx) => (
+                      <FileListItem key={idx}>
+                        <FileListHeader>
+                          <FileListInfo>
+                            <FileListName>{file.originalFileName || file.fileName}</FileListName>
+                            {file.size && (
+                              <FileListDescription>{`${file.size} bytes`}</FileListDescription>
+                            )}
+                          </FileListInfo>
+                          <FileListAction
+                            onClick={() =>
+                              setAttachments((prev) => prev.filter((_, i) => i !== idx))
+                            }
+                          >
+                            <X className="h-4 w-4" />
+                            <span className="sr-only">Remove</span>
+                          </FileListAction>
+                        </FileListHeader>
+                      </FileListItem>
+                    ))}
+                  </FileList>
+                </div>
+              )}
+            </div>
+
             {/* Required 체크박스 */}
 
 
diff --git a/lib/pq/service.ts b/lib/pq/service.ts
index 57ce5f88..6d60e193 100644
--- a/lib/pq/service.ts
+++ b/lib/pq/service.ts
@@ -1,4870 +1,5062 @@
-"use server"
-
-import db from "@/db/db"
-import { CopyPqListInput, CreatePqListInput, UpdatePqValidToInput, copyPqListSchema, createPqListSchema, updatePqValidToSchema, GetPqListsSchema, GetPQSchema, GetPQSubmissionsSchema } from "./validations"
-import { unstable_cache } from "@/lib/unstable-cache";
-import { filterColumns } from "@/lib/filter-columns";
-import { getErrorMessage } from "@/lib/handle-error";
-import { asc, desc, ilike, inArray, and, gte, lte, not, or, eq, ne, count,isNull,SQL, sql, lt, gt, isNotNull} from "drizzle-orm";
-import { z } from "zod"
-import { revalidateTag, unstable_noStore, revalidatePath} from "next/cache";
-import { format } from "date-fns"
-import { pqCriterias, vendorCriteriaAttachments, vendorInvestigations, vendorInvestigationAttachments, vendorPQSubmissions, vendorPqCriteriaAnswers, vendorPqReviewLogs, siteVisitRequests, vendorSiteVisitInfo, siteVisitRequestAttachments } from "@/db/schema/pq"
-import { sendEmail } from "../mail/sendEmail";
-import { decryptWithServerAction } from '@/components/drm/drmUtils'
-
-import { vendorAttachments, vendors } from "@/db/schema/vendors";
-import { vendorRegularRegistrations } from "@/db/schema/vendorRegistrations";
-import { saveFile, saveDRMFile } from "@/lib/file-stroage";
-import { GetVendorsSchema } from "../vendors/validations";
-import { selectVendors } from "../vendors/repository";
-import { projects, users, roles, userRoles } from "@/db/schema";
-import { headers } from 'next/headers';
-import { getServerSession } from "next-auth/next"
-import { authOptions } from "@/app/api/auth/[...nextauth]/route"
-import { alias } from 'drizzle-orm/pg-core';
-import { createPQFilterMapping, getPQJoinedTables } from "./helper";
-import { pqLists } from "@/db/schema/pq";
-
-export interface PQAttachment {
-  attachId: number
-  fileName: string
-  filePath: string
-  fileSize?: number
-}
-
-export interface PQItem {
-  answerId: number | null
-  criteriaId: number
-  code: string
-  checkPoint: string
-  description: string | null
-  remarks?: string | null
-  // 프로젝트 PQ 전용 필드
-  contractInfo?: string | null
-  additionalRequirement?: string | null
-  answer: string
-  shiComment: string
-  vendorReply: string
-  attachments: PQAttachment[]
-  subGroupName: string
-  inputFormat: string
-
-  createdAt: Date | null
-  updatedAt: Date | null
-}
-
-export interface PQGroupData {
-  groupName: string
-  items: PQItem[]
-}
-
-export interface ProjectPQ {
-  id: number;
-  projectId: number | null;
-  status: string;
-  submittedAt: Date | null;
-  projectCode: string;
-  projectName: string;
-}
-
-export async function getPQProjectsByVendorId(vendorId: number): Promise<ProjectPQ[]> {
-  const result = await db
-    .select({
-      id: vendorPQSubmissions.id,
-      projectId: vendorPQSubmissions.projectId,
-      status: vendorPQSubmissions.status,
-      submittedAt: vendorPQSubmissions.submittedAt,
-      projectCode: projects.code,
-      projectName: projects.name,
-    })
-    .from(vendorPQSubmissions)
-    .innerJoin(
-      projects,
-      eq(vendorPQSubmissions.projectId, projects.id)
-    )
-    .where(eq(vendorPQSubmissions.vendorId, vendorId))
-    .orderBy(projects.code);
-    
-  return result;
-}
-
-export async function getPQDataByVendorId(
-  vendorId: number,
-  projectId?: number,
-  pqType?: "GENERAL" | "PROJECT" | "NON_INSPECTION"
-): Promise<PQGroupData[]> {
-  try {
-    // 파라미터 유효성 검증
-    if (isNaN(vendorId)) {
-      throw new Error("Invalid vendorId parameter");
-    }
-    
-    // 타입 결정 로직
-    let finalPqType: "GENERAL" | "PROJECT" | "NON_INSPECTION";
-    if (pqType) {
-      finalPqType = pqType;
-    } else if (projectId) {
-      finalPqType = "PROJECT";
-    } else {
-      finalPqType = "GENERAL";
-    }
-    
-    // 기본 쿼리 구성
-    const selectObj = {
-      criteriaId: pqCriterias.id,
-      groupName: pqCriterias.groupName,
-      code: pqCriterias.code,
-      checkPoint: pqCriterias.checkPoint,
-      description: pqCriterias.description,
-      remarks: pqCriterias.remarks,
-      
-      // 입력 형식 필드 추가
-      inputFormat: pqCriterias.inputFormat,
-      
-      // 협력업체 응답 필드
-      answer: vendorPqCriteriaAnswers.answer,
-      answerId: vendorPqCriteriaAnswers.id,
-      
-      // SHI 코멘트와 벤더 답변 필드 추가
-      shiComment: vendorPqCriteriaAnswers.shiComment,
-      vendorReply: vendorPqCriteriaAnswers.vendorReply,
-      createdAt: vendorPqCriteriaAnswers.createdAt,
-      updatedAt: vendorPqCriteriaAnswers.updatedAt,
-      
-      // 첨부 파일 필드
-      attachId: vendorCriteriaAttachments.id,
-      fileName: vendorCriteriaAttachments.fileName,
-      filePath: vendorCriteriaAttachments.filePath,
-      fileSize: vendorCriteriaAttachments.fileSize,
-    };
-
-    // 타입별 쿼리 조건 구성
-    const pqListConditions = [
-      eq(pqCriterias.pqListId, pqLists.id),
-      eq(pqLists.type, finalPqType),
-      eq(pqLists.isDeleted, false)
-    ];
-
-    const answerConditions = [
-      eq(pqCriterias.id, vendorPqCriteriaAnswers.criteriaId),
-      eq(vendorPqCriteriaAnswers.vendorId, vendorId)
-    ];
-
-    // 프로젝트별 조건 추가
-    if (finalPqType === "PROJECT" && projectId) {
-      pqListConditions.push(eq(pqLists.projectId, projectId));
-      answerConditions.push(eq(vendorPqCriteriaAnswers.projectId, projectId));
-    } else if (finalPqType === "GENERAL" || finalPqType === "NON_INSPECTION") {
-      pqListConditions.push(isNull(pqLists.projectId));
-      answerConditions.push(isNull(vendorPqCriteriaAnswers.projectId));
-    }
-
-    const rows = await db
-      .select(selectObj)
-      .from(pqCriterias)
-      .innerJoin(
-        pqLists,
-        and(...pqListConditions)
-      )
-      .leftJoin(
-        vendorPqCriteriaAnswers,
-        and(...answerConditions)
-      )
-      .leftJoin(
-        vendorCriteriaAttachments,
-        eq(vendorPqCriteriaAnswers.id, vendorCriteriaAttachments.vendorCriteriaAnswerId)
-      )
-      .orderBy(pqCriterias.groupName, pqCriterias.code);
-    
-    return processQueryResults(rows);
-  } catch (error) {
-    console.error("Error fetching PQ data:", error);
-    return [];
-  }
-
-  // Helper function to process query results
-  function processQueryResults(rows: any[]) {
-    // 그룹별로 데이터 구성
-    const groupMap = new Map<string, Record<number, PQItem>>();
-    
-    for (const row of rows) {
-      const g = row.groupName || "Others";
-      
-      // 그룹 확인
-      if (!groupMap.has(g)) {
-        groupMap.set(g, {});
-      }
-      
-      const groupItems = groupMap.get(g)!;
-      
-      // 아직 이 기준을 처리하지 않았으면 PQItem 생성
-      if (!groupItems[row.criteriaId]) {
-        groupItems[row.criteriaId] = {
-          answerId: row.answerId,
-          criteriaId: row.criteriaId,
-          code: row.code,
-          checkPoint: row.checkPoint,
-          description: row.description,
-          remarks: row.remarks,
-          answer: row.answer || "",
-          shiComment: row.shiComment || "",
-          vendorReply: row.vendorReply || "",
-          attachments: [],
-          inputFormat: row.inputFormat || "",
-  
-          subGroupName: row.subGroupName || "",
-          createdAt: row.createdAt,
-          updatedAt: row.updatedAt,
-        };
-      }
-      
-      // 첨부 파일이 있으면 추가
-      if (row.attachId) {
-        groupItems[row.criteriaId].attachments.push({
-          attachId: row.attachId,
-          fileName: row.fileName || "",
-          filePath: row.filePath || "",
-          fileSize: row.fileSize || undefined,
-        });
-      }
-    }
-    
-    // 최종 데이터 구성
-    const data: PQGroupData[] = [];
-    for (const [groupName, itemsMap] of groupMap.entries()) {
-      const items = Object.values(itemsMap);
-      data.push({ groupName, items });
-    }
-    
-    return data;
-  }
-}
-
-
-interface PQAttachmentInput {
-  fileName: string      // original user-friendly file name
-  url: string           // the UUID-based path stored on server
-  size?: number         // optional file size
-}
-
-interface SavePQAnswer {
-  criteriaId: number
-  answer: string
-  shiComment?: string
-  vendorReply?: string
-  attachments: PQAttachmentInput[]
-}
-
-interface SavePQInput {
-  vendorId: number
-  projectId?: number
-  answers: SavePQAnswer[]
-}
-
-/**
- * 여러 항목을 한 번에 Upsert
- */
-export async function savePQAnswersAction(input: SavePQInput) {
-  const { vendorId, projectId, answers } = input
-
-  try {
-    for (const ans of answers) {
-      // 1) Check if a row already exists for (vendorId, criteriaId, projectId)
-      const queryConditions = [
-        eq(vendorPqCriteriaAnswers.vendorId, vendorId),
-        eq(vendorPqCriteriaAnswers.criteriaId, ans.criteriaId)
-      ];
-      
-      // Add projectId condition when it exists
-      if (projectId !== undefined) {
-        queryConditions.push(eq(vendorPqCriteriaAnswers.projectId, projectId));
-      } else {
-        queryConditions.push(isNull(vendorPqCriteriaAnswers.projectId));
-      }
-      
-      const existing = await db
-        .select()
-        .from(vendorPqCriteriaAnswers)
-        .where(and(...queryConditions));
-
-      let answerId: number
-
-      // 2) If it exists, update the row; otherwise insert
-      if (existing.length === 0) {
-        // Insert new
-        const inserted = await db
-          .insert(vendorPqCriteriaAnswers)
-          .values({
-            vendorId,
-            criteriaId: ans.criteriaId,
-            projectId: projectId || null, // Include projectId when provided
-            answer: ans.answer,
-            shiComment: ans.shiComment || null,
-            vendorReply: ans.vendorReply || null,
-            createdAt: new Date(),
-            updatedAt: new Date(),
-          })
-          .returning({ id: vendorPqCriteriaAnswers.id })
-
-        answerId = inserted[0].id
-      } else {
-        // Update existing
-        answerId = existing[0].id
-
-        await db
-          .update(vendorPqCriteriaAnswers)
-          .set({
-            answer: ans.answer,
-            shiComment: ans.shiComment || null,
-            vendorReply: ans.vendorReply || null,
-            updatedAt: new Date(),
-          })
-          .where(eq(vendorPqCriteriaAnswers.id, answerId))
-      }
-
-      // 3) Now manage attachments in vendorCriteriaAttachments
-      // 3a) Load old attachments from DB
-      const oldAttachments = await db
-        .select({
-          id: vendorCriteriaAttachments.id,
-          filePath: vendorCriteriaAttachments.filePath,
-        })
-        .from(vendorCriteriaAttachments)
-        .where(eq(vendorCriteriaAttachments.vendorCriteriaAnswerId, answerId))
-
-      // 3b) Gather the new filePaths (urls) from the client
-      const newPaths = ans.attachments.map(a => a.url)
-
-      // 3c) Find attachments to remove
-      const toRemove = oldAttachments.filter(old => !newPaths.includes(old.filePath))
-      if (toRemove.length > 0) {
-        const removeIds = toRemove.map(r => r.id)
-        await db
-          .delete(vendorCriteriaAttachments)
-          .where(inArray(vendorCriteriaAttachments.id, removeIds))
-      }
-
-      // 3d) Insert new attachments that aren't in DB
-      const oldPaths = oldAttachments.map(o => o.filePath)
-      const toAdd = ans.attachments.filter(a => !oldPaths.includes(a.url))
-
-      for (const attach of toAdd) {
-        await db.insert(vendorCriteriaAttachments).values({
-          vendorCriteriaAnswerId: answerId,
-          fileName: attach.fileName,
-          filePath: attach.url,
-          fileSize: attach.size ?? null,
-        })
-      }
-    }
-
-    return { ok: true }
-  } catch (error) {
-    console.error("savePQAnswersAction error:", error)
-    return { ok: false, error: String(error) }
-  }
-}
-
-
-
-/**
- * PQ 제출 서버 액션 - 협력업체 상태를 PQ_SUBMITTED로 업데이트
- * @param vendorId 협력업체 ID
- */
-export async function submitPQAction({ 
-  vendorId, 
-  projectId,
-  pqSubmissionId
-}: { 
-  vendorId: number; 
-  projectId?: number;
-  pqSubmissionId?: number; // 특정 PQ 제출 ID가 있는 경우 사용
-}) {
-  unstable_noStore();
-  
-  try {
-    const headersList = await headers();
-    const host = headersList.get('host') || 'localhost:3000';
-
-    // 1. 모든 PQ 항목에 대한 응답이 있는지 검증
-    const answerQueryConditions = [
-      eq(vendorPqCriteriaAnswers.vendorId, vendorId)
-    ];
-    
-    // Add projectId condition when it exists
-    if (projectId !== undefined) {
-      answerQueryConditions.push(eq(vendorPqCriteriaAnswers.projectId, projectId));
-    } else {
-      answerQueryConditions.push(isNull(vendorPqCriteriaAnswers.projectId));
-    }
-    
-    const pqCriteriaCount = await db
-      .select({ count: count() })
-      .from(vendorPqCriteriaAnswers)
-      .where(and(...answerQueryConditions));
-      
-    const totalPqCriteriaCount = pqCriteriaCount[0]?.count || 0;
-      
-    // 응답 데이터 검증
-    if (totalPqCriteriaCount === 0) {
-      return { ok: false, error: "No PQ answers found" };
-    }
-      
-    // 2. 협력업체 정보 조회
-    const vendor = await db
-      .select({
-        id: vendors.id,
-        vendorName: vendors.vendorName,
-        email: vendors.email,
-        status: vendors.status,
-      })
-      .from(vendors)
-      .where(eq(vendors.id, vendorId))
-      .then(rows => rows[0]);
-      
-    if (!vendor) {
-      return { ok: false, error: "Vendor not found" };
-    }
-    
-    // Project 정보 조회 (projectId가 있는 경우)
-    let projectName = '';
-    if (projectId) {
-      const projectData = await db
-        .select({
-          projectName: projects.name
-        })
-        .from(projects)
-        .where(eq(projects.id, projectId))
-        .then(rows => rows[0]);
-        
-      projectName = projectData?.projectName || 'Unknown Project';
-    }
-    
-    // 3. 현재 PQ 제출 상태 확인 및 업데이트
-    const currentDate = new Date();
-    let existingSubmission;
-    
-    // 특정 PQ Submission ID가 있는 경우
-    if (pqSubmissionId) {
-      existingSubmission = await db
-        .select({
-          id: vendorPQSubmissions.id,
-          status: vendorPQSubmissions.status,
-          type: vendorPQSubmissions.type,
-          requesterId: vendorPQSubmissions.requesterId
-        })
-        .from(vendorPQSubmissions)
-        .where(
-          and(
-            eq(vendorPQSubmissions.id, pqSubmissionId),
-            eq(vendorPQSubmissions.vendorId, vendorId)
-          )
-        )
-        .then(rows => rows[0]);
-        
-      if (!existingSubmission) {
-        return { ok: false, error: "PQ submission not found or access denied" };
-      }
-    } 
-    // ID가 없는 경우 vendorId와 projectId로 조회
-    else {
-      const pqType = projectId ? "PROJECT" : "GENERAL";
-      
-      const submissionQueryConditions = [
-        eq(vendorPQSubmissions.vendorId, vendorId),
-        eq(vendorPQSubmissions.type, pqType)
-      ];
-      
-      if (projectId) {
-        submissionQueryConditions.push(eq(vendorPQSubmissions.projectId, projectId));
-      } else {
-        submissionQueryConditions.push(isNull(vendorPQSubmissions.projectId));
-      }
-      
-      existingSubmission = await db
-        .select({
-          id: vendorPQSubmissions.id,
-          status: vendorPQSubmissions.status,
-          type: vendorPQSubmissions.type,
-          requesterId: vendorPQSubmissions.requesterId
-        })
-        .from(vendorPQSubmissions)
-        .where(and(...submissionQueryConditions))
-        .then(rows => rows[0]);
-    }
-    
-    // 제출 가능한 상태 확인
-    const allowedStatuses = ["REQUESTED", "IN_PROGRESS", "SUBMITTED", "REJECTED"];
-    
-    if (existingSubmission) {
-      if (!allowedStatuses.includes(existingSubmission.status)) {
-        return {
-          ok: false,
-          error: `Cannot submit PQ in current status: ${existingSubmission.status}`
-        };
-      }
-      
-      // 기존 제출 상태 업데이트
-      await db
-        .update(vendorPQSubmissions)
-        .set({
-          status: "SUBMITTED",
-          submittedAt: currentDate,
-          updatedAt: currentDate,
-        })
-        .where(eq(vendorPQSubmissions.id, existingSubmission.id));
-    } else {
-      // PQ Submission ID가 없고 기존 submission도 없는 경우 새로운 제출 생성
-      const pqType = projectId ? "PROJECT" : "GENERAL";
-      
-      // PQ 번호 생성 (예: PQ-2024-001)
-      const currentYear = new Date().getFullYear();
-      const pqNumber = `PQ-${currentYear}-${String(vendorId).padStart(3, '0')}`;
-      
-      await db
-        .insert(vendorPQSubmissions)
-        .values({
-          pqNumber,
-          vendorId,
-          projectId: projectId || null,
-          type: pqType,
-          status: "SUBMITTED",
-          submittedAt: currentDate,
-          createdAt: currentDate,
-          updatedAt: currentDate,
-        });
-    }
-    
-    // 4. 일반 PQ인 경우 벤더 상태도 업데이트
-    if (!projectId) {
-      const allowedVendorStatuses = ["IN_PQ", "PENDING_REVIEW", "IN_REVIEW", "REJECTED", "PQ_FAILED"];
-      
-      if (allowedVendorStatuses.includes(vendor.status)) {
-        await db
-          .update(vendors)
-          .set({
-            status: "PQ_SUBMITTED",
-            updatedAt: currentDate,
-          })
-          .where(eq(vendors.id, vendorId));
-      }
-    }
-
-    // 5. PQ 요청자에게 이메일 알림 발송
-    const targetSubmissionId = existingSubmission?.id || '';
-    const targetRequesterId = existingSubmission?.requesterId || null;
-
-    // QM 담당자 이메일 조회 (해당 PQ와 연결된 실사에 배정된 경우)
-    let qmManagerEmail: string | null = null;
-    if (targetSubmissionId) {
-      try {
-        const inv = await db
-          .select({ qmManagerId: vendorInvestigations.qmManagerId })
-          .from(vendorInvestigations)
-          .where(eq(vendorInvestigations.pqSubmissionId, Number(targetSubmissionId)))
-          .then(rows => rows[0]);
-        if (inv?.qmManagerId) {
-          const qmUser = await db
-            .select({ email: users.email })
-            .from(users)
-            .where(eq(users.id, inv.qmManagerId))
-            .then(rows => rows[0]);
-          qmManagerEmail = qmUser?.email || null;
-        }
-      } catch (e) {
-        console.warn("Failed to fetch QM manager email for PQ submission", e);
-      }
-    }
-
-    if (targetRequesterId !== null) {
-      try {
-        // 요청자 정보 조회
-        const requester = await db
-          .select({
-            id: users.id,
-            name: users.name,
-            email: users.email,
-          })
-          .from(users)
-          .where(eq(users.id, targetRequesterId))
-          .then(rows => rows[0]);
-
-        if (requester?.email) {
-          const emailSubject = projectId
-            ? `[eVCP] Project PQ Submitted: ${vendor.vendorName} for ${projectName}`
-            : `[eVCP] General PQ Submitted: ${vendor.vendorName}`;
-
-          const adminUrl = `http://${host}/evcp/pq/${vendorId}/${targetSubmissionId}`;
-
-          await sendEmail({
-            to: requester.email,
-            cc: qmManagerEmail ? [qmManagerEmail] : undefined,
-            subject: emailSubject,
-            template: "pq-submitted-admin",
-            context: {
-              vendorName: vendor.vendorName,
-              vendorId: vendor.id,
-              projectId: projectId,
-              projectName: projectName,
-              isProjectPQ: !!projectId,
-              submittedDate: currentDate.toLocaleString(),
-              adminUrl,
-              requesterName: requester.name,
-            }
-          });
-        }
-      } catch (emailError) {
-        console.error("Failed to send requester notification:", emailError);
-      }
-    }
-      
-    // 6. 벤더에게 확인 이메일 발송
-    if (vendor.email) {
-      try {
-        const emailSubject = projectId
-          ? `[eVCP] Project PQ Submission Confirmation for ${projectName}`
-          : "[eVCP] General PQ Submission Confirmation";
-          
-        const portalUrl = `${host}/partners/pq`;
-          
-        await sendEmail({
-          to: vendor.email,
-          subject: emailSubject,
-          template: "pq-submitted-vendor",
-          context: {
-            vendorName: vendor.vendorName,
-            projectId: projectId,
-            projectName: projectName,
-            isProjectPQ: !!projectId,
-            submittedDate: currentDate.toLocaleString(),
-            portalUrl,
-          }      
-        });
-      } catch (emailError) {
-        console.error("Failed to send vendor confirmation:", emailError);
-      }
-    }
-      
-    // 7. 캐시 무효화
-    revalidateTag("vendors");
-    revalidateTag("vendor-status-counts");
-    revalidateTag(`vendor-pq-submissions-${vendorId}`);
-    
-    if (projectId) {
-      revalidateTag(`project-pq-submissions-${projectId}`);
-      revalidateTag(`project-vendors-${projectId}`);
-      revalidateTag(`project-pq-${projectId}`);
-    }
-      
-    return { ok: true };
-  } catch (error) {
-    console.error("PQ submit error:", error);
-    return { ok: false, error: getErrorMessage(error) };
-  }
-}
-
-/**
- * 향상된 파일 업로드 서버 액션
- * - 직접 파일 처리 (file 객체로 받음)
- * - 디렉토리 자동 생성
- * - 중복 방지를 위한 UUID 적용
- */
-/**
- * 벤더용 파일 업로드 액션 (saveFile 사용)
- */
-export async function uploadVendorFileAction(file: File, userId?: string) {
-  unstable_noStore();
-  
-  try {
-    const result = await saveFile({
-      file,
-      directory: 'pq/vendor',
-      originalName: file.name,
-      userId,
-    });
-
-    if (!result.success) {
-      throw new Error(result.error || "파일 업로드에 실패했습니다.");
-    }
-
-    return {
-      fileName: result.fileName!,
-      url: result.publicPath!,
-      size: result.fileSize!,
-    };
-  } catch (error) {
-    console.error("Vendor file upload error:", error);
-    throw new Error(`Upload failed: ${getErrorMessage(error)}`);
-  }
-}
-
-/**
- * SHI용 파일 업로드 액션 (saveDRMFile 사용)
- */
-export async function uploadSHIFileAction(file: File, userId?: string) {
-  unstable_noStore();
-  
-  try {
-    const result = await saveDRMFile(
-      file,
-      decryptWithServerAction,
-      'pq/shi',
-      userId
-    );
-
-    if (!result.success) {
-      throw new Error(result.error || "파일 업로드에 실패했습니다.");
-    }
-
-    return {
-      fileName: result.fileName!,
-      url: result.publicPath!,
-      size: result.fileSize!,
-    };
-  } catch (error) {
-    console.error("SHI file upload error:", error);
-    throw new Error(`Upload failed: ${getErrorMessage(error)}`);
-  }
-}
-
-/**
- * 벤더용 여러 파일 일괄 업로드
- */
-export async function uploadVendorMultipleFilesAction(files: File[], userId?: string) {
-  unstable_noStore();
-  
-  try {
-    const results = [];
-    
-    for (const file of files) {
-      try {
-        const result = await uploadVendorFileAction(file, userId);
-        results.push({
-          success: true,
-          ...result
-        });
-      } catch (error) {
-        results.push({
-          success: false,
-          fileName: file.name,
-          error: getErrorMessage(error)
-        });
-      }
-    }
-    
-    return {
-      ok: true,
-      results
-    };
-  } catch (error) {
-    console.error("Vendor batch upload error:", error);
-    return {
-      ok: false,
-      error: getErrorMessage(error)
-    };
-  }
-}
-
-/**
- * SHI용 여러 파일 일괄 업로드
- */
-export async function uploadSHIMultipleFilesAction(files: File[], userId?: string) {
-  unstable_noStore();
-  
-  try {
-    const results = [];
-    
-    for (const file of files) {
-      try {
-        const result = await uploadSHIFileAction(file, userId);
-        results.push({
-          success: true,
-          ...result
-        });
-      } catch (error) {
-        results.push({
-          success: false,
-          fileName: file.name,
-          error: getErrorMessage(error)
-        });
-      }
-    }
-    
-    return {
-      ok: true,
-      results
-    };
-  } catch (error) {
-    console.error("SHI batch upload error:", error);
-    return {
-      ok: false,
-      error: getErrorMessage(error)
-    };
-  }
-}
-
-// export async function getVendorsInPQ(input: GetVendorsSchema) {
-//   return unstable_cache(
-//     async () => {
-//       try {
-//         const offset = (input.page - 1) * input.perPage;
-
-//         // 1) 고급 필터
-//         const advancedWhere = filterColumns({
-//           table: vendors,
-//           filters: input.filters,
-//           joinOperator: input.joinOperator,
-//         });
-
-//         // 2) 글로벌 검색
-//         let globalWhere: SQL<unknown> | undefined = undefined;
-//         if (input.search) {
-//           const s = `%${input.search}%`;
-//           globalWhere = or(
-//             ilike(vendors.vendorName, s),
-//             ilike(vendors.vendorCode, s),
-//             ilike(vendors.email, s),
-//             ilike(vendors.status, s)
-//           );
-//         }
-
-//         // 트랜잭션 내에서 데이터 조회
-//         const { data, total } = await db.transaction(async (tx) => {
-//           // 협력업체 ID 모음 (중복 제거용)
-//           const vendorIds = new Set<number>();
-          
-//           // 1-A) 일반 PQ 답변이 있는 협력업체 찾기 (status와 상관없이)
-//           const generalPqVendors = await tx
-//             .select({ 
-//               vendorId: vendorPqCriteriaAnswers.vendorId 
-//             })
-//             .from(vendorPqCriteriaAnswers)
-//             .innerJoin(
-//               vendors,
-//               eq(vendorPqCriteriaAnswers.vendorId, vendors.id)
-//             )
-//             .where(
-//               and(
-//                 isNull(vendorPqCriteriaAnswers.projectId), // 일반 PQ만 (프로젝트 PQ 아님)
-//                 advancedWhere,
-//                 globalWhere
-//               )
-//             )
-//             .groupBy(vendorPqCriteriaAnswers.vendorId); // 각 벤더당 한 번만 카운트
-          
-//           generalPqVendors.forEach(v => vendorIds.add(v.vendorId));
-          
-//           // 1-B) 프로젝트 PQ 답변이 있는 협력업체 ID 조회 (status와 상관없이)
-//           const projectPqVendors = await tx
-//             .select({ 
-//               vendorId: vendorPQSubmissions.vendorId
-//             })
-//             .from(vendorPQSubmissions)
-//             .innerJoin(
-//               vendors,
-//               eq(vendorPQSubmissions.vendorId, vendors.id)
-//             )
-//             .where(
-//               and(
-//                 eq(vendorPQSubmissions.type, "PROJECT"),
-//                 // 최소한 IN_PROGRESS부터는 작업이 시작된 상태이므로 포함
-//                 not(eq(vendorPQSubmissions.status, "REQUESTED")), // REQUESTED 상태는 제외
-//                 advancedWhere,
-//                 globalWhere
-//               )
-//             );
-            
-//           projectPqVendors.forEach(v => vendorIds.add(v.vendorId));
-          
-//           // 중복 제거된 협력업체 ID 배열
-//           const uniqueVendorIds = Array.from(vendorIds);
-          
-//           // 총 개수 (중복 제거 후)
-//           const total = uniqueVendorIds.length;
-          
-//           if (total === 0) {
-//             return { data: [], total: 0 };
-//           }
-          
-//           // 페이징 처리 (정렬 후 limit/offset 적용)
-//           const paginatedIds = uniqueVendorIds.slice(offset, offset + input.perPage);
-          
-//           // 2) 페이징된 협력업체 상세 정보 조회
-//           const vendorsData = await selectVendors(tx, {
-//             where: inArray(vendors.id, paginatedIds),
-//             orderBy: input.sort.length > 0
-//               ? input.sort.map((item) => 
-//                 item.desc ? desc(vendors.vendorName) : asc(vendors.vendorName)
-//             )
-//               : [asc(vendors.createdAt)],
-//           });
-          
-//           // 3) 각 벤더별 PQ 상태 정보 추가 
-//           const vendorsWithPqInfo = await Promise.all(
-//             vendorsData.map(async (vendor) => {
-//               // 3-A) 첨부 파일 조회
-//               const attachments = await tx
-//                 .select({
-//                   id: vendorAttachments.id,
-//                   fileName: vendorAttachments.fileName,
-//                   filePath: vendorAttachments.filePath,
-//                 })
-//                 .from(vendorAttachments)
-//                 .where(eq(vendorAttachments.vendorId, vendor.id));
-              
-//               // 3-B) 일반 PQ 제출 여부 확인 (PQ 답변이 있는지)
-//               const generalPqAnswers = await tx
-//                 .select({ count: count() })
-//                 .from(vendorPqCriteriaAnswers)
-//                 .where(
-//                   and(
-//                     eq(vendorPqCriteriaAnswers.vendorId, vendor.id),
-//                     isNull(vendorPqCriteriaAnswers.projectId)
-//                   )
-//                 );
-                
-//               const hasGeneralPq = generalPqAnswers[0]?.count > 0;
-              
-//               // 3-C) 프로젝트 PQ 정보 조회 (모든 상태 포함)
-//               const projectPqs = await tx
-//                 .select({
-//                   projectId: vendorPQSubmissions.projectId,
-//                   projectName: projects.name,
-//                   status: vendorPQSubmissions.status,
-//                   submittedAt: vendorPQSubmissions.submittedAt,
-//                   approvedAt: vendorPQSubmissions.approvedAt,
-//                   rejectedAt: vendorPQSubmissions.rejectedAt
-//                 })
-//                 .from(vendorPQSubmissions)
-//                 .innerJoin(
-//                   projects,
-//                   eq(vendorPQSubmissions.projectId, projects.id)
-//                 )
-//                 .where(
-//                   and(
-//                     eq(vendorPQSubmissions.vendorId, vendor.id),
-//                     eq(vendorPQSubmissions.type, "PROJECT"),
-//                     not(eq(vendorPQSubmissions.status, "REQUESTED")) // REQUESTED 상태는 제외
-//                   )
-//                 );
-              
-//               const hasProjectPq = projectPqs.length > 0;
-              
-//               // 프로젝트 PQ 상태별 카운트
-//               const projectPqStatusCounts = {
-//                 inProgress: projectPqs.filter(p => p.status === "IN_PROGRESS").length,
-//                 submitted: projectPqs.filter(p => p.status === "SUBMITTED").length,
-//                 approved: projectPqs.filter(p => p.status === "APPROVED").length,
-//                 rejected: projectPqs.filter(p => p.status === "REJECTED").length,
-//                 total: projectPqs.length
-//               };
-              
-//               // 3-D) PQ 상태 정보 추가
-//               return {
-//                 ...vendor,
-//                 hasAttachments: attachments.length > 0,
-//                 attachmentsList: attachments,
-//                 pqInfo: {
-//                   hasGeneralPq,
-//                   hasProjectPq,
-//                   projectPqs,
-//                   projectPqStatusCounts,
-//                   // 현재 PQ 상태 (UI에 표시 용도)
-//                   pqStatus: getPqStatusDisplay(vendor.status, hasGeneralPq, hasProjectPq, projectPqStatusCounts)
-//                 }
-//               };
-//             })
-//           );
-          
-//           return { data: vendorsWithPqInfo, total };
-//         });
-
-//         // 페이지 수
-//         const pageCount = Math.ceil(total / input.perPage);
-
-//         return { data, pageCount };
-//       } catch (err) {
-//         console.error("Error in getVendorsInPQ:", err);
-//         // 에러 발생 시
-//         return { data: [], pageCount: 0 };
-//       }
-//     },
-//     [JSON.stringify(input)], // 캐싱 키
-//     {
-//       revalidate: 3600,
-//       tags: ["vendors-in-pq", "project-pqs"], // revalidateTag 호출 시 무효화
-//     }
-//   )();
-// }
-
-// PQ 상태 표시 함수
-function getPqStatusDisplay(
-  vendorStatus: string, 
-  hasGeneralPq: boolean, 
-  hasProjectPq: boolean,
-  projectPqCounts: { inProgress: number, submitted: number, approved: number, rejected: number, total: number }
-): string {
-  // 프로젝트 PQ 상태 문자열 생성
-  let projectPqStatus = "";
-  if (hasProjectPq) {
-    const parts = [];
-    if (projectPqCounts.inProgress > 0) {
-      parts.push(`진행중: ${projectPqCounts.inProgress}`);
-    }
-    if (projectPqCounts.submitted > 0) {
-      parts.push(`제출: ${projectPqCounts.submitted}`);
-    }
-    if (projectPqCounts.approved > 0) {
-      parts.push(`승인: ${projectPqCounts.approved}`);
-    }
-    if (projectPqCounts.rejected > 0) {
-      parts.push(`거부: ${projectPqCounts.rejected}`);
-    }
-    projectPqStatus = parts.join(", ");
-  }
-
-  // 일반 PQ + 프로젝트 PQ 조합 상태
-  if (hasGeneralPq && hasProjectPq) {
-    return `일반 PQ (${getPqVendorStatusText(vendorStatus)}) + 프로젝트 PQ (${projectPqStatus})`;
-  } else if (hasGeneralPq) {
-    return `일반 PQ (${getPqVendorStatusText(vendorStatus)})`;
-  } else if (hasProjectPq) {
-    return `프로젝트 PQ (${projectPqStatus})`;
-  }
-  
-  return "PQ 정보 없음";
-}
-
-// 협력업체 상태 텍스트 변환
-function getPqVendorStatusText(status: string): string {
-  switch (status) {
-    case "IN_PQ": return "진행중";
-    case "PQ_SUBMITTED": return "제출됨";
-    case "PQ_FAILED": return "실패";
-    case "PQ_APPROVED": 
-    case "APPROVED": return "승인됨";
-    case "READY_TO_SEND": return "거래 준비";
-    case "ACTIVE": return "활성";
-    case "INACTIVE": return "비활성";
-    case "BLACKLISTED": return "거래금지";
-    default: return status;
-  }
-}
-
-
-export type VendorStatus =
-  | "PENDING_REVIEW"
-  | "IN_REVIEW"
-  | "REJECTED"
-  | "IN_PQ"
-  | "PQ_SUBMITTED"
-  | "PQ_FAILED"
-  | "APPROVED"
-  | "ACTIVE"
-  | "INACTIVE"
-  | "BLACKLISTED"
-  | "PQ_APPROVED"
-
-  export async function updateVendorStatusAction(
-    vendorId: number,
-    newStatus: VendorStatus
-  ) {
-    try {
-      // 1) Update DB
-      await db.update(vendors)
-        .set({ status: newStatus })
-        .where(eq(vendors.id, vendorId))
-  
-      // 2) Load vendor's email & name
-      const vendor = await db.select().from(vendors).where(eq(vendors.id, vendorId)).then(r => r[0])
-      if (!vendor) {
-        return { ok: false, error: "Vendor not found" }
-      }
-      const headersList = await headers();
-      const host = headersList.get('host') || 'localhost:3000';
-      const loginUrl = `http://${host}/partners/pq`
-  
-      // 3) Send email
-      await sendEmail({
-        to: vendor.email || "",
-        subject: `Your PQ Status is now ${newStatus}`,
-        template: "vendor-pq-status",  // matches .hbs file
-        context: {
-          name: vendor.vendorName,
-          status: newStatus,
-          loginUrl: loginUrl,  // etc.
-        },
-      })
-      revalidateTag("vendors")
-      revalidateTag("vendors-in-pq")
-      return { ok: true }
-    } catch (error) {
-      console.error("updateVendorStatusAction error:", error)
-      return { ok: false, error: String(error) }
-    }
-  }
-
-  type ProjectPQStatus = "REQUESTED" | "IN_PROGRESS" | "SUBMITTED" | "APPROVED" | "REJECTED";
-
-/**
- * Update the status of a project-specific PQ for a vendor
- */
-export async function updateProjectPQStatusAction({
-  vendorId,
-  projectId,
-  status,
-  comment
-}: {
-  vendorId: number;
-  projectId: number;
-  status: ProjectPQStatus;
-  comment?: string;
-}) {
-  try {
-    const currentDate = new Date();
-    
-    // 1) Prepare update data with appropriate timestamps
-    const updateData: any = {
-      status,
-      updatedAt: currentDate,
-    };
-    
-    // Add status-specific fields
-    if (status === "APPROVED") {
-      updateData.approvedAt = currentDate;
-    } else if (status === "REJECTED") {
-      updateData.rejectedAt = currentDate;
-      updateData.rejectReason = comment || null;
-    } else if (status === "SUBMITTED") {
-      updateData.submittedAt = currentDate;
-    }
-    
-    // 2) Update the project PQ record
-    await db
-      .update(vendorPQSubmissions)
-      .set(updateData)
-      .where(
-        and(
-          eq(vendorPQSubmissions.vendorId, vendorId),
-          eq(vendorPQSubmissions.projectId, projectId),
-          eq(vendorPQSubmissions.type, "PROJECT")
-        )
-      );
-    
-    // 3) Load vendor and project details for email
-    const vendor = await db
-      .select({
-        id: vendors.id,
-        email: vendors.email,
-        vendorName: vendors.vendorName
-      })
-      .from(vendors)
-      .where(eq(vendors.id, vendorId))
-      .then(rows => rows[0]);
-    
-    if (!vendor) {
-      return { ok: false, error: "Vendor not found" };
-    }
-    
-    const project = await db
-      .select({
-        name: projects.name
-      })
-      .from(projects)
-      .where(eq(projects.id, projectId))
-      .then(rows => rows[0]);
-    
-    if (!project) {
-      return { ok: false, error: "Project not found" };
-    }
-    
-    // 4) Send email notification
-    await sendEmail({
-      to: vendor.email || "",
-      subject: `Your Project PQ for ${project.name} is now ${status}`,
-      template: "vendor-project-pq-status", // matches .hbs file (you might need to create this)
-      context: {
-        name: vendor.vendorName,
-        status,
-        projectName: project.name,
-        rejectionReason: status === "REJECTED" ? comment : undefined,
-        hasRejectionReason: status === "REJECTED" && !!comment,
-        loginUrl: `${process.env.NEXT_PUBLIC_URL}/partners/pq?projectId=${projectId}`,
-        approvalDate: status === "APPROVED" ? currentDate.toLocaleDateString() : undefined,
-        rejectionDate: status === "REJECTED" ? currentDate.toLocaleDateString() : undefined,
-      },
-    });
-    
-    // 5) Revalidate cache tags
-    revalidateTag("vendors");
-    revalidateTag("vendors-in-pq");
-    revalidateTag(`vendor-project-pqs-${vendorId}`);
-    revalidateTag(`project-pq-${projectId}`);
-    revalidateTag(`project-vendors-${projectId}`);
-    
-    return { ok: true };
-  } catch (error) {
-    console.error("updateProjectPQStatusAction error:", error);
-    return { ok: false, error: String(error) };
-  }
-}
-
-// 코멘트 타입 정의
-interface ItemComment {
-  answerId: number;
-  checkPoint: string; // 체크포인트 정보 추가
-  code: string;      // 코드 정보 추가
-  comment: string;
-}
-
-/**
- * PQ 변경 요청 처리 서버 액션
- * 
- * @param vendorId 협력업체 ID
- * @param comment 항목별 코멘트 배열 (answerId, checkPoint, code, comment로 구성)
- * @param generalComment 전체 PQ에 대한 일반 코멘트 (선택사항)
- */
-export async function requestPqChangesAction({
-  vendorId,
-  projectId,
-  comment,
-  generalComment,
-  reviewerName
-}: {
-  vendorId: number;
-  projectId?: number; // Optional project ID for project-specific PQs
-  comment: ItemComment[];
-  generalComment?: string;
-  reviewerName?: string;
-}) {
-  try {
-    // 1) 상태 업데이트 (PQ 타입에 따라 다르게 처리)
-    if (projectId) {
-      // 프로젝트 PQ인 경우 vendorPQSubmissions 테이블 업데이트
-      const projectPq = await db
-        .select()
-        .from(vendorPQSubmissions)
-        .where(
-          and(
-            eq(vendorPQSubmissions.vendorId, vendorId),
-            eq(vendorPQSubmissions.projectId, projectId),
-            eq(vendorPQSubmissions.type, "PROJECT")
-          )
-        )
-        .then(rows => rows[0]);
-
-      if (!projectPq) {
-        return { ok: false, error: "Project PQ record not found" };
-      }
-
-      await db
-        .update(vendorPQSubmissions)
-        .set({
-          status: "IN_PROGRESS", // 변경 요청 상태로 설정
-          updatedAt: new Date(),
-        })
-        .where(
-          and(
-            eq(vendorPQSubmissions.vendorId, vendorId),
-            eq(vendorPQSubmissions.projectId, projectId),
-            eq(vendorPQSubmissions.type, "PROJECT")
-          )
-        );
-    } else {
-      // 일반 PQ인 경우 vendors 테이블 업데이트
-      await db
-        .update(vendors)
-        .set({
-          status: "IN_PQ", // 변경 요청 상태로 설정
-          updatedAt: new Date(),
-        })
-        .where(eq(vendors.id, vendorId));
-    }
-
-    // 2) 협력업체 정보 가져오기
-    const vendor = await db
-      .select()
-      .from(vendors)
-      .where(eq(vendors.id, vendorId))
-      .then(r => r[0]);
-
-    if (!vendor) {
-      return { ok: false, error: "Vendor not found" };
-    }
-
-    // 프로젝트 정보 가져오기 (프로젝트 PQ인 경우)
-    let projectName = "";
-    if (projectId) {
-      const project = await db
-        .select({
-          name: projects.name
-        })
-        .from(projects)
-        .where(eq(projects.id, projectId))
-        .then(rows => rows[0]);
-
-      projectName = project?.name || "Unknown Project";
-    }
-
-    // 3) 각 항목별 코멘트 저장
-    const currentDate = new Date();
-
-
-    // 병렬로 모든 코멘트 저장
-    if (comment && comment.length > 0) {
-      const insertPromises = comment.map(item =>
-        db.insert(vendorPqReviewLogs)
-          .values({
-            vendorPqCriteriaAnswerId: item.answerId,
-            // reviewerId: reviewerId,
-            reviewerName: reviewerName,
-            reviewerComment: item.comment,
-            createdAt: currentDate,
-            // 추가 메타데이터 필드가 있다면 저장
-            // 이런 메타데이터는 DB 스키마에 해당 필드가 있어야 함
-            // meta: JSON.stringify({ checkPoint: item.checkPoint, code: item.code })
-          })
-      );
-
-      // 모든 삽입 기다리기
-      await Promise.all(insertPromises);
-    }
-
-    // 4) 변경 요청 이메일 보내기
-    // 코멘트 목록 준비
-    const commentItems = comment.map(item => ({
-      id: item.answerId,
-      code: item.code,
-      checkPoint: item.checkPoint,
-      text: item.comment
-    }));
-
-    // PQ 유형에 따라 이메일 제목 및 내용 조정
-    const emailSubject = projectId
-      ? `[IMPORTANT] Your Project PQ (${projectName}) requires changes`
-      : `[IMPORTANT] Your PQ submission requires changes`;
-
-    // 로그인 URL - 프로젝트 PQ인 경우 다른 경로로 안내
-    const loginUrl = projectId
-      ? `${process.env.NEXT_PUBLIC_URL}/partners/pq?projectId=${projectId}`
-      : `${process.env.NEXT_PUBLIC_URL}/partners/pq`;
-
-    await sendEmail({
-      to: vendor.email || "",
-      subject: emailSubject,
-      template: "vendor-pq-comment", // matches .hbs file
-      context: {
-        name: vendor.vendorName,
-        vendorCode: vendor.vendorCode,
-        loginUrl,
-        comments: commentItems,
-        generalComment: generalComment || "",
-        hasGeneralComment: !!generalComment,
-        commentCount: commentItems.length,
-        projectId,
-        projectName,
-        isProjPQ: !!projectId,
-      },
-    });
-
-    // 5) 캐시 무효화 - PQ 유형에 따라 적절한 태그 무효화
-    revalidateTag("vendors");
-    revalidateTag("vendors-in-pq");
-    
-    if (projectId) {
-      revalidateTag(`vendor-project-pqs-${vendorId}`);
-      revalidateTag(`project-pq-${projectId}`);
-      revalidateTag(`project-vendors-${projectId}`);
-    }
-
-    return { ok: true };
-  } catch (error) {
-    console.error("requestPqChangesAction error:", error);
-    return { ok: false, error: String(error) };
-  }
-}
-
-interface AddReviewCommentInput {
-  answerId: number // vendorPqCriteriaAnswers.id
-  comment: string
-  reviewerName?: string
-}
-
-export async function addReviewCommentAction(input: AddReviewCommentInput) {
-  try {
-    // 1) Check that the answer row actually exists
-    const existing = await db
-      .select({ id: vendorPqCriteriaAnswers.id })
-      .from(vendorPqCriteriaAnswers)
-      .where(eq(vendorPqCriteriaAnswers.id, input.answerId))
-
-    if (existing.length === 0) {
-      return { ok: false, error: "Item not found" }
-    }
-
-    // 2) Insert the log
-    await db.insert(vendorPqReviewLogs).values({
-      vendorPqCriteriaAnswerId: input.answerId,
-      reviewerComment: input.comment,
-      reviewerName: input.reviewerName ?? "AdminUser",
-    })
-
-    return { ok: true }
-  } catch (error) {
-    console.error("addReviewCommentAction error:", error)
-    return { ok: false, error: String(error) }
-  }
-}
-
-interface GetItemReviewLogsInput {
-  answerId: number
-}
-
-export async function getItemReviewLogsAction(input: GetItemReviewLogsInput) {
-  try {
-    
-    const logs = await db
-      .select()
-      .from(vendorPqReviewLogs)
-      .where(eq(vendorPqReviewLogs.vendorPqCriteriaAnswerId, input.answerId))
-      .orderBy(desc(vendorPqReviewLogs.createdAt));
-      
-    return { ok: true, data: logs };
-  } catch (error) {
-    console.error("getItemReviewLogsAction error:", error);
-    return { ok: false, error: String(error) };
-  }
-}
-
-export interface VendorPQListItem {
-  projectId: number;
-  projectName: string;
-  status: string;
-  submittedAt?: Date | null; // Change to accept both undefined and null
-}
-
-export interface VendorPQsList {
-  hasGeneralPq: boolean;
-  generalPqStatus?: string; // vendor.status for general PQ
-  projectPQs: VendorPQListItem[];
-}
-
-export async function getVendorPQsList(vendorId: number): Promise<VendorPQsList> {
-  unstable_noStore();
-  
-  try {
-    // 1. Check if vendor has general PQ answers
-    const generalPqAnswers = await db
-      .select({ count: count() })
-      .from(vendorPqCriteriaAnswers)
-      .where(
-        and(
-          eq(vendorPqCriteriaAnswers.vendorId, vendorId),
-          isNull(vendorPqCriteriaAnswers.projectId)
-        )
-      );
-        
-    const hasGeneralPq = (generalPqAnswers[0]?.count || 0) > 0;
-      
-    // 2. Get vendor status for general PQ
-    let generalPqStatus;
-    if (hasGeneralPq) {
-      const vendor = await db
-        .select({ status: vendors.status })
-        .from(vendors)
-        .where(eq(vendors.id, vendorId))
-        .then(rows => rows[0]);
-            
-      generalPqStatus = vendor?.status;
-    }
-      
-    // 3. Get project PQs
-    const projectPQs = await db
-      .select({
-        projectId: vendorPQSubmissions.projectId,
-        projectName: projects.name,
-        status: vendorPQSubmissions.status,
-        submittedAt: vendorPQSubmissions.submittedAt
-      })
-      .from(vendorPQSubmissions)
-      .innerJoin(
-        projects,
-        eq(vendorPQSubmissions.projectId, projects.id)
-      )
-      .where(
-        and(
-          eq(vendorPQSubmissions.vendorId, vendorId),
-          eq(vendorPQSubmissions.type, "PROJECT"),
-          not(eq(vendorPQSubmissions.status, "REQUESTED")) // Exclude requests that haven't been started
-        )
-      )
-      .orderBy(vendorPQSubmissions.updatedAt);
-        
-    return {
-      hasGeneralPq,
-      generalPqStatus,
-      projectPQs: projectPQs
-    };
-    
-  } catch (error) {
-    console.error("Error fetching vendor PQs list:", error);
-    return {
-      hasGeneralPq: false,
-      projectPQs: []
-    };
-  }
-}
-
-
-export async function loadGeneralPQData(vendorId: number) {
-  "use server";
-  return getPQDataByVendorId(vendorId)
-}
-
-export async function loadProjectPQData(vendorId: number, projectId: number) {
-  "use server";
-  return getPQDataByVendorId(vendorId, projectId)
-}
-
-export async function loadGeneralPQAction(vendorId: number) {
-  return getPQDataByVendorId(vendorId);
-}
-
-export async function loadProjectPQAction(vendorId: number, projectId?: number): Promise<PQGroupData[]> {
-  if (!projectId) {
-    throw new Error("Project ID is required for loading project PQ data");
-  }
-  return getPQDataByVendorId(vendorId, projectId);
-}
-
-
-
-export async function getAllPQsByVendorId(vendorId: number) {
-  unstable_noStore();
-  
-  try {
-    const pqList = await db
-      .select({
-        id: vendorPQSubmissions.id,
-        type: vendorPQSubmissions.type,
-        status: vendorPQSubmissions.status,
-        pqNumber: vendorPQSubmissions.pqNumber,
-        projectId: vendorPQSubmissions.projectId,
-        projectName: projects.name,
-        createdAt: vendorPQSubmissions.createdAt,
-        updatedAt: vendorPQSubmissions.updatedAt,
-        submittedAt: vendorPQSubmissions.submittedAt,
-        approvedAt: vendorPQSubmissions.approvedAt,
-        rejectedAt: vendorPQSubmissions.rejectedAt,
-        rejectReason: vendorPQSubmissions.rejectReason,
-      })
-      .from(vendorPQSubmissions)
-      .leftJoin(projects, eq(vendorPQSubmissions.projectId, projects.id))
-      .where(eq(vendorPQSubmissions.vendorId, vendorId))
-      .orderBy(desc(vendorPQSubmissions.createdAt));
-    
-    return pqList;
-  } catch (error) {
-    console.error("Error fetching PQ list:", error);
-    return [];
-  }
-}
-
-// 특정 PQ의 상세 정보 조회 (개별 PQ 페이지용)
-export async function getPQById(pqSubmissionId: number, vendorId: number) {
-  unstable_noStore();
-  
-  try {
-
-    const pq = await db
-      .select({
-        id: vendorPQSubmissions.id,
-        vendorId: vendorPQSubmissions.vendorId,
-        projectId: vendorPQSubmissions.projectId,
-        type: vendorPQSubmissions.type,
-        status: vendorPQSubmissions.status,
-        createdAt: vendorPQSubmissions.createdAt,
-        submittedAt: vendorPQSubmissions.submittedAt,
-        approvedAt: vendorPQSubmissions.approvedAt,
-        rejectedAt: vendorPQSubmissions.rejectedAt,
-        rejectReason: vendorPQSubmissions.rejectReason,
-
-        // 벤더 정보 (추가)
-        vendorName: vendors.vendorName,
-        vendorCode: vendors.vendorCode,
-        vendorStatus: vendors.status,
-        vendorCountry: vendors.country,
-        vendorEmail: vendors.email,
-        vendorPhone: vendors.phone,
-
-        // 프로젝트 정보 (조인)
-        projectName: projects.name,
-        projectCode: projects.code,
-      })
-      .from(vendorPQSubmissions)
-      .leftJoin(vendors, eq(vendorPQSubmissions.vendorId, vendors.id))
-      .leftJoin(projects, eq(vendorPQSubmissions.projectId, projects.id))
-      .where(
-        and(
-          eq(vendorPQSubmissions.id, pqSubmissionId),
-          eq(vendorPQSubmissions.vendorId, vendorId)
-        )
-      )
-      .limit(1)
-      .then(rows => rows[0]);
-
-    if (!pq) {
-      throw new Error("PQ not found or access denied");
-    }
-
-    return pq;
-  } catch (error) {
-    console.error("Error fetching PQ by ID:", error);
-    throw error;
-  }
-}
-
-export async function getPQStatusCounts(vendorId: number) {
-  try {
-    // 모든 PQ 상태 조회 (일반 PQ + 프로젝트 PQ)
-    const pqStatuses = await db
-      .select({
-        status: vendorPQSubmissions.status,
-        count: count(),
-      })
-      .from(vendorPQSubmissions)
-      .where(eq(vendorPQSubmissions.vendorId, vendorId))
-      .groupBy(vendorPQSubmissions.status);
-    
-    // 상태별 개수를 객체로 변환
-    const statusCounts = {
-      REQUESTED: 0,
-      IN_PROGRESS: 0,
-      SUBMITTED: 0,
-      APPROVED: 0,
-      REJECTED: 0,
-    };
-    
-    // 조회된 결과를 statusCounts 객체에 매핑
-    pqStatuses.forEach((item) => {
-      if (item.status in statusCounts) {
-        statusCounts[item.status as keyof typeof statusCounts] = item.count;
-      }
-    });
-    
-    return statusCounts;
-  } catch (error) {
-    console.error("Error fetching PQ status counts:", error);
-    return {
-      REQUESTED: 0,
-      IN_PROGRESS: 0,
-      SUBMITTED: 0,
-      APPROVED: 0,
-      REJECTED: 0,
-    };
-  }
-}
-
-// 상태 레이블 함수
-function getStatusLabel(status: string): string {
-  switch (status) {
-    case "REQUESTED":
-      return "요청됨";
-    case "IN_PROGRESS":
-      return "진행 중";
-    case "SUBMITTED":
-      return "제출됨";
-    case "APPROVED":
-      return "승인됨";
-    case "REJECTED":
-      return "거부됨";
-    default:
-      return status;
-  }
-}
-
-export async function getPQSubmissions(input: GetPQSubmissionsSchema) {
-      unstable_noStore();
-      
-      try {
-        const offset = (input.page - 1) * input.perPage;
-
-        const pqFilterMapping = createPQFilterMapping();
-        const joinedTables = getPQJoinedTables();
-
-        console.log(input, "input")
-
-        // 1) 고급 필터 조건 (DataTableAdvancedToolbar에서)
-        let advancedWhere: SQL<unknown> | undefined = undefined;
-        if (input.filters && input.filters.length > 0) {
-          advancedWhere = filterColumns({
-            table: vendorPQSubmissions,
-            filters: input.filters,
-            joinOperator: input.joinOperator || 'and',
-            joinedTables,
-            customColumnMapping: pqFilterMapping,
-          });
-          console.log("advancedWhere:", advancedWhere);
-        }
-
-        // 2) 기본 필터 조건 (PQFilterSheet에서)
-        let basicWhere: SQL<unknown> | undefined = undefined;
-        if (input.basicFilters && input.basicFilters.length > 0) {
-          basicWhere = filterColumns({
-            table: vendorPQSubmissions,
-            filters: input.basicFilters,
-            joinOperator: input.basicJoinOperator || 'and',
-            joinedTables,
-            customColumnMapping: pqFilterMapping,
-          });
-          console.log("basicWhere:", basicWhere);
-        }
-
-        // 3) 글로벌 검색 조건
-        let globalWhere: SQL<unknown> | undefined = undefined;
-        if (input.search) {
-          const s = `%${input.search}%`;
-          
-          const validSearchConditions: SQL<unknown>[] = [];
-          
-          // 기존 검색 조건들
-          const nameCondition = ilike(vendors.vendorName, s);
-          if (nameCondition) validSearchConditions.push(nameCondition);
-          
-          const codeCondition = ilike(vendors.vendorCode, s);
-          if (codeCondition) validSearchConditions.push(codeCondition);
-          
-          const projectNameCondition = ilike(projects.name, s);
-          if (projectNameCondition) validSearchConditions.push(projectNameCondition);
-          
-          const projectCodeCondition = ilike(projects.code, s);
-          if (projectCodeCondition) validSearchConditions.push(projectCodeCondition);
-          
-          // 새로 추가된 검색 조건들
-          const pqNumberCondition = ilike(vendorPQSubmissions.pqNumber, s);
-          if (pqNumberCondition) validSearchConditions.push(pqNumberCondition);
-          
-          const requesterCondition = ilike(users.name, s);
-          if (requesterCondition) validSearchConditions.push(requesterCondition);
-          
-          if (validSearchConditions.length > 0) {
-            globalWhere = or(...validSearchConditions);
-          }
-        }
-
-        // 4) 날짜 조건
-        let fromDateWhere: SQL<unknown> | undefined = undefined;
-        let toDateWhere: SQL<unknown> | undefined = undefined;
-        
-        if (input.submittedDateFrom) {
-          const fromDate = new Date(input.submittedDateFrom);
-          const condition = gte(vendorPQSubmissions.submittedAt, fromDate);
-          if (condition) fromDateWhere = condition;
-        }
-        
-        if (input.submittedDateTo) {
-          const toDate = new Date(input.submittedDateTo);
-          const condition = lte(vendorPQSubmissions.submittedAt, toDate);
-          if (condition) toDateWhere = condition;
-        }
-
-        // 5) 최종 WHERE 조건 생성 - 각 그룹을 AND로 연결
-        const whereConditions: SQL<unknown>[] = [];
-        
-        // 고급 필터 조건 추가
-        if (advancedWhere) whereConditions.push(advancedWhere);
-        
-        // 기본 필터 조건 추가  
-        if (basicWhere) whereConditions.push(basicWhere);
-        
-        // 기타 조건들 추가
-        if (globalWhere) whereConditions.push(globalWhere);
-        if (fromDateWhere) whereConditions.push(fromDateWhere);
-        if (toDateWhere) whereConditions.push(toDateWhere);
-        
-        // 모든 조건을 AND로 연결
-        const finalWhere = whereConditions.length > 0 ? and(...whereConditions) : undefined;
-
-        console.log("Final WHERE conditions:", {
-          advancedWhere: !!advancedWhere,
-          basicWhere: !!basicWhere,
-          globalWhere: !!globalWhere,
-          dateConditions: !!(fromDateWhere || toDateWhere),
-          totalConditions: whereConditions.length
-        });
-      
-        // 6) 전체 데이터 수 조회
-        const totalResult = await db
-          .select({ count: count() })
-          .from(vendorPQSubmissions)
-          .leftJoin(vendors, eq(vendorPQSubmissions.vendorId, vendors.id))
-          .leftJoin(projects, eq(vendorPQSubmissions.projectId, projects.id))
-          .leftJoin(users, eq(vendorPQSubmissions.requesterId, users.id))
-          .leftJoin(vendorInvestigations, eq(vendorInvestigations.pqSubmissionId, vendorPQSubmissions.id))
-          .where(finalWhere);
-
-        const total = totalResult[0]?.count || 0;
-
-        if (total === 0) {
-          return { data: [], pageCount: 0 };
-        }
-
-        // 7) 정렬 및 페이징 처리된 데이터 조회
-        const orderByColumns = input.sort.map((sort) => {
-          const column = sort.id;
-
-          // JOIN된 테이블의 컬럼인 경우 적절한 테이블 참조
-          if (column === 'vendorName') {
-            return sort.desc ? desc(vendors.vendorName) : asc(vendors.vendorName);
-          } else if (column === 'projectName') {
-            return sort.desc ? desc(projects.name) : asc(projects.name);
-          } else if (column === 'requesterName') {
-            return sort.desc ? desc(users.name) : asc(users.name);
-          } else {
-            // vendorPQSubmissions 테이블의 컬럼인 경우
-            const dbColumn = column as keyof typeof vendorPQSubmissions.$inferSelect;
-            return sort.desc ? desc(vendorPQSubmissions[dbColumn]) : asc(vendorPQSubmissions[dbColumn]);
-          }
-        });
-
-        if (orderByColumns.length === 0) {
-          orderByColumns.push(desc(vendorPQSubmissions.updatedAt));
-        }
-
-        const pqSubmissions = await db
-          .select({
-            id: vendorPQSubmissions.id,
-            type: vendorPQSubmissions.type,
-            pqNumber: vendorPQSubmissions.pqNumber,
-            requesterId: vendorPQSubmissions.requesterId,
-            requesterName: users.name,
-            status: vendorPQSubmissions.status,
-            createdAt: vendorPQSubmissions.createdAt,
-            updatedAt: vendorPQSubmissions.updatedAt,
-            submittedAt: vendorPQSubmissions.submittedAt,
-            approvedAt: vendorPQSubmissions.approvedAt,
-            rejectedAt: vendorPQSubmissions.rejectedAt,
-            rejectReason: vendorPQSubmissions.rejectReason,
-            pqItems: vendorPQSubmissions.pqItems,
-            // Vendor 정보
-            vendorId: vendors.id,
-            vendorName: vendors.vendorName,
-            vendorCode: vendors.vendorCode,
-            email: vendors.email,
-            taxId: vendors.taxId,
-            vendorStatus: vendors.status,
-            // Project 정보 (프로젝트 PQ인 경우)
-            projectId: projects.id,
-            projectName: projects.name,
-            projectCode: projects.code,
-          })
-          .from(vendorPQSubmissions)
-          .leftJoin(vendors, eq(vendorPQSubmissions.vendorId, vendors.id))
-          .leftJoin(projects, eq(vendorPQSubmissions.projectId, projects.id))
-          .leftJoin(users, eq(vendorPQSubmissions.requesterId, users.id))
-          .where(finalWhere)
-          .orderBy(...orderByColumns)
-          .limit(input.perPage)
-          .offset(offset);
-
-        // 8) 각 PQ 제출에 대한 추가 정보 조회 (기존과 동일)
-        const pqSubmissionsWithDetails = await Promise.all(
-          pqSubmissions.map(async (submission) => {
-            // 기본 반환 객체
-            const baseResult = {
-              ...submission,
-              answerCount: 0,
-              attachmentCount: 0,
-              pqStatus: getStatusLabel(submission.status),
-              pqTypeLabel: submission.type === "GENERAL" ? "일반 PQ" : "프로젝트 PQ",
-            };
-            
-            // vendorId가 null이면 기본 정보만 반환
-            if (submission.vendorId === null) {
-              return baseResult;
-            }
-            
-            try {
-              // 답변 수 조회
-              const vendorId = submission.vendorId;
-              
-              const answerWhereConditions: SQL<unknown>[] = [];
-              
-              const vendorCondition = eq(vendorPqCriteriaAnswers.vendorId, vendorId);
-              if (vendorCondition) answerWhereConditions.push(vendorCondition);
-              
-              let projectCondition: SQL<unknown> | undefined;
-              if (submission.projectId !== null) {
-                projectCondition = eq(vendorPqCriteriaAnswers.projectId, submission.projectId);
-              } else {
-                projectCondition = isNull(vendorPqCriteriaAnswers.projectId);
-              }
-              
-              if (projectCondition) answerWhereConditions.push(projectCondition);
-              
-              const answerWhere = and(...answerWhereConditions);
-                     
-              const answersResult = await db
-                .select({ count: count() })
-                .from(vendorPqCriteriaAnswers)
-                .where(answerWhere);
-
-              const answerCount = answersResult[0]?.count || 0;
-
-              // 첨부 파일 수 조회
-              const attachmentsResult = await db
-                .select({ count: count() })
-                .from(vendorPqCriteriaAnswers)
-                .leftJoin(
-                  vendorCriteriaAttachments,
-                  eq(vendorCriteriaAttachments.vendorCriteriaAnswerId, vendorPqCriteriaAnswers.id)
-                )
-                .where(answerWhere);
-
-              const attachmentCount = attachmentsResult[0]?.count || 0;
-
-              const requesters = alias(users, 'requesters');
-              const qmManagers = alias(users, 'qmManagers');
-              
-              const investigationResult = await db
-                .select({
-                  id: vendorInvestigations.id,
-                  investigationStatus: vendorInvestigations.investigationStatus,
-                  investigationAddress: vendorInvestigations.investigationAddress,
-                  investigationMethod: vendorInvestigations.investigationMethod,
-                  scheduledStartAt: vendorInvestigations.scheduledStartAt,
-                  scheduledEndAt: vendorInvestigations.scheduledEndAt,
-                  requestedAt: vendorInvestigations.requestedAt,
-                  confirmedAt: vendorInvestigations.confirmedAt,
-                  completedAt: vendorInvestigations.completedAt,
-                  forecastedAt: vendorInvestigations.forecastedAt,
-                  evaluationScore: vendorInvestigations.evaluationScore,
-                  hasSupplementRequested: vendorInvestigations.hasSupplementRequested,
-                  evaluationResult: vendorInvestigations.evaluationResult,
-                  investigationNotes: vendorInvestigations.investigationNotes,
-                  requesterId: vendorInvestigations.requesterId,
-                  requesterName: requesters.name,
-                  qmManagerId: vendorInvestigations.qmManagerId,
-                  qmManagerName: qmManagers.name,
-                  qmManagerEmail: qmManagers.email,
-                })
-                .from(vendorInvestigations)
-                .leftJoin(requesters, eq(vendorInvestigations.requesterId, requesters.id))
-                .leftJoin(qmManagers, eq(vendorInvestigations.qmManagerId, qmManagers.id))
-                .where(and(
-                  eq(vendorInvestigations.vendorId, submission.vendorId),
-                  eq(vendorInvestigations.pqSubmissionId, submission.id)
-                ))
-                .orderBy(desc(vendorInvestigations.createdAt))
-                .limit(1);
-
-              const investigation = investigationResult[0] || null;
-
-              // investigation이 있으면 해당 investigation의 최신 siteVisitRequest 조회
-              let siteVisitRequestId: number | null = null;
-              if (investigation) {
-                const siteVisitRequestResult = await db
-                  .select({ id: siteVisitRequests.id })
-                  .from(siteVisitRequests)
-                  .where(eq(siteVisitRequests.investigationId, investigation.id))
-                  .orderBy(desc(siteVisitRequests.createdAt))
-                  .limit(1);
-                
-                siteVisitRequestId = siteVisitRequestResult[0]?.id || null;
-              }
-
-              return {
-                ...baseResult,
-                answerCount,
-                attachmentCount,
-                siteVisitRequestId,
-                investigation
-              };
-            } catch (error) {
-              console.error("Error fetching PQ details:", error);
-              return baseResult;
-            }
-          })
-        );
-
-        const pageCount = Math.ceil(total / input.perPage);
-
-        return { data: pqSubmissionsWithDetails, pageCount };
-      } catch (err) {
-        console.error("Error in getPQSubmissions:", err);
-        return { data: [], pageCount: 0 };
-      }
-}
-
-export async function getPQStatusCountsAll() {
-  unstable_noStore();
-  
-  try {
-    // 모든 PQ 상태별 개수 조회 (벤더 제한 없음)
-    const pqStatuses = await db
-      .select({
-        status: vendorPQSubmissions.status,
-        count: count(),
-      })
-      .from(vendorPQSubmissions)
-      .groupBy(vendorPQSubmissions.status);
-    
-    // 상태별 개수를 객체로 변환
-    const statusCounts = {
-      REQUESTED: 0,
-      IN_PROGRESS: 0,
-      SUBMITTED: 0,
-      APPROVED: 0,
-      REJECTED: 0,
-    };
-    
-    // 조회된 결과를 statusCounts 객체에 매핑
-    pqStatuses.forEach((item) => {
-      if (item.status in statusCounts) {
-        statusCounts[item.status as keyof typeof statusCounts] = item.count;
-      }
-    });
-    
-    return statusCounts;
-  } catch (error) {
-    console.error("Error fetching PQ status counts:", error);
-    return {
-      REQUESTED: 0,
-      IN_PROGRESS: 0,
-      SUBMITTED: 0,
-      APPROVED: 0,
-      REJECTED: 0,
-    };
-  }
-}
-
-// PQ 타입별, 상태별 개수 집계 함수 (추가 옵션)
-export async function getPQDetailedStatusCounts() {
-  try {
-    // 타입별, 상태별 개수 조회
-    const pqStatuses = await db
-      .select({
-        type: vendorPQSubmissions.type,
-        status: vendorPQSubmissions.status,
-        count: count(),
-      })
-      .from(vendorPQSubmissions)
-      .groupBy(vendorPQSubmissions.type, vendorPQSubmissions.status);
-    
-    // 결과를 저장할 객체 초기화
-    const result = {
-      GENERAL: {
-        REQUESTED: 0,
-        IN_PROGRESS: 0,
-        SUBMITTED: 0,
-        APPROVED: 0,
-        REJECTED: 0,
-        total: 0
-      },
-      PROJECT: {
-        REQUESTED: 0,
-        IN_PROGRESS: 0,
-        SUBMITTED: 0,
-        APPROVED: 0,
-        REJECTED: 0,
-        total: 0
-      },
-      total: {
-        REQUESTED: 0,
-        IN_PROGRESS: 0,
-        SUBMITTED: 0,
-        APPROVED: 0,
-        REJECTED: 0,
-        total: 0
-      }
-    };
-    
-    // 결과 매핑
-    pqStatuses.forEach((item) => {
-      if (item.type && item.status) {
-        const type = item.type as keyof typeof result;
-        const status = item.status as keyof typeof result.GENERAL;
-        
-        if (type in result && status in result[type]) {
-          // 타입별 상태 카운트 업데이트
-          result[type][status] = item.count;
-          
-          // 타입별 합계 업데이트
-          result[type].total += item.count;
-          
-          // 전체 상태별 카운트 업데이트
-          result.total[status] += item.count;
-          
-          // 전체 합계 업데이트
-          result.total.total += item.count;
-        }
-      }
-    });
-    
-    return result;
-  } catch (error) {
-    console.error("Error fetching detailed PQ status counts:", error);
-    return {
-      GENERAL: {
-        REQUESTED: 0,
-        IN_PROGRESS: 0,
-        SUBMITTED: 0,
-        APPROVED: 0,
-        REJECTED: 0,
-        total: 0
-      },
-      PROJECT: {
-        REQUESTED: 0,
-        IN_PROGRESS: 0,
-        SUBMITTED: 0,
-        APPROVED: 0,
-        REJECTED: 0,
-        total: 0
-      },
-      total: {
-        REQUESTED: 0,
-        IN_PROGRESS: 0,
-        SUBMITTED: 0,
-        APPROVED: 0,
-        REJECTED: 0,
-        total: 0
-      }
-    };
-  }
-}
-
-/**
- * SHI 코멘트 업데이트 액션
- */
-export async function updateSHICommentAction({
-  answerId,
-  shiComment,
-}: {
-  answerId: number;
-  shiComment: string;
-}) {
-  try {
-    await db
-      .update(vendorPqCriteriaAnswers)
-      .set({
-        shiComment,
-        updatedAt: new Date(),
-      })
-      .where(eq(vendorPqCriteriaAnswers.id, answerId));
-
-    return { ok: true };
-  } catch (error) {
-    console.error("updateSHICommentAction error:", error);
-    return { ok: false, error: String(error) };
-  }
-}
-
-// PQ 승인 액션
-export async function approvePQAction({
-  pqSubmissionId,
-  vendorId,
-}: {
-  pqSubmissionId: number;
-  vendorId: number;
-}) {
-  unstable_noStore();
-  
-  try {
-    const headersList = await headers();
-    const host = headersList.get('host') || 'localhost:3000';
-    const currentDate = new Date();
-    
-    // 1. PQ 제출 정보 조회
-    const pqSubmission = await db
-      .select({
-        id: vendorPQSubmissions.id,
-        vendorId: vendorPQSubmissions.vendorId,
-        projectId: vendorPQSubmissions.projectId,
-        type: vendorPQSubmissions.type,
-        status: vendorPQSubmissions.status,
-      })
-      .from(vendorPQSubmissions)
-      .where(
-        and(
-          eq(vendorPQSubmissions.id, pqSubmissionId),
-          eq(vendorPQSubmissions.vendorId, vendorId)
-        )
-      )
-      .then(rows => rows[0]);
-      
-    if (!pqSubmission) {
-      return { ok: false, error: "PQ submission not found" };
-    }
-    
-    // 2. 상태 확인 (SUBMITTED 상태만 승인 가능)
-    if (pqSubmission.status !== "SUBMITTED") {
-      return { 
-        ok: false, 
-        error: `Cannot approve PQ in current status: ${pqSubmission.status}` 
-      };
-    }
-    
-    // 3. 벤더 정보 조회
-    const vendor = await db
-      .select({
-        id: vendors.id,
-        vendorName: vendors.vendorName,
-        email: vendors.email,
-        status: vendors.status,
-      })
-      .from(vendors)
-      .where(eq(vendors.id, vendorId))
-      .then(rows => rows[0]);
-      
-    if (!vendor) {
-      return { ok: false, error: "Vendor not found" };
-    }
-    
-    // 4. 프로젝트 정보 (프로젝트 PQ인 경우)
-    let projectName = '';
-    if (pqSubmission.projectId) {
-      const projectData = await db
-        .select({
-          id: projects.id,
-          name: projects.name,
-        })
-        .from(projects)
-        .where(eq(projects.id, pqSubmission.projectId))
-        .then(rows => rows[0]);
-        
-      projectName = projectData?.name || 'Unknown Project';
-    }
-        
-    // 5. PQ 상태 업데이트
-    await db
-    .update(vendorPQSubmissions)
-    .set({
-      status: "APPROVED",
-      approvedAt: currentDate,
-      updatedAt: currentDate,
-    })
-    .where(eq(vendorPQSubmissions.id, pqSubmissionId));
-
-    // 6. 일반 PQ인 경우 벤더 상태 업데이트 (선택사항)
-    if (pqSubmission.type === "GENERAL") {
-    await db
-      .update(vendors)
-      .set({
-        status: "PQ_APPROVED",
-        updatedAt: currentDate,
-      })
-      .where(eq(vendors.id, vendorId));
-    }
-
-    // 7. 벤더에게 이메일 알림 발송
-    if (vendor.email) {
-    try {
-      const emailSubject = pqSubmission.projectId
-        ? `[eVCP] Project PQ Approved for ${projectName}`
-        : "[eVCP] General PQ Approved";
-        
-      const portalUrl = `${host}/partners/pq`;
-        
-      await sendEmail({
-        to: vendor.email,
-        subject: emailSubject,
-        template: "pq-approved-vendor",
-        context: {
-          vendorName: vendor.vendorName,
-          projectId: pqSubmission.projectId,
-          projectName: projectName,
-          isProjectPQ: !!pqSubmission.projectId,
-          approvedDate: currentDate.toLocaleString(),
-          portalUrl,
-        }
-      });
-    } catch (emailError) {
-      console.error("Failed to send vendor notification:", emailError);
-      // 이메일 발송 실패가 전체 프로세스를 중단하지 않음
-    }
-    }
-    
-    // 8. 캐시 무효화
-    revalidateTag("vendors");
-    revalidateTag("vendor-status-counts");
-    revalidateTag("pq-submissions");
-    revalidateTag(`vendor-pq-submissions-${vendorId}`);
-    
-    if (pqSubmission.projectId) {
-      revalidateTag(`project-pq-submissions-${pqSubmission.projectId}`);
-      revalidateTag(`project-vendors-${pqSubmission.projectId}`);
-    }
-    
-    return { ok: true };
-  } catch (error) {
-    console.error("PQ approve error:", error);
-    return { ok: false, error: getErrorMessage(error) };
-  }
-}
-
-// QM 검토 승인 액션
-export async function approveQMReviewAction({
-  pqSubmissionId,
-  vendorId,
-}: {
-  pqSubmissionId: number;
-  vendorId: number;
-}) {
-  unstable_noStore();
-  
-  try {
-    const headersList = await headers();
-    const host = headersList.get('host') || 'localhost:3000';
-    const currentDate = new Date();
-    
-    // 1. PQ 제출 정보 조회
-    const pqSubmission = await db
-      .select({
-        id: vendorPQSubmissions.id,
-        vendorId: vendorPQSubmissions.vendorId,
-        projectId: vendorPQSubmissions.projectId,
-        type: vendorPQSubmissions.type,
-        status: vendorPQSubmissions.status,
-      })
-      .from(vendorPQSubmissions)
-      .where(
-        and(
-          eq(vendorPQSubmissions.id, pqSubmissionId),
-          eq(vendorPQSubmissions.vendorId, vendorId)
-        )
-      )
-      .then(rows => rows[0]);
-      
-    if (!pqSubmission) {
-      return { ok: false, error: "PQ submission not found" };
-    }
-    
-    // 2. 상태 확인 (QM_REVIEWING 상태만 승인 가능)
-    // if (pqSubmission.status !== "QM_REVIEWING") {
-    //   return { 
-    //     ok: false, 
-    //     error: `Cannot approve QM review in current status: ${pqSubmission.status}` 
-    //   };
-    // }
-    
-    // 3. 벤더 정보 조회
-    const vendor = await db
-      .select({
-        id: vendors.id,
-        vendorName: vendors.vendorName,
-        email: vendors.email,
-        status: vendors.status,
-      })
-      .from(vendors)
-      .where(eq(vendors.id, vendorId))
-      .then(rows => rows[0]);
-      
-    if (!vendor) {
-      return { ok: false, error: "Vendor not found" };
-    }
-    
-    // 4. 프로젝트 정보 (프로젝트 PQ인 경우)
-    let projectName = '';
-    if (pqSubmission.projectId) {
-      const projectData = await db
-        .select({
-          id: projects.id,
-          name: projects.name,
-        })
-        .from(projects)
-        .where(eq(projects.id, pqSubmission.projectId))
-        .then(rows => rows[0]);
-        
-      projectName = projectData?.name || 'Unknown Project';
-    }
-    
-    // 5. PQ 상태를 QM_APPROVED로 업데이트
-    await db
-      .update(vendorPQSubmissions)
-      .set({
-        status: "QM_APPROVED",
-        approvedAt: currentDate,
-        updatedAt: currentDate,
-      })
-      .where(eq(vendorPQSubmissions.id, pqSubmissionId));
-    
-    // 6. 일반 PQ인 경우 벤더 상태를 PQ_APPROVED로 업데이트
-    if (pqSubmission.type === "GENERAL") {
-      await db
-        .update(vendors)
-        .set({
-          status: "PQ_APPROVED",
-          updatedAt: currentDate,
-        })
-        .where(eq(vendors.id, vendorId));
-    }
-    
-    // 7. 실사 상태 변경: QM 승인 시 QM_REVIEW_CONFIRMED로 전환
-    try {
-      const existingInvestigation = await db
-        .select({ id: vendorInvestigations.id })
-        .from(vendorInvestigations)
-        .where(eq(vendorInvestigations.pqSubmissionId, pqSubmissionId))
-        .then(rows => rows[0]);
-
-      if (existingInvestigation) {
-        await db
-          .update(vendorInvestigations)
-          .set({ investigationStatus: "QM_REVIEW_CONFIRMED", updatedAt: currentDate })
-          .where(eq(vendorInvestigations.id, existingInvestigation.id));
-      } else {
-        await db
-          .insert(vendorInvestigations)
-          .values({
-            vendorId: vendorId,
-            pqSubmissionId: pqSubmissionId,
-            investigationStatus: "QM_REVIEW_CONFIRMED",
-            investigationMethod: "DOCUMENT_EVAL",
-            requestedAt: currentDate,
-            updatedAt: currentDate,
-          });
-      }
-    } catch (e) {
-      console.error("Failed to set investigation QM_REVIEW_CONFIRMED on QM approve", e);
-    }
-    
-    // 8. 벤더에게 이메일 알림 발송
-    if (vendor.email) {
-      try {
-        const emailSubject = pqSubmission.projectId
-          ? `[eVCP] Project PQ QM Approved for ${projectName}`
-          : "[eVCP] General PQ QM Approved";
-          
-        const portalUrl = `${host}/partners/pq`;
-          
-        await sendEmail({
-          to: vendor.email,
-          subject: emailSubject,
-          template: "pq-approved-vendor",
-          context: {
-            vendorName: vendor.vendorName,
-            projectId: pqSubmission.projectId,
-            projectName: projectName,
-            isProjectPQ: !!pqSubmission.projectId,
-            approvedDate: currentDate.toLocaleString(),
-            portalUrl,
-          }
-        });
-      } catch (emailError) {
-        console.error("Failed to send vendor notification:", emailError);
-      }
-    }
-    
-    // 9. 캐시 무효화
-    revalidateTag("vendors");
-    revalidateTag("vendor-status-counts");
-    revalidateTag("pq-submissions");
-    revalidateTag("vendor-pq-submissions");
-    revalidateTag("vendor-investigations");
-    revalidatePath("/evcp/pq_new");
-    
-    return { ok: true };
-  } catch (error) {
-    console.error("QM review approve error:", error);
-    return { ok: false, error: getErrorMessage(error) };
-  }
-}
-
-// QM 검토 거절 액션
-export async function rejectQMReviewAction({
-  pqSubmissionId,
-  vendorId,
-  rejectReason
-}: {
-  pqSubmissionId: number;
-  vendorId: number;
-  rejectReason: string;
-}) {
-  unstable_noStore();
-  
-  try {
-    const headersList = await headers();
-    const host = headersList.get('host') || 'localhost:3000';
-    const currentDate = new Date();
-    
-    // 1. PQ 제출 정보 조회
-    const pqSubmission = await db
-      .select({
-        id: vendorPQSubmissions.id,
-        vendorId: vendorPQSubmissions.vendorId,
-        projectId: vendorPQSubmissions.projectId,
-        type: vendorPQSubmissions.type,
-        status: vendorPQSubmissions.status,
-      })
-      .from(vendorPQSubmissions)
-      .where(
-        and(
-          eq(vendorPQSubmissions.id, pqSubmissionId),
-          eq(vendorPQSubmissions.vendorId, vendorId)
-        )
-      )
-      .then(rows => rows[0]);
-      
-    if (!pqSubmission) {
-      return { ok: false, error: "PQ submission not found" };
-    }
-    
-    // 2. 상태 확인 (QM_REVIEWING 상태만 거절 가능)
-    if (pqSubmission.status !== "QM_REVIEWING") {
-      return { 
-        ok: false, 
-        error: `Cannot reject QM review in current status: ${pqSubmission.status}` 
-      };
-    }
-    
-    // 3. 벤더 정보 조회
-    const vendor = await db
-      .select({
-        id: vendors.id,
-        vendorName: vendors.vendorName,
-        email: vendors.email,
-        status: vendors.status,
-      })
-      .from(vendors)
-      .where(eq(vendors.id, vendorId))
-      .then(rows => rows[0]);
-      
-    if (!vendor) {
-      return { ok: false, error: "Vendor not found" };
-    }
-    
-    // 4. 프로젝트 정보 (프로젝트 PQ인 경우)
-    let projectName = '';
-    if (pqSubmission.projectId) {
-      const projectData = await db
-        .select({
-          id: projects.id,
-          name: projects.name,
-        })
-        .from(projects)
-        .where(eq(projects.id, pqSubmission.projectId))
-        .then(rows => rows[0]);
-        
-      projectName = projectData?.name || 'Unknown Project';
-    }
-    
-    // 5. PQ 상태를 QM_REJECTED로 업데이트
-    await db
-      .update(vendorPQSubmissions)
-      .set({
-        status: "QM_REJECTED",
-        rejectedAt: currentDate,
-        rejectReason: rejectReason,
-        updatedAt: currentDate,
-      })
-      .where(eq(vendorPQSubmissions.id, pqSubmissionId));
-    
-    // 6. 일반 PQ인 경우 벤더 상태를 PQ_FAILED로 업데이트
-    if (pqSubmission.type === "GENERAL") {
-      await db
-        .update(vendors)
-        .set({
-          status: "PQ_FAILED",
-          updatedAt: currentDate,
-        })
-        .where(eq(vendors.id, vendorId));
-    }
-    
-    // 7. 실사 상태 변경: QM 거절 시 CANCELED로 전환
-    try {
-      const existingInvestigation = await db
-        .select({ id: vendorInvestigations.id })
-        .from(vendorInvestigations)
-        .where(eq(vendorInvestigations.pqSubmissionId, pqSubmissionId))
-        .then(rows => rows[0]);
-
-      if (existingInvestigation) {
-        await db
-          .update(vendorInvestigations)
-          .set({ investigationStatus: "CANCELED", updatedAt: currentDate })
-          .where(eq(vendorInvestigations.id, existingInvestigation.id));
-      }
-    } catch (e) {
-      console.error("Failed to set investigation CANCELED on QM reject", e);
-    }
-
-    // 8. 벤더에게 이메일 알림 발송
-    if (vendor.email) {
-      try {
-        const emailSubject = pqSubmission.projectId
-          ? `[eVCP] Project PQ Rejected for ${projectName}`
-          : "[eVCP] General PQ Rejected";
-          
-        const portalUrl = `${host}/partners/pq`;
-          
-        await sendEmail({
-          to: vendor.email,
-          subject: emailSubject,
-          template: "pq-rejected-vendor",
-          context: {
-            vendorName: vendor.vendorName,
-            projectId: pqSubmission.projectId,
-            projectName: projectName,
-            isProjectPQ: !!pqSubmission.projectId,
-            rejectedDate: currentDate.toLocaleString(),
-            rejectReason: rejectReason,
-            portalUrl,
-          }
-        });
-      } catch (emailError) {
-        console.error("Failed to send vendor notification:", emailError);
-      }
-    }
-    
-    // 9. 캐시 무효화
-    revalidateTag("vendors");
-    revalidateTag("vendor-status-counts");
-    revalidateTag("pq-submissions");
-    revalidateTag("vendor-pq-submissions");
-    revalidateTag("vendor-investigations");
-    revalidatePath("/evcp/pq_new");
-    
-    return { ok: true };
-  } catch (error) {
-    console.error("QM review reject error:", error);
-    return { ok: false, error: getErrorMessage(error) };
-  }
-}
-
-// PQ 거부 액션
-export async function rejectPQAction({
-  pqSubmissionId,
-  vendorId,
-  rejectReason
-}: {
-  pqSubmissionId: number;
-  vendorId: number;
-  rejectReason: string;
-}) {
-  unstable_noStore();
-  
-  try {
-    const headersList = await headers();
-    const host = headersList.get('host') || 'localhost:3000';
-    const currentDate = new Date();
-    
-    // 1. PQ 제출 정보 조회
-    const pqSubmission = await db
-      .select({
-        id: vendorPQSubmissions.id,
-        vendorId: vendorPQSubmissions.vendorId,
-        projectId: vendorPQSubmissions.projectId,
-        type: vendorPQSubmissions.type,
-        status: vendorPQSubmissions.status,
-      })
-      .from(vendorPQSubmissions)
-      .where(
-        and(
-          eq(vendorPQSubmissions.id, pqSubmissionId),
-          eq(vendorPQSubmissions.vendorId, vendorId)
-        )
-      )
-      .then(rows => rows[0]);
-      
-    if (!pqSubmission) {
-      return { ok: false, error: "PQ submission not found" };
-    }
-    
-    // 2. 상태 확인 (SUBMITTED 상태만 거부 가능)
-    if (pqSubmission.status !== "SUBMITTED") {
-      return { 
-        ok: false, 
-        error: `Cannot reject PQ in current status: ${pqSubmission.status}` 
-      };
-    }
-    
-    // 3. 벤더 정보 조회
-    const vendor = await db
-      .select({
-        id: vendors.id,
-        vendorName: vendors.vendorName,
-        email: vendors.email,
-        status: vendors.status,
-      })
-      .from(vendors)
-      .where(eq(vendors.id, vendorId))
-      .then(rows => rows[0]);
-      
-    if (!vendor) {
-      return { ok: false, error: "Vendor not found" };
-    }
-    
-    // 4. 프로젝트 정보 (프로젝트 PQ인 경우)
-    let projectName = '';
-    if (pqSubmission.projectId) {
-      const projectData = await db
-        .select({
-          id: projects.id,
-          name: projects.name,
-        })
-        .from(projects)
-        .where(eq(projects.id, pqSubmission.projectId))
-        .then(rows => rows[0]);
-        
-      projectName = projectData?.name || 'Unknown Project';
-    }
-    
-    // 5. PQ 상태 업데이트
-    await db
-      .update(vendorPQSubmissions)
-      .set({
-        status: "REJECTED",
-        rejectedAt: currentDate,
-        rejectReason: rejectReason,
-        updatedAt: currentDate,
-      })
-      .where(eq(vendorPQSubmissions.id, pqSubmissionId));
-    
-    // 6. 일반 PQ인 경우 벤더 상태 업데이트 (선택사항)
-    if (pqSubmission.type === "GENERAL") {
-      await db
-        .update(vendors)
-        .set({
-          status: "PQ_FAILED",
-          updatedAt: currentDate,
-        })
-        .where(eq(vendors.id, vendorId));
-    }
-    
-    // 7. 벤더에게 이메일 알림 발송
-    if (vendor.email) {
-      try {
-        const emailSubject = pqSubmission.projectId
-          ? `[eVCP] Project PQ Rejected for ${projectName}`
-          : "[eVCP] General PQ Rejected";
-          
-        const portalUrl = `${host}/partners/pq`;
-          
-        await sendEmail({
-          to: vendor.email,
-          subject: emailSubject,
-          template: "pq-rejected-vendor",
-          context: {
-            vendorName: vendor.vendorName,
-            projectId: pqSubmission.projectId,
-            projectName: projectName,
-            isProjectPQ: !!pqSubmission.projectId,
-            rejectedDate: currentDate.toLocaleString(),
-            rejectReason: rejectReason,
-            portalUrl,
-          }
-        });
-      } catch (emailError) {
-        console.error("Failed to send vendor notification:", emailError);
-        // 이메일 발송 실패가 전체 프로세스를 중단하지 않음
-      }
-    }
-    
-    // 8. 캐시 무효화
-    revalidateTag("vendors");
-    revalidateTag("vendor-status-counts");
-    revalidateTag("pq-submissions");
-    revalidateTag(`vendor-pq-submissions-${vendorId}`);
-    
-    if (pqSubmission.projectId) {
-      revalidateTag(`project-pq-submissions-${pqSubmission.projectId}`);
-      revalidateTag(`project-vendors-${pqSubmission.projectId}`);
-    }
-    
-    return { ok: true };
-  } catch (error) {
-    console.error("PQ reject error:", error);
-    return { ok: false, error: getErrorMessage(error) };
-  }
-}
-
-// PQ 보완요청 메일 발송 액션
-export async function requestPqSupplementAction({
-  pqSubmissionId,
-  vendorId,
-  comment,
-}: {
-  pqSubmissionId: number;
-  vendorId: number;
-  comment: string;
-}) {
-  unstable_noStore();
-  try {
-    const session = await getServerSession(authOptions);
-    const currentUserEmail = session?.user?.email || null;
-    const headersList = await headers();
-    const host = headersList.get('host') || 'localhost:3000';
-
-    // PQ/벤더/요청자 정보 조회
-    const pq = await db
-      .select({ id: vendorPQSubmissions.id, pqNumber: vendorPQSubmissions.pqNumber, requesterId: vendorPQSubmissions.requesterId, projectId: vendorPQSubmissions.projectId })
-      .from(vendorPQSubmissions)
-      .where(and(eq(vendorPQSubmissions.id, pqSubmissionId), eq(vendorPQSubmissions.vendorId, vendorId)))
-      .then(rows => rows[0]);
-    if (!pq) return { ok: false, error: 'PQ submission not found' };
-
-    const vendor = await db
-      .select({ vendorName: vendors.vendorName, email: vendors.email })
-      .from(vendors)
-      .where(eq(vendors.id, vendorId))
-      .then(rows => rows[0]);
-    if (!vendor?.email) return { ok: false, error: 'Vendor email not found' };
-
-    let requesterEmail: string | null = null;
-    if (pq.requesterId) {
-      const requester = await db
-        .select({ email: users.email })
-        .from(users)
-        .where(eq(users.id, pq.requesterId))
-        .then(rows => rows[0]);
-      requesterEmail = requester?.email || null;
-    }
-
-    const reviewUrl = `${process.env.NEXT_PUBLIC_BASE_URL}/partners/pq_new`;
-
-    await sendEmail({
-      to: vendor.email,
-      cc: [currentUserEmail, requesterEmail].filter(Boolean) as string[],
-      subject: `[eVCP] PQ 보완 요청: ${vendor.vendorName}`,
-      template: 'pq-supplement-request',
-      context: {
-        vendorName: vendor.vendorName,
-        pqNumber: pq.pqNumber,
-        comment,
-        reviewUrl,
-      },
-    });
-
-    revalidateTag('pq-submissions');
-    return { ok: true };
-  } catch (error) {
-    console.error('PQ supplement request error:', error);
-    return { ok: false, error: getErrorMessage(error) };
-  }
-}
-
-
-// 실사 의뢰 생성 서버 액션
-export async function requestInvestigationAction(
-  pqSubmissionIds: number[],
-  currentUser: { id: number; epId: string | null; email?: string },
-  data: {
-    qmManagerId: number,
-    forecastedAt: Date,
-    investigationAddress: string,
-    investigationNotes?: string
-  },
-  options?: {
-    skipRevalidation?: boolean; // ✅ 핸들러에서 호출 시 revalidation 건너뛰기
-  }
-) {
-  try {
-    // 세션에서 요청자 정보 가져오기
-    if (!currentUser.id) {
-      return { success: false, error: "인증된 사용자만 실사를 의뢰할 수 있습니다." };
-    }
-
-    const result = await db.transaction(async (tx) => {
-      // PQ 제출 정보 조회
-      const pqSubmissions = await tx
-        .select({
-          id: vendorPQSubmissions.id,
-          vendorId: vendorPQSubmissions.vendorId,
-        })
-        .from(vendorPQSubmissions)
-        .where(
-          and(
-            inArray(vendorPQSubmissions.id, pqSubmissionIds),
-            eq(vendorPQSubmissions.status, "APPROVED")
-          )
-        );
-
-      if (pqSubmissions.length === 0) {
-        throw new Error("승인된 PQ 제출 항목이 없습니다.");
-      }
-
-      const now = new Date();
-
-      //  실사 요청 생성
-      const investigations = pqSubmissions.map((pq) => {
-        return {
-          vendorId: pq.vendorId,
-          pqSubmissionId: pq.id,
-          investigationStatus: "PLANNED" as const, // enum 타입으로 명시적 지정
-          qmManagerId: data.qmManagerId,
-          forecastedAt: data.forecastedAt,
-          investigationAddress: data.investigationAddress,
-          investigationNotes: data.investigationNotes || null,
-          requesterId: currentUser.id,
-          requestedAt: now,
-          createdAt: now,
-          updatedAt: now,
-        };
-      });
-      //PQ 제출 정보 업데이트, status를 QM_REVIEWING로 업데이트
-      await tx
-        .update(vendorPQSubmissions)
-        .set({
-          status: "QM_REVIEWING",
-          updatedAt: now,
-        })
-        .where(inArray(vendorPQSubmissions.id, pqSubmissionIds));
-      
-
-      // 실사 요청 저장
-      const created = await tx
-        .insert(vendorInvestigations)
-        .values(investigations)
-        .returning();
-
-      return created;
-    });
-
-  
-    // 이메일 발송 (트랜잭션 외부에서 실행)
-    try {
-      // 1. 협력업체 정보 조회 (이메일 포함)
-      const vendorIds = result.map(inv => inv.vendorId);
-      const uniqueVendorIds = [...new Set(vendorIds)];
-      
-      const vendorInfos = await db
-        .select({
-          id: vendors.id,
-          vendorName: vendors.vendorName,
-          email: vendors.email,
-        })
-        .from(vendors)
-        .where(inArray(vendors.id, uniqueVendorIds));
-
-      // 2. QM 담당자 정보 조회
-      const qmManager = await db
-        .select({
-          id: users.id,
-          name: users.name,
-          email: users.email,
-        })
-        .from(users)
-        .where(eq(users.id, data.qmManagerId))
-        .limit(1)
-        .then(rows => rows[0]);
-
-      // 3. 요청자(현재 사용자) 정보 조회
-      const requester = await db
-        .select({
-          id: users.id,
-          name: users.name,
-          email: users.email,
-        })
-        .from(users)
-        .where(eq(users.id, currentUser.id))
-        .limit(1)
-        .then(rows => rows[0]);
-
-      const portalUrl = process.env.NEXT_PUBLIC_BASE_URL || "http://localhost:3000";
-      const currentYear = new Date().getFullYear();
-      const forecastedAtFormatted = format(data.forecastedAt, "yyyy-MM-dd");
-
-      // 4. 협력업체별로 이메일 발송 (investigation-request.hbs 템플릿 사용)
-      const vendorEmailPromises = vendorInfos
-        .filter(vendor => vendor.email) // 이메일이 있는 경우만
-        .map(async (vendor) => {
-          try {
-            await sendEmail({
-              to: vendor.email!,
-              subject: "[eVCP] 협력업체 실사 요청",
-              template: "investigation-request",
-              context: {
-                language: "ko",
-                vendorIds: [vendor.id],
-                notes: data.investigationNotes || "실사가 예정되어 있습니다.",
-                portalUrl: `${portalUrl}/ko/partners/site-visit`,
-                currentYear: currentYear,
-              },
-            });
-            console.log(`협력업체 이메일 발송 완료: ${vendor.vendorName} (${vendor.email})`);
-          } catch (emailError) {
-            console.error(`협력업체 이메일 발송 실패: ${vendor.vendorName} (${vendor.email})`, emailError);
-          }
-        });
-
-      await Promise.all(vendorEmailPromises);
-
-      // 5. QM 담당자에게 알림 이메일 발송
-      if (qmManager?.email) {
-        try {
-          const vendorNames = vendorInfos.map(v => v.vendorName);
-          
-          await sendEmail({
-            to: qmManager.email,
-            subject: "[eVCP] 실사 의뢰 요청 알림",
-            template: "investigation-request-notification",
-            context: {
-              language: "ko",
-              recipientName: qmManager.name,
-              vendorNames: vendorNames,
-              forecastedAt: forecastedAtFormatted,
-              investigationAddress: data.investigationAddress,
-              investigationNotes: data.investigationNotes || null,
-              requesterName: requester?.name || "알 수 없음",
-              portalUrl: `${portalUrl}/evcp/vendor-investigation`,
-              currentYear: currentYear,
-            },
-          });
-          console.log(`QM 담당자 이메일 발송 완료: ${qmManager.name} (${qmManager.email})`);
-        } catch (emailError) {
-          console.error(`QM 담당자 이메일 발송 실패: ${qmManager.name} (${qmManager.email})`, emailError);
-        }
-      }
-
-      // 6. 요청자(현재 사용자)에게 알림 이메일 발송 (QM 담당자와 다른 경우만)
-      // if (requester?.email && requester.id !== data.qmManagerId) {
-      //   try {
-      //     const vendorNames = vendorInfos.map(v => v.vendorName);
-          
-      //     await sendEmail({
-      //       to: requester.email,
-      //       subject: "[eVCP] 실사 의뢰 요청 알림",
-      //       template: "investigation-request-notification",
-      //       context: {
-      //         language: "ko",
-      //         recipientName: requester.name,
-      //         vendorNames: vendorNames,
-      //         forecastedAt: forecastedAtFormatted,
-      //         investigationAddress: data.investigationAddress,
-      //         investigationNotes: data.investigationNotes || null,
-      //         requesterName: requester.name,
-      //         portalUrl: `${portalUrl}/evcp/vendor-investigation`,
-      //         currentYear: currentYear,
-      //       },
-      //     });
-      //     console.log(`요청자 이메일 발송 완료: ${requester.name} (${requester.email})`);
-      //   } catch (emailError) {
-      //     console.error(`요청자 이메일 발송 실패: ${requester.name} (${requester.email})`, emailError);
-      //   }
-      // }
-    } catch (emailErr) {
-      // 이메일 발송 실패는 로그만 남기고 전체 프로세스는 성공으로 처리
-      console.error("이메일 발송 중 오류 발생:", emailErr);
-    }
-
-    // 캐시 무효화 (skipRevalidation 옵션이 false일 때만)
-    if (!options?.skipRevalidation) {
-      revalidateTag("vendor-investigations")
-      revalidateTag("pq-submissions")
-    }
-
-    return {
-      success: true,
-      count: result.length,
-      data: result
-    };
-  } catch (err) {
-    console.error("실사 의뢰 중 오류 발생:", err);
-    return {
-      success: false,
-      error: err instanceof Error ? err.message : "알 수 없는 오류가 발생했습니다."
-    };
-  }
-}
-
-// 실사 의뢰 취소 서버 액션
-export async function cancelInvestigationAction(investigationIds: number[]) {
-  try {
-    const session = await getServerSession(authOptions)
-    const userId = session?.user?.id ? Number(session.user.id) : null
-
-    if (!userId) {
-      return { success: false, error: "인증된 사용자만 실사를 취소할 수 있습니다." }
-    }
-
-    const result = await db.transaction(async (tx) => {
-      // PLANNED 상태인 실사만 취소 가능
-      const updatedInvestigations = await tx
-        .update(vendorInvestigations)
-        .set({
-          investigationStatus: "CANCELED",
-          updatedAt: new Date(),
-        })
-        .where(
-          and(
-            inArray(vendorInvestigations.id, investigationIds),
-            eq(vendorInvestigations.investigationStatus, "PLANNED")
-          )
-        )
-        .returning()
-
-      return updatedInvestigations
-    })
-
-    // 캐시 무효화
-    revalidateTag("vendor-investigations")
-    revalidateTag("pq-submissions")
-
-    return { 
-      success: true, 
-      count: result.length, 
-      data: result 
-    }
-  } catch (err) {
-    console.error("실사 취소 중 오류 발생:", err)
-    return { 
-      success: false, 
-      error: err instanceof Error ? err.message : "알 수 없는 오류가 발생했습니다." 
-    }
-  }
-}
-
-// 실사 재의뢰 서버 액션
-export async function reRequestInvestigationAction(
-  investigationIds: number[],
-  currentUser?: { id: number }, // ✅ 핸들러에서 호출 시 사용자 정보 전달
-  options?: {
-    skipRevalidation?: boolean; // ✅ 핸들러에서 호출 시 revalidation 건너뛰기
-  }
-) {
-  try {
-    let userId: number | null = null;
-    
-    if (currentUser) {
-      // 핸들러에서 호출 시 (결재 승인 후)
-      userId = currentUser.id;
-      
-      // ✅ 핸들러에서 호출 시 userId 검증: 없으면 잘못된 상황 (예외 처리)
-      if (!userId || userId <= 0) {
-        throw new Error('핸들러에서 호출 시 currentUser.id가 필수입니다.');
-      }
-    } else {
-      // 직접 호출 시 (세션에서 가져오기)
-      const session = await getServerSession(authOptions);
-      userId = session?.user?.id ? Number(session.user.id) : null;
-    }
-
-    if (!userId) {
-      return { success: false, error: "인증된 사용자만 실사를 재의뢰할 수 있습니다." }
-    }
-
-    const result = await db.transaction(async (tx) => {
-      // CANCELED 상태인 실사만 재의뢰 가능
-      const updatedInvestigations = await tx
-        .update(vendorInvestigations)
-        .set({
-          investigationStatus: "PLANNED",
-          updatedAt: new Date(),
-        })
-        .where(
-          and(
-            inArray(vendorInvestigations.id, investigationIds),
-            eq(vendorInvestigations.investigationStatus, "CANCELED")
-          )
-        )
-        .returning()
-
-      return updatedInvestigations
-    })
-
-    // 캐시 무효화 (skipRevalidation 옵션이 false일 때만)
-    if (!options?.skipRevalidation) {
-      revalidateTag("vendor-investigations")
-      revalidateTag("pq-submissions")
-    }
-
-    return {
-      success: true,
-      count: result.length,
-      data: result
-    }
-  } catch (err) {
-    console.error("실사 재의뢰 중 오류 발생:", err)
-    return {
-      success: false,
-      error: err instanceof Error ? err.message : "알 수 없는 오류가 발생했습니다."
-    }
-  }
-}
-
-// 실사 결과 발송 서버 액션
-export async function sendInvestigationResultsAction(input: {
-  investigationIds: number[];
-  purchaseComment?: string;
-}) {
-  try {
-    const session = await getServerSession(authOptions)
-    const userId = session?.user?.id ? Number(session.user.id) : null
-
-    if (!userId) {
-      return { success: false, error: "인증된 사용자만 실사 결과를 발송할 수 있습니다." }
-    }
-
-    const result = await db.transaction(async (tx) => {
-      // 완료된 실사만 결과 발송 가능
-      const investigations = await tx
-        .select({
-          id: vendorInvestigations.id,
-          vendorId: vendorInvestigations.vendorId,
-          pqSubmissionId: vendorInvestigations.pqSubmissionId,
-          evaluationResult: vendorInvestigations.evaluationResult,
-          investigationNotes: vendorInvestigations.investigationNotes,
-          investigationAddress: vendorInvestigations.investigationAddress,
-          investigationMethod: vendorInvestigations.investigationMethod,
-          confirmedAt: vendorInvestigations.confirmedAt,
-          // Vendor 정보
-          vendorCode: vendors.vendorCode,
-          vendorName: vendors.vendorName,
-          vendorEmail: vendors.email,
-          // PQ 정보
-          pqNumber: vendorPQSubmissions.pqNumber,
-          pqItems: vendorPQSubmissions.pqItems,
-          projectCode: projects.code,
-          projectName: projects.name,
-          // 발신자 정보
-          senderName: users.name,
-          senderEmail: users.email,
-        })
-        .from(vendorInvestigations)
-        .leftJoin(vendors, eq(vendorInvestigations.vendorId, vendors.id))
-        .leftJoin(vendorPQSubmissions, eq(vendorInvestigations.pqSubmissionId, vendorPQSubmissions.id))
-        .leftJoin(projects, eq(vendorPQSubmissions.projectId, projects.id))
-        .leftJoin(users, eq(vendorInvestigations.requesterId, users.id))
-        .where(
-            inArray(vendorInvestigations.id, input.investigationIds)
-        )
-
-      if (investigations.length === 0) {
-        throw new Error("발송할 수 있는 완료된 실사가 없습니다.")
-      }
-
-      // 각 실사에 대해 이메일 발송
-      const emailResults = await Promise.all(
-        investigations.map(async (investigation) => {
-          try {
-            // 이메일 컨텍스트 구성
-            const emailContext = {
-              // 기본 정보
-              pqNumber: investigation.pqNumber || "N/A",
-              vendorCode: investigation.vendorCode || "N/A",
-              vendorName: investigation.vendorName || "N/A",
-              
-              // 실사 정보 - pqItems를 itemCode-itemName 형태로 모든 항목 표시
-              auditItem: (() => {
-                if (investigation.pqItems) {
-                  try {
-                    const parsed = typeof investigation.pqItems === 'string' 
-                      ? JSON.parse(investigation.pqItems) 
-                      : investigation.pqItems;
-                    if (Array.isArray(parsed)) {
-                      return parsed.map(item => {
-                        if (typeof item === 'string') return item;
-                        if (typeof item === 'object') {
-                          const code = item.itemCode || item.code || "";
-                          const name = item.itemName || item.name || "";
-                          if (code && name) return `${code}-${name}`;
-                          return name || code || String(item);
-                        }
-                        return String(item);
-                      }).join(', ');
-                    }
-                    return String(parsed);
-                  } catch {
-                    return String(investigation.pqItems);
-                  }
-                }
-                return investigation.projectName || "N/A";
-              })(),
-              auditFactoryAddress: investigation.investigationAddress || "N/A",
-              auditMethod: getInvestigationMethodLabel(investigation.investigationMethod || ""),
-              auditResult: investigation.evaluationResult === "APPROVED" ? "Pass(승인)" : 
-                          investigation.evaluationResult === "SUPPLEMENT" ? "Pass(조건부승인)" : 
-                          investigation.evaluationResult === "REJECTED" ? "Fail(미승인)" : "N/A",
-              additionalNotes: input.purchaseComment || investigation.investigationNotes || "",
-              
-              // 발신자 정보
-              senderName: investigation.senderName || "삼성중공업",
-              senderEmail: investigation.senderEmail || "procurement@samsung.com",
-              
-              // 이메일 제목
-              subject: `[SHI Audit] 실사 결과 안내 _ ${investigation.vendorName} _ PQ No. ${investigation.pqNumber}`,
-            }
-
-            // 이메일 발송
-            if (investigation.vendorEmail) {
-              await sendEmail({
-                to: investigation.vendorEmail,
-                subject: emailContext.subject,
-                template: "audit-result-notice",
-                context: emailContext,
-              })
-            } else {
-              throw new Error("벤더 이메일 주소가 없습니다.")
-            }
-
-            return { success: true, investigationId: investigation.id }
-          } catch (error) {
-            console.error(`실사 ID ${investigation.id} 이메일 발송 실패:`, error)
-            return { success: false, investigationId: investigation.id, error: error instanceof Error ? error.message : "알 수 없는 오류" }
-          }
-        })
-      )
-
-      // 성공한 실사들의 상태를 RESULT_SENT로 업데이트
-      const successfulInvestigationIds = emailResults
-        .filter(result => result.success)
-        .map(result => result.investigationId)
-
-      if (successfulInvestigationIds.length > 0) {
-        await tx
-          .update(vendorInvestigations)
-          .set({
-            investigationStatus: "RESULT_SENT",
-            purchaseComment: input.purchaseComment,
-            updatedAt: new Date(),
-          })
-          .where(inArray(vendorInvestigations.id, successfulInvestigationIds))
-
-        // 정규업체등록관리에 레코드 생성 로직
-        const successfulInvestigations = investigations.filter(inv => 
-          successfulInvestigationIds.includes(inv.id)
-        );
-
-        for (const investigation of successfulInvestigations) {
-          // 1. 미실사 PQ는 제외 (이미 COMPLETED 상태인 것만 처리하므로 실사된 것들)
-          // 2. 승인된 실사만 정규업체등록 대상
-          if (investigation.evaluationResult === "APPROVED") {
-            try {
-              // 기존 정규업체등록 레코드 확인
-              const existingRegistration = await tx
-                .select({ id: vendorRegularRegistrations.id })
-                .from(vendorRegularRegistrations)
-                .where(eq(vendorRegularRegistrations.vendorId, investigation.vendorId))
-                .limit(1);
-
-              // 프로젝트 PQ의 경우 기존 레코드가 있으면 skip, 없으면 생성
-              // 일반 PQ의 경우 무조건 생성 (이미 체크는 위에서 함)
-              if (existingRegistration.length === 0) {
-                // pqItems를 majorItems로 변환 - JSON 통째로 넘겨줌
-                let majorItemsJson = null;
-                if (investigation.pqItems) {
-                  try {
-                    // 이미 파싱된 객체거나 JSON 문자열인 경우 모두 처리
-                    const parsed = typeof investigation.pqItems === 'string' 
-                      ? JSON.parse(investigation.pqItems) 
-                      : investigation.pqItems;
-                    
-                    // 원본 구조를 최대한 보존하면서 JSON으로 저장
-                    majorItemsJson = JSON.stringify(parsed);
-                  } catch {
-                    // 파싱 실패 시 문자열로 저장
-                    majorItemsJson = JSON.stringify([{ 
-                      itemCode: "UNKNOWN", 
-                      itemName: String(investigation.pqItems) 
-                    }]);
-                  }
-                }
-
-                await tx.insert(vendorRegularRegistrations).values({
-                  vendorId: investigation.vendorId,
-                  status: "under_review", // 실사 통과 상태로 시작
-                  majorItems: majorItemsJson,
-                  registrationRequestDate: new Date().toISOString().split('T')[0], // date 타입으로 변환
-                  remarks: `PQ 실사 통과로 자동 생성 (PQ번호: ${investigation.pqNumber || 'N/A'})`,
-                });
-
-                console.log(`✅ 정규업체등록 레코드 생성: 벤더 ID ${investigation.vendorId}`);
-              } else {
-                console.log(`⏭️ 정규업체등록 레코드 이미 존재: 벤더 ID ${investigation.vendorId} (Skip)`);
-              }
-            } catch (error) {
-              console.error(`❌ 정규업체등록 레코드 생성 실패 (벤더 ID: ${investigation.vendorId}):`, error);
-              // 정규업체등록 생성 실패는 전체 프로세스를 중단하지 않음
-            }
-          }
-        }
-      }
-
-      return {
-        totalCount: investigations.length,
-        successCount: emailResults.filter(r => r.success).length,
-        failedCount: emailResults.filter(r => !r.success).length,
-        emailResults,
-      }
-    })
-
-    // 캐시 무효화
-    revalidateTag("vendor-investigations")
-    revalidateTag("pq-submissions")
-    revalidateTag("vendor-regular-registrations")
-
-    return { 
-      success: true, 
-      data: result,
-      message: `${result.successCount}개 실사 결과가 성공적으로 발송되었습니다.`
-    }
-  } catch (err) {
-    console.error("실사 결과 발송 중 오류 발생:", err)
-    return { 
-      success: false, 
-      error: err instanceof Error ? err.message : "알 수 없는 오류가 발생했습니다." 
-    }
-  }
-}
-
-// 실사 방법 라벨 변환 함수
-function getInvestigationMethodLabel(method: string): string {
-  switch (method) {
-    case "PURCHASE_SELF_EVAL":
-      return "구매자체평가"
-    case "DOCUMENT_EVAL":
-      return "서류평가"
-    case "PRODUCT_INSPECTION":
-      return "제품검사평가"
-    case "SITE_VISIT_EVAL":
-      return "방문실사평가"
-    default:
-      return method
-  }
-}
-
-// export async function getQMManagers() {
-//   try {
-//     // QM 부서 사용자만 필터링 (department 필드가 있다고 가정)
-//     // 또는 QM 역할을 가진 사용자만 필터링 (role 필드가 있다고 가정)
-//     const qmUsers = await db
-//       .select({
-//         id: users.id,
-//         name: users.name,
-//         email: users.email,
-//       })
-//       .from(users)
-//       // .where(
-//       //   // 필요에 따라 조건 조정 (예: QM 부서 또는 특정 역할만)
-//       //   // eq(users.department, "QM") 또는
-//       //   // eq(users.role, "QM_MANAGER")
-//       //   // 테스트를 위해 모든 사용자 반환도 가능
-//       //   eq(users.active, true)
-//       // )
-//       .orderBy(users.name)
-
-//     return { 
-//       data: qmUsers,
-//       success: true 
-//     }
-//   } catch (error) {
-//     console.error("QM 담당자 목록 조회 오류:", error)
-//     return { 
-//       data: [],
-//       success: false,
-//       error: error instanceof Error ? error.message : "QM 담당자 목록을 가져오는 중 오류가 발생했습니다." 
-//     }
-//   }
-// }
-export async function getQMManagers() {
-  try {
-    // domain이 'partners'가 아니고, isActive가 true인 사용자만 조회
-    // 또는 deptName이 '품질경영팀('를 포함하는 경우도 포함
-    const qmUsers = await db
-      .select({
-        id: users.id,
-        name: users.name,
-        email: users.email,
-        isActive: users.isActive,
-      })
-      .from(users)
-      .where(
-        and(
-          eq(users.isActive, true),
-          ne(users.domain, "partners"),
-          ilike(users.deptName, "%품질경영팀(%")
-        )
-      )
-      .orderBy(users.name);
-
-    return {
-      data: qmUsers,
-      success: true
-    }
-  } catch (error) {
-    console.error("QM 담당자 목록 조회 오류:", error)
-    return {
-      data: [],
-      success: false,
-      error: error instanceof Error ? error.message : "QM 담당자 목록을 가져오는 중 오류가 발생했습니다."
-    }
-  }
-}
-export async function getFactoryLocationAnswer(vendorId: number, projectId: number | null = null) {
-  try {
-    // 1. "Location of Factory" 체크포인트를 가진 criteria 찾기
-    const criteria = await db
-      .select({
-        id: pqCriterias.id
-      })
-      .from(pqCriterias)
-      .where(ilike(pqCriterias.checkPoint, "%Location of Factory%"))
-      .limit(1);
-
-    if (!criteria.length) {
-      return { success: false, message: "Factory Location 질문을 찾을 수 없습니다." };
-    }
-
-    const criteriaId = criteria[0].id;
-
-    // 2. 해당 criteria에 대한 벤더의 응답 조회
-    const answerQuery = db
-      .select({
-        answer: vendorPqCriteriaAnswers.answer
-      })
-      .from(vendorPqCriteriaAnswers)
-      .where(
-        and(
-          eq(vendorPqCriteriaAnswers.vendorId, vendorId),
-          eq(vendorPqCriteriaAnswers.criteriaId, criteriaId)
-        )
-      );
-
-    // 프로젝트 ID가 있으면 추가 조건
-    if (projectId !== null) {
-      answerQuery.where(eq(vendorPqCriteriaAnswers.projectId, projectId));
-    } else {
-      answerQuery.where(eq(vendorPqCriteriaAnswers.projectId, null));
-    }
-
-    const answers = await answerQuery.limit(1);
-
-    if (!answers.length || !answers[0].answer) {
-      return { success: false, message: "공장 위치 정보를 찾을 수 없습니다." };
-    }
-
-    return { 
-      success: true, 
-      factoryLocation: answers[0].answer 
-    };
-  } catch (error) {
-    console.error("Factory location 조회 오류:", error);
-    return { success: false, message: "오류가 발생했습니다." };
-  }
-}
-
-// -----------------------------------------------------------------------------
-// PQ LISTS (GENERAL / PROJECT / NON_INSPECTION) CRUD + 조회
-
-// LOAD CRITERIAS BY LIST
-export async function getPqCriteriasByListId(listId: number) {
-  const criterias = await db
-    .select()
-    .from(pqCriterias)
-    .where(eq(pqCriterias.pqListId, listId))
-    .orderBy(pqCriterias.groupName, pqCriterias.code);
-  return criterias;
-}
-
-// -----------------------------------------------------------------------------
-// PQ LISTS CRUD 액션 - 개선된 버전
-// -----------------------------------------------------------------------------
-
-
-export async function getPQLists(input: GetPqListsSchema) {
-  return unstable_cache(
-    async () => {
-      try {
-        const offset = (input.page - 1) * input.perPage;
-
-        let globalWhere;
-        if (input.search) {
-          const s = `%${input.search}%`;
-          globalWhere = or(
-            ilike(pqLists.name, s),
-            ilike(pqLists.type, s),
-            ilike(projects.code, s),
-            ilike(projects.name, s)
-          );
-        }
-
-        const advancedWhere = input.filters
-          ? filterColumns({ table: pqLists, filters: input.filters, joinOperator: input.joinOperator })
-          : undefined;
-
-        const finalWhere = and(
-          // eq(pqLists.isDeleted, false),
-          advancedWhere,
-          globalWhere
-        );
-
-        const orderBy = input.sort.length
-          ? input.sort.map((s) => (s.desc ? desc(pqLists.createdAt) : asc(pqLists.createdAt)))
-          : [desc(pqLists.createdAt)];
-
-        const { data, total } = await db.transaction(async (tx) => {
-          // 만료된 PQ 리스트들을 자동으로 비활성화
-          const now = new Date();
-          await tx
-            .update(pqLists)
-            .set({ 
-              isDeleted: true, 
-              updatedAt: now 
-            })
-            .where(
-              and(
-                eq(pqLists.isDeleted, false),
-                lt(pqLists.validTo, now),
-                isNotNull(pqLists.validTo)
-              )
-            );
-
-          const data = await tx
-            .select({
-              id: pqLists.id,
-              name: pqLists.name,
-              type: pqLists.type,
-              projectId: pqLists.projectId,
-              validTo: pqLists.validTo,
-              isDeleted: pqLists.isDeleted,
-              createdAt: pqLists.createdAt,
-              updatedAt: pqLists.updatedAt,
-              createdBy: users.name,
-              projectCode: projects.code,
-              projectName: projects.name,
-              updatedBy: users.name,
-            })
-            .from(pqLists)
-            .leftJoin(projects, eq(pqLists.projectId, projects.id))
-            .leftJoin(users, eq(pqLists.createdBy, users.id))
-            .where(finalWhere)
-            .orderBy(...orderBy)
-            .offset(offset)
-            .limit(input.perPage);
-
-          const countRes = await tx
-            .select({ count: count() })
-            .from(pqLists)
-            .where(finalWhere);
-
-          // 각 PQ 리스트의 항목 수 조회
-          const dataWithCriteriaCount = await Promise.all(
-            data.map(async (item) => {
-              const criteriaCount = await getPqListCriteriaCount(item.id);
-              return {
-                ...item,
-                criteriaCount
-              };
-            })
-          );
-          
-
-          return { data: dataWithCriteriaCount, total: countRes[0]?.count ?? 0 };
-        });
-
-        const pageCount = Math.ceil(total / input.perPage);
-        return { data, pageCount };
-      } catch (err) {
-        console.error("Error in getPQLists:", err);
-        return { data: [], pageCount: 0 };
-      }
-    },
-    [JSON.stringify(input)],
-    { revalidate: 3600, tags: ["pq-lists"] }
-  )();
-}
-
-export async function togglePQListsAction(ids: number[], newIsDeleted: boolean) {
-  try {
-    if (ids.length === 0) {
-      return { success: false, message: "선택한 항목이 없습니다" };
-    }
-    const session = await getServerSession(authOptions);
-    const userId = session?.user?.id ? Number(session.user.id) : null;
-    const now = new Date();
-
-    // 활성화하려는 경우 중복 활성화 체크
-    if (!newIsDeleted) {
-      // 선택된 PQ 리스트들의 정보를 먼저 가져옴
-      const selectedPqLists = await db
-        .select({
-          id: pqLists.id,
-          name: pqLists.name,
-          type: pqLists.type,
-          projectId: pqLists.projectId,
-        })
-        .from(pqLists)
-        .where(inArray(pqLists.id, ids));
-
-      // 현재 활성화된 PQ 리스트 확인
-      const activePqLists = await db
-        .select({
-          id: pqLists.id,
-          name: pqLists.name,
-          type: pqLists.type,
-          projectId: pqLists.projectId,
-        })
-        .from(pqLists)
-        .where(and(
-          eq(pqLists.isDeleted, false),
-          not(inArray(pqLists.id, ids))
-        ));
-
-      // 각 선택된 PQ 리스트에 대해 중복 체크
-      for (const selectedPq of selectedPqLists) {
-        // 일반 PQ 또는 미실사 PQ인 경우
-        if (selectedPq.type === "GENERAL" || selectedPq.type === "NON_INSPECTION") {
-          const activeSameType = activePqLists.filter(pq => pq.type === selectedPq.type);
-          
-          if (activeSameType.length > 0) {
-            const activeNames = activeSameType.map(pq => pq.name).join(", ");
-            return {
-              success: false,
-              error: `${selectedPq.type === "GENERAL" ? "일반" : "미실사"} PQ는 하나만 활성화할 수 있습니다.먼저 활성화된 ${selectedPq.type === "GENERAL" ? "일반" : "미실사"} PQ를 비활성화한 후 활성화해주세요.`
-            };
-          }
-        }
-        
-        // 프로젝트 PQ인 경우
-        if (selectedPq.type === "PROJECT" && selectedPq.projectId) {
-          const activeSameProject = activePqLists.filter(pq => 
-            pq.type === "PROJECT" && pq.projectId === selectedPq.projectId
-          );
-          
-          if (activeSameProject.length > 0) {
-            const activeNames = activeSameProject.map(pq => pq.name).join(", ");
-            return {
-              success: false,
-              error: `프로젝트 PQ는 프로젝트별로 하나만 활성화할 수 있습니다. 먼저 활성화된 프로젝트 PQ를 비활성화한 후 활성화해주세요.`
-            };
-          }
-        }
-      }
-    }
-
-    const updated = await db
-      .update(pqLists)
-      .set({ isDeleted: newIsDeleted, updatedAt: now, updatedBy: userId })
-      .where(inArray(pqLists.id, ids))
-      .returning();
-    revalidateTag("pq-lists");
-    return {
-      success: true,
-      data: updated,
-      message: `${updated.length}개의 PQ 목록이 ${newIsDeleted ? "비활성화" : "활성화"}되었습니다`
-    };
-  } catch (error) {
-    console.error("Error toggling PQ lists:", error);
-    return {
-      success: false,
-      message: "PQ 목록 상태 변경에 실패했습니다"
-    };
-  }
-}
-
-export async function createPQListAction(input: CreatePqListInput) {
-  try {
-    const validated = createPqListSchema.parse(input);
-    const session = await getServerSession(authOptions);
-    const userId = session?.user?.id;
-    // const userName = session?.user?.name || "Unknown";    
-    
-    // General PQ인 경우 중복 체크
-    if (validated.type === "GENERAL") {
-      const existingGeneralPQ = await db
-        .select()
-        .from(pqLists)
-        .where(
-          and(
-            eq(pqLists.type, "GENERAL"),
-            eq(pqLists.isDeleted, false)
-          )
-        )
-        .limit(1);
-
-      if (existingGeneralPQ.length > 0) {
-        return {
-          success: false,
-          error: "General PQ 목록은 하나만 생성할 수 있습니다. 먼저 활성화된 General PQ를 비활성화한 후 생성해주세요."
-        };
-      }
-    }
-
-    // Non-Inspection PQ인 경우 중복 체크
-    if (validated.type === "NON_INSPECTION") {
-      const existingNonInspectionPQ = await db
-        .select()
-        .from(pqLists)
-        .where(
-          and(
-            eq(pqLists.type, "NON_INSPECTION"),
-            eq(pqLists.isDeleted, false)
-          )
-        )
-        .limit(1);
-
-      if (existingNonInspectionPQ.length > 0) {
-        return {
-          success: false,
-          error: "미실사 PQ 목록은 하나만 생성할 수 있습니다. 먼저 활성화된 미실사 PQ를 비활성화한 후 생성해주세요."
-        };
-      }
-    }
-
-    // 프로젝트 PQ인 경우 중복 체크
-    if (validated.type === "PROJECT" && validated.projectId) {
-      // 프로젝트 정보 조회 (이름과 코드 포함)
-      const projectInfo = await db
-        .select({
-          code: projects.code,
-          name: projects.name
-        })
-        .from(projects)
-        .where(eq(projects.id, validated.projectId))
-        .limit(1)
-        .then(rows => rows[0]);
-
-      const existingPQ = await db
-        .select()
-        .from(pqLists)
-        .where(
-          and(
-            eq(pqLists.projectId, validated.projectId),
-            eq(pqLists.type, "PROJECT"),
-            eq(pqLists.isDeleted, false)
-          )
-        )
-        .limit(1);
-
-      if (existingPQ.length > 0) {
-        const projectDisplayName = projectInfo ? `${projectInfo.code} - ${projectInfo.name}` : "알 수 없는 프로젝트";
-        return {
-          success: false,
-          error: `${projectDisplayName} 프로젝트에 대한 PQ가 이미 존재합니다`
-        };
-      }
-    }
-    return await db.transaction(async (tx) => {
-      const now = new Date();
-      const [newPqList] = await tx
-        .insert(pqLists)
-        .values({
-          ...validated,
-          isDeleted: false,
-          createdAt: now,
-          updatedAt: now,
-          createdBy: userId,
-          updatedBy: userId,
-        })
-        .returning();
-
-      // NON_INSPECTION 타입인 경우 기존 활성화된 NON_INSPECTION 리스트들을 비활성화
-      if (validated.type === "NON_INSPECTION") {
-        await tx
-          .update(pqLists)
-          .set({ isDeleted: true, updatedAt: now, updatedBy: userId })
-          .where(
-            and(
-              eq(pqLists.type, "NON_INSPECTION"),
-              eq(pqLists.isDeleted, false),
-              ne(pqLists.id, newPqList.id) // 새로 생성한 리스트 제외
-            )
-          );
-      }
-
-      // 프로젝트 PQ인 경우 General PQ 항목들을 자동으로 복사
-      let copiedCriteriaCount = 0;
-      if (validated.type === "PROJECT") {
-        // General PQ 목록 찾기
-        const generalPqList = await tx
-          .select()
-          .from(pqLists)
-          .where(
-            and(
-              eq(pqLists.type, "GENERAL"),
-              eq(pqLists.isDeleted, false)
-            )
-          )
-          .limit(1)
-          .then(rows => rows[0]);
-
-        if (generalPqList) {
-          // General PQ의 항목들 조회
-          const generalCriterias = await tx
-            .select()
-            .from(pqCriterias)
-            .where(eq(pqCriterias.pqListId, generalPqList.id));
-
-          if (generalCriterias.length > 0) {
-            // 새로운 프로젝트 PQ에 항목들 복사
-            const newCriterias = generalCriterias.map(criteria => ({
-               code: criteria.code,
-               checkPoint: criteria.checkPoint,
-               description: criteria.description,
-               remarks: criteria.remarks,
-               groupName: criteria.groupName,
-               subGroupName: criteria.subGroupName,
-               pqListId: newPqList.id,
-               inputFormat: criteria.inputFormat,
-               createdAt: now,
-               updatedAt: now,
-             }));
-
-            await tx.insert(pqCriterias).values(newCriterias);
-            copiedCriteriaCount = newCriterias.length;
-          }
-        }
-      }
-
-      revalidateTag("pq-lists");
-      revalidateTag("pq-criterias");
-      return { 
-        success: true, 
-        data: newPqList,
-        copiedCriteriaCount 
-      };
-    });
-  } catch (error) {
-    console.error("Error creating PQ list:", error);
-    
-    if (error instanceof z.ZodError) {
-      return {
-        success: false,
-        error: "유효성 검사 실패",
-        details: error.errors
-      };
-    }
-    
-    return {
-      success: false,
-      error: "PQ 목록 생성에 실패했습니다"
-    };
-  }
-}
-export async function deletePQListsAction(ids: number[]) {
-  try {
-    if (ids.length === 0) {
-      return {
-        success: false,
-        message: "삭제할 항목을 선택해주세요"
-      };
-    }
-    console.log("ids", ids)
-    console.log("pqLists", pqLists)
-    const now = new Date();
-    const updated = await db
-      .update(pqLists)
-      .set({ isDeleted: true, updatedAt: now })
-      .where(inArray(pqLists.id, ids))
-      .returning();
-
-    revalidateTag("pq-lists");
-    return {
-      success: true,
-      data: updated,
-      message: `${updated.length}개의 PQ 목록이 비활성화되었습니다`
-    };
-  } catch (error) {
-    console.error("Error deleting PQ lists:", error);
-    return {
-      success: false,
-      message: "PQ 목록 삭제에 실패했습니다"
-    };
-  }
-}
-
-export async function getPqListById(id: number) {
-  try {
-    const pqList = await db
-      .select()
-      .from(pqLists)
-      .where(and(
-        eq(pqLists.id, id),
-        eq(pqLists.isDeleted, false)
-      ))
-      .limit(1)
-      .then(rows => rows[0]);
-      
-    return pqList || null;
-  } catch (error) {
-    console.error("Error fetching PQ list by ID:", error);
-    return null;
-  }
-}
-
-export async function getPqListCriteriaCount(listId: number) {
-  try {
-    const result = await db
-      .select({ count: count() })
-      .from(pqCriterias)
-      .where(eq(pqCriterias.pqListId, listId));
-
-    return result[0]?.count || 0;
-  } catch (error) {
-    console.error("Error getting PQ list criteria count:", error);
-    return 0;
-  }
-}
-
-
-
-export async function copyPQListAction(input: CopyPqListInput) {
-  try {
-    const validated = copyPqListSchema.parse(input);
-    const session = await getServerSession(authOptions);
-    const userId = session?.user?.id;
-    return await db.transaction(async (tx) => {
-      // 1. 원본 PQ 목록 조회
-      const sourcePqList = await tx
-        .select()
-        .from(pqLists)
-        .where(eq(pqLists.id, validated.sourcePqListId))
-        .limit(1)
-        .then(rows => rows[0]);
-
-      if (!sourcePqList) {
-        return {
-          success: false,
-          error: "복사할 PQ 목록을 찾을 수 없습니다"
-        };
-      }
-
-      // 2. 프로젝트 PQ인 경우에만 대상 프로젝트에 이미 PQ가 존재하는지 확인
-      if (sourcePqList.type === "PROJECT" && validated.targetProjectId) {
-        // 프로젝트 정보 조회 (이름과 코드 포함)
-        const projectInfo = await tx
-          .select({
-            code: projects.code,
-            name: projects.name
-          })
-          .from(projects)
-          .where(eq(projects.id, validated.targetProjectId))
-          .limit(1)
-          .then(rows => rows[0]);
-
-        const existingProjectPQ = await tx
-          .select()
-          .from(pqLists)
-          .where(
-            and(
-              eq(pqLists.projectId, validated.targetProjectId),
-              eq(pqLists.type, "PROJECT"),
-              eq(pqLists.isDeleted, false)
-            )
-          )
-          .limit(1);
-
-        if (existingProjectPQ.length > 0) {
-          const projectDisplayName = projectInfo ? `${projectInfo.code} - ${projectInfo.name}` : "알 수 없는 프로젝트";
-          return {
-            success: false,
-            error: `${projectDisplayName} 프로젝트에 대한 PQ가 이미 존재합니다`
-          };
-        }
-      }
-
-      // 3. 새 PQ 목록 생성
-      const now = new Date();
-      const newName = validated.newName || `${sourcePqList.name} (복사본)`;
-
-      const [newPqList] = await tx
-        .insert(pqLists)
-        .values({
-          name: newName || sourcePqList.name,
-          type: sourcePqList.type,
-          projectId: sourcePqList.type === "PROJECT" ? validated.targetProjectId : null,
-          isDeleted: false,
-          createdAt: now,
-          updatedAt: now,
-          createdBy: userId,
-          updatedBy: userId,
-          validTo: validated.validTo,
-        })
-        .returning();
-
-      // 4. 원본 PQ 항목들 조회 및 복사
-      const sourceCriterias = await tx
-        .select()
-        .from(pqCriterias)
-        .where(eq(pqCriterias.pqListId, validated.sourcePqListId));
-
-      if (sourceCriterias.length > 0) {
-        const newCriterias = sourceCriterias.map(criteria => ({
-          code: criteria.code,
-          checkPoint: criteria.checkPoint,
-          description: criteria.description,
-          remarks: criteria.remarks,
-          groupName: criteria.groupName,
-          subGroupName: criteria.subGroupName,
-          pqListId: newPqList.id,
-          inputFormat: criteria.inputFormat,
-          createdAt: now,
-          updatedAt: now,
-          createdBy: userId,
-          updatedBy: userId,
-        }));
-
-        await tx.insert(pqCriterias).values(newCriterias);
-      }
-
-      revalidateTag("pq-lists");
-      return {
-        success: true,
-        data: newPqList,
-        copiedCriteriaCount: sourceCriterias.length
-      };
-    });
-  } catch (error) {
-    console.error("Error copying PQ list:", error);
-
-    if (error instanceof z.ZodError) {
-      return {
-        success: false,
-        error: "유효성 검사 실패",
-        details: error.errors
-      };
-    }
-
-    return {
-      success: false,
-      error: error instanceof Error ? error.message : "PQ 목록 복사에 실패했습니다"
-    };
-  }
-}
-export type Project = {
-  id: number;
-  projectCode: string;
-  projectName: string;
-  pjtType: string;
-}
-// -----------------------------------------------------------------------------
-export async function getProjects() {
-  try {
-    const projectList = await db.transaction(async (tx) => {
-      const results = await tx
-        .select({
-          id: projects.id,
-          code: projects.code,
-          name: projects.name,
-          type: projects.type,
-          createdAt: projects.createdAt,
-          updatedAt: projects.updatedAt,
-        })
-        .from(projects)
-        .orderBy(projects.code);
-
-      return results;
-    });
-
-    return projectList;
-  } catch (error) {
-    console.error("프로젝트 목록 가져오기 실패:", error);
-    return [];
-  }
-}
-
-// PQ 리스트에 등재된 프로젝트만 가져오는 함수
-export async function getProjectsWithPQList() {
-  try {
-    const projectList = await db.transaction(async (tx) => {
-      const results = await tx
-        .select({
-          id: projects.id,
-          projectCode: projects.code,
-          projectName: projects.name,
-          pjtType: projects.type,
-          type: projects.type,
-          createdAt: projects.createdAt,
-          updatedAt: projects.updatedAt,
-        })
-        .from(projects)
-        .innerJoin(pqLists, eq(projects.id, pqLists.projectId))
-        .where(
-          and(
-            eq(pqLists.type, "PROJECT"),
-            eq(pqLists.isDeleted, false)
-          )
-        )
-        .orderBy(projects.code);
-
-      return results;
-    });
-
-    return projectList;
-  } catch (error) {
-    console.error("PQ 리스트 등재 프로젝트 목록 가져오기 실패:", error);
-    return [];
-  }
-}
-// -----------------------------------------------------------------------------
-// PQ Criteria CRUD 액션 - 개선된 버전
-// -----------------------------------------------------------------------------
-
-// PQ 항목 생성 (특정 PQ 목록에 속함)
-export async function createPqCriteria(
-  pqListId: number,
-  input: {
-    code: string;
-    checkPoint: string;
-    groupName: string;
-    subGroupName?: string;
-    description?: string;
-    remarks?: string;
-    inputFormat?: string;
-  }
-) {
-  try {
-    const now = new Date();
-    const [newCriteria] = await db
-      .insert(pqCriterias)
-      .values({
-        code: input.code,
-        checkPoint: input.checkPoint,
-        description: input.description || null,
-        remarks: input.remarks || null,
-        groupName: input.groupName,
-        subGroupName: input.subGroupName || null,
-        pqListId: pqListId,
-        inputFormat: input.inputFormat || "TEXT",
-        createdAt: now,
-        updatedAt: now,
-      })
-      .returning();
-
-    revalidateTag("pq-criterias");
-    return {
-      success: true,
-      data: newCriteria,
-      message: "PQ 항목이 성공적으로 생성되었습니다"
-    };
-  } catch (error) {
-    console.error("Error creating PQ criteria:", error);
-    return {
-      success: false,
-      message: "PQ 항목 생성에 실패했습니다"
-    };
-  }
-}
-
-// PQ 항목 수정
-export async function updatePqCriteria(
-  id: number,
-  input: {
-    code: string;
-    checkPoint: string;
-    groupName: string;
-    subGroupName?: string;
-    description?: string;
-    remarks?: string;
-    inputFormat?: string;
-  }
-) {
-  try {
-    const now = new Date();
-    const [updatedCriteria] = await db
-      .update(pqCriterias)
-      .set({
-        code: input.code,
-        checkPoint: input.checkPoint,
-        description: input.description || null,
-        remarks: input.remarks || null,
-        groupName: input.groupName,
-        subGroupName: input.subGroupName || null,
-        inputFormat: input.inputFormat || "TEXT",
-        updatedAt: now,
-      })
-      .where(eq(pqCriterias.id, id))
-      .returning();
-
-    if (!updatedCriteria) {
-      return {
-        success: false,
-        message: "수정할 PQ 항목을 찾을 수 없습니다"
-      };
-    }
-
-    revalidateTag("pq-criterias");
-    return {
-      success: true,
-      data: updatedCriteria,
-      message: "PQ 항목이 성공적으로 수정되었습니다"
-    };
-  } catch (error) {
-    console.error("Error updating PQ criteria:", error);
-    return {
-      success: false,
-      message: "PQ 항목 수정에 실패했습니다"
-    };
-  }
-}
-
-// PQ 항목 삭제
-export async function deletePqCriterias(ids: number[]) {
-  try {
-    if (ids.length === 0) {
-      return {
-        success: false,
-        message: "삭제할 항목을 선택해주세요"
-      };
-    }
-
-    const deletedCriterias = await db
-      .delete(pqCriterias)
-      .where(inArray(pqCriterias.id, ids))
-      .returning();
-
-    revalidateTag("pq-criterias");
-    return {
-      success: true,
-      data: deletedCriterias,
-      message: `${deletedCriterias.length}개의 PQ 항목이 삭제되었습니다`
-    };
-  } catch (error) {
-    console.error("Error deleting PQ criterias:", error);
-    return {
-      success: false,
-      message: "PQ 항목 삭제에 실패했습니다"
-    };
-  }
-}
-
-/**
- * PQ 제출 삭제 함수 (REQUESTED 상태일 때만 삭제 가능)
- */
-export async function deletePQSubmissionAction(pqSubmissionId: number) {
-  try {
-    // PQ 제출 정보 조회
-    const submission = await db
-      .select()
-      .from(vendorPQSubmissions)
-      .where(eq(vendorPQSubmissions.id, pqSubmissionId))
-      .limit(1);
-
-    if (submission.length === 0) {
-      return { success: false, error: "PQ 제출을 찾을 수 없습니다." };
-    }
-
-    const pqSubmission = submission[0];
-
-    // REQUESTED 상태가 아니면 삭제 불가
-    if (pqSubmission.status !== "REQUESTED") {
-      return { success: false, error: "요청됨 상태가 아닌 PQ는 삭제할 수 없습니다." };
-    }
-
-    // 트랜잭션으로 관련 데이터 모두 삭제
-    await db.transaction(async (tx) => {
-      // 1. PQ 답변 삭제 (vendorId와 projectId로 식별)
-      await tx
-        .delete(vendorPqCriteriaAnswers)
-        .where(
-          and(
-            eq(vendorPqCriteriaAnswers.vendorId, pqSubmission.vendorId),
-            pqSubmission.projectId 
-              ? eq(vendorPqCriteriaAnswers.projectId, pqSubmission.projectId)
-              : isNull(vendorPqCriteriaAnswers.projectId)
-          )
-        );
-
-      // 2. 첨부파일 삭제 (vendorCriteriaAnswerId로 연결)
-      const answerIds = await tx
-        .select({ id: vendorPqCriteriaAnswers.id })
-        .from(vendorPqCriteriaAnswers)
-        .where(
-          and(
-            eq(vendorPqCriteriaAnswers.vendorId, pqSubmission.vendorId),
-            pqSubmission.projectId 
-              ? eq(vendorPqCriteriaAnswers.projectId, pqSubmission.projectId)
-              : isNull(vendorPqCriteriaAnswers.projectId)
-          )
-        );
-
-      if (answerIds.length > 0) {
-        await tx
-          .delete(vendorCriteriaAttachments)
-          .where(inArray(vendorCriteriaAttachments.vendorCriteriaAnswerId, answerIds.map(a => a.id)));
-      }
-
-      // 3. PQ 제출 삭제
-      await tx
-        .delete(vendorPQSubmissions)
-        .where(eq(vendorPQSubmissions.id, pqSubmissionId));
-    });
-
-    // 삭제 후 캐시 무효화 (PQ 히스토리 캐시)
-    revalidateTag('pq-submissions');
-
-    return { success: true };
-  } catch (error) {
-    console.error("deletePQSubmissionAction error:", error);
-    return { success: false, error: String(error) };
-  }
-}
-
-// PQ 목록별 항목 조회 (특정 pqListId에 속한 PQ 항목들)
-// PQ 리스트 정보 조회 (상태 포함)
-export async function getPQListInfo(pqListId: number) {
-  return unstable_cache(
-    async () => {
-      try {
-        const pqList = await db
-          .select({
-            id: pqLists.id,
-            name: pqLists.name,
-            type: pqLists.type,
-            projectId: pqLists.projectId,
-            validTo: pqLists.validTo,
-            isDeleted: pqLists.isDeleted,
-            createdAt: pqLists.createdAt,
-            updatedAt: pqLists.updatedAt,
-          })
-          .from(pqLists)
-          .where(and(
-            eq(pqLists.id, pqListId),
-            eq(pqLists.isDeleted, false)
-          ))
-          .limit(1)
-          .then(rows => rows[0]);
-
-        if (!pqList) {
-          return {
-            success: false,
-            error: "PQ 목록을 찾을 수 없습니다"
-          };
-        }
-
-        // 현재 시간과 비교하여 상태 결정
-        const now = new Date();
-        const isValid = !pqList.validTo || pqList.validTo > now;
-        const status = isValid ? "ACTIVE" : "INACTIVE";
-
-        return {
-          success: true,
-          data: {
-            ...pqList,
-            status
-          }
-        };
-      } catch (error) {
-        console.error("Error in getPQListInfo:", error);
-        return {
-          success: false,
-          error: "PQ 목록 정보를 가져오는 중 오류가 발생했습니다"
-        };
-      }
-    },
-    [`pq-list-info-${pqListId}`],
-    {
-      tags: ["pq-lists"],
-      revalidate: 3600, // 1시간
-    }
-  )();
-}
-
-// 활성화된 미실사 PQ 리스트 조회 (하나만 존재한다고 가정)
-export async function getNonInspectionPQLists() {
-  unstable_noStore();
-
-  try {
-    const pqList = await db
-      .select({
-        id: pqLists.id,
-        name: pqLists.name,
-        type: pqLists.type,
-        projectId: pqLists.projectId,
-        validTo: pqLists.validTo,
-        isDeleted: pqLists.isDeleted,
-        createdAt: pqLists.createdAt,
-        updatedAt: pqLists.updatedAt,
-      })
-      .from(pqLists)
-      .where(and(
-        eq(pqLists.type, "NON_INSPECTION"),
-        eq(pqLists.isDeleted, false)
-      ))
-      .limit(1)
-      .then(rows => rows[0]);
-
-    if (!pqList) {
-      return {
-        success: false,
-        error: "활성화된 미실사 PQ 목록을 찾을 수 없습니다"
-      };
-    }
-
-    // 현재 시간과 비교하여 상태 결정
-    const now = new Date();
-    const isValid = !pqList.validTo || pqList.validTo > now;
-    const status = isValid ? "ACTIVE" : "INACTIVE";
-
-    return {
-      success: true,
-      data: {
-        ...pqList,
-        status
-      }
-    };
-  } catch (error) {
-    console.error("Error in getNonInspectionPQLists:", error);
-    return {
-      success: false,
-      error: "미실사 PQ 목록 정보를 가져오는 중 오류가 발생했습니다"
-    };
-  }
-}
-
-export async function getPQsByListId(pqListId: number, input: GetPQSchema) {
-  return unstable_cache(
-    async () => {
-      try {
-        const offset = (input.page - 1) * input.perPage;
-
-        // 검색 조건
-        let globalWhere;
-        if (input.search) {
-          const s = `%${input.search}%`;
-          globalWhere = or(
-            ilike(pqCriterias.code, s),
-            ilike(pqCriterias.groupName, s),
-            ilike(pqCriterias.subGroupName, s),
-            ilike(pqCriterias.remarks, s),
-            ilike(pqCriterias.checkPoint, s),
-            ilike(pqCriterias.description, s)
-          );
-        }
-
-        // 고급 필터
-        const advancedWhere = input.filters
-          ? filterColumns({ table: pqCriterias, filters: input.filters, joinOperator: input.joinOperator })
-          : undefined;
-
-        // 최종 WHERE 조건 (pqListId 조건 추가)
-        const finalWhere = and(
-          eq(pqCriterias.pqListId, pqListId), // 특정 PQ 목록에 속한 항목들만
-          advancedWhere,
-          globalWhere
-        );
-
-        // 정렬
-        const orderBy = input.sort.length
-          ? input.sort.map((s) => (s.desc ? desc(pqCriterias[s.id]) : asc(pqCriterias[s.id])))
-          : [asc(pqCriterias.createdAt)];
-
-        const { data, total } = await db.transaction(async (tx) => {
-          // 데이터 조회
-          const data = await tx
-                       .select({
-             id: pqCriterias.id,
-             code: pqCriterias.code,
-             checkPoint: pqCriterias.checkPoint,
-             description: pqCriterias.description,
-             remarks: pqCriterias.remarks,
-             groupName: pqCriterias.groupName,
-             subGroupName: pqCriterias.subGroupName,
-             pqListId: pqCriterias.pqListId,
-             inputFormat: pqCriterias.inputFormat,
-     
-             createdAt: pqCriterias.createdAt,
-             updatedAt: pqCriterias.updatedAt,
-           })
-            .from(pqCriterias)
-            .where(finalWhere)
-            .orderBy(...orderBy)
-            .offset(offset)
-            .limit(input.perPage);
-
-          // 카운트 조회
-          const countRes = await tx
-            .select({ count: count() })
-            .from(pqCriterias)
-            .where(finalWhere);
-
-          const total = countRes[0]?.count ?? 0;
-
-          return { data, total };
-        });
-
-        const pageCount = Math.ceil(total / input.perPage);
-        return { data, pageCount };
-      } catch (err) {
-        console.error("Error in getPQsByListId:", err);
-        return { data: [], pageCount: 0 };
-      }
-    },
-    [JSON.stringify(input), pqListId.toString()],
-    { revalidate: 3600, tags: ["pq-criterias"] }
-  )();
-}
-
-// 실사 정보 업데이트 액션 (구매자체평가용)
-export async function updateInvestigationDetailsAction(input: {
-  investigationId: number;
-  confirmedAt?: Date;
-  evaluationResult?: "APPROVED" | "SUPPLEMENT" | "REJECTED";
-  investigationNotes?: string;
-  attachments?: File[];
-}) {
-  try {
-    const updateData: any = {
-      updatedAt: new Date(),
-    };
-
-    if (input.confirmedAt !== undefined) {
-      updateData.confirmedAt = input.confirmedAt;
-    }
-
-    if (input.evaluationResult !== undefined) {
-      updateData.evaluationResult = input.evaluationResult;
-    }
-
-    if (input.investigationNotes !== undefined) {
-      updateData.investigationNotes = input.investigationNotes;
-    }
-    // evaluationResult가 APPROVED라면 investigationStatus를 "COMPLETED"(완료됨)로 변경
-    if (input.evaluationResult === "APPROVED") {
-      updateData.investigationStatus = "COMPLETED";
-    }
-
-    // 트랜잭션으로 실사 정보 업데이트와 첨부파일 저장을 함께 처리
-    await db.transaction(async (tx) => {
-      // 1. 실사 정보 업데이트
-      await tx
-        .update(vendorInvestigations)
-        .set(updateData)
-        .where(eq(vendorInvestigations.id, input.investigationId));
-
-      // 2. 첨부파일 처리
-      if (input.attachments && input.attachments.length > 0) {
-        for (const file of input.attachments) {
-          try {
-            console.log(`📁 실사 첨부파일 처리 중: ${file.name} (${file.size} bytes)`);
-            
-            // saveDRMFile을 사용하여 파일 저장
-            const saveResult = await saveDRMFile(
-              file,
-              decryptWithServerAction,
-              `vendor-investigation/${input.investigationId}`,
-              "investigation-update"
-            );
-
-            if (!saveResult.success) {
-              console.error(`❌ 파일 저장 실패: ${file.name}`, saveResult.error);
-              throw new Error(`파일 저장 실패: ${file.name} - ${saveResult.error}`);
-            }
-
-            console.log(`✅ 파일 저장 완료: ${file.name} -> ${saveResult.fileName}`);
-
-            // 파일 타입 결정
-            let attachmentType = "OTHER";
-            if (file.type.includes("pdf")) {
-              attachmentType = "REPORT";
-            } else if (file.type.includes("image")) {
-              attachmentType = "PHOTO";
-            } else if (
-              file.type.includes("word") ||
-              file.type.includes("document") ||
-              file.name.toLowerCase().includes("report")
-            ) {
-              attachmentType = "DOCUMENT";
-            }
-
-            // DB에 첨부파일 레코드 생성
-            await tx.insert(vendorInvestigationAttachments).values({
-              investigationId: input.investigationId,
-              fileName: saveResult.fileName!,
-              originalFileName: file.name,
-              filePath: saveResult.publicPath!,
-              fileSize: file.size,
-              mimeType: file.type || 'application/octet-stream',
-              attachmentType: attachmentType as "REPORT" | "PHOTO" | "DOCUMENT" | "CERTIFICATE" | "OTHER",
-            });
-            
-          } catch (error) {
-            console.error(`❌ 첨부파일 처리 오류: ${file.name}`, error);
-            throw new Error(`첨부파일 처리 중 오류가 발생했습니다: ${file.name}`);
-          }
-        }
-      }
-    });
-
-    revalidateTag("pq-submissions");
-    revalidatePath("/evcp/pq_new");
-
-    return {
-      success: true,
-      message: "실사 정보가 성공적으로 업데이트되었습니다."
-    };
-
-  } catch (error) {
-    console.error("실사 정보 업데이트 오류:", error);
-    const errorMessage = error instanceof Error ? error.message : "실사 정보 업데이트 중 오류가 발생했습니다.";
-    return {
-      success: false,
-      error: errorMessage
-    };
-  }
-}
-
-// 구매자체평가 첨부파일 조회
-export async function getInvestigationAttachments(investigationId: number) {
-  try {
-    const attachments = await db
-      .select({
-        id: vendorInvestigationAttachments.id,
-        fileName: vendorInvestigationAttachments.fileName,
-        originalFileName: vendorInvestigationAttachments.originalFileName,
-        filePath: vendorInvestigationAttachments.filePath,
-        fileSize: vendorInvestigationAttachments.fileSize,
-        mimeType: vendorInvestigationAttachments.mimeType,
-        attachmentType: vendorInvestigationAttachments.attachmentType,
-        createdAt: vendorInvestigationAttachments.createdAt,
-      })
-      .from(vendorInvestigationAttachments)
-      .where(eq(vendorInvestigationAttachments.investigationId, investigationId))
-      .orderBy(desc(vendorInvestigationAttachments.createdAt));
-
-    return {
-      success: true,
-      attachments,
-    };
-  } catch (error) {
-    console.error("첨부파일 조회 오류:", error);
-    return {
-      success: false,
-      error: "첨부파일 조회 중 오류가 발생했습니다.",
-      attachments: [],
-    };
-  }
-}
-
-// 구매자체평가 첨부파일 삭제
-export async function deleteInvestigationAttachment(attachmentId: number) {
-  try {
-    await db
-      .delete(vendorInvestigationAttachments)
-      .where(eq(vendorInvestigationAttachments.id, attachmentId));
-
-    revalidateTag("pq-submissions");
-    revalidatePath("/evcp/pq_new");
-
-    return {
-      success: true,
-      message: "첨부파일이 성공적으로 삭제되었습니다.",
-    };
-  } catch (error) {
-    console.error("첨부파일 삭제 오류:", error);
-    return {
-      success: false,
-      error: "첨부파일 삭제 중 오류가 발생했습니다.",
-    };
-  }
-}
-
-export async function autoDeactivateExpiredPQLists() {
-  try {
-    const now = new Date();
-    
-    // 유효기간이 지난 PQ 리스트들을 비활성화
-    const expiredLists = await db
-      .update(pqLists)
-      .set({ 
-        isDeleted: true, 
-        updatedAt: now 
-      })
-      .where(
-        and(
-          eq(pqLists.isDeleted, false),
-          lt(pqLists.validTo, now),
-          isNotNull(pqLists.validTo)
-        )
-      )
-      .returning();
-
-    console.log(`[PQ Auto Deactivation] ${expiredLists.length}개의 만료된 PQ 리스트가 비활성화되었습니다.`);
-    
-    if (expiredLists.length > 0) {
-      revalidateTag("pq-lists");
-    }
-
-    return {
-      success: true,
-      deactivatedCount: expiredLists.length,
-      message: `${expiredLists.length}개의 만료된 PQ 리스트가 비활성화되었습니다.`
-    };
-  } catch (error) {
-    console.error("Error auto-deactivating expired PQ lists:", error);
-    return {
-      success: false,
-      message: "만료된 PQ 리스트 자동 비활성화에 실패했습니다."
-    };
-  }
-}
-
-// PQ 유효일 수정 서버액션
-export async function updatePqValidToAction(input: UpdatePqValidToInput) {
-  try {
-    const validated = updatePqValidToSchema.parse(input);
-    const session = await getServerSession(authOptions);
-    const userId = session?.user?.id;
-
-    if (!userId) {
-      return {
-        success: false,
-        error: "인증이 필요합니다"
-      };
-    }
-
-    // PQ 목록 존재 확인
-    const existingPqList = await db
-      .select()
-      .from(pqLists)
-      .where(eq(pqLists.id, validated.pqListId))
-      .limit(1)
-      .then(rows => rows[0]);
-
-    if (!existingPqList) {
-      return {
-        success: false,
-        error: "PQ 목록을 찾을 수 없습니다"
-      };
-    }
-
-    // 유효일 업데이트
-    await db
-      .update(pqLists)
-      .set({
-        validTo: validated.validTo,
-        updatedAt: new Date(),
-        updatedBy: userId,
-      })
-      .where(eq(pqLists.id, validated.pqListId));
-
-    // 캐시 재검증
-    revalidateTag("pq-lists");
-
-    return {
-      success: true,
-      message: "유효일이 성공적으로 수정되었습니다"
-    };
-  } catch (error) {
-    console.error("Error updating PQ valid to:", error);
-    if (error instanceof z.ZodError) {
-      return {
-        success: false,
-        error: "입력 데이터가 올바르지 않습니다"
-      };
-    }
-    return {
-      success: false,
-      error: "유효일 수정에 실패했습니다"
-    };
-  }
-}
-
-
-// SHI 참석자 총 인원수 계산 함수
-
-export async function getTotalShiAttendees(shiAttendees: Record<string, unknown> | null): Promise<number> {
-  if (!shiAttendees) return 0
-
-  let total = 0
-  Object.entries(shiAttendees).forEach(([key, value]) => {
-    if (value && typeof value === 'object' && 'checked' in value && 'count' in value) {
-      const attendee = value as { checked: boolean; count: number }
-      if (attendee.checked) {
-        total += attendee.count
-      }
-    }
-  })
-  return total
+"use server"
+
+import db from "@/db/db"
+import { CopyPqListInput, CreatePqListInput, UpdatePqValidToInput, copyPqListSchema, createPqListSchema, updatePqValidToSchema, GetPqListsSchema, GetPQSchema, GetPQSubmissionsSchema } from "./validations"
+import { unstable_cache } from "@/lib/unstable-cache";
+import { filterColumns } from "@/lib/filter-columns";
+import { getErrorMessage } from "@/lib/handle-error";
+import { asc, desc, ilike, inArray, and, gte, lte, not, or, eq, ne, count,isNull,SQL, sql, lt, gt, isNotNull} from "drizzle-orm";
+import { z } from "zod"
+import { revalidateTag, unstable_noStore, revalidatePath} from "next/cache";
+import { format } from "date-fns"
+import { pqCriterias, pqCriteriasAttachments, vendorCriteriaAttachments, vendorInvestigations, vendorInvestigationAttachments, vendorPQSubmissions, vendorPqCriteriaAnswers, vendorPqReviewLogs, siteVisitRequests, vendorSiteVisitInfo, siteVisitRequestAttachments } from "@/db/schema/pq"
+import { sendEmail } from "../mail/sendEmail";
+import { decryptWithServerAction } from '@/components/drm/drmUtils'
+
+import { vendorAttachments, vendors } from "@/db/schema/vendors";
+import { vendorRegularRegistrations } from "@/db/schema/vendorRegistrations";
+import { saveFile, saveDRMFile } from "@/lib/file-stroage";
+import { GetVendorsSchema } from "../vendors/validations";
+import { selectVendors } from "../vendors/repository";
+import { projects, users, roles, userRoles, redFlagManagers } from "@/db/schema";
+import { basicContract } from "@/db/schema/basicContractDocumnet";
+import { headers } from 'next/headers';
+import { getServerSession } from "next-auth/next"
+import { authOptions } from "@/app/api/auth/[...nextauth]/route"
+import { alias } from 'drizzle-orm/pg-core';
+import { createPQFilterMapping, getPQJoinedTables } from "./helper";
+import { pqLists } from "@/db/schema/pq";
+
+export interface PQAttachment {
+  attachId: number
+  fileName: string
+  filePath: string
+  fileSize?: number
+}
+
+export interface PQItem {
+  answerId: number | null
+  criteriaId: number
+  code: string
+  checkPoint: string
+  description: string | null
+  remarks?: string | null
+  // 프로젝트 PQ 전용 필드
+  contractInfo?: string | null
+  additionalRequirement?: string | null
+  answer: string
+  shiComment: string
+  vendorReply: string
+  attachments: PQAttachment[]
+  criteriaAttachments: PQAttachment[]
+  subGroupName: string
+  inputFormat: string
+  type?: string | null
+
+  createdAt: Date | null
+  updatedAt: Date | null
+}
+
+export interface PQGroupData {
+  groupName: string
+  items: PQItem[]
+}
+
+export interface ProjectPQ {
+  id: number;
+  projectId: number | null;
+  status: string;
+  submittedAt: Date | null;
+  projectCode: string;
+  projectName: string;
+}
+
+export async function getPQProjectsByVendorId(vendorId: number): Promise<ProjectPQ[]> {
+  const result = await db
+    .select({
+      id: vendorPQSubmissions.id,
+      projectId: vendorPQSubmissions.projectId,
+      status: vendorPQSubmissions.status,
+      submittedAt: vendorPQSubmissions.submittedAt,
+      projectCode: projects.code,
+      projectName: projects.name,
+    })
+    .from(vendorPQSubmissions)
+    .innerJoin(
+      projects,
+      eq(vendorPQSubmissions.projectId, projects.id)
+    )
+    .where(eq(vendorPQSubmissions.vendorId, vendorId))
+    .orderBy(projects.code);
+    
+  return result;
+}
+
+export async function getPqCriteriaAttachments(criteriaId: number) {
+  unstable_noStore();
+  try {
+    const rows = await db
+      .select({
+        id: pqCriteriasAttachments.id,
+        fileName: pqCriteriasAttachments.fileName,
+        originalFileName: pqCriteriasAttachments.originalFileName,
+        filePath: pqCriteriasAttachments.filePath,
+        fileSize: pqCriteriasAttachments.fileSize,
+      })
+      .from(pqCriteriasAttachments)
+      .where(eq(pqCriteriasAttachments.pqCriteriaId, criteriaId));
+
+    return { success: true, data: rows };
+  } catch (error) {
+    console.error("Error fetching pq criteria attachments:", error);
+    return { success: false, error: getErrorMessage(error) };
+  }
+}
+
+export async function getPQDataByVendorId(
+  vendorId: number,
+  projectId?: number,
+  pqType?: "GENERAL" | "PROJECT" | "NON_INSPECTION"
+): Promise<PQGroupData[]> {
+  try {
+    // 파라미터 유효성 검증
+    if (isNaN(vendorId)) {
+      throw new Error("Invalid vendorId parameter");
+    }
+    
+    // 타입 결정 로직
+    let finalPqType: "GENERAL" | "PROJECT" | "NON_INSPECTION";
+    if (pqType) {
+      finalPqType = pqType;
+    } else if (projectId) {
+      finalPqType = "PROJECT";
+    } else {
+      finalPqType = "GENERAL";
+    }
+    
+    // 기본 쿼리 구성
+    const selectObj = {
+      criteriaId: pqCriterias.id,
+      groupName: pqCriterias.groupName,
+      code: pqCriterias.code,
+      checkPoint: pqCriterias.checkPoint,
+      description: pqCriterias.description,
+      remarks: pqCriterias.remarks,
+      subGroupName: pqCriterias.subGroupName,
+      
+      // 입력 형식 필드 추가
+      inputFormat: pqCriterias.inputFormat,
+      type: pqCriterias.type,
+      // 기준 첨부
+      criteriaAttachId: pqCriteriasAttachments.id,
+      criteriaAttachFileName: pqCriteriasAttachments.fileName,
+      criteriaAttachFilePath: pqCriteriasAttachments.filePath,
+      criteriaAttachFileSize: pqCriteriasAttachments.fileSize,
+      
+      // 협력업체 응답 필드
+      answer: vendorPqCriteriaAnswers.answer,
+      answerId: vendorPqCriteriaAnswers.id,
+      
+      // SHI 코멘트와 벤더 답변 필드 추가
+      shiComment: vendorPqCriteriaAnswers.shiComment,
+      vendorReply: vendorPqCriteriaAnswers.vendorReply,
+      createdAt: vendorPqCriteriaAnswers.createdAt,
+      updatedAt: vendorPqCriteriaAnswers.updatedAt,
+      
+      // 첨부 파일 필드
+      vendorAttachId: vendorCriteriaAttachments.id,
+      vendorFileName: vendorCriteriaAttachments.fileName,
+      vendorFilePath: vendorCriteriaAttachments.filePath,
+      vendorFileSize: vendorCriteriaAttachments.fileSize,
+    };
+
+    // 타입별 쿼리 조건 구성
+    const pqListConditions = [
+      eq(pqCriterias.pqListId, pqLists.id),
+      eq(pqLists.type, finalPqType),
+      eq(pqLists.isDeleted, false)
+    ];
+
+    const answerConditions = [
+      eq(pqCriterias.id, vendorPqCriteriaAnswers.criteriaId),
+      eq(vendorPqCriteriaAnswers.vendorId, vendorId)
+    ];
+
+    // 프로젝트별 조건 추가
+    if (finalPqType === "PROJECT" && projectId) {
+      pqListConditions.push(eq(pqLists.projectId, projectId));
+      answerConditions.push(eq(vendorPqCriteriaAnswers.projectId, projectId));
+    } else if (finalPqType === "GENERAL" || finalPqType === "NON_INSPECTION") {
+      pqListConditions.push(isNull(pqLists.projectId));
+      answerConditions.push(isNull(vendorPqCriteriaAnswers.projectId));
+    }
+
+    const rows = await db
+      .select(selectObj)
+      .from(pqCriterias)
+      .innerJoin(
+        pqLists,
+        and(...pqListConditions)
+      )
+      .leftJoin(
+        vendorPqCriteriaAnswers,
+        and(...answerConditions)
+      )
+      .leftJoin(
+        vendorCriteriaAttachments,
+        eq(vendorPqCriteriaAnswers.id, vendorCriteriaAttachments.vendorCriteriaAnswerId)
+      )
+      .leftJoin(
+        pqCriteriasAttachments,
+        eq(pqCriteriasAttachments.pqCriteriaId, pqCriterias.id)
+      )
+      .orderBy(pqCriterias.groupName, pqCriterias.code);
+    
+    return processQueryResults(rows);
+  } catch (error) {
+    console.error("Error fetching PQ data:", error);
+    return [];
+  }
+
+  // Helper function to process query results
+  function processQueryResults(rows: any[]) {
+    // 그룹별로 데이터 구성
+    const groupMap = new Map<string, Record<number, PQItem>>();
+    
+    for (const row of rows) {
+      const g = row.groupName || "Others";
+      
+      // 그룹 확인
+      if (!groupMap.has(g)) {
+        groupMap.set(g, {});
+      }
+      
+      const groupItems = groupMap.get(g)!;
+      
+      // 아직 이 기준을 처리하지 않았으면 PQItem 생성
+      if (!groupItems[row.criteriaId]) {
+        groupItems[row.criteriaId] = {
+          answerId: row.answerId,
+          criteriaId: row.criteriaId,
+          code: row.code,
+          checkPoint: row.checkPoint,
+          description: row.description,
+          remarks: row.remarks,
+          answer: row.answer || "",
+          shiComment: row.shiComment || "",
+          vendorReply: row.vendorReply || "",
+          attachments: [],
+          criteriaAttachments: [],
+          inputFormat: row.inputFormat || "",
+          type: row.type || null,
+          subGroupName: row.subGroupName || "",
+          createdAt: row.createdAt,
+          updatedAt: row.updatedAt,
+        };
+      }
+      
+      // 협력업체 답변 첨부
+      if (row.vendorAttachId) {
+        const exists = groupItems[row.criteriaId].attachments.some(
+          (a) => a.attachId === row.vendorAttachId
+        );
+        if (!exists) {
+          groupItems[row.criteriaId].attachments.push({
+            attachId: row.vendorAttachId,
+            fileName: row.vendorFileName || "",
+            filePath: row.vendorFilePath || "",
+            fileSize: row.vendorFileSize || undefined,
+          });
+        }
+      }
+
+      // 기준 첨부
+      if (row.criteriaAttachId) {
+        const existsBase = groupItems[row.criteriaId].criteriaAttachments.some(
+          (a) => a.attachId === row.criteriaAttachId
+        );
+        if (!existsBase) {
+          groupItems[row.criteriaId].criteriaAttachments.push({
+            attachId: row.criteriaAttachId,
+            fileName: row.criteriaAttachFileName || "",
+            filePath: row.criteriaAttachFilePath || "",
+            fileSize: row.criteriaAttachFileSize || undefined,
+          });
+        }
+      }
+    }
+    
+    // 최종 데이터 구성
+    const data: PQGroupData[] = [];
+    for (const [groupName, itemsMap] of groupMap.entries()) {
+      const items = Object.values(itemsMap);
+      data.push({ groupName, items });
+    }
+    
+    return data;
+  }
+}
+
+
+interface PQAttachmentInput {
+  fileName: string      // original user-friendly file name
+  url: string           // the UUID-based path stored on server
+  size?: number         // optional file size
+}
+
+interface SavePQAnswer {
+  criteriaId: number
+  answer: string
+  shiComment?: string
+  vendorReply?: string
+  attachments: PQAttachmentInput[]
+}
+
+interface SavePQInput {
+  vendorId: number
+  projectId?: number
+  answers: SavePQAnswer[]
+}
+
+/**
+ * 여러 항목을 한 번에 Upsert
+ */
+export async function savePQAnswersAction(input: SavePQInput) {
+  const { vendorId, projectId, answers } = input
+
+  try {
+    for (const ans of answers) {
+      // 1) Check if a row already exists for (vendorId, criteriaId, projectId)
+      const queryConditions = [
+        eq(vendorPqCriteriaAnswers.vendorId, vendorId),
+        eq(vendorPqCriteriaAnswers.criteriaId, ans.criteriaId)
+      ];
+      
+      // Add projectId condition when it exists
+      if (projectId !== undefined) {
+        queryConditions.push(eq(vendorPqCriteriaAnswers.projectId, projectId));
+      } else {
+        queryConditions.push(isNull(vendorPqCriteriaAnswers.projectId));
+      }
+      
+      const existing = await db
+        .select()
+        .from(vendorPqCriteriaAnswers)
+        .where(and(...queryConditions));
+
+      let answerId: number
+
+      // 2) If it exists, update the row; otherwise insert
+      if (existing.length === 0) {
+        // Insert new
+        const inserted = await db
+          .insert(vendorPqCriteriaAnswers)
+          .values({
+            vendorId,
+            criteriaId: ans.criteriaId,
+            projectId: projectId || null, // Include projectId when provided
+            answer: ans.answer,
+            shiComment: ans.shiComment || null,
+            vendorReply: ans.vendorReply || null,
+            createdAt: new Date(),
+            updatedAt: new Date(),
+          })
+          .returning({ id: vendorPqCriteriaAnswers.id })
+
+        answerId = inserted[0].id
+      } else {
+        // Update existing
+        answerId = existing[0].id
+
+        await db
+          .update(vendorPqCriteriaAnswers)
+          .set({
+            answer: ans.answer,
+            shiComment: ans.shiComment || null,
+            vendorReply: ans.vendorReply || null,
+            updatedAt: new Date(),
+          })
+          .where(eq(vendorPqCriteriaAnswers.id, answerId))
+      }
+
+      // 3) Now manage attachments in vendorCriteriaAttachments
+      // 3a) Load old attachments from DB
+      const oldAttachments = await db
+        .select({
+          id: vendorCriteriaAttachments.id,
+          filePath: vendorCriteriaAttachments.filePath,
+        })
+        .from(vendorCriteriaAttachments)
+        .where(eq(vendorCriteriaAttachments.vendorCriteriaAnswerId, answerId))
+
+      // 3b) Gather the new filePaths (urls) from the client
+      const newPaths = ans.attachments.map(a => a.url)
+
+      // 3c) Find attachments to remove
+      const toRemove = oldAttachments.filter(old => !newPaths.includes(old.filePath))
+      if (toRemove.length > 0) {
+        const removeIds = toRemove.map(r => r.id)
+        await db
+          .delete(vendorCriteriaAttachments)
+          .where(inArray(vendorCriteriaAttachments.id, removeIds))
+      }
+
+      // 3d) Insert new attachments that aren't in DB
+      const oldPaths = oldAttachments.map(o => o.filePath)
+      const toAdd = ans.attachments.filter(a => !oldPaths.includes(a.url))
+
+      for (const attach of toAdd) {
+        await db.insert(vendorCriteriaAttachments).values({
+          vendorCriteriaAnswerId: answerId,
+          fileName: attach.fileName,
+          filePath: attach.url,
+          fileSize: attach.size ?? null,
+        })
+      }
+    }
+
+    return { ok: true }
+  } catch (error) {
+    console.error("savePQAnswersAction error:", error)
+    return { ok: false, error: String(error) }
+  }
+}
+
+
+
+/**
+ * PQ 제출 서버 액션 - 협력업체 상태를 PQ_SUBMITTED로 업데이트
+ * @param vendorId 협력업체 ID
+ */
+export async function submitPQAction({ 
+  vendorId, 
+  projectId,
+  pqSubmissionId
+}: { 
+  vendorId: number; 
+  projectId?: number;
+  pqSubmissionId?: number; // 특정 PQ 제출 ID가 있는 경우 사용
+}) {
+  unstable_noStore();
+  
+  try {
+    const headersList = await headers();
+    const host = headersList.get('host') || 'localhost:3000';
+
+    // 1. 모든 PQ 항목에 대한 응답이 있는지 검증
+    const answerQueryConditions = [
+      eq(vendorPqCriteriaAnswers.vendorId, vendorId)
+    ];
+    
+    // Add projectId condition when it exists
+    if (projectId !== undefined) {
+      answerQueryConditions.push(eq(vendorPqCriteriaAnswers.projectId, projectId));
+    } else {
+      answerQueryConditions.push(isNull(vendorPqCriteriaAnswers.projectId));
+    }
+    
+    const pqCriteriaCount = await db
+      .select({ count: count() })
+      .from(vendorPqCriteriaAnswers)
+      .where(and(...answerQueryConditions));
+      
+    const totalPqCriteriaCount = pqCriteriaCount[0]?.count || 0;
+      
+    // 응답 데이터 검증
+    if (totalPqCriteriaCount === 0) {
+      return { ok: false, error: "No PQ answers found" };
+    }
+      
+    // 2. 협력업체 정보 조회
+    const vendor = await db
+      .select({
+        id: vendors.id,
+        vendorName: vendors.vendorName,
+        email: vendors.email,
+        status: vendors.status,
+      })
+      .from(vendors)
+      .where(eq(vendors.id, vendorId))
+      .then(rows => rows[0]);
+      
+    if (!vendor) {
+      return { ok: false, error: "Vendor not found" };
+    }
+    
+    // Project 정보 조회 (projectId가 있는 경우)
+    let projectName = '';
+    if (projectId) {
+      const projectData = await db
+        .select({
+          projectName: projects.name
+        })
+        .from(projects)
+        .where(eq(projects.id, projectId))
+        .then(rows => rows[0]);
+        
+      projectName = projectData?.projectName || 'Unknown Project';
+    }
+    
+    // 3. 현재 PQ 제출 상태 확인 및 업데이트
+    const currentDate = new Date();
+    let existingSubmission;
+    
+    // 특정 PQ Submission ID가 있는 경우
+    if (pqSubmissionId) {
+      existingSubmission = await db
+        .select({
+          id: vendorPQSubmissions.id,
+          status: vendorPQSubmissions.status,
+          type: vendorPQSubmissions.type,
+          requesterId: vendorPQSubmissions.requesterId
+        })
+        .from(vendorPQSubmissions)
+        .where(
+          and(
+            eq(vendorPQSubmissions.id, pqSubmissionId),
+            eq(vendorPQSubmissions.vendorId, vendorId)
+          )
+        )
+        .then(rows => rows[0]);
+        
+      if (!existingSubmission) {
+        return { ok: false, error: "PQ submission not found or access denied" };
+      }
+    } 
+    // ID가 없는 경우 vendorId와 projectId로 조회
+    else {
+      const pqType = projectId ? "PROJECT" : "GENERAL";
+      
+      const submissionQueryConditions = [
+        eq(vendorPQSubmissions.vendorId, vendorId),
+        eq(vendorPQSubmissions.type, pqType)
+      ];
+      
+      if (projectId) {
+        submissionQueryConditions.push(eq(vendorPQSubmissions.projectId, projectId));
+      } else {
+        submissionQueryConditions.push(isNull(vendorPQSubmissions.projectId));
+      }
+      
+      existingSubmission = await db
+        .select({
+          id: vendorPQSubmissions.id,
+          status: vendorPQSubmissions.status,
+          type: vendorPQSubmissions.type,
+          requesterId: vendorPQSubmissions.requesterId
+        })
+        .from(vendorPQSubmissions)
+        .where(and(...submissionQueryConditions))
+        .then(rows => rows[0]);
+    }
+    
+    // 제출 가능한 상태 확인
+    const allowedStatuses = ["REQUESTED", "IN_PROGRESS", "SUBMITTED", "REJECTED"];
+    
+    if (existingSubmission) {
+      if (!allowedStatuses.includes(existingSubmission.status)) {
+        return {
+          ok: false,
+          error: `Cannot submit PQ in current status: ${existingSubmission.status}`
+        };
+      }
+      
+      // 기존 제출 상태 업데이트
+      await db
+        .update(vendorPQSubmissions)
+        .set({
+          status: "SUBMITTED",
+          submittedAt: currentDate,
+          updatedAt: currentDate,
+        })
+        .where(eq(vendorPQSubmissions.id, existingSubmission.id));
+    } else {
+      // PQ Submission ID가 없고 기존 submission도 없는 경우 새로운 제출 생성
+      const pqType = projectId ? "PROJECT" : "GENERAL";
+      
+      // PQ 번호 생성 (예: PQ-2024-001)
+      const currentYear = new Date().getFullYear();
+      const pqNumber = `PQ-${currentYear}-${String(vendorId).padStart(3, '0')}`;
+      
+      await db
+        .insert(vendorPQSubmissions)
+        .values({
+          pqNumber,
+          vendorId,
+          projectId: projectId || null,
+          type: pqType,
+          status: "SUBMITTED",
+          submittedAt: currentDate,
+          createdAt: currentDate,
+          updatedAt: currentDate,
+        });
+    }
+    
+    // 4. 일반 PQ인 경우 벤더 상태도 업데이트
+    if (!projectId) {
+      const allowedVendorStatuses = ["IN_PQ", "PENDING_REVIEW", "IN_REVIEW", "REJECTED", "PQ_FAILED"];
+      
+      if (allowedVendorStatuses.includes(vendor.status)) {
+        await db
+          .update(vendors)
+          .set({
+            status: "PQ_SUBMITTED",
+            updatedAt: currentDate,
+          })
+          .where(eq(vendors.id, vendorId));
+      }
+    }
+
+    // 5. PQ 요청자에게 이메일 알림 발송
+    const targetSubmissionId = existingSubmission?.id || '';
+    const targetRequesterId = existingSubmission?.requesterId || null;
+
+    // QM 담당자 이메일 조회 (해당 PQ와 연결된 실사에 배정된 경우)
+    let qmManagerEmail: string | null = null;
+    if (targetSubmissionId) {
+      try {
+        const inv = await db
+          .select({ qmManagerId: vendorInvestigations.qmManagerId })
+          .from(vendorInvestigations)
+          .where(eq(vendorInvestigations.pqSubmissionId, Number(targetSubmissionId)))
+          .then(rows => rows[0]);
+        if (inv?.qmManagerId) {
+          const qmUser = await db
+            .select({ email: users.email })
+            .from(users)
+            .where(eq(users.id, inv.qmManagerId))
+            .then(rows => rows[0]);
+          qmManagerEmail = qmUser?.email || null;
+        }
+      } catch (e) {
+        console.warn("Failed to fetch QM manager email for PQ submission", e);
+      }
+    }
+
+    // HSE 담당자 이메일 조회 (레드플래그/HSE 담당자 설정 기반)
+    let hseManagerEmail: string | null = null;
+    try {
+      const hseManagerRow = await db
+        .select({ hseManagerId: redFlagManagers.hseManagerId })
+        .from(redFlagManagers)
+        .orderBy(desc(redFlagManagers.createdAt))
+        .limit(1);
+
+      const hseManagerId = hseManagerRow[0]?.hseManagerId;
+      if (hseManagerId) {
+        const hseUser = await db
+          .select({ email: users.email })
+          .from(users)
+          .where(eq(users.id, hseManagerId))
+          .then(rows => rows[0]);
+        hseManagerEmail = hseUser?.email || null;
+      }
+    } catch (e) {
+      console.warn("Failed to fetch HSE manager email for PQ submission", e);
+    }
+
+    if (targetRequesterId !== null) {
+      try {
+        // 요청자 정보 조회
+        const requester = await db
+          .select({
+            id: users.id,
+            name: users.name,
+            email: users.email,
+          })
+          .from(users)
+          .where(eq(users.id, targetRequesterId))
+          .then(rows => rows[0]);
+
+        if (requester?.email) {
+          const emailSubject = projectId
+            ? `[eVCP] Project PQ Submitted: ${vendor.vendorName} for ${projectName}`
+            : `[eVCP] General PQ Submitted: ${vendor.vendorName}`;
+
+          const adminUrl = `http://${host}/evcp/pq/${vendorId}/${targetSubmissionId}`;
+
+          const adminCc: string[] = [];
+          if (qmManagerEmail) {
+            adminCc.push(qmManagerEmail);
+          }
+          if (hseManagerEmail && !adminCc.includes(hseManagerEmail)) {
+            adminCc.push(hseManagerEmail);
+          }
+
+          await sendEmail({
+            to: requester.email,
+            cc: adminCc.length ? adminCc : undefined,
+            subject: emailSubject,
+            template: "pq-submitted-admin",
+            context: {
+              vendorName: vendor.vendorName,
+              vendorId: vendor.id,
+              projectId: projectId,
+              projectName: projectName,
+              isProjectPQ: !!projectId,
+              submittedDate: currentDate.toLocaleString(),
+              adminUrl,
+              requesterName: requester.name,
+            }
+          });
+        }
+      } catch (emailError) {
+        console.error("Failed to send requester notification:", emailError);
+      }
+    }
+      
+    // 6. 벤더에게 확인 이메일 발송
+    if (vendor.email) {
+      try {
+        const emailSubject = projectId
+          ? `[eVCP] Project PQ Submission Confirmation for ${projectName}`
+          : "[eVCP] General PQ Submission Confirmation";
+          
+        const portalUrl = `${host}/partners/pq`;
+          
+        await sendEmail({
+          to: vendor.email,
+          subject: emailSubject,
+          template: "pq-submitted-vendor",
+          context: {
+            vendorName: vendor.vendorName,
+            projectId: projectId,
+            projectName: projectName,
+            isProjectPQ: !!projectId,
+            submittedDate: currentDate.toLocaleString(),
+            portalUrl,
+          }      
+        });
+      } catch (emailError) {
+        console.error("Failed to send vendor confirmation:", emailError);
+      }
+    }
+      
+    // 7. 캐시 무효화
+    revalidateTag("vendors");
+    revalidateTag("vendor-status-counts");
+    revalidateTag(`vendor-pq-submissions-${vendorId}`);
+    
+    if (projectId) {
+      revalidateTag(`project-pq-submissions-${projectId}`);
+      revalidateTag(`project-vendors-${projectId}`);
+      revalidateTag(`project-pq-${projectId}`);
+    }
+      
+    return { ok: true };
+  } catch (error) {
+    console.error("PQ submit error:", error);
+    return { ok: false, error: getErrorMessage(error) };
+  }
+}
+
+/**
+ * 향상된 파일 업로드 서버 액션
+ * - 직접 파일 처리 (file 객체로 받음)
+ * - 디렉토리 자동 생성
+ * - 중복 방지를 위한 UUID 적용
+ */
+/**
+ * 벤더용 파일 업로드 액션 (saveFile 사용)
+ */
+export async function uploadVendorFileAction(file: File, userId?: string) {
+  unstable_noStore();
+  
+  try {
+    const result = await saveFile({
+      file,
+      directory: 'pq/vendor',
+      originalName: file.name,
+      userId,
+    });
+
+    if (!result.success) {
+      throw new Error(result.error || "파일 업로드에 실패했습니다.");
+    }
+
+    return {
+      fileName: result.fileName!,
+      url: result.publicPath!,
+      size: result.fileSize!,
+    };
+  } catch (error) {
+    console.error("Vendor file upload error:", error);
+    throw new Error(`Upload failed: ${getErrorMessage(error)}`);
+  }
+}
+
+// PQ 기준 첨부 업로드 (saveFile)
+export async function uploadPqCriteriaFileAction(file: File, userId?: string) {
+  unstable_noStore();
+
+  try {
+    const result = await saveFile({
+      file,
+      directory: "pq/criteria",
+      originalName: file.name,
+      userId,
+    });
+
+    if (!result.success) {
+      throw new Error(result.error || "파일 업로드에 실패했습니다.");
+    }
+
+    return {
+      fileName: result.fileName!,
+      url: result.publicPath!,
+      size: result.fileSize!,
+      originalFileName: file.name,
+    };
+  } catch (error) {
+    console.error("Pq criteria file upload error:", error);
+    throw new Error(`Upload failed: ${getErrorMessage(error)}`);
+  }
+}
+
+/**
+ * SHI용 파일 업로드 액션 (saveDRMFile 사용)
+ */
+export async function uploadSHIFileAction(file: File, userId?: string) {
+  unstable_noStore();
+  
+  try {
+    const result = await saveDRMFile(
+      file,
+      decryptWithServerAction,
+      'pq/shi',
+      userId
+    );
+
+    if (!result.success) {
+      throw new Error(result.error || "파일 업로드에 실패했습니다.");
+    }
+
+    return {
+      fileName: result.fileName!,
+      url: result.publicPath!,
+      size: result.fileSize!,
+    };
+  } catch (error) {
+    console.error("SHI file upload error:", error);
+    throw new Error(`Upload failed: ${getErrorMessage(error)}`);
+  }
+}
+
+/**
+ * 벤더용 여러 파일 일괄 업로드
+ */
+export async function uploadVendorMultipleFilesAction(files: File[], userId?: string) {
+  unstable_noStore();
+  
+  try {
+    const results = [];
+    
+    for (const file of files) {
+      try {
+        const result = await uploadVendorFileAction(file, userId);
+        results.push({
+          success: true,
+          ...result
+        });
+      } catch (error) {
+        results.push({
+          success: false,
+          fileName: file.name,
+          error: getErrorMessage(error)
+        });
+      }
+    }
+    
+    return {
+      ok: true,
+      results
+    };
+  } catch (error) {
+    console.error("Vendor batch upload error:", error);
+    return {
+      ok: false,
+      error: getErrorMessage(error)
+    };
+  }
+}
+
+/**
+ * SHI용 여러 파일 일괄 업로드
+ */
+export async function uploadSHIMultipleFilesAction(files: File[], userId?: string) {
+  unstable_noStore();
+  
+  try {
+    const results = [];
+    
+    for (const file of files) {
+      try {
+        const result = await uploadSHIFileAction(file, userId);
+        results.push({
+          success: true,
+          ...result
+        });
+      } catch (error) {
+        results.push({
+          success: false,
+          fileName: file.name,
+          error: getErrorMessage(error)
+        });
+      }
+    }
+    
+    return {
+      ok: true,
+      results
+    };
+  } catch (error) {
+    console.error("SHI batch upload error:", error);
+    return {
+      ok: false,
+      error: getErrorMessage(error)
+    };
+  }
+}
+
+// export async function getVendorsInPQ(input: GetVendorsSchema) {
+//   return unstable_cache(
+//     async () => {
+//       try {
+//         const offset = (input.page - 1) * input.perPage;
+
+//         // 1) 고급 필터
+//         const advancedWhere = filterColumns({
+//           table: vendors,
+//           filters: input.filters,
+//           joinOperator: input.joinOperator,
+//         });
+
+//         // 2) 글로벌 검색
+//         let globalWhere: SQL<unknown> | undefined = undefined;
+//         if (input.search) {
+//           const s = `%${input.search}%`;
+//           globalWhere = or(
+//             ilike(vendors.vendorName, s),
+//             ilike(vendors.vendorCode, s),
+//             ilike(vendors.email, s),
+//             ilike(vendors.status, s)
+//           );
+//         }
+
+//         // 트랜잭션 내에서 데이터 조회
+//         const { data, total } = await db.transaction(async (tx) => {
+//           // 협력업체 ID 모음 (중복 제거용)
+//           const vendorIds = new Set<number>();
+          
+//           // 1-A) 일반 PQ 답변이 있는 협력업체 찾기 (status와 상관없이)
+//           const generalPqVendors = await tx
+//             .select({ 
+//               vendorId: vendorPqCriteriaAnswers.vendorId 
+//             })
+//             .from(vendorPqCriteriaAnswers)
+//             .innerJoin(
+//               vendors,
+//               eq(vendorPqCriteriaAnswers.vendorId, vendors.id)
+//             )
+//             .where(
+//               and(
+//                 isNull(vendorPqCriteriaAnswers.projectId), // 일반 PQ만 (프로젝트 PQ 아님)
+//                 advancedWhere,
+//                 globalWhere
+//               )
+//             )
+//             .groupBy(vendorPqCriteriaAnswers.vendorId); // 각 벤더당 한 번만 카운트
+          
+//           generalPqVendors.forEach(v => vendorIds.add(v.vendorId));
+          
+//           // 1-B) 프로젝트 PQ 답변이 있는 협력업체 ID 조회 (status와 상관없이)
+//           const projectPqVendors = await tx
+//             .select({ 
+//               vendorId: vendorPQSubmissions.vendorId
+//             })
+//             .from(vendorPQSubmissions)
+//             .innerJoin(
+//               vendors,
+//               eq(vendorPQSubmissions.vendorId, vendors.id)
+//             )
+//             .where(
+//               and(
+//                 eq(vendorPQSubmissions.type, "PROJECT"),
+//                 // 최소한 IN_PROGRESS부터는 작업이 시작된 상태이므로 포함
+//                 not(eq(vendorPQSubmissions.status, "REQUESTED")), // REQUESTED 상태는 제외
+//                 advancedWhere,
+//                 globalWhere
+//               )
+//             );
+            
+//           projectPqVendors.forEach(v => vendorIds.add(v.vendorId));
+          
+//           // 중복 제거된 협력업체 ID 배열
+//           const uniqueVendorIds = Array.from(vendorIds);
+          
+//           // 총 개수 (중복 제거 후)
+//           const total = uniqueVendorIds.length;
+          
+//           if (total === 0) {
+//             return { data: [], total: 0 };
+//           }
+          
+//           // 페이징 처리 (정렬 후 limit/offset 적용)
+//           const paginatedIds = uniqueVendorIds.slice(offset, offset + input.perPage);
+          
+//           // 2) 페이징된 협력업체 상세 정보 조회
+//           const vendorsData = await selectVendors(tx, {
+//             where: inArray(vendors.id, paginatedIds),
+//             orderBy: input.sort.length > 0
+//               ? input.sort.map((item) => 
+//                 item.desc ? desc(vendors.vendorName) : asc(vendors.vendorName)
+//             )
+//               : [asc(vendors.createdAt)],
+//           });
+          
+//           // 3) 각 벤더별 PQ 상태 정보 추가 
+//           const vendorsWithPqInfo = await Promise.all(
+//             vendorsData.map(async (vendor) => {
+//               // 3-A) 첨부 파일 조회
+//               const attachments = await tx
+//                 .select({
+//                   id: vendorAttachments.id,
+//                   fileName: vendorAttachments.fileName,
+//                   filePath: vendorAttachments.filePath,
+//                 })
+//                 .from(vendorAttachments)
+//                 .where(eq(vendorAttachments.vendorId, vendor.id));
+              
+//               // 3-B) 일반 PQ 제출 여부 확인 (PQ 답변이 있는지)
+//               const generalPqAnswers = await tx
+//                 .select({ count: count() })
+//                 .from(vendorPqCriteriaAnswers)
+//                 .where(
+//                   and(
+//                     eq(vendorPqCriteriaAnswers.vendorId, vendor.id),
+//                     isNull(vendorPqCriteriaAnswers.projectId)
+//                   )
+//                 );
+                
+//               const hasGeneralPq = generalPqAnswers[0]?.count > 0;
+              
+//               // 3-C) 프로젝트 PQ 정보 조회 (모든 상태 포함)
+//               const projectPqs = await tx
+//                 .select({
+//                   projectId: vendorPQSubmissions.projectId,
+//                   projectName: projects.name,
+//                   status: vendorPQSubmissions.status,
+//                   submittedAt: vendorPQSubmissions.submittedAt,
+//                   approvedAt: vendorPQSubmissions.approvedAt,
+//                   rejectedAt: vendorPQSubmissions.rejectedAt
+//                 })
+//                 .from(vendorPQSubmissions)
+//                 .innerJoin(
+//                   projects,
+//                   eq(vendorPQSubmissions.projectId, projects.id)
+//                 )
+//                 .where(
+//                   and(
+//                     eq(vendorPQSubmissions.vendorId, vendor.id),
+//                     eq(vendorPQSubmissions.type, "PROJECT"),
+//                     not(eq(vendorPQSubmissions.status, "REQUESTED")) // REQUESTED 상태는 제외
+//                   )
+//                 );
+              
+//               const hasProjectPq = projectPqs.length > 0;
+              
+//               // 프로젝트 PQ 상태별 카운트
+//               const projectPqStatusCounts = {
+//                 inProgress: projectPqs.filter(p => p.status === "IN_PROGRESS").length,
+//                 submitted: projectPqs.filter(p => p.status === "SUBMITTED").length,
+//                 approved: projectPqs.filter(p => p.status === "APPROVED").length,
+//                 rejected: projectPqs.filter(p => p.status === "REJECTED").length,
+//                 total: projectPqs.length
+//               };
+              
+//               // 3-D) PQ 상태 정보 추가
+//               return {
+//                 ...vendor,
+//                 hasAttachments: attachments.length > 0,
+//                 attachmentsList: attachments,
+//                 pqInfo: {
+//                   hasGeneralPq,
+//                   hasProjectPq,
+//                   projectPqs,
+//                   projectPqStatusCounts,
+//                   // 현재 PQ 상태 (UI에 표시 용도)
+//                   pqStatus: getPqStatusDisplay(vendor.status, hasGeneralPq, hasProjectPq, projectPqStatusCounts)
+//                 }
+//               };
+//             })
+//           );
+          
+//           return { data: vendorsWithPqInfo, total };
+//         });
+
+//         // 페이지 수
+//         const pageCount = Math.ceil(total / input.perPage);
+
+//         return { data, pageCount };
+//       } catch (err) {
+//         console.error("Error in getVendorsInPQ:", err);
+//         // 에러 발생 시
+//         return { data: [], pageCount: 0 };
+//       }
+//     },
+//     [JSON.stringify(input)], // 캐싱 키
+//     {
+//       revalidate: 3600,
+//       tags: ["vendors-in-pq", "project-pqs"], // revalidateTag 호출 시 무효화
+//     }
+//   )();
+// }
+
+// PQ 상태 표시 함수
+function getPqStatusDisplay(
+  vendorStatus: string, 
+  hasGeneralPq: boolean, 
+  hasProjectPq: boolean,
+  projectPqCounts: { inProgress: number, submitted: number, approved: number, rejected: number, total: number }
+): string {
+  // 프로젝트 PQ 상태 문자열 생성
+  let projectPqStatus = "";
+  if (hasProjectPq) {
+    const parts = [];
+    if (projectPqCounts.inProgress > 0) {
+      parts.push(`진행중: ${projectPqCounts.inProgress}`);
+    }
+    if (projectPqCounts.submitted > 0) {
+      parts.push(`제출: ${projectPqCounts.submitted}`);
+    }
+    if (projectPqCounts.approved > 0) {
+      parts.push(`승인: ${projectPqCounts.approved}`);
+    }
+    if (projectPqCounts.rejected > 0) {
+      parts.push(`거부: ${projectPqCounts.rejected}`);
+    }
+    projectPqStatus = parts.join(", ");
+  }
+
+  // 일반 PQ + 프로젝트 PQ 조합 상태
+  if (hasGeneralPq && hasProjectPq) {
+    return `일반 PQ (${getPqVendorStatusText(vendorStatus)}) + 프로젝트 PQ (${projectPqStatus})`;
+  } else if (hasGeneralPq) {
+    return `일반 PQ (${getPqVendorStatusText(vendorStatus)})`;
+  } else if (hasProjectPq) {
+    return `프로젝트 PQ (${projectPqStatus})`;
+  }
+  
+  return "PQ 정보 없음";
+}
+
+// 협력업체 상태 텍스트 변환
+function getPqVendorStatusText(status: string): string {
+  switch (status) {
+    case "IN_PQ": return "진행중";
+    case "PQ_SUBMITTED": return "제출됨";
+    case "PQ_FAILED": return "실패";
+    case "PQ_APPROVED": 
+    case "APPROVED": return "승인됨";
+    case "READY_TO_SEND": return "거래 준비";
+    case "ACTIVE": return "활성";
+    case "INACTIVE": return "비활성";
+    case "BLACKLISTED": return "거래금지";
+    default: return status;
+  }
+}
+
+
+export type VendorStatus =
+  | "PENDING_REVIEW"
+  | "IN_REVIEW"
+  | "REJECTED"
+  | "IN_PQ"
+  | "PQ_SUBMITTED"
+  | "PQ_FAILED"
+  | "APPROVED"
+  | "ACTIVE"
+  | "INACTIVE"
+  | "BLACKLISTED"
+  | "PQ_APPROVED"
+
+  export async function updateVendorStatusAction(
+    vendorId: number,
+    newStatus: VendorStatus
+  ) {
+    try {
+      // 1) Update DB
+      await db.update(vendors)
+        .set({ status: newStatus })
+        .where(eq(vendors.id, vendorId))
+  
+      // 2) Load vendor's email & name
+      const vendor = await db.select().from(vendors).where(eq(vendors.id, vendorId)).then(r => r[0])
+      if (!vendor) {
+        return { ok: false, error: "Vendor not found" }
+      }
+      const headersList = await headers();
+      const host = headersList.get('host') || 'localhost:3000';
+      const loginUrl = `http://${host}/partners/pq`
+  
+      // 3) Send email
+      await sendEmail({
+        to: vendor.email || "",
+        subject: `Your PQ Status is now ${newStatus}`,
+        template: "vendor-pq-status",  // matches .hbs file
+        context: {
+          name: vendor.vendorName,
+          status: newStatus,
+          loginUrl: loginUrl,  // etc.
+        },
+      })
+      revalidateTag("vendors")
+      revalidateTag("vendors-in-pq")
+      return { ok: true }
+    } catch (error) {
+      console.error("updateVendorStatusAction error:", error)
+      return { ok: false, error: String(error) }
+    }
+  }
+
+  type ProjectPQStatus = "REQUESTED" | "IN_PROGRESS" | "SUBMITTED" | "APPROVED" | "REJECTED";
+
+/**
+ * Update the status of a project-specific PQ for a vendor
+ */
+export async function updateProjectPQStatusAction({
+  vendorId,
+  projectId,
+  status,
+  comment
+}: {
+  vendorId: number;
+  projectId: number;
+  status: ProjectPQStatus;
+  comment?: string;
+}) {
+  try {
+    const currentDate = new Date();
+    
+    // 1) Prepare update data with appropriate timestamps
+    const updateData: any = {
+      status,
+      updatedAt: currentDate,
+    };
+    
+    // Add status-specific fields
+    if (status === "APPROVED") {
+      updateData.approvedAt = currentDate;
+    } else if (status === "REJECTED") {
+      updateData.rejectedAt = currentDate;
+      updateData.rejectReason = comment || null;
+    } else if (status === "SUBMITTED") {
+      updateData.submittedAt = currentDate;
+    }
+    
+    // 2) Update the project PQ record
+    await db
+      .update(vendorPQSubmissions)
+      .set(updateData)
+      .where(
+        and(
+          eq(vendorPQSubmissions.vendorId, vendorId),
+          eq(vendorPQSubmissions.projectId, projectId),
+          eq(vendorPQSubmissions.type, "PROJECT")
+        )
+      );
+    
+    // 3) Load vendor and project details for email
+    const vendor = await db
+      .select({
+        id: vendors.id,
+        email: vendors.email,
+        vendorName: vendors.vendorName
+      })
+      .from(vendors)
+      .where(eq(vendors.id, vendorId))
+      .then(rows => rows[0]);
+    
+    if (!vendor) {
+      return { ok: false, error: "Vendor not found" };
+    }
+    
+    const project = await db
+      .select({
+        name: projects.name
+      })
+      .from(projects)
+      .where(eq(projects.id, projectId))
+      .then(rows => rows[0]);
+    
+    if (!project) {
+      return { ok: false, error: "Project not found" };
+    }
+    
+    // 4) Send email notification
+    await sendEmail({
+      to: vendor.email || "",
+      subject: `Your Project PQ for ${project.name} is now ${status}`,
+      template: "vendor-project-pq-status", // matches .hbs file (you might need to create this)
+      context: {
+        name: vendor.vendorName,
+        status,
+        projectName: project.name,
+        rejectionReason: status === "REJECTED" ? comment : undefined,
+        hasRejectionReason: status === "REJECTED" && !!comment,
+        loginUrl: `${process.env.NEXT_PUBLIC_URL}/partners/pq?projectId=${projectId}`,
+        approvalDate: status === "APPROVED" ? currentDate.toLocaleDateString() : undefined,
+        rejectionDate: status === "REJECTED" ? currentDate.toLocaleDateString() : undefined,
+      },
+    });
+    
+    // 5) Revalidate cache tags
+    revalidateTag("vendors");
+    revalidateTag("vendors-in-pq");
+    revalidateTag(`vendor-project-pqs-${vendorId}`);
+    revalidateTag(`project-pq-${projectId}`);
+    revalidateTag(`project-vendors-${projectId}`);
+    
+    return { ok: true };
+  } catch (error) {
+    console.error("updateProjectPQStatusAction error:", error);
+    return { ok: false, error: String(error) };
+  }
+}
+
+// 코멘트 타입 정의
+interface ItemComment {
+  answerId: number;
+  checkPoint: string; // 체크포인트 정보 추가
+  code: string;      // 코드 정보 추가
+  comment: string;
+}
+
+/**
+ * PQ 변경 요청 처리 서버 액션
+ * 
+ * @param vendorId 협력업체 ID
+ * @param comment 항목별 코멘트 배열 (answerId, checkPoint, code, comment로 구성)
+ * @param generalComment 전체 PQ에 대한 일반 코멘트 (선택사항)
+ */
+export async function requestPqChangesAction({
+  vendorId,
+  projectId,
+  comment,
+  generalComment,
+  reviewerName
+}: {
+  vendorId: number;
+  projectId?: number; // Optional project ID for project-specific PQs
+  comment: ItemComment[];
+  generalComment?: string;
+  reviewerName?: string;
+}) {
+  try {
+    // 1) 상태 업데이트 (PQ 타입에 따라 다르게 처리)
+    if (projectId) {
+      // 프로젝트 PQ인 경우 vendorPQSubmissions 테이블 업데이트
+      const projectPq = await db
+        .select()
+        .from(vendorPQSubmissions)
+        .where(
+          and(
+            eq(vendorPQSubmissions.vendorId, vendorId),
+            eq(vendorPQSubmissions.projectId, projectId),
+            eq(vendorPQSubmissions.type, "PROJECT")
+          )
+        )
+        .then(rows => rows[0]);
+
+      if (!projectPq) {
+        return { ok: false, error: "Project PQ record not found" };
+      }
+
+      await db
+        .update(vendorPQSubmissions)
+        .set({
+          status: "IN_PROGRESS", // 변경 요청 상태로 설정
+          updatedAt: new Date(),
+        })
+        .where(
+          and(
+            eq(vendorPQSubmissions.vendorId, vendorId),
+            eq(vendorPQSubmissions.projectId, projectId),
+            eq(vendorPQSubmissions.type, "PROJECT")
+          )
+        );
+    } else {
+      // 일반 PQ인 경우 vendors 테이블 업데이트
+      await db
+        .update(vendors)
+        .set({
+          status: "IN_PQ", // 변경 요청 상태로 설정
+          updatedAt: new Date(),
+        })
+        .where(eq(vendors.id, vendorId));
+    }
+
+    // 2) 협력업체 정보 가져오기
+    const vendor = await db
+      .select()
+      .from(vendors)
+      .where(eq(vendors.id, vendorId))
+      .then(r => r[0]);
+
+    if (!vendor) {
+      return { ok: false, error: "Vendor not found" };
+    }
+
+    // 프로젝트 정보 가져오기 (프로젝트 PQ인 경우)
+    let projectName = "";
+    if (projectId) {
+      const project = await db
+        .select({
+          name: projects.name
+        })
+        .from(projects)
+        .where(eq(projects.id, projectId))
+        .then(rows => rows[0]);
+
+      projectName = project?.name || "Unknown Project";
+    }
+
+    // 3) 각 항목별 코멘트 저장
+    const currentDate = new Date();
+
+
+    // 병렬로 모든 코멘트 저장
+    if (comment && comment.length > 0) {
+      const insertPromises = comment.map(item =>
+        db.insert(vendorPqReviewLogs)
+          .values({
+            vendorPqCriteriaAnswerId: item.answerId,
+            // reviewerId: reviewerId,
+            reviewerName: reviewerName,
+            reviewerComment: item.comment,
+            createdAt: currentDate,
+            // 추가 메타데이터 필드가 있다면 저장
+            // 이런 메타데이터는 DB 스키마에 해당 필드가 있어야 함
+            // meta: JSON.stringify({ checkPoint: item.checkPoint, code: item.code })
+          })
+      );
+
+      // 모든 삽입 기다리기
+      await Promise.all(insertPromises);
+    }
+
+    // 4) 변경 요청 이메일 보내기
+    // 코멘트 목록 준비
+    const commentItems = comment.map(item => ({
+      id: item.answerId,
+      code: item.code,
+      checkPoint: item.checkPoint,
+      text: item.comment
+    }));
+
+    // PQ 유형에 따라 이메일 제목 및 내용 조정
+    const emailSubject = projectId
+      ? `[IMPORTANT] Your Project PQ (${projectName}) requires changes`
+      : `[IMPORTANT] Your PQ submission requires changes`;
+
+    // 로그인 URL - 프로젝트 PQ인 경우 다른 경로로 안내
+    const loginUrl = projectId
+      ? `${process.env.NEXT_PUBLIC_URL}/partners/pq?projectId=${projectId}`
+      : `${process.env.NEXT_PUBLIC_URL}/partners/pq`;
+
+    await sendEmail({
+      to: vendor.email || "",
+      subject: emailSubject,
+      template: "vendor-pq-comment", // matches .hbs file
+      context: {
+        name: vendor.vendorName,
+        vendorCode: vendor.vendorCode,
+        loginUrl,
+        comments: commentItems,
+        generalComment: generalComment || "",
+        hasGeneralComment: !!generalComment,
+        commentCount: commentItems.length,
+        projectId,
+        projectName,
+        isProjPQ: !!projectId,
+      },
+    });
+
+    // 5) 캐시 무효화 - PQ 유형에 따라 적절한 태그 무효화
+    revalidateTag("vendors");
+    revalidateTag("vendors-in-pq");
+    
+    if (projectId) {
+      revalidateTag(`vendor-project-pqs-${vendorId}`);
+      revalidateTag(`project-pq-${projectId}`);
+      revalidateTag(`project-vendors-${projectId}`);
+    }
+
+    return { ok: true };
+  } catch (error) {
+    console.error("requestPqChangesAction error:", error);
+    return { ok: false, error: String(error) };
+  }
+}
+
+interface AddReviewCommentInput {
+  answerId: number // vendorPqCriteriaAnswers.id
+  comment: string
+  reviewerName?: string
+}
+
+export async function addReviewCommentAction(input: AddReviewCommentInput) {
+  try {
+    // 1) Check that the answer row actually exists
+    const existing = await db
+      .select({ id: vendorPqCriteriaAnswers.id })
+      .from(vendorPqCriteriaAnswers)
+      .where(eq(vendorPqCriteriaAnswers.id, input.answerId))
+
+    if (existing.length === 0) {
+      return { ok: false, error: "Item not found" }
+    }
+
+    // 2) Insert the log
+    await db.insert(vendorPqReviewLogs).values({
+      vendorPqCriteriaAnswerId: input.answerId,
+      reviewerComment: input.comment,
+      reviewerName: input.reviewerName ?? "AdminUser",
+    })
+
+    return { ok: true }
+  } catch (error) {
+    console.error("addReviewCommentAction error:", error)
+    return { ok: false, error: String(error) }
+  }
+}
+
+interface GetItemReviewLogsInput {
+  answerId: number
+}
+
+export async function getItemReviewLogsAction(input: GetItemReviewLogsInput) {
+  try {
+    
+    const logs = await db
+      .select()
+      .from(vendorPqReviewLogs)
+      .where(eq(vendorPqReviewLogs.vendorPqCriteriaAnswerId, input.answerId))
+      .orderBy(desc(vendorPqReviewLogs.createdAt));
+      
+    return { ok: true, data: logs };
+  } catch (error) {
+    console.error("getItemReviewLogsAction error:", error);
+    return { ok: false, error: String(error) };
+  }
+}
+
+export interface VendorPQListItem {
+  projectId: number;
+  projectName: string;
+  status: string;
+  submittedAt?: Date | null; // Change to accept both undefined and null
+}
+
+export interface VendorPQsList {
+  hasGeneralPq: boolean;
+  generalPqStatus?: string; // vendor.status for general PQ
+  projectPQs: VendorPQListItem[];
+}
+
+export async function getVendorPQsList(vendorId: number): Promise<VendorPQsList> {
+  unstable_noStore();
+  
+  try {
+    // 1. Check if vendor has general PQ answers
+    const generalPqAnswers = await db
+      .select({ count: count() })
+      .from(vendorPqCriteriaAnswers)
+      .where(
+        and(
+          eq(vendorPqCriteriaAnswers.vendorId, vendorId),
+          isNull(vendorPqCriteriaAnswers.projectId)
+        )
+      );
+        
+    const hasGeneralPq = (generalPqAnswers[0]?.count || 0) > 0;
+      
+    // 2. Get vendor status for general PQ
+    let generalPqStatus;
+    if (hasGeneralPq) {
+      const vendor = await db
+        .select({ status: vendors.status })
+        .from(vendors)
+        .where(eq(vendors.id, vendorId))
+        .then(rows => rows[0]);
+            
+      generalPqStatus = vendor?.status;
+    }
+      
+    // 3. Get project PQs
+    const projectPQs = await db
+      .select({
+        projectId: vendorPQSubmissions.projectId,
+        projectName: projects.name,
+        status: vendorPQSubmissions.status,
+        submittedAt: vendorPQSubmissions.submittedAt
+      })
+      .from(vendorPQSubmissions)
+      .innerJoin(
+        projects,
+        eq(vendorPQSubmissions.projectId, projects.id)
+      )
+      .where(
+        and(
+          eq(vendorPQSubmissions.vendorId, vendorId),
+          eq(vendorPQSubmissions.type, "PROJECT"),
+          not(eq(vendorPQSubmissions.status, "REQUESTED")) // Exclude requests that haven't been started
+        )
+      )
+      .orderBy(vendorPQSubmissions.updatedAt);
+        
+    return {
+      hasGeneralPq,
+      generalPqStatus,
+      projectPQs: projectPQs
+    };
+    
+  } catch (error) {
+    console.error("Error fetching vendor PQs list:", error);
+    return {
+      hasGeneralPq: false,
+      projectPQs: []
+    };
+  }
+}
+
+
+export async function loadGeneralPQData(vendorId: number) {
+  "use server";
+  return getPQDataByVendorId(vendorId)
+}
+
+export async function loadProjectPQData(vendorId: number, projectId: number) {
+  "use server";
+  return getPQDataByVendorId(vendorId, projectId)
+}
+
+export async function loadGeneralPQAction(vendorId: number) {
+  return getPQDataByVendorId(vendorId);
+}
+
+export async function loadProjectPQAction(vendorId: number, projectId?: number): Promise<PQGroupData[]> {
+  if (!projectId) {
+    throw new Error("Project ID is required for loading project PQ data");
+  }
+  return getPQDataByVendorId(vendorId, projectId);
+}
+
+
+
+export async function getAllPQsByVendorId(vendorId: number) {
+  unstable_noStore();
+  
+  try {
+    const pqList = await db
+      .select({
+        id: vendorPQSubmissions.id,
+        type: vendorPQSubmissions.type,
+        status: vendorPQSubmissions.status,
+        pqNumber: vendorPQSubmissions.pqNumber,
+        projectId: vendorPQSubmissions.projectId,
+        projectName: projects.name,
+        createdAt: vendorPQSubmissions.createdAt,
+        updatedAt: vendorPQSubmissions.updatedAt,
+        submittedAt: vendorPQSubmissions.submittedAt,
+        approvedAt: vendorPQSubmissions.approvedAt,
+        rejectedAt: vendorPQSubmissions.rejectedAt,
+        rejectReason: vendorPQSubmissions.rejectReason,
+        pqItems: vendorPQSubmissions.pqItems,
+      })
+      .from(vendorPQSubmissions)
+      .leftJoin(projects, eq(vendorPQSubmissions.projectId, projects.id))
+      .where(eq(vendorPQSubmissions.vendorId, vendorId))
+      .orderBy(desc(vendorPQSubmissions.createdAt));
+    
+    return pqList;
+  } catch (error) {
+    console.error("Error fetching PQ list:", error);
+    return [];
+  }
+}
+
+// 특정 PQ의 상세 정보 조회 (개별 PQ 페이지용)
+export async function getPQById(pqSubmissionId: number, vendorId: number) {
+  unstable_noStore();
+  
+  try {
+
+    const pq = await db
+      .select({
+        id: vendorPQSubmissions.id,
+        vendorId: vendorPQSubmissions.vendorId,
+        projectId: vendorPQSubmissions.projectId,
+        type: vendorPQSubmissions.type,
+        status: vendorPQSubmissions.status,
+        createdAt: vendorPQSubmissions.createdAt,
+        submittedAt: vendorPQSubmissions.submittedAt,
+        approvedAt: vendorPQSubmissions.approvedAt,
+        rejectedAt: vendorPQSubmissions.rejectedAt,
+        rejectReason: vendorPQSubmissions.rejectReason,
+        pqItems: vendorPQSubmissions.pqItems,
+
+        // 벤더 정보 (추가)
+        vendorName: vendors.vendorName,
+        vendorCode: vendors.vendorCode,
+        vendorStatus: vendors.status,
+        vendorCountry: vendors.country,
+        vendorEmail: vendors.email,
+        vendorPhone: vendors.phone,
+
+        // 프로젝트 정보 (조인)
+        projectName: projects.name,
+        projectCode: projects.code,
+      })
+      .from(vendorPQSubmissions)
+      .leftJoin(vendors, eq(vendorPQSubmissions.vendorId, vendors.id))
+      .leftJoin(projects, eq(vendorPQSubmissions.projectId, projects.id))
+      .where(
+        and(
+          eq(vendorPQSubmissions.id, pqSubmissionId),
+          eq(vendorPQSubmissions.vendorId, vendorId)
+        )
+      )
+      .limit(1)
+      .then(rows => rows[0]);
+
+    if (!pq) {
+      throw new Error("PQ not found or access denied");
+    }
+
+    return pq;
+  } catch (error) {
+    console.error("Error fetching PQ by ID:", error);
+    throw error;
+  }
+}
+
+export async function getPQStatusCounts(vendorId: number) {
+  try {
+    // 모든 PQ 상태 조회 (일반 PQ + 프로젝트 PQ)
+    const pqStatuses = await db
+      .select({
+        status: vendorPQSubmissions.status,
+        count: count(),
+      })
+      .from(vendorPQSubmissions)
+      .where(eq(vendorPQSubmissions.vendorId, vendorId))
+      .groupBy(vendorPQSubmissions.status);
+    
+    // 상태별 개수를 객체로 변환
+    const statusCounts = {
+      REQUESTED: 0,
+      IN_PROGRESS: 0,
+      SUBMITTED: 0,
+      APPROVED: 0,
+      REJECTED: 0,
+    };
+    
+    // 조회된 결과를 statusCounts 객체에 매핑
+    pqStatuses.forEach((item) => {
+      if (item.status in statusCounts) {
+        statusCounts[item.status as keyof typeof statusCounts] = item.count;
+      }
+    });
+    
+    return statusCounts;
+  } catch (error) {
+    console.error("Error fetching PQ status counts:", error);
+    return {
+      REQUESTED: 0,
+      IN_PROGRESS: 0,
+      SUBMITTED: 0,
+      APPROVED: 0,
+      REJECTED: 0,
+    };
+  }
+}
+
+// 상태 레이블 함수
+function getStatusLabel(status: string): string {
+  switch (status) {
+    case "REQUESTED":
+      return "요청됨";
+    case "IN_PROGRESS":
+      return "진행 중";
+    case "SUBMITTED":
+      return "제출됨";
+    case "APPROVED":
+      return "승인됨";
+    case "REJECTED":
+      return "거부됨";
+    default:
+      return status;
+  }
+}
+
+export async function getPQSubmissions(input: GetPQSubmissionsSchema) {
+      unstable_noStore();
+      
+      try {
+        const offset = (input.page - 1) * input.perPage;
+
+        const pqFilterMapping = createPQFilterMapping();
+        const joinedTables = getPQJoinedTables();
+
+        console.log(input, "input")
+
+        // 1) 고급 필터 조건 (DataTableAdvancedToolbar에서)
+        let advancedWhere: SQL<unknown> | undefined = undefined;
+        if (input.filters && input.filters.length > 0) {
+          advancedWhere = filterColumns({
+            table: vendorPQSubmissions,
+            filters: input.filters,
+            joinOperator: input.joinOperator || 'and',
+            joinedTables,
+            customColumnMapping: pqFilterMapping,
+          });
+          console.log("advancedWhere:", advancedWhere);
+        }
+
+        // 2) 기본 필터 조건 (PQFilterSheet에서)
+        let basicWhere: SQL<unknown> | undefined = undefined;
+        if (input.basicFilters && input.basicFilters.length > 0) {
+          basicWhere = filterColumns({
+            table: vendorPQSubmissions,
+            filters: input.basicFilters,
+            joinOperator: input.basicJoinOperator || 'and',
+            joinedTables,
+            customColumnMapping: pqFilterMapping,
+          });
+          console.log("basicWhere:", basicWhere);
+        }
+
+        // 3) 글로벌 검색 조건
+        let globalWhere: SQL<unknown> | undefined = undefined;
+        if (input.search) {
+          const s = `%${input.search}%`;
+          
+          const validSearchConditions: SQL<unknown>[] = [];
+          
+          // 기존 검색 조건들
+          const nameCondition = ilike(vendors.vendorName, s);
+          if (nameCondition) validSearchConditions.push(nameCondition);
+          
+          const codeCondition = ilike(vendors.vendorCode, s);
+          if (codeCondition) validSearchConditions.push(codeCondition);
+          
+          const projectNameCondition = ilike(projects.name, s);
+          if (projectNameCondition) validSearchConditions.push(projectNameCondition);
+          
+          const projectCodeCondition = ilike(projects.code, s);
+          if (projectCodeCondition) validSearchConditions.push(projectCodeCondition);
+          
+          // 새로 추가된 검색 조건들
+          const pqNumberCondition = ilike(vendorPQSubmissions.pqNumber, s);
+          if (pqNumberCondition) validSearchConditions.push(pqNumberCondition);
+          
+          const requesterCondition = ilike(users.name, s);
+          if (requesterCondition) validSearchConditions.push(requesterCondition);
+          
+          if (validSearchConditions.length > 0) {
+            globalWhere = or(...validSearchConditions);
+          }
+        }
+
+        // 4) 날짜 조건
+        let fromDateWhere: SQL<unknown> | undefined = undefined;
+        let toDateWhere: SQL<unknown> | undefined = undefined;
+        
+        if (input.submittedDateFrom) {
+          const fromDate = new Date(input.submittedDateFrom);
+          const condition = gte(vendorPQSubmissions.submittedAt, fromDate);
+          if (condition) fromDateWhere = condition;
+        }
+        
+        if (input.submittedDateTo) {
+          const toDate = new Date(input.submittedDateTo);
+          const condition = lte(vendorPQSubmissions.submittedAt, toDate);
+          if (condition) toDateWhere = condition;
+        }
+
+        // 5) 최종 WHERE 조건 생성 - 각 그룹을 AND로 연결
+        const whereConditions: SQL<unknown>[] = [];
+        
+        // 고급 필터 조건 추가
+        if (advancedWhere) whereConditions.push(advancedWhere);
+        
+        // 기본 필터 조건 추가  
+        if (basicWhere) whereConditions.push(basicWhere);
+        
+        // 기타 조건들 추가
+        if (globalWhere) whereConditions.push(globalWhere);
+        if (fromDateWhere) whereConditions.push(fromDateWhere);
+        if (toDateWhere) whereConditions.push(toDateWhere);
+        
+        // 모든 조건을 AND로 연결
+        const finalWhere = whereConditions.length > 0 ? and(...whereConditions) : undefined;
+
+        console.log("Final WHERE conditions:", {
+          advancedWhere: !!advancedWhere,
+          basicWhere: !!basicWhere,
+          globalWhere: !!globalWhere,
+          dateConditions: !!(fromDateWhere || toDateWhere),
+          totalConditions: whereConditions.length
+        });
+      
+        // 6) 전체 데이터 수 조회
+        const totalResult = await db
+          .select({ count: count() })
+          .from(vendorPQSubmissions)
+          .leftJoin(vendors, eq(vendorPQSubmissions.vendorId, vendors.id))
+          .leftJoin(projects, eq(vendorPQSubmissions.projectId, projects.id))
+          .leftJoin(users, eq(vendorPQSubmissions.requesterId, users.id))
+          .leftJoin(vendorInvestigations, eq(vendorInvestigations.pqSubmissionId, vendorPQSubmissions.id))
+          .where(finalWhere);
+
+        const total = totalResult[0]?.count || 0;
+
+        if (total === 0) {
+          return { data: [], pageCount: 0 };
+        }
+
+        // 7) 정렬 및 페이징 처리된 데이터 조회
+        const orderByColumns = input.sort.map((sort) => {
+          const column = sort.id;
+
+          // JOIN된 테이블의 컬럼인 경우 적절한 테이블 참조
+          if (column === 'vendorName') {
+            return sort.desc ? desc(vendors.vendorName) : asc(vendors.vendorName);
+          } else if (column === 'projectName') {
+            return sort.desc ? desc(projects.name) : asc(projects.name);
+          } else if (column === 'requesterName') {
+            return sort.desc ? desc(users.name) : asc(users.name);
+          } else {
+            // vendorPQSubmissions 테이블의 컬럼인 경우
+            const dbColumn = column as keyof typeof vendorPQSubmissions.$inferSelect;
+            return sort.desc ? desc(vendorPQSubmissions[dbColumn]) : asc(vendorPQSubmissions[dbColumn]);
+          }
+        });
+
+        if (orderByColumns.length === 0) {
+          orderByColumns.push(desc(vendorPQSubmissions.updatedAt));
+        }
+
+        const pqSubmissions = await db
+          .select({
+            id: vendorPQSubmissions.id,
+            type: vendorPQSubmissions.type,
+            pqNumber: vendorPQSubmissions.pqNumber,
+            requesterId: vendorPQSubmissions.requesterId,
+            requesterName: users.name,
+            status: vendorPQSubmissions.status,
+            createdAt: vendorPQSubmissions.createdAt,
+            updatedAt: vendorPQSubmissions.updatedAt,
+            submittedAt: vendorPQSubmissions.submittedAt,
+            approvedAt: vendorPQSubmissions.approvedAt,
+            rejectedAt: vendorPQSubmissions.rejectedAt,
+            rejectReason: vendorPQSubmissions.rejectReason,
+            pqItems: vendorPQSubmissions.pqItems,
+            // Vendor 정보
+            vendorId: vendors.id,
+            vendorName: vendors.vendorName,
+            vendorCode: vendors.vendorCode,
+            email: vendors.email,
+            taxId: vendors.taxId,
+            vendorStatus: vendors.status,
+            // Project 정보 (프로젝트 PQ인 경우)
+            projectId: projects.id,
+            projectName: projects.name,
+            projectCode: projects.code,
+          })
+          .from(vendorPQSubmissions)
+          .leftJoin(vendors, eq(vendorPQSubmissions.vendorId, vendors.id))
+          .leftJoin(projects, eq(vendorPQSubmissions.projectId, projects.id))
+          .leftJoin(users, eq(vendorPQSubmissions.requesterId, users.id))
+          .where(finalWhere)
+          .orderBy(...orderByColumns)
+          .limit(input.perPage)
+          .offset(offset);
+
+        // 8) 각 PQ 제출에 대한 추가 정보 조회 (기존과 동일)
+        const pqSubmissionsWithDetails = await Promise.all(
+          pqSubmissions.map(async (submission) => {
+            // 기본 반환 객체
+            const baseResult = {
+              ...submission,
+              answerCount: 0,
+              attachmentCount: 0,
+              pqStatus: getStatusLabel(submission.status),
+              pqTypeLabel: submission.type === "GENERAL" ? "일반 PQ" : "프로젝트 PQ",
+            };
+            
+            // vendorId가 null이면 기본 정보만 반환
+            if (submission.vendorId === null) {
+              return baseResult;
+            }
+            
+            try {
+              // 답변 수 조회
+              const vendorId = submission.vendorId;
+              
+              const answerWhereConditions: SQL<unknown>[] = [];
+              
+              const vendorCondition = eq(vendorPqCriteriaAnswers.vendorId, vendorId);
+              if (vendorCondition) answerWhereConditions.push(vendorCondition);
+              
+              let projectCondition: SQL<unknown> | undefined;
+              if (submission.projectId !== null) {
+                projectCondition = eq(vendorPqCriteriaAnswers.projectId, submission.projectId);
+              } else {
+                projectCondition = isNull(vendorPqCriteriaAnswers.projectId);
+              }
+              
+              if (projectCondition) answerWhereConditions.push(projectCondition);
+              
+              const answerWhere = and(...answerWhereConditions);
+                     
+              const answersResult = await db
+                .select({ count: count() })
+                .from(vendorPqCriteriaAnswers)
+                .where(answerWhere);
+
+              const answerCount = answersResult[0]?.count || 0;
+
+              // 첨부 파일 수 조회
+              const attachmentsResult = await db
+                .select({ count: count() })
+                .from(vendorPqCriteriaAnswers)
+                .leftJoin(
+                  vendorCriteriaAttachments,
+                  eq(vendorCriteriaAttachments.vendorCriteriaAnswerId, vendorPqCriteriaAnswers.id)
+                )
+                .where(answerWhere);
+
+              const attachmentCount = attachmentsResult[0]?.count || 0;
+
+              const requesters = alias(users, 'requesters');
+              const qmManagers = alias(users, 'qmManagers');
+              
+              const investigationResult = await db
+                .select({
+                  id: vendorInvestigations.id,
+                  investigationStatus: vendorInvestigations.investigationStatus,
+                  investigationAddress: vendorInvestigations.investigationAddress,
+                  investigationMethod: vendorInvestigations.investigationMethod,
+                  scheduledStartAt: vendorInvestigations.scheduledStartAt,
+                  scheduledEndAt: vendorInvestigations.scheduledEndAt,
+                  requestedAt: vendorInvestigations.requestedAt,
+                  confirmedAt: vendorInvestigations.confirmedAt,
+                  completedAt: vendorInvestigations.completedAt,
+                  forecastedAt: vendorInvestigations.forecastedAt,
+                  evaluationScore: vendorInvestigations.evaluationScore,
+                  hasSupplementRequested: vendorInvestigations.hasSupplementRequested,
+                  evaluationResult: vendorInvestigations.evaluationResult,
+                  investigationNotes: vendorInvestigations.investigationNotes,
+                  requesterId: vendorInvestigations.requesterId,
+                  requesterName: requesters.name,
+                  qmManagerId: vendorInvestigations.qmManagerId,
+                  qmManagerName: qmManagers.name,
+                  qmManagerEmail: qmManagers.email,
+                })
+                .from(vendorInvestigations)
+                .leftJoin(requesters, eq(vendorInvestigations.requesterId, requesters.id))
+                .leftJoin(qmManagers, eq(vendorInvestigations.qmManagerId, qmManagers.id))
+                .where(and(
+                  eq(vendorInvestigations.vendorId, submission.vendorId),
+                  eq(vendorInvestigations.pqSubmissionId, submission.id)
+                ))
+                .orderBy(desc(vendorInvestigations.createdAt))
+                .limit(1);
+
+              const investigation = investigationResult[0] || null;
+
+              // investigation이 있으면 해당 investigation의 최신 siteVisitRequest 조회
+              let siteVisitRequestId: number | null = null;
+              if (investigation) {
+                const siteVisitRequestResult = await db
+                  .select({ id: siteVisitRequests.id })
+                  .from(siteVisitRequests)
+                  .where(eq(siteVisitRequests.investigationId, investigation.id))
+                  .orderBy(desc(siteVisitRequests.createdAt))
+                  .limit(1);
+                
+                siteVisitRequestId = siteVisitRequestResult[0]?.id || null;
+              }
+
+              return {
+                ...baseResult,
+                answerCount,
+                attachmentCount,
+                siteVisitRequestId,
+                investigation
+              };
+            } catch (error) {
+              console.error("Error fetching PQ details:", error);
+              return baseResult;
+            }
+          })
+        );
+
+        const pageCount = Math.ceil(total / input.perPage);
+
+        return { data: pqSubmissionsWithDetails, pageCount };
+      } catch (err) {
+        console.error("Error in getPQSubmissions:", err);
+        return { data: [], pageCount: 0 };
+      }
+}
+
+export async function getPQStatusCountsAll() {
+  unstable_noStore();
+  
+  try {
+    // 모든 PQ 상태별 개수 조회 (벤더 제한 없음)
+    const pqStatuses = await db
+      .select({
+        status: vendorPQSubmissions.status,
+        count: count(),
+      })
+      .from(vendorPQSubmissions)
+      .groupBy(vendorPQSubmissions.status);
+    
+    // 상태별 개수를 객체로 변환
+    const statusCounts = {
+      REQUESTED: 0,
+      IN_PROGRESS: 0,
+      SUBMITTED: 0,
+      APPROVED: 0,
+      REJECTED: 0,
+    };
+    
+    // 조회된 결과를 statusCounts 객체에 매핑
+    pqStatuses.forEach((item) => {
+      if (item.status in statusCounts) {
+        statusCounts[item.status as keyof typeof statusCounts] = item.count;
+      }
+    });
+    
+    return statusCounts;
+  } catch (error) {
+    console.error("Error fetching PQ status counts:", error);
+    return {
+      REQUESTED: 0,
+      IN_PROGRESS: 0,
+      SUBMITTED: 0,
+      APPROVED: 0,
+      REJECTED: 0,
+    };
+  }
+}
+
+// PQ 타입별, 상태별 개수 집계 함수 (추가 옵션)
+export async function getPQDetailedStatusCounts() {
+  try {
+    // 타입별, 상태별 개수 조회
+    const pqStatuses = await db
+      .select({
+        type: vendorPQSubmissions.type,
+        status: vendorPQSubmissions.status,
+        count: count(),
+      })
+      .from(vendorPQSubmissions)
+      .groupBy(vendorPQSubmissions.type, vendorPQSubmissions.status);
+    
+    // 결과를 저장할 객체 초기화
+    const result = {
+      GENERAL: {
+        REQUESTED: 0,
+        IN_PROGRESS: 0,
+        SUBMITTED: 0,
+        APPROVED: 0,
+        REJECTED: 0,
+        total: 0
+      },
+      PROJECT: {
+        REQUESTED: 0,
+        IN_PROGRESS: 0,
+        SUBMITTED: 0,
+        APPROVED: 0,
+        REJECTED: 0,
+        total: 0
+      },
+      total: {
+        REQUESTED: 0,
+        IN_PROGRESS: 0,
+        SUBMITTED: 0,
+        APPROVED: 0,
+        REJECTED: 0,
+        total: 0
+      }
+    };
+    
+    // 결과 매핑
+    pqStatuses.forEach((item) => {
+      if (item.type && item.status) {
+        const type = item.type as keyof typeof result;
+        const status = item.status as keyof typeof result.GENERAL;
+        
+        if (type in result && status in result[type]) {
+          // 타입별 상태 카운트 업데이트
+          result[type][status] = item.count;
+          
+          // 타입별 합계 업데이트
+          result[type].total += item.count;
+          
+          // 전체 상태별 카운트 업데이트
+          result.total[status] += item.count;
+          
+          // 전체 합계 업데이트
+          result.total.total += item.count;
+        }
+      }
+    });
+    
+    return result;
+  } catch (error) {
+    console.error("Error fetching detailed PQ status counts:", error);
+    return {
+      GENERAL: {
+        REQUESTED: 0,
+        IN_PROGRESS: 0,
+        SUBMITTED: 0,
+        APPROVED: 0,
+        REJECTED: 0,
+        total: 0
+      },
+      PROJECT: {
+        REQUESTED: 0,
+        IN_PROGRESS: 0,
+        SUBMITTED: 0,
+        APPROVED: 0,
+        REJECTED: 0,
+        total: 0
+      },
+      total: {
+        REQUESTED: 0,
+        IN_PROGRESS: 0,
+        SUBMITTED: 0,
+        APPROVED: 0,
+        REJECTED: 0,
+        total: 0
+      }
+    };
+  }
+}
+
+/**
+ * SHI 코멘트 업데이트 액션
+ */
+export async function updateSHICommentAction({
+  answerId,
+  shiComment,
+}: {
+  answerId: number;
+  shiComment: string;
+}) {
+  try {
+    await db
+      .update(vendorPqCriteriaAnswers)
+      .set({
+        shiComment,
+        updatedAt: new Date(),
+      })
+      .where(eq(vendorPqCriteriaAnswers.id, answerId));
+
+    return { ok: true };
+  } catch (error) {
+    console.error("updateSHICommentAction error:", error);
+    return { ok: false, error: String(error) };
+  }
+}
+
+// PQ 승인 액션
+export async function approvePQAction({
+  pqSubmissionId,
+  vendorId,
+}: {
+  pqSubmissionId: number;
+  vendorId: number;
+}) {
+  unstable_noStore();
+  
+  try {
+    const headersList = await headers();
+    const host = headersList.get('host') || 'localhost:3000';
+    const currentDate = new Date();
+    
+    // 1. PQ 제출 정보 조회
+    const pqSubmission = await db
+      .select({
+        id: vendorPQSubmissions.id,
+        vendorId: vendorPQSubmissions.vendorId,
+        projectId: vendorPQSubmissions.projectId,
+        type: vendorPQSubmissions.type,
+        status: vendorPQSubmissions.status,
+      })
+      .from(vendorPQSubmissions)
+      .where(
+        and(
+          eq(vendorPQSubmissions.id, pqSubmissionId),
+          eq(vendorPQSubmissions.vendorId, vendorId)
+        )
+      )
+      .then(rows => rows[0]);
+      
+    if (!pqSubmission) {
+      return { ok: false, error: "PQ submission not found" };
+    }
+    
+    // 2. 상태 확인 (SUBMITTED 상태만 승인 가능)
+    if (pqSubmission.status !== "SUBMITTED") {
+      return { 
+        ok: false, 
+        error: `Cannot approve PQ in current status: ${pqSubmission.status}` 
+      };
+    }
+    
+    // 3. 벤더 정보 조회
+    const vendor = await db
+      .select({
+        id: vendors.id,
+        vendorName: vendors.vendorName,
+        email: vendors.email,
+        status: vendors.status,
+      })
+      .from(vendors)
+      .where(eq(vendors.id, vendorId))
+      .then(rows => rows[0]);
+      
+    if (!vendor) {
+      return { ok: false, error: "Vendor not found" };
+    }
+    
+    // 4. 프로젝트 정보 (프로젝트 PQ인 경우)
+    let projectName = '';
+    if (pqSubmission.projectId) {
+      const projectData = await db
+        .select({
+          id: projects.id,
+          name: projects.name,
+        })
+        .from(projects)
+        .where(eq(projects.id, pqSubmission.projectId))
+        .then(rows => rows[0]);
+        
+      projectName = projectData?.name || 'Unknown Project';
+    }
+        
+    // 5. PQ 상태 업데이트
+    await db
+    .update(vendorPQSubmissions)
+    .set({
+      status: "APPROVED",
+      approvedAt: currentDate,
+      updatedAt: currentDate,
+    })
+    .where(eq(vendorPQSubmissions.id, pqSubmissionId));
+
+    // 6. 일반 PQ인 경우 벤더 상태 업데이트 (선택사항)
+    if (pqSubmission.type === "GENERAL") {
+    await db
+      .update(vendors)
+      .set({
+        status: "PQ_APPROVED",
+        updatedAt: currentDate,
+      })
+      .where(eq(vendors.id, vendorId));
+    }
+
+    // 7. 벤더에게 이메일 알림 발송
+    if (vendor.email) {
+    try {
+      const emailSubject = pqSubmission.projectId
+        ? `[eVCP] Project PQ Approved for ${projectName}`
+        : "[eVCP] General PQ Approved";
+        
+      const portalUrl = `${host}/partners/pq`;
+        
+      await sendEmail({
+        to: vendor.email,
+        subject: emailSubject,
+        template: "pq-approved-vendor",
+        context: {
+          vendorName: vendor.vendorName,
+          projectId: pqSubmission.projectId,
+          projectName: projectName,
+          isProjectPQ: !!pqSubmission.projectId,
+          approvedDate: currentDate.toLocaleString(),
+          portalUrl,
+        }
+      });
+    } catch (emailError) {
+      console.error("Failed to send vendor notification:", emailError);
+      // 이메일 발송 실패가 전체 프로세스를 중단하지 않음
+    }
+    }
+    
+    // 8. 캐시 무효화
+    revalidateTag("vendors");
+    revalidateTag("vendor-status-counts");
+    revalidateTag("pq-submissions");
+    revalidateTag(`vendor-pq-submissions-${vendorId}`);
+    
+    if (pqSubmission.projectId) {
+      revalidateTag(`project-pq-submissions-${pqSubmission.projectId}`);
+      revalidateTag(`project-vendors-${pqSubmission.projectId}`);
+    }
+    
+    return { ok: true };
+  } catch (error) {
+    console.error("PQ approve error:", error);
+    return { ok: false, error: getErrorMessage(error) };
+  }
+}
+
+// QM 검토 승인 액션
+export async function approveQMReviewAction({
+  pqSubmissionId,
+  vendorId,
+}: {
+  pqSubmissionId: number;
+  vendorId: number;
+}) {
+  unstable_noStore();
+  
+  try {
+    const headersList = await headers();
+    const host = headersList.get('host') || 'localhost:3000';
+    const currentDate = new Date();
+    
+    // 1. PQ 제출 정보 조회
+    const pqSubmission = await db
+      .select({
+        id: vendorPQSubmissions.id,
+        vendorId: vendorPQSubmissions.vendorId,
+        projectId: vendorPQSubmissions.projectId,
+        type: vendorPQSubmissions.type,
+        status: vendorPQSubmissions.status,
+      })
+      .from(vendorPQSubmissions)
+      .where(
+        and(
+          eq(vendorPQSubmissions.id, pqSubmissionId),
+          eq(vendorPQSubmissions.vendorId, vendorId)
+        )
+      )
+      .then(rows => rows[0]);
+      
+    if (!pqSubmission) {
+      return { ok: false, error: "PQ submission not found" };
+    }
+    
+    // 2. 상태 확인 (QM_REVIEWING 상태만 승인 가능)
+    // if (pqSubmission.status !== "QM_REVIEWING") {
+    //   return { 
+    //     ok: false, 
+    //     error: `Cannot approve QM review in current status: ${pqSubmission.status}` 
+    //   };
+    // }
+    
+    // 3. 벤더 정보 조회
+    const vendor = await db
+      .select({
+        id: vendors.id,
+        vendorName: vendors.vendorName,
+        email: vendors.email,
+        status: vendors.status,
+      })
+      .from(vendors)
+      .where(eq(vendors.id, vendorId))
+      .then(rows => rows[0]);
+      
+    if (!vendor) {
+      return { ok: false, error: "Vendor not found" };
+    }
+    
+    // 4. 프로젝트 정보 (프로젝트 PQ인 경우)
+    let projectName = '';
+    if (pqSubmission.projectId) {
+      const projectData = await db
+        .select({
+          id: projects.id,
+          name: projects.name,
+        })
+        .from(projects)
+        .where(eq(projects.id, pqSubmission.projectId))
+        .then(rows => rows[0]);
+        
+      projectName = projectData?.name || 'Unknown Project';
+    }
+    
+    // 5. PQ 상태를 QM_APPROVED로 업데이트
+    await db
+      .update(vendorPQSubmissions)
+      .set({
+        status: "QM_APPROVED",
+        approvedAt: currentDate,
+        updatedAt: currentDate,
+      })
+      .where(eq(vendorPQSubmissions.id, pqSubmissionId));
+    
+    // 6. 일반 PQ인 경우 벤더 상태를 PQ_APPROVED로 업데이트
+    if (pqSubmission.type === "GENERAL") {
+      await db
+        .update(vendors)
+        .set({
+          status: "PQ_APPROVED",
+          updatedAt: currentDate,
+        })
+        .where(eq(vendors.id, vendorId));
+    }
+    
+    // 7. 실사 상태 변경: QM 승인 시 QM_REVIEW_CONFIRMED로 전환
+    try {
+      const existingInvestigation = await db
+        .select({ id: vendorInvestigations.id })
+        .from(vendorInvestigations)
+        .where(eq(vendorInvestigations.pqSubmissionId, pqSubmissionId))
+        .then(rows => rows[0]);
+
+      if (existingInvestigation) {
+        await db
+          .update(vendorInvestigations)
+          .set({ investigationStatus: "QM_REVIEW_CONFIRMED", updatedAt: currentDate })
+          .where(eq(vendorInvestigations.id, existingInvestigation.id));
+      } else {
+        await db
+          .insert(vendorInvestigations)
+          .values({
+            vendorId: vendorId,
+            pqSubmissionId: pqSubmissionId,
+            investigationStatus: "QM_REVIEW_CONFIRMED",
+            investigationMethod: "DOCUMENT_EVAL",
+            requestedAt: currentDate,
+            updatedAt: currentDate,
+          });
+      }
+    } catch (e) {
+      console.error("Failed to set investigation QM_REVIEW_CONFIRMED on QM approve", e);
+    }
+    
+    // 8. 벤더에게 이메일 알림 발송
+    if (vendor.email) {
+      try {
+        const emailSubject = pqSubmission.projectId
+          ? `[eVCP] Project PQ QM Approved for ${projectName}`
+          : "[eVCP] General PQ QM Approved";
+          
+        const portalUrl = `${host}/partners/pq`;
+          
+        await sendEmail({
+          to: vendor.email,
+          subject: emailSubject,
+          template: "pq-approved-vendor",
+          context: {
+            vendorName: vendor.vendorName,
+            projectId: pqSubmission.projectId,
+            projectName: projectName,
+            isProjectPQ: !!pqSubmission.projectId,
+            approvedDate: currentDate.toLocaleString(),
+            portalUrl,
+          }
+        });
+      } catch (emailError) {
+        console.error("Failed to send vendor notification:", emailError);
+      }
+    }
+    
+    // 9. 캐시 무효화
+    revalidateTag("vendors");
+    revalidateTag("vendor-status-counts");
+    revalidateTag("pq-submissions");
+    revalidateTag("vendor-pq-submissions");
+    revalidateTag("vendor-investigations");
+    revalidatePath("/evcp/pq_new");
+    
+    return { ok: true };
+  } catch (error) {
+    console.error("QM review approve error:", error);
+    return { ok: false, error: getErrorMessage(error) };
+  }
+}
+
+// QM 검토 거절 액션
+export async function rejectQMReviewAction({
+  pqSubmissionId,
+  vendorId,
+  rejectReason
+}: {
+  pqSubmissionId: number;
+  vendorId: number;
+  rejectReason: string;
+}) {
+  unstable_noStore();
+  
+  try {
+    const headersList = await headers();
+    const host = headersList.get('host') || 'localhost:3000';
+    const currentDate = new Date();
+    
+    // 1. PQ 제출 정보 조회
+    const pqSubmission = await db
+      .select({
+        id: vendorPQSubmissions.id,
+        vendorId: vendorPQSubmissions.vendorId,
+        projectId: vendorPQSubmissions.projectId,
+        type: vendorPQSubmissions.type,
+        status: vendorPQSubmissions.status,
+      })
+      .from(vendorPQSubmissions)
+      .where(
+        and(
+          eq(vendorPQSubmissions.id, pqSubmissionId),
+          eq(vendorPQSubmissions.vendorId, vendorId)
+        )
+      )
+      .then(rows => rows[0]);
+      
+    if (!pqSubmission) {
+      return { ok: false, error: "PQ submission not found" };
+    }
+    
+    // 2. 상태 확인 (QM_REVIEWING 상태만 거절 가능)
+    if (pqSubmission.status !== "QM_REVIEWING") {
+      return { 
+        ok: false, 
+        error: `Cannot reject QM review in current status: ${pqSubmission.status}` 
+      };
+    }
+    
+    // 3. 벤더 정보 조회
+    const vendor = await db
+      .select({
+        id: vendors.id,
+        vendorName: vendors.vendorName,
+        email: vendors.email,
+        status: vendors.status,
+      })
+      .from(vendors)
+      .where(eq(vendors.id, vendorId))
+      .then(rows => rows[0]);
+      
+    if (!vendor) {
+      return { ok: false, error: "Vendor not found" };
+    }
+    
+    // 4. 프로젝트 정보 (프로젝트 PQ인 경우)
+    let projectName = '';
+    if (pqSubmission.projectId) {
+      const projectData = await db
+        .select({
+          id: projects.id,
+          name: projects.name,
+        })
+        .from(projects)
+        .where(eq(projects.id, pqSubmission.projectId))
+        .then(rows => rows[0]);
+        
+      projectName = projectData?.name || 'Unknown Project';
+    }
+    
+    // 5. PQ 상태를 QM_REJECTED로 업데이트
+    await db
+      .update(vendorPQSubmissions)
+      .set({
+        status: "QM_REJECTED",
+        rejectedAt: currentDate,
+        rejectReason: rejectReason,
+        updatedAt: currentDate,
+      })
+      .where(eq(vendorPQSubmissions.id, pqSubmissionId));
+    
+    // 6. 일반 PQ인 경우 벤더 상태를 PQ_FAILED로 업데이트
+    if (pqSubmission.type === "GENERAL") {
+      await db
+        .update(vendors)
+        .set({
+          status: "PQ_FAILED",
+          updatedAt: currentDate,
+        })
+        .where(eq(vendors.id, vendorId));
+    }
+    
+    // 7. 실사 상태 변경: QM 거절 시 CANCELED로 전환
+    try {
+      const existingInvestigation = await db
+        .select({ id: vendorInvestigations.id })
+        .from(vendorInvestigations)
+        .where(eq(vendorInvestigations.pqSubmissionId, pqSubmissionId))
+        .then(rows => rows[0]);
+
+      if (existingInvestigation) {
+        await db
+          .update(vendorInvestigations)
+          .set({ investigationStatus: "CANCELED", updatedAt: currentDate })
+          .where(eq(vendorInvestigations.id, existingInvestigation.id));
+      }
+    } catch (e) {
+      console.error("Failed to set investigation CANCELED on QM reject", e);
+    }
+
+    // 8. 벤더에게 이메일 알림 발송
+    if (vendor.email) {
+      try {
+        const emailSubject = pqSubmission.projectId
+          ? `[eVCP] Project PQ Rejected for ${projectName}`
+          : "[eVCP] General PQ Rejected";
+          
+        const portalUrl = `${host}/partners/pq`;
+          
+        await sendEmail({
+          to: vendor.email,
+          subject: emailSubject,
+          template: "pq-rejected-vendor",
+          context: {
+            vendorName: vendor.vendorName,
+            projectId: pqSubmission.projectId,
+            projectName: projectName,
+            isProjectPQ: !!pqSubmission.projectId,
+            rejectedDate: currentDate.toLocaleString(),
+            rejectReason: rejectReason,
+            portalUrl,
+          }
+        });
+      } catch (emailError) {
+        console.error("Failed to send vendor notification:", emailError);
+      }
+    }
+    
+    // 9. 캐시 무효화
+    revalidateTag("vendors");
+    revalidateTag("vendor-status-counts");
+    revalidateTag("pq-submissions");
+    revalidateTag("vendor-pq-submissions");
+    revalidateTag("vendor-investigations");
+    revalidatePath("/evcp/pq_new");
+    
+    return { ok: true };
+  } catch (error) {
+    console.error("QM review reject error:", error);
+    return { ok: false, error: getErrorMessage(error) };
+  }
+}
+
+// PQ 거부 액션
+export async function rejectPQAction({
+  pqSubmissionId,
+  vendorId,
+  rejectReason
+}: {
+  pqSubmissionId: number;
+  vendorId: number;
+  rejectReason: string;
+}) {
+  unstable_noStore();
+  
+  try {
+    const headersList = await headers();
+    const host = headersList.get('host') || 'localhost:3000';
+    const currentDate = new Date();
+    
+    // 1. PQ 제출 정보 조회
+    const pqSubmission = await db
+      .select({
+        id: vendorPQSubmissions.id,
+        vendorId: vendorPQSubmissions.vendorId,
+        projectId: vendorPQSubmissions.projectId,
+        type: vendorPQSubmissions.type,
+        status: vendorPQSubmissions.status,
+      })
+      .from(vendorPQSubmissions)
+      .where(
+        and(
+          eq(vendorPQSubmissions.id, pqSubmissionId),
+          eq(vendorPQSubmissions.vendorId, vendorId)
+        )
+      )
+      .then(rows => rows[0]);
+      
+    if (!pqSubmission) {
+      return { ok: false, error: "PQ submission not found" };
+    }
+    
+    // 2. 상태 확인 (SUBMITTED 상태만 거부 가능)
+    if (pqSubmission.status !== "SUBMITTED") {
+      return { 
+        ok: false, 
+        error: `Cannot reject PQ in current status: ${pqSubmission.status}` 
+      };
+    }
+    
+    // 3. 벤더 정보 조회
+    const vendor = await db
+      .select({
+        id: vendors.id,
+        vendorName: vendors.vendorName,
+        email: vendors.email,
+        status: vendors.status,
+      })
+      .from(vendors)
+      .where(eq(vendors.id, vendorId))
+      .then(rows => rows[0]);
+      
+    if (!vendor) {
+      return { ok: false, error: "Vendor not found" };
+    }
+    
+    // 4. 프로젝트 정보 (프로젝트 PQ인 경우)
+    let projectName = '';
+    if (pqSubmission.projectId) {
+      const projectData = await db
+        .select({
+          id: projects.id,
+          name: projects.name,
+        })
+        .from(projects)
+        .where(eq(projects.id, pqSubmission.projectId))
+        .then(rows => rows[0]);
+        
+      projectName = projectData?.name || 'Unknown Project';
+    }
+    
+    // 5. PQ 상태 업데이트
+    await db
+      .update(vendorPQSubmissions)
+      .set({
+        status: "REJECTED",
+        rejectedAt: currentDate,
+        rejectReason: rejectReason,
+        updatedAt: currentDate,
+      })
+      .where(eq(vendorPQSubmissions.id, pqSubmissionId));
+    
+    // 6. 일반 PQ인 경우 벤더 상태 업데이트 (선택사항)
+    if (pqSubmission.type === "GENERAL") {
+      await db
+        .update(vendors)
+        .set({
+          status: "PQ_FAILED",
+          updatedAt: currentDate,
+        })
+        .where(eq(vendors.id, vendorId));
+    }
+    
+    // 7. 벤더에게 이메일 알림 발송
+    if (vendor.email) {
+      try {
+        const emailSubject = pqSubmission.projectId
+          ? `[eVCP] Project PQ Rejected for ${projectName}`
+          : "[eVCP] General PQ Rejected";
+          
+        const portalUrl = `${host}/partners/pq`;
+          
+        await sendEmail({
+          to: vendor.email,
+          subject: emailSubject,
+          template: "pq-rejected-vendor",
+          context: {
+            vendorName: vendor.vendorName,
+            projectId: pqSubmission.projectId,
+            projectName: projectName,
+            isProjectPQ: !!pqSubmission.projectId,
+            rejectedDate: currentDate.toLocaleString(),
+            rejectReason: rejectReason,
+            portalUrl,
+          }
+        });
+      } catch (emailError) {
+        console.error("Failed to send vendor notification:", emailError);
+        // 이메일 발송 실패가 전체 프로세스를 중단하지 않음
+      }
+    }
+    
+    // 8. 캐시 무효화
+    revalidateTag("vendors");
+    revalidateTag("vendor-status-counts");
+    revalidateTag("pq-submissions");
+    revalidateTag(`vendor-pq-submissions-${vendorId}`);
+    
+    if (pqSubmission.projectId) {
+      revalidateTag(`project-pq-submissions-${pqSubmission.projectId}`);
+      revalidateTag(`project-vendors-${pqSubmission.projectId}`);
+    }
+    
+    return { ok: true };
+  } catch (error) {
+    console.error("PQ reject error:", error);
+    return { ok: false, error: getErrorMessage(error) };
+  }
+}
+
+// PQ 보완요청 메일 발송 액션
+export async function requestPqSupplementAction({
+  pqSubmissionId,
+  vendorId,
+  comment,
+}: {
+  pqSubmissionId: number;
+  vendorId: number;
+  comment: string;
+}) {
+  unstable_noStore();
+  try {
+    const session = await getServerSession(authOptions);
+    const currentUserEmail = session?.user?.email || null;
+    const headersList = await headers();
+    const host = headersList.get('host') || 'localhost:3000';
+
+    // PQ/벤더/요청자 정보 조회
+    const pq = await db
+      .select({ id: vendorPQSubmissions.id, pqNumber: vendorPQSubmissions.pqNumber, requesterId: vendorPQSubmissions.requesterId, projectId: vendorPQSubmissions.projectId })
+      .from(vendorPQSubmissions)
+      .where(and(eq(vendorPQSubmissions.id, pqSubmissionId), eq(vendorPQSubmissions.vendorId, vendorId)))
+      .then(rows => rows[0]);
+    if (!pq) return { ok: false, error: 'PQ submission not found' };
+
+    const vendor = await db
+      .select({ vendorName: vendors.vendorName, email: vendors.email })
+      .from(vendors)
+      .where(eq(vendors.id, vendorId))
+      .then(rows => rows[0]);
+    if (!vendor?.email) return { ok: false, error: 'Vendor email not found' };
+
+    let requesterEmail: string | null = null;
+    if (pq.requesterId) {
+      const requester = await db
+        .select({ email: users.email })
+        .from(users)
+        .where(eq(users.id, pq.requesterId))
+        .then(rows => rows[0]);
+      requesterEmail = requester?.email || null;
+    }
+
+    const reviewUrl = `${process.env.NEXT_PUBLIC_BASE_URL}/partners/pq_new`;
+
+    await sendEmail({
+      to: vendor.email,
+      cc: [currentUserEmail, requesterEmail].filter(Boolean) as string[],
+      subject: `[eVCP] PQ 보완 요청: ${vendor.vendorName}`,
+      template: 'pq-supplement-request',
+      context: {
+        vendorName: vendor.vendorName,
+        pqNumber: pq.pqNumber,
+        comment,
+        reviewUrl,
+      },
+    });
+
+    revalidateTag('pq-submissions');
+    return { ok: true };
+  } catch (error) {
+    console.error('PQ supplement request error:', error);
+    return { ok: false, error: getErrorMessage(error) };
+  }
+}
+
+
+// 실사 의뢰 생성 서버 액션
+export async function requestInvestigationAction(
+  pqSubmissionIds: number[],
+  currentUser: { id: number; epId: string | null; email?: string },
+  data: {
+    qmManagerId: number,
+    forecastedAt: Date,
+    investigationAddress: string,
+    investigationNotes?: string
+  },
+  options?: {
+    skipRevalidation?: boolean; // ✅ 핸들러에서 호출 시 revalidation 건너뛰기
+  }
+) {
+  try {
+    // 세션에서 요청자 정보 가져오기
+    if (!currentUser.id) {
+      return { success: false, error: "인증된 사용자만 실사를 의뢰할 수 있습니다." };
+    }
+
+    const result = await db.transaction(async (tx) => {
+      // PQ 제출 정보 조회
+      const pqSubmissions = await tx
+        .select({
+          id: vendorPQSubmissions.id,
+          vendorId: vendorPQSubmissions.vendorId,
+        })
+        .from(vendorPQSubmissions)
+        .where(
+          and(
+            inArray(vendorPQSubmissions.id, pqSubmissionIds),
+            eq(vendorPQSubmissions.status, "APPROVED")
+          )
+        );
+
+      if (pqSubmissions.length === 0) {
+        throw new Error("승인된 PQ 제출 항목이 없습니다.");
+      }
+
+      const now = new Date();
+
+      //  실사 요청 생성
+      const investigations = pqSubmissions.map((pq) => {
+        return {
+          vendorId: pq.vendorId,
+          pqSubmissionId: pq.id,
+          investigationStatus: "PLANNED" as const, // enum 타입으로 명시적 지정
+          qmManagerId: data.qmManagerId,
+          forecastedAt: data.forecastedAt,
+          investigationAddress: data.investigationAddress,
+          investigationNotes: data.investigationNotes || null,
+          requesterId: currentUser.id,
+          requestedAt: now,
+          createdAt: now,
+          updatedAt: now,
+        };
+      });
+      //PQ 제출 정보 업데이트, status를 QM_REVIEWING로 업데이트
+      await tx
+        .update(vendorPQSubmissions)
+        .set({
+          status: "QM_REVIEWING",
+          updatedAt: now,
+        })
+        .where(inArray(vendorPQSubmissions.id, pqSubmissionIds));
+      
+
+      // 실사 요청 저장
+      const created = await tx
+        .insert(vendorInvestigations)
+        .values(investigations)
+        .returning();
+
+      return created;
+    });
+
+  
+    // 이메일 발송 (트랜잭션 외부에서 실행)
+    try {
+      // 1. 협력업체 정보 조회 (이메일 포함)
+      const vendorIds = result.map(inv => inv.vendorId);
+      const uniqueVendorIds = [...new Set(vendorIds)];
+      
+      const vendorInfos = await db
+        .select({
+          id: vendors.id,
+          vendorName: vendors.vendorName,
+          email: vendors.email,
+        })
+        .from(vendors)
+        .where(inArray(vendors.id, uniqueVendorIds));
+
+      // 2. QM 담당자 정보 조회
+      const qmManager = await db
+        .select({
+          id: users.id,
+          name: users.name,
+          email: users.email,
+        })
+        .from(users)
+        .where(eq(users.id, data.qmManagerId))
+        .limit(1)
+        .then(rows => rows[0]);
+
+      // 3. 요청자(현재 사용자) 정보 조회
+      const requester = await db
+        .select({
+          id: users.id,
+          name: users.name,
+          email: users.email,
+        })
+        .from(users)
+        .where(eq(users.id, currentUser.id))
+        .limit(1)
+        .then(rows => rows[0]);
+
+      const portalUrl = process.env.NEXT_PUBLIC_BASE_URL || "http://localhost:3000";
+      const currentYear = new Date().getFullYear();
+      const forecastedAtFormatted = format(data.forecastedAt, "yyyy-MM-dd");
+
+      // 4. 협력업체별로 이메일 발송 (investigation-request.hbs 템플릿 사용)
+      const vendorEmailPromises = vendorInfos
+        .filter(vendor => vendor.email) // 이메일이 있는 경우만
+        .map(async (vendor) => {
+          try {
+            await sendEmail({
+              to: vendor.email!,
+              subject: "[eVCP] 협력업체 실사 요청",
+              template: "investigation-request",
+              context: {
+                language: "ko",
+                vendorIds: [vendor.id],
+                notes: data.investigationNotes || "실사가 예정되어 있습니다.",
+                portalUrl: `${portalUrl}/ko/partners/site-visit`,
+                currentYear: currentYear,
+              },
+            });
+            console.log(`협력업체 이메일 발송 완료: ${vendor.vendorName} (${vendor.email})`);
+          } catch (emailError) {
+            console.error(`협력업체 이메일 발송 실패: ${vendor.vendorName} (${vendor.email})`, emailError);
+          }
+        });
+
+      await Promise.all(vendorEmailPromises);
+
+      // 5. QM 담당자에게 알림 이메일 발송
+      if (qmManager?.email) {
+        try {
+          const vendorNames = vendorInfos.map(v => v.vendorName);
+          
+          await sendEmail({
+            to: qmManager.email,
+            subject: "[eVCP] 실사 의뢰 요청 알림",
+            template: "investigation-request-notification",
+            context: {
+              language: "ko",
+              recipientName: qmManager.name,
+              vendorNames: vendorNames,
+              forecastedAt: forecastedAtFormatted,
+              investigationAddress: data.investigationAddress,
+              investigationNotes: data.investigationNotes || null,
+              requesterName: requester?.name || "알 수 없음",
+              portalUrl: `${portalUrl}/evcp/vendor-investigation`,
+              currentYear: currentYear,
+            },
+          });
+          console.log(`QM 담당자 이메일 발송 완료: ${qmManager.name} (${qmManager.email})`);
+        } catch (emailError) {
+          console.error(`QM 담당자 이메일 발송 실패: ${qmManager.name} (${qmManager.email})`, emailError);
+        }
+      }
+
+      // 6. 요청자(현재 사용자)에게 알림 이메일 발송 (QM 담당자와 다른 경우만)
+      // if (requester?.email && requester.id !== data.qmManagerId) {
+      //   try {
+      //     const vendorNames = vendorInfos.map(v => v.vendorName);
+          
+      //     await sendEmail({
+      //       to: requester.email,
+      //       subject: "[eVCP] 실사 의뢰 요청 알림",
+      //       template: "investigation-request-notification",
+      //       context: {
+      //         language: "ko",
+      //         recipientName: requester.name,
+      //         vendorNames: vendorNames,
+      //         forecastedAt: forecastedAtFormatted,
+      //         investigationAddress: data.investigationAddress,
+      //         investigationNotes: data.investigationNotes || null,
+      //         requesterName: requester.name,
+      //         portalUrl: `${portalUrl}/evcp/vendor-investigation`,
+      //         currentYear: currentYear,
+      //       },
+      //     });
+      //     console.log(`요청자 이메일 발송 완료: ${requester.name} (${requester.email})`);
+      //   } catch (emailError) {
+      //     console.error(`요청자 이메일 발송 실패: ${requester.name} (${requester.email})`, emailError);
+      //   }
+      // }
+    } catch (emailErr) {
+      // 이메일 발송 실패는 로그만 남기고 전체 프로세스는 성공으로 처리
+      console.error("이메일 발송 중 오류 발생:", emailErr);
+    }
+
+    // 캐시 무효화 (skipRevalidation 옵션이 false일 때만)
+    if (!options?.skipRevalidation) {
+      revalidateTag("vendor-investigations")
+      revalidateTag("pq-submissions")
+    }
+
+    return {
+      success: true,
+      count: result.length,
+      data: result
+    };
+  } catch (err) {
+    console.error("실사 의뢰 중 오류 발생:", err);
+    return {
+      success: false,
+      error: err instanceof Error ? err.message : "알 수 없는 오류가 발생했습니다."
+    };
+  }
+}
+
+// 실사 의뢰 취소 서버 액션
+export async function cancelInvestigationAction(investigationIds: number[]) {
+  try {
+    const session = await getServerSession(authOptions)
+    const userId = session?.user?.id ? Number(session.user.id) : null
+
+    if (!userId) {
+      return { success: false, error: "인증된 사용자만 실사를 취소할 수 있습니다." }
+    }
+
+    const result = await db.transaction(async (tx) => {
+      // PLANNED 상태인 실사만 취소 가능
+      const updatedInvestigations = await tx
+        .update(vendorInvestigations)
+        .set({
+          investigationStatus: "CANCELED",
+          updatedAt: new Date(),
+        })
+        .where(
+          and(
+            inArray(vendorInvestigations.id, investigationIds),
+            eq(vendorInvestigations.investigationStatus, "PLANNED")
+          )
+        )
+        .returning()
+
+      return updatedInvestigations
+    })
+
+    // 캐시 무효화
+    revalidateTag("vendor-investigations")
+    revalidateTag("pq-submissions")
+
+    return { 
+      success: true, 
+      count: result.length, 
+      data: result 
+    }
+  } catch (err) {
+    console.error("실사 취소 중 오류 발생:", err)
+    return { 
+      success: false, 
+      error: err instanceof Error ? err.message : "알 수 없는 오류가 발생했습니다." 
+    }
+  }
+}
+
+// 실사 재의뢰 서버 액션
+export async function reRequestInvestigationAction(
+  investigationIds: number[],
+  currentUser?: { id: number }, // ✅ 핸들러에서 호출 시 사용자 정보 전달
+  options?: {
+    skipRevalidation?: boolean; // ✅ 핸들러에서 호출 시 revalidation 건너뛰기
+  }
+) {
+  try {
+    let userId: number | null = null;
+    
+    if (currentUser) {
+      // 핸들러에서 호출 시 (결재 승인 후)
+      userId = currentUser.id;
+      
+      // ✅ 핸들러에서 호출 시 userId 검증: 없으면 잘못된 상황 (예외 처리)
+      if (!userId || userId <= 0) {
+        throw new Error('핸들러에서 호출 시 currentUser.id가 필수입니다.');
+      }
+    } else {
+      // 직접 호출 시 (세션에서 가져오기)
+      const session = await getServerSession(authOptions);
+      userId = session?.user?.id ? Number(session.user.id) : null;
+    }
+
+    if (!userId) {
+      return { success: false, error: "인증된 사용자만 실사를 재의뢰할 수 있습니다." }
+    }
+
+    const result = await db.transaction(async (tx) => {
+      // CANCELED 상태인 실사만 재의뢰 가능
+      const updatedInvestigations = await tx
+        .update(vendorInvestigations)
+        .set({
+          investigationStatus: "PLANNED",
+          updatedAt: new Date(),
+        })
+        .where(
+          and(
+            inArray(vendorInvestigations.id, investigationIds),
+            eq(vendorInvestigations.investigationStatus, "CANCELED")
+          )
+        )
+        .returning()
+
+      return updatedInvestigations
+    })
+
+    // 캐시 무효화 (skipRevalidation 옵션이 false일 때만)
+    if (!options?.skipRevalidation) {
+      revalidateTag("vendor-investigations")
+      revalidateTag("pq-submissions")
+    }
+
+    return {
+      success: true,
+      count: result.length,
+      data: result
+    }
+  } catch (err) {
+    console.error("실사 재의뢰 중 오류 발생:", err)
+    return {
+      success: false,
+      error: err instanceof Error ? err.message : "알 수 없는 오류가 발생했습니다."
+    }
+  }
+}
+
+// 실사 결과 발송 서버 액션
+export async function sendInvestigationResultsAction(input: {
+  investigationIds: number[];
+  purchaseComment?: string;
+}) {
+  try {
+    const session = await getServerSession(authOptions)
+    const userId = session?.user?.id ? Number(session.user.id) : null
+
+    if (!userId) {
+      return { success: false, error: "인증된 사용자만 실사 결과를 발송할 수 있습니다." }
+    }
+
+    const result = await db.transaction(async (tx) => {
+      // 완료된 실사만 결과 발송 가능
+      const investigations = await tx
+        .select({
+          id: vendorInvestigations.id,
+          vendorId: vendorInvestigations.vendorId,
+          pqSubmissionId: vendorInvestigations.pqSubmissionId,
+          evaluationResult: vendorInvestigations.evaluationResult,
+          investigationNotes: vendorInvestigations.investigationNotes,
+          investigationAddress: vendorInvestigations.investigationAddress,
+          investigationMethod: vendorInvestigations.investigationMethod,
+          confirmedAt: vendorInvestigations.confirmedAt,
+          // Vendor 정보
+          vendorCode: vendors.vendorCode,
+          vendorName: vendors.vendorName,
+          vendorEmail: vendors.email,
+          // PQ 정보
+          pqNumber: vendorPQSubmissions.pqNumber,
+          pqItems: vendorPQSubmissions.pqItems,
+          projectCode: projects.code,
+          projectName: projects.name,
+          // 발신자 정보
+          senderName: users.name,
+          senderEmail: users.email,
+        })
+        .from(vendorInvestigations)
+        .leftJoin(vendors, eq(vendorInvestigations.vendorId, vendors.id))
+        .leftJoin(vendorPQSubmissions, eq(vendorInvestigations.pqSubmissionId, vendorPQSubmissions.id))
+        .leftJoin(projects, eq(vendorPQSubmissions.projectId, projects.id))
+        .leftJoin(users, eq(vendorInvestigations.requesterId, users.id))
+        .where(
+            inArray(vendorInvestigations.id, input.investigationIds)
+        )
+
+      if (investigations.length === 0) {
+        throw new Error("발송할 수 있는 완료된 실사가 없습니다.")
+      }
+
+      // 각 실사에 대해 이메일 발송
+      const emailResults = await Promise.all(
+        investigations.map(async (investigation) => {
+          try {
+            // 이메일 컨텍스트 구성
+            const emailContext = {
+              // 기본 정보
+              pqNumber: investigation.pqNumber || "N/A",
+              vendorCode: investigation.vendorCode || "N/A",
+              vendorName: investigation.vendorName || "N/A",
+              
+              // 실사 정보 - pqItems를 itemCode-itemName 형태로 모든 항목 표시
+              auditItem: (() => {
+                if (investigation.pqItems) {
+                  try {
+                    const parsed = typeof investigation.pqItems === 'string' 
+                      ? JSON.parse(investigation.pqItems) 
+                      : investigation.pqItems;
+                    if (Array.isArray(parsed)) {
+                      return parsed.map(item => {
+                        if (typeof item === 'string') return item;
+                        if (typeof item === 'object') {
+                          const code = item.itemCode || item.code || "";
+                          const name = item.itemName || item.name || "";
+                          if (code && name) return `${code}-${name}`;
+                          return name || code || String(item);
+                        }
+                        return String(item);
+                      }).join(', ');
+                    }
+                    return String(parsed);
+                  } catch {
+                    return String(investigation.pqItems);
+                  }
+                }
+                return investigation.projectName || "N/A";
+              })(),
+              auditFactoryAddress: investigation.investigationAddress || "N/A",
+              auditMethod: getInvestigationMethodLabel(investigation.investigationMethod || ""),
+              auditResult: investigation.evaluationResult === "APPROVED" ? "Pass(승인)" : 
+                          investigation.evaluationResult === "SUPPLEMENT" ? "Pass(조건부승인)" : 
+                          investigation.evaluationResult === "REJECTED" ? "Fail(미승인)" : "N/A",
+              additionalNotes: input.purchaseComment || investigation.investigationNotes || "",
+              
+              // 발신자 정보
+              senderName: investigation.senderName || "삼성중공업",
+              senderEmail: investigation.senderEmail || "procurement@samsung.com",
+              
+              // 이메일 제목
+              subject: `[SHI Audit] 실사 결과 안내 _ ${investigation.vendorName} _ PQ No. ${investigation.pqNumber}`,
+            }
+
+            // 이메일 발송
+            if (investigation.vendorEmail) {
+              await sendEmail({
+                to: investigation.vendorEmail,
+                subject: emailContext.subject,
+                template: "audit-result-notice",
+                context: emailContext,
+              })
+            } else {
+              throw new Error("벤더 이메일 주소가 없습니다.")
+            }
+
+            return { success: true, investigationId: investigation.id }
+          } catch (error) {
+            console.error(`실사 ID ${investigation.id} 이메일 발송 실패:`, error)
+            return { success: false, investigationId: investigation.id, error: error instanceof Error ? error.message : "알 수 없는 오류" }
+          }
+        })
+      )
+
+      // 성공한 실사들의 상태를 RESULT_SENT로 업데이트
+      const successfulInvestigationIds = emailResults
+        .filter(result => result.success)
+        .map(result => result.investigationId)
+
+      if (successfulInvestigationIds.length > 0) {
+        await tx
+          .update(vendorInvestigations)
+          .set({
+            investigationStatus: "RESULT_SENT",
+            purchaseComment: input.purchaseComment,
+            updatedAt: new Date(),
+          })
+          .where(inArray(vendorInvestigations.id, successfulInvestigationIds))
+
+        // 정규업체등록관리에 레코드 생성 로직
+        const successfulInvestigations = investigations.filter(inv => 
+          successfulInvestigationIds.includes(inv.id)
+        );
+
+        for (const investigation of successfulInvestigations) {
+          // 1. 미실사 PQ는 제외 (이미 COMPLETED 상태인 것만 처리하므로 실사된 것들)
+          // 2. 승인된 실사만 정규업체등록 대상
+          if (investigation.evaluationResult === "APPROVED") {
+            try {
+              // 기존 정규업체등록 레코드 확인
+              const existingRegistration = await tx
+                .select({ id: vendorRegularRegistrations.id })
+                .from(vendorRegularRegistrations)
+                .where(eq(vendorRegularRegistrations.vendorId, investigation.vendorId))
+                .limit(1);
+
+              // 프로젝트 PQ의 경우 기존 레코드가 있으면 skip, 없으면 생성
+              // 일반 PQ의 경우 무조건 생성 (이미 체크는 위에서 함)
+              if (existingRegistration.length === 0) {
+                // pqItems를 majorItems로 변환 - JSON 통째로 넘겨줌
+                let majorItemsJson = null;
+                if (investigation.pqItems) {
+                  try {
+                    // 이미 파싱된 객체거나 JSON 문자열인 경우 모두 처리
+                    const parsed = typeof investigation.pqItems === 'string' 
+                      ? JSON.parse(investigation.pqItems) 
+                      : investigation.pqItems;
+                    
+                    // 원본 구조를 최대한 보존하면서 JSON으로 저장
+                    majorItemsJson = JSON.stringify(parsed);
+                  } catch {
+                    // 파싱 실패 시 문자열로 저장
+                    majorItemsJson = JSON.stringify([{ 
+                      itemCode: "UNKNOWN", 
+                      itemName: String(investigation.pqItems) 
+                    }]);
+                  }
+                }
+
+                await tx.insert(vendorRegularRegistrations).values({
+                  vendorId: investigation.vendorId,
+                  status: "under_review", // 실사 통과 상태로 시작
+                  majorItems: majorItemsJson,
+                  registrationRequestDate: new Date().toISOString().split('T')[0], // date 타입으로 변환
+                  remarks: `PQ 실사 통과로 자동 생성 (PQ번호: ${investigation.pqNumber || 'N/A'})`,
+                });
+
+                console.log(`✅ 정규업체등록 레코드 생성: 벤더 ID ${investigation.vendorId}`);
+              } else {
+                console.log(`⏭️ 정규업체등록 레코드 이미 존재: 벤더 ID ${investigation.vendorId} (Skip)`);
+              }
+            } catch (error) {
+              console.error(`❌ 정규업체등록 레코드 생성 실패 (벤더 ID: ${investigation.vendorId}):`, error);
+              // 정규업체등록 생성 실패는 전체 프로세스를 중단하지 않음
+            }
+          }
+        }
+      }
+
+      return {
+        totalCount: investigations.length,
+        successCount: emailResults.filter(r => r.success).length,
+        failedCount: emailResults.filter(r => !r.success).length,
+        emailResults,
+      }
+    })
+
+    // 캐시 무효화
+    revalidateTag("vendor-investigations")
+    revalidateTag("pq-submissions")
+    revalidateTag("vendor-regular-registrations")
+
+    return { 
+      success: true, 
+      data: result,
+      message: `${result.successCount}개 실사 결과가 성공적으로 발송되었습니다.`
+    }
+  } catch (err) {
+    console.error("실사 결과 발송 중 오류 발생:", err)
+    return { 
+      success: false, 
+      error: err instanceof Error ? err.message : "알 수 없는 오류가 발생했습니다." 
+    }
+  }
+}
+
+// 실사 방법 라벨 변환 함수
+function getInvestigationMethodLabel(method: string): string {
+  switch (method) {
+    case "PURCHASE_SELF_EVAL":
+      return "구매자체평가"
+    case "DOCUMENT_EVAL":
+      return "서류평가"
+    case "PRODUCT_INSPECTION":
+      return "제품검사평가"
+    case "SITE_VISIT_EVAL":
+      return "방문실사평가"
+    default:
+      return method
+  }
+}
+
+// export async function getQMManagers() {
+//   try {
+//     // QM 부서 사용자만 필터링 (department 필드가 있다고 가정)
+//     // 또는 QM 역할을 가진 사용자만 필터링 (role 필드가 있다고 가정)
+//     const qmUsers = await db
+//       .select({
+//         id: users.id,
+//         name: users.name,
+//         email: users.email,
+//       })
+//       .from(users)
+//       // .where(
+//       //   // 필요에 따라 조건 조정 (예: QM 부서 또는 특정 역할만)
+//       //   // eq(users.department, "QM") 또는
+//       //   // eq(users.role, "QM_MANAGER")
+//       //   // 테스트를 위해 모든 사용자 반환도 가능
+//       //   eq(users.active, true)
+//       // )
+//       .orderBy(users.name)
+
+//     return { 
+//       data: qmUsers,
+//       success: true 
+//     }
+//   } catch (error) {
+//     console.error("QM 담당자 목록 조회 오류:", error)
+//     return { 
+//       data: [],
+//       success: false,
+//       error: error instanceof Error ? error.message : "QM 담당자 목록을 가져오는 중 오류가 발생했습니다." 
+//     }
+//   }
+// }
+export async function getQMManagers() {
+  try {
+    // domain이 'partners'가 아니고, isActive가 true인 사용자만 조회
+    // 또는 deptName이 '품질경영팀('를 포함하는 경우도 포함
+    const qmUsers = await db
+      .select({
+        id: users.id,
+        name: users.name,
+        email: users.email,
+        isActive: users.isActive,
+      })
+      .from(users)
+      .where(
+        and(
+          eq(users.isActive, true),
+          ne(users.domain, "partners"),
+          ilike(users.deptName, "%품질경영팀(%")
+        )
+      )
+      .orderBy(users.name);
+
+    return {
+      data: qmUsers,
+      success: true
+    }
+  } catch (error) {
+    console.error("QM 담당자 목록 조회 오류:", error)
+    return {
+      data: [],
+      success: false,
+      error: error instanceof Error ? error.message : "QM 담당자 목록을 가져오는 중 오류가 발생했습니다."
+    }
+  }
+}
+export async function getFactoryLocationAnswer(vendorId: number, projectId: number | null = null) {
+  try {
+    // 1. "Location of Factory" 체크포인트를 가진 criteria 찾기
+    const criteria = await db
+      .select({
+        id: pqCriterias.id
+      })
+      .from(pqCriterias)
+      .where(ilike(pqCriterias.checkPoint, "%Location of Factory%"))
+      .limit(1);
+
+    if (!criteria.length) {
+      return { success: false, message: "Factory Location 질문을 찾을 수 없습니다." };
+    }
+
+    const criteriaId = criteria[0].id;
+
+    // 2. 해당 criteria에 대한 벤더의 응답 조회
+    const answerQuery = db
+      .select({
+        answer: vendorPqCriteriaAnswers.answer
+      })
+      .from(vendorPqCriteriaAnswers)
+      .where(
+        and(
+          eq(vendorPqCriteriaAnswers.vendorId, vendorId),
+          eq(vendorPqCriteriaAnswers.criteriaId, criteriaId)
+        )
+      );
+
+    // 프로젝트 ID가 있으면 추가 조건
+    if (projectId !== null) {
+      answerQuery.where(eq(vendorPqCriteriaAnswers.projectId, projectId));
+    } else {
+      answerQuery.where(eq(vendorPqCriteriaAnswers.projectId, null));
+    }
+
+    const answers = await answerQuery.limit(1);
+
+    if (!answers.length || !answers[0].answer) {
+      return { success: false, message: "공장 위치 정보를 찾을 수 없습니다." };
+    }
+
+    return { 
+      success: true, 
+      factoryLocation: answers[0].answer 
+    };
+  } catch (error) {
+    console.error("Factory location 조회 오류:", error);
+    return { success: false, message: "오류가 발생했습니다." };
+  }
+}
+
+// -----------------------------------------------------------------------------
+// PQ LISTS (GENERAL / PROJECT / NON_INSPECTION) CRUD + 조회
+
+// LOAD CRITERIAS BY LIST
+export async function getPqCriteriasByListId(listId: number) {
+  const criterias = await db
+    .select()
+    .from(pqCriterias)
+    .where(eq(pqCriterias.pqListId, listId))
+    .orderBy(pqCriterias.groupName, pqCriterias.code);
+  return criterias;
+}
+
+// -----------------------------------------------------------------------------
+// PQ LISTS CRUD 액션 - 개선된 버전
+// -----------------------------------------------------------------------------
+
+
+export async function getPQLists(input: GetPqListsSchema) {
+  return unstable_cache(
+    async () => {
+      try {
+        const offset = (input.page - 1) * input.perPage;
+
+        let globalWhere;
+        if (input.search) {
+          const s = `%${input.search}%`;
+          globalWhere = or(
+            ilike(pqLists.name, s),
+            ilike(pqLists.type, s),
+            ilike(projects.code, s),
+            ilike(projects.name, s)
+          );
+        }
+
+        const advancedWhere = input.filters
+          ? filterColumns({ table: pqLists, filters: input.filters, joinOperator: input.joinOperator })
+          : undefined;
+
+        const finalWhere = and(
+          // eq(pqLists.isDeleted, false),
+          advancedWhere,
+          globalWhere
+        );
+
+        const orderBy = input.sort.length
+          ? input.sort.map((s) => (s.desc ? desc(pqLists.createdAt) : asc(pqLists.createdAt)))
+          : [desc(pqLists.createdAt)];
+
+        const { data, total } = await db.transaction(async (tx) => {
+          // 만료된 PQ 리스트들을 자동으로 비활성화
+          const now = new Date();
+          await tx
+            .update(pqLists)
+            .set({ 
+              isDeleted: true, 
+              updatedAt: now 
+            })
+            .where(
+              and(
+                eq(pqLists.isDeleted, false),
+                lt(pqLists.validTo, now),
+                isNotNull(pqLists.validTo)
+              )
+            );
+
+          const data = await tx
+            .select({
+              id: pqLists.id,
+              name: pqLists.name,
+              type: pqLists.type,
+              projectId: pqLists.projectId,
+              validTo: pqLists.validTo,
+              isDeleted: pqLists.isDeleted,
+              createdAt: pqLists.createdAt,
+              updatedAt: pqLists.updatedAt,
+              createdBy: users.name,
+              projectCode: projects.code,
+              projectName: projects.name,
+              updatedBy: users.name,
+            })
+            .from(pqLists)
+            .leftJoin(projects, eq(pqLists.projectId, projects.id))
+            .leftJoin(users, eq(pqLists.createdBy, users.id))
+            .where(finalWhere)
+            .orderBy(...orderBy)
+            .offset(offset)
+            .limit(input.perPage);
+
+          const countRes = await tx
+            .select({ count: count() })
+            .from(pqLists)
+            .where(finalWhere);
+
+          // 각 PQ 리스트의 항목 수 조회
+          const dataWithCriteriaCount = await Promise.all(
+            data.map(async (item) => {
+              const criteriaCount = await getPqListCriteriaCount(item.id);
+              return {
+                ...item,
+                criteriaCount
+              };
+            })
+          );
+          
+
+          return { data: dataWithCriteriaCount, total: countRes[0]?.count ?? 0 };
+        });
+
+        const pageCount = Math.ceil(total / input.perPage);
+        return { data, pageCount };
+      } catch (err) {
+        console.error("Error in getPQLists:", err);
+        return { data: [], pageCount: 0 };
+      }
+    },
+    [JSON.stringify(input)],
+    { revalidate: 3600, tags: ["pq-lists"] }
+  )();
+}
+
+export async function togglePQListsAction(ids: number[], newIsDeleted: boolean) {
+  try {
+    if (ids.length === 0) {
+      return { success: false, message: "선택한 항목이 없습니다" };
+    }
+    const session = await getServerSession(authOptions);
+    const userId = session?.user?.id ? Number(session.user.id) : null;
+    const now = new Date();
+
+    // 활성화하려는 경우 중복 활성화 체크
+    if (!newIsDeleted) {
+      // 선택된 PQ 리스트들의 정보를 먼저 가져옴
+      const selectedPqLists = await db
+        .select({
+          id: pqLists.id,
+          name: pqLists.name,
+          type: pqLists.type,
+          projectId: pqLists.projectId,
+        })
+        .from(pqLists)
+        .where(inArray(pqLists.id, ids));
+
+      // 현재 활성화된 PQ 리스트 확인
+      const activePqLists = await db
+        .select({
+          id: pqLists.id,
+          name: pqLists.name,
+          type: pqLists.type,
+          projectId: pqLists.projectId,
+        })
+        .from(pqLists)
+        .where(and(
+          eq(pqLists.isDeleted, false),
+          not(inArray(pqLists.id, ids))
+        ));
+
+      // 각 선택된 PQ 리스트에 대해 중복 체크
+      for (const selectedPq of selectedPqLists) {
+        // 일반 PQ 또는 미실사 PQ인 경우
+        if (selectedPq.type === "GENERAL" || selectedPq.type === "NON_INSPECTION") {
+          const activeSameType = activePqLists.filter(pq => pq.type === selectedPq.type);
+          
+          if (activeSameType.length > 0) {
+            const activeNames = activeSameType.map(pq => pq.name).join(", ");
+            return {
+              success: false,
+              error: `${selectedPq.type === "GENERAL" ? "일반" : "미실사"} PQ는 하나만 활성화할 수 있습니다.먼저 활성화된 ${selectedPq.type === "GENERAL" ? "일반" : "미실사"} PQ를 비활성화한 후 활성화해주세요.`
+            };
+          }
+        }
+        
+        // 프로젝트 PQ인 경우
+        if (selectedPq.type === "PROJECT" && selectedPq.projectId) {
+          const activeSameProject = activePqLists.filter(pq => 
+            pq.type === "PROJECT" && pq.projectId === selectedPq.projectId
+          );
+          
+          if (activeSameProject.length > 0) {
+            const activeNames = activeSameProject.map(pq => pq.name).join(", ");
+            return {
+              success: false,
+              error: `프로젝트 PQ는 프로젝트별로 하나만 활성화할 수 있습니다. 먼저 활성화된 프로젝트 PQ를 비활성화한 후 활성화해주세요.`
+            };
+          }
+        }
+      }
+    }
+
+    const updated = await db
+      .update(pqLists)
+      .set({ isDeleted: newIsDeleted, updatedAt: now, updatedBy: userId })
+      .where(inArray(pqLists.id, ids))
+      .returning();
+    revalidateTag("pq-lists");
+    return {
+      success: true,
+      data: updated,
+      message: `${updated.length}개의 PQ 목록이 ${newIsDeleted ? "비활성화" : "활성화"}되었습니다`
+    };
+  } catch (error) {
+    console.error("Error toggling PQ lists:", error);
+    return {
+      success: false,
+      message: "PQ 목록 상태 변경에 실패했습니다"
+    };
+  }
+}
+
+export async function createPQListAction(input: CreatePqListInput) {
+  try {
+    const validated = createPqListSchema.parse(input);
+    const session = await getServerSession(authOptions);
+    const userId = session?.user?.id;
+    // const userName = session?.user?.name || "Unknown";    
+    
+    // General PQ인 경우 중복 체크
+    if (validated.type === "GENERAL") {
+      const existingGeneralPQ = await db
+        .select()
+        .from(pqLists)
+        .where(
+          and(
+            eq(pqLists.type, "GENERAL"),
+            eq(pqLists.isDeleted, false)
+          )
+        )
+        .limit(1);
+
+      if (existingGeneralPQ.length > 0) {
+        return {
+          success: false,
+          error: "General PQ 목록은 하나만 생성할 수 있습니다. 먼저 활성화된 General PQ를 비활성화한 후 생성해주세요."
+        };
+      }
+    }
+
+    // Non-Inspection PQ인 경우 중복 체크
+    if (validated.type === "NON_INSPECTION") {
+      const existingNonInspectionPQ = await db
+        .select()
+        .from(pqLists)
+        .where(
+          and(
+            eq(pqLists.type, "NON_INSPECTION"),
+            eq(pqLists.isDeleted, false)
+          )
+        )
+        .limit(1);
+
+      if (existingNonInspectionPQ.length > 0) {
+        return {
+          success: false,
+          error: "미실사 PQ 목록은 하나만 생성할 수 있습니다. 먼저 활성화된 미실사 PQ를 비활성화한 후 생성해주세요."
+        };
+      }
+    }
+
+    // 프로젝트 PQ인 경우 중복 체크
+    if (validated.type === "PROJECT" && validated.projectId) {
+      // 프로젝트 정보 조회 (이름과 코드 포함)
+      const projectInfo = await db
+        .select({
+          code: projects.code,
+          name: projects.name
+        })
+        .from(projects)
+        .where(eq(projects.id, validated.projectId))
+        .limit(1)
+        .then(rows => rows[0]);
+
+      const existingPQ = await db
+        .select()
+        .from(pqLists)
+        .where(
+          and(
+            eq(pqLists.projectId, validated.projectId),
+            eq(pqLists.type, "PROJECT"),
+            eq(pqLists.isDeleted, false)
+          )
+        )
+        .limit(1);
+
+      if (existingPQ.length > 0) {
+        const projectDisplayName = projectInfo ? `${projectInfo.code} - ${projectInfo.name}` : "알 수 없는 프로젝트";
+        return {
+          success: false,
+          error: `${projectDisplayName} 프로젝트에 대한 PQ가 이미 존재합니다`
+        };
+      }
+    }
+    return await db.transaction(async (tx) => {
+      const now = new Date();
+      const [newPqList] = await tx
+        .insert(pqLists)
+        .values({
+          ...validated,
+          isDeleted: false,
+          createdAt: now,
+          updatedAt: now,
+          createdBy: userId,
+          updatedBy: userId,
+        })
+        .returning();
+
+      // NON_INSPECTION 타입인 경우 기존 활성화된 NON_INSPECTION 리스트들을 비활성화
+      if (validated.type === "NON_INSPECTION") {
+        await tx
+          .update(pqLists)
+          .set({ isDeleted: true, updatedAt: now, updatedBy: userId })
+          .where(
+            and(
+              eq(pqLists.type, "NON_INSPECTION"),
+              eq(pqLists.isDeleted, false),
+              ne(pqLists.id, newPqList.id) // 새로 생성한 리스트 제외
+            )
+          );
+      }
+
+      // 프로젝트 PQ인 경우 General PQ 항목들을 자동으로 복사
+      let copiedCriteriaCount = 0;
+      if (validated.type === "PROJECT") {
+        // General PQ 목록 찾기
+        const generalPqList = await tx
+          .select()
+          .from(pqLists)
+          .where(
+            and(
+              eq(pqLists.type, "GENERAL"),
+              eq(pqLists.isDeleted, false)
+            )
+          )
+          .limit(1)
+          .then(rows => rows[0]);
+
+        if (generalPqList) {
+          // General PQ의 항목들 조회
+          const generalCriterias = await tx
+            .select()
+            .from(pqCriterias)
+            .where(eq(pqCriterias.pqListId, generalPqList.id));
+
+          if (generalCriterias.length > 0) {
+            // 새로운 프로젝트 PQ에 항목들 복사
+            const newCriterias = generalCriterias.map(criteria => ({
+               code: criteria.code,
+               checkPoint: criteria.checkPoint,
+               description: criteria.description,
+               remarks: criteria.remarks,
+               groupName: criteria.groupName,
+               subGroupName: criteria.subGroupName,
+               pqListId: newPqList.id,
+               inputFormat: criteria.inputFormat,
+               createdAt: now,
+               updatedAt: now,
+             }));
+
+            await tx.insert(pqCriterias).values(newCriterias);
+            copiedCriteriaCount = newCriterias.length;
+          }
+        }
+      }
+
+      revalidateTag("pq-lists");
+      revalidateTag("pq-criterias");
+      return { 
+        success: true, 
+        data: newPqList,
+        copiedCriteriaCount 
+      };
+    });
+  } catch (error) {
+    console.error("Error creating PQ list:", error);
+    
+    if (error instanceof z.ZodError) {
+      return {
+        success: false,
+        error: "유효성 검사 실패",
+        details: error.errors
+      };
+    }
+    
+    return {
+      success: false,
+      error: "PQ 목록 생성에 실패했습니다"
+    };
+  }
+}
+export async function deletePQListsAction(ids: number[]) {
+  try {
+    if (ids.length === 0) {
+      return {
+        success: false,
+        message: "삭제할 항목을 선택해주세요"
+      };
+    }
+    console.log("ids", ids)
+    console.log("pqLists", pqLists)
+    const now = new Date();
+    const updated = await db
+      .update(pqLists)
+      .set({ isDeleted: true, updatedAt: now })
+      .where(inArray(pqLists.id, ids))
+      .returning();
+
+    revalidateTag("pq-lists");
+    return {
+      success: true,
+      data: updated,
+      message: `${updated.length}개의 PQ 목록이 비활성화되었습니다`
+    };
+  } catch (error) {
+    console.error("Error deleting PQ lists:", error);
+    return {
+      success: false,
+      message: "PQ 목록 삭제에 실패했습니다"
+    };
+  }
+}
+
+export async function getPqListById(id: number) {
+  try {
+    const pqList = await db
+      .select()
+      .from(pqLists)
+      .where(and(
+        eq(pqLists.id, id),
+        eq(pqLists.isDeleted, false)
+      ))
+      .limit(1)
+      .then(rows => rows[0]);
+      
+    return pqList || null;
+  } catch (error) {
+    console.error("Error fetching PQ list by ID:", error);
+    return null;
+  }
+}
+
+export async function getPqListCriteriaCount(listId: number) {
+  try {
+    const result = await db
+      .select({ count: count() })
+      .from(pqCriterias)
+      .where(eq(pqCriterias.pqListId, listId));
+
+    return result[0]?.count || 0;
+  } catch (error) {
+    console.error("Error getting PQ list criteria count:", error);
+    return 0;
+  }
+}
+
+
+
+export async function copyPQListAction(input: CopyPqListInput) {
+  try {
+    const validated = copyPqListSchema.parse(input);
+    const session = await getServerSession(authOptions);
+    const userId = session?.user?.id;
+    return await db.transaction(async (tx) => {
+      // 1. 원본 PQ 목록 조회
+      const sourcePqList = await tx
+        .select()
+        .from(pqLists)
+        .where(eq(pqLists.id, validated.sourcePqListId))
+        .limit(1)
+        .then(rows => rows[0]);
+
+      if (!sourcePqList) {
+        return {
+          success: false,
+          error: "복사할 PQ 목록을 찾을 수 없습니다"
+        };
+      }
+
+      // 2. 프로젝트 PQ인 경우에만 대상 프로젝트에 이미 PQ가 존재하는지 확인
+      if (sourcePqList.type === "PROJECT" && validated.targetProjectId) {
+        // 프로젝트 정보 조회 (이름과 코드 포함)
+        const projectInfo = await tx
+          .select({
+            code: projects.code,
+            name: projects.name
+          })
+          .from(projects)
+          .where(eq(projects.id, validated.targetProjectId))
+          .limit(1)
+          .then(rows => rows[0]);
+
+        const existingProjectPQ = await tx
+          .select()
+          .from(pqLists)
+          .where(
+            and(
+              eq(pqLists.projectId, validated.targetProjectId),
+              eq(pqLists.type, "PROJECT"),
+              eq(pqLists.isDeleted, false)
+            )
+          )
+          .limit(1);
+
+        if (existingProjectPQ.length > 0) {
+          const projectDisplayName = projectInfo ? `${projectInfo.code} - ${projectInfo.name}` : "알 수 없는 프로젝트";
+          return {
+            success: false,
+            error: `${projectDisplayName} 프로젝트에 대한 PQ가 이미 존재합니다`
+          };
+        }
+      }
+
+      // 3. 새 PQ 목록 생성
+      const now = new Date();
+      const newName = validated.newName || `${sourcePqList.name} (복사본)`;
+
+      const [newPqList] = await tx
+        .insert(pqLists)
+        .values({
+          name: newName || sourcePqList.name,
+          type: sourcePqList.type,
+          projectId: sourcePqList.type === "PROJECT" ? validated.targetProjectId : null,
+          isDeleted: false,
+          createdAt: now,
+          updatedAt: now,
+          createdBy: userId,
+          updatedBy: userId,
+          validTo: validated.validTo,
+        })
+        .returning();
+
+      // 4. 원본 PQ 항목들 조회 및 복사
+      const sourceCriterias = await tx
+        .select()
+        .from(pqCriterias)
+        .where(eq(pqCriterias.pqListId, validated.sourcePqListId));
+
+      if (sourceCriterias.length > 0) {
+        const newCriterias = sourceCriterias.map(criteria => ({
+          code: criteria.code,
+          checkPoint: criteria.checkPoint,
+          description: criteria.description,
+          remarks: criteria.remarks,
+          groupName: criteria.groupName,
+          subGroupName: criteria.subGroupName,
+          pqListId: newPqList.id,
+          inputFormat: criteria.inputFormat,
+          createdAt: now,
+          updatedAt: now,
+          createdBy: userId,
+          updatedBy: userId,
+        }));
+
+        await tx.insert(pqCriterias).values(newCriterias);
+      }
+
+      revalidateTag("pq-lists");
+      return {
+        success: true,
+        data: newPqList,
+        copiedCriteriaCount: sourceCriterias.length
+      };
+    });
+  } catch (error) {
+    console.error("Error copying PQ list:", error);
+
+    if (error instanceof z.ZodError) {
+      return {
+        success: false,
+        error: "유효성 검사 실패",
+        details: error.errors
+      };
+    }
+
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : "PQ 목록 복사에 실패했습니다"
+    };
+  }
+}
+export type Project = {
+  id: number;
+  projectCode: string;
+  projectName: string;
+  pjtType: string;
+}
+// -----------------------------------------------------------------------------
+export async function getProjects() {
+  try {
+    const projectList = await db.transaction(async (tx) => {
+      const results = await tx
+        .select({
+          id: projects.id,
+          code: projects.code,
+          name: projects.name,
+          type: projects.type,
+          createdAt: projects.createdAt,
+          updatedAt: projects.updatedAt,
+        })
+        .from(projects)
+        .orderBy(projects.code);
+
+      return results;
+    });
+
+    return projectList;
+  } catch (error) {
+    console.error("프로젝트 목록 가져오기 실패:", error);
+    return [];
+  }
+}
+
+// PQ 리스트에 등재된 프로젝트만 가져오는 함수
+export async function getProjectsWithPQList() {
+  try {
+    const projectList = await db.transaction(async (tx) => {
+      const results = await tx
+        .select({
+          id: projects.id,
+          projectCode: projects.code,
+          projectName: projects.name,
+          pjtType: projects.type,
+          type: projects.type,
+          createdAt: projects.createdAt,
+          updatedAt: projects.updatedAt,
+        })
+        .from(projects)
+        .innerJoin(pqLists, eq(projects.id, pqLists.projectId))
+        .where(
+          and(
+            eq(pqLists.type, "PROJECT"),
+            eq(pqLists.isDeleted, false)
+          )
+        )
+        .orderBy(projects.code);
+
+      return results;
+    });
+
+    return projectList;
+  } catch (error) {
+    console.error("PQ 리스트 등재 프로젝트 목록 가져오기 실패:", error);
+    return [];
+  }
+}
+// -----------------------------------------------------------------------------
+// PQ Criteria CRUD 액션 - 개선된 버전
+// -----------------------------------------------------------------------------
+
+// PQ 항목 생성 (특정 PQ 목록에 속함)
+export async function createPqCriteria(
+  pqListId: number,
+  input: {
+    code: string;
+    checkPoint: string;
+    groupName: string;
+    subGroupName?: string;
+    description?: string;
+    remarks?: string;
+    inputFormat?: string;
+    type?: string | null;
+    attachments?: {
+      fileName: string;
+      url: string;
+      size?: number;
+      originalFileName?: string;
+    }[];
+  }
+) {
+  try {
+    const now = new Date();
+    const [newCriteria] = await db
+      .insert(pqCriterias)
+      .values({
+        code: input.code,
+        checkPoint: input.checkPoint,
+        description: input.description || null,
+        remarks: input.remarks || null,
+        groupName: input.groupName,
+        subGroupName: input.subGroupName || null,
+        pqListId: pqListId,
+        inputFormat: input.inputFormat || "TEXT",
+        type: input.type || "내외자",
+        createdAt: now,
+        updatedAt: now,
+      })
+      .returning();
+
+    // 첨부파일 저장
+    if (input.attachments && input.attachments.length > 0) {
+      await db.insert(pqCriteriasAttachments).values(
+        input.attachments.map((attach) => ({
+          pqCriteriaId: newCriteria.id,
+          fileName: attach.fileName,
+          originalFileName: attach.originalFileName || attach.fileName,
+          filePath: attach.url,
+          fileSize: attach.size ?? null,
+          createdAt: now,
+          updatedAt: now,
+        }))
+      );
+    }
+
+    revalidateTag("pq-criterias");
+    return {
+      success: true,
+      data: newCriteria,
+      message: "PQ 항목이 성공적으로 생성되었습니다"
+    };
+  } catch (error) {
+    console.error("Error creating PQ criteria:", error);
+    return {
+      success: false,
+      message: "PQ 항목 생성에 실패했습니다"
+    };
+  }
+}
+
+// PQ 항목 수정
+export async function updatePqCriteria(
+  id: number,
+  input: {
+    code: string;
+    checkPoint: string;
+    groupName: string;
+    subGroupName?: string;
+    description?: string;
+    remarks?: string;
+    inputFormat?: string;
+    type?: string | null;
+    attachments?: {
+      fileName: string;
+      url: string;
+      size?: number;
+      originalFileName?: string;
+    }[];
+  }
+) {
+  try {
+    const now = new Date();
+    const [updatedCriteria] = await db
+      .update(pqCriterias)
+      .set({
+        code: input.code,
+        checkPoint: input.checkPoint,
+        description: input.description || null,
+        remarks: input.remarks || null,
+        groupName: input.groupName,
+        subGroupName: input.subGroupName || null,
+        inputFormat: input.inputFormat || "TEXT",
+        type: input.type || "내외자",
+        updatedAt: now,
+      })
+      .where(eq(pqCriterias.id, id))
+      .returning();
+
+    if (!updatedCriteria) {
+      return {
+        success: false,
+        message: "수정할 PQ 항목을 찾을 수 없습니다"
+      };
+    }
+
+    // 첨부파일 동기화 (입력된 경우에만)
+    if (input.attachments) {
+      const existing = await db
+        .select({
+          id: pqCriteriasAttachments.id,
+          filePath: pqCriteriasAttachments.filePath,
+        })
+        .from(pqCriteriasAttachments)
+        .where(eq(pqCriteriasAttachments.pqCriteriaId, id));
+
+      const newPaths = input.attachments.map((a) => a.url);
+      const toDelete = existing.filter((e) => !newPaths.includes(e.filePath));
+      if (toDelete.length > 0) {
+        await db
+          .delete(pqCriteriasAttachments)
+          .where(inArray(pqCriteriasAttachments.id, toDelete.map((d) => d.id)));
+      }
+
+      const existingPaths = existing.map((e) => e.filePath);
+      const toAdd = input.attachments.filter((a) => !existingPaths.includes(a.url));
+      if (toAdd.length > 0) {
+        await db.insert(pqCriteriasAttachments).values(
+          toAdd.map((attach) => ({
+            pqCriteriaId: id,
+            fileName: attach.fileName,
+            originalFileName: attach.originalFileName || attach.fileName,
+            filePath: attach.url,
+            fileSize: attach.size ?? null,
+            createdAt: now,
+            updatedAt: now,
+          }))
+        );
+      }
+    }
+
+    revalidateTag("pq-criterias");
+    return {
+      success: true,
+      data: updatedCriteria,
+      message: "PQ 항목이 성공적으로 수정되었습니다"
+    };
+  } catch (error) {
+    console.error("Error updating PQ criteria:", error);
+    return {
+      success: false,
+      message: "PQ 항목 수정에 실패했습니다"
+    };
+  }
+}
+
+// PQ 항목 삭제
+export async function deletePqCriterias(ids: number[]) {
+  try {
+    if (ids.length === 0) {
+      return {
+        success: false,
+        message: "삭제할 항목을 선택해주세요"
+      };
+    }
+
+    const deletedCriterias = await db
+      .delete(pqCriterias)
+      .where(inArray(pqCriterias.id, ids))
+      .returning();
+
+    revalidateTag("pq-criterias");
+    return {
+      success: true,
+      data: deletedCriterias,
+      message: `${deletedCriterias.length}개의 PQ 항목이 삭제되었습니다`
+    };
+  } catch (error) {
+    console.error("Error deleting PQ criterias:", error);
+    return {
+      success: false,
+      message: "PQ 항목 삭제에 실패했습니다"
+    };
+  }
+}
+
+/**
+ * PQ 제출 삭제 함수 (REQUESTED 상태일 때만 삭제 가능)
+ */
+export async function deletePQSubmissionAction(pqSubmissionId: number) {
+  try {
+    // PQ 제출 정보 조회
+    const submission = await db
+      .select()
+      .from(vendorPQSubmissions)
+      .where(eq(vendorPQSubmissions.id, pqSubmissionId))
+      .limit(1);
+
+    if (submission.length === 0) {
+      return { success: false, error: "PQ 제출을 찾을 수 없습니다." };
+    }
+
+    const pqSubmission = submission[0];
+
+    // REQUESTED 상태가 아니면 삭제 불가
+    if (pqSubmission.status !== "REQUESTED") {
+      return { success: false, error: "요청됨 상태가 아닌 PQ는 삭제할 수 없습니다." };
+    }
+
+    // 트랜잭션으로 관련 데이터 모두 삭제
+    await db.transaction(async (tx) => {
+      // 1. PQ 답변 삭제 (vendorId와 projectId로 식별)
+      await tx
+        .delete(vendorPqCriteriaAnswers)
+        .where(
+          and(
+            eq(vendorPqCriteriaAnswers.vendorId, pqSubmission.vendorId),
+            pqSubmission.projectId 
+              ? eq(vendorPqCriteriaAnswers.projectId, pqSubmission.projectId)
+              : isNull(vendorPqCriteriaAnswers.projectId)
+          )
+        );
+
+      // 2. 첨부파일 삭제 (vendorCriteriaAnswerId로 연결)
+      const answerIds = await tx
+        .select({ id: vendorPqCriteriaAnswers.id })
+        .from(vendorPqCriteriaAnswers)
+        .where(
+          and(
+            eq(vendorPqCriteriaAnswers.vendorId, pqSubmission.vendorId),
+            pqSubmission.projectId 
+              ? eq(vendorPqCriteriaAnswers.projectId, pqSubmission.projectId)
+              : isNull(vendorPqCriteriaAnswers.projectId)
+          )
+        );
+
+      if (answerIds.length > 0) {
+        await tx
+          .delete(vendorCriteriaAttachments)
+          .where(inArray(vendorCriteriaAttachments.vendorCriteriaAnswerId, answerIds.map(a => a.id)));
+      }
+
+     
+      // 3-1. 기본계약서 삭제
+      await tx
+        .delete(basicContract)
+        .where(eq(basicContract.pqSubmissionId, pqSubmissionId));
+      // 3-2. PQ 제출 삭제
+      await tx
+        .delete(vendorPQSubmissions)
+        .where(eq(vendorPQSubmissions.id, pqSubmissionId));
+    });
+
+    // 삭제 후 캐시 무효화 (PQ 히스토리 캐시)
+    revalidateTag('pq-submissions');
+    revalidateTag('basic-contract-requests');
+    revalidatePath('/partners/basic-contract');
+    revalidatePath('/evcp/basic-contract');
+
+
+    return { success: true };
+  } catch (error) {
+    console.error("deletePQSubmissionAction error:", error);
+    return { success: false, error: String(error) };
+  }
+}
+
+// PQ 목록별 항목 조회 (특정 pqListId에 속한 PQ 항목들)
+// PQ 리스트 정보 조회 (상태 포함)
+export async function getPQListInfo(pqListId: number) {
+  return unstable_cache(
+    async () => {
+      try {
+        const pqList = await db
+          .select({
+            id: pqLists.id,
+            name: pqLists.name,
+            type: pqLists.type,
+            projectId: pqLists.projectId,
+            validTo: pqLists.validTo,
+            isDeleted: pqLists.isDeleted,
+            createdAt: pqLists.createdAt,
+            updatedAt: pqLists.updatedAt,
+          })
+          .from(pqLists)
+          .where(and(
+            eq(pqLists.id, pqListId),
+            eq(pqLists.isDeleted, false)
+          ))
+          .limit(1)
+          .then(rows => rows[0]);
+
+        if (!pqList) {
+          return {
+            success: false,
+            error: "PQ 목록을 찾을 수 없습니다"
+          };
+        }
+
+        // 현재 시간과 비교하여 상태 결정
+        const now = new Date();
+        const isValid = !pqList.validTo || pqList.validTo > now;
+        const status = isValid ? "ACTIVE" : "INACTIVE";
+
+        return {
+          success: true,
+          data: {
+            ...pqList,
+            status
+          }
+        };
+      } catch (error) {
+        console.error("Error in getPQListInfo:", error);
+        return {
+          success: false,
+          error: "PQ 목록 정보를 가져오는 중 오류가 발생했습니다"
+        };
+      }
+    },
+    [`pq-list-info-${pqListId}`],
+    {
+      tags: ["pq-lists"],
+      revalidate: 3600, // 1시간
+    }
+  )();
+}
+
+// 활성화된 미실사 PQ 리스트 조회 (하나만 존재한다고 가정)
+export async function getNonInspectionPQLists() {
+  unstable_noStore();
+
+  try {
+    const pqList = await db
+      .select({
+        id: pqLists.id,
+        name: pqLists.name,
+        type: pqLists.type,
+        projectId: pqLists.projectId,
+        validTo: pqLists.validTo,
+        isDeleted: pqLists.isDeleted,
+        createdAt: pqLists.createdAt,
+        updatedAt: pqLists.updatedAt,
+      })
+      .from(pqLists)
+      .where(and(
+        eq(pqLists.type, "NON_INSPECTION"),
+        eq(pqLists.isDeleted, false)
+      ))
+      .limit(1)
+      .then(rows => rows[0]);
+
+    if (!pqList) {
+      return {
+        success: false,
+        error: "활성화된 미실사 PQ 목록을 찾을 수 없습니다"
+      };
+    }
+
+    // 현재 시간과 비교하여 상태 결정
+    const now = new Date();
+    const isValid = !pqList.validTo || pqList.validTo > now;
+    const status = isValid ? "ACTIVE" : "INACTIVE";
+
+    return {
+      success: true,
+      data: {
+        ...pqList,
+        status
+      }
+    };
+  } catch (error) {
+    console.error("Error in getNonInspectionPQLists:", error);
+    return {
+      success: false,
+      error: "미실사 PQ 목록 정보를 가져오는 중 오류가 발생했습니다"
+    };
+  }
+}
+
+export async function getPQsByListId(pqListId: number, input: GetPQSchema) {
+  return unstable_cache(
+    async () => {
+      try {
+        const offset = (input.page - 1) * input.perPage;
+
+        // 검색 조건
+        let globalWhere;
+        if (input.search) {
+          const s = `%${input.search}%`;
+          globalWhere = or(
+            ilike(pqCriterias.code, s),
+            ilike(pqCriterias.groupName, s),
+            ilike(pqCriterias.subGroupName, s),
+            ilike(pqCriterias.remarks, s),
+            ilike(pqCriterias.checkPoint, s),
+            ilike(pqCriterias.description, s)
+          );
+        }
+
+        // 고급 필터
+        const advancedWhere = input.filters
+          ? filterColumns({ table: pqCriterias, filters: input.filters, joinOperator: input.joinOperator })
+          : undefined;
+
+        // 최종 WHERE 조건 (pqListId 조건 추가)
+        const finalWhere = and(
+          eq(pqCriterias.pqListId, pqListId), // 특정 PQ 목록에 속한 항목들만
+          advancedWhere,
+          globalWhere
+        );
+
+        // 정렬
+        const orderBy = input.sort.length
+          ? input.sort.map((s) => (s.desc ? desc(pqCriterias[s.id]) : asc(pqCriterias[s.id])))
+          : [asc(pqCriterias.createdAt)];
+
+        const { data, total } = await db.transaction(async (tx) => {
+          // 데이터 조회
+          const data = await tx
+                       .select({
+             id: pqCriterias.id,
+             code: pqCriterias.code,
+             checkPoint: pqCriterias.checkPoint,
+             description: pqCriterias.description,
+             remarks: pqCriterias.remarks,
+             groupName: pqCriterias.groupName,
+             subGroupName: pqCriterias.subGroupName,
+             pqListId: pqCriterias.pqListId,
+             inputFormat: pqCriterias.inputFormat,
+             type: pqCriterias.type,
+     
+             createdAt: pqCriterias.createdAt,
+             updatedAt: pqCriterias.updatedAt,
+           })
+            .from(pqCriterias)
+            .where(finalWhere)
+            .orderBy(...orderBy)
+            .offset(offset)
+            .limit(input.perPage);
+
+          // 카운트 조회
+          const countRes = await tx
+            .select({ count: count() })
+            .from(pqCriterias)
+            .where(finalWhere);
+
+          const total = countRes[0]?.count ?? 0;
+
+          return { data, total };
+        });
+
+        const pageCount = Math.ceil(total / input.perPage);
+        return { data, pageCount };
+      } catch (err) {
+        console.error("Error in getPQsByListId:", err);
+        return { data: [], pageCount: 0 };
+      }
+    },
+    [JSON.stringify(input), pqListId.toString()],
+    { revalidate: 3600, tags: ["pq-criterias"] }
+  )();
+}
+
+// 실사 정보 업데이트 액션 (구매자체평가용)
+export async function updateInvestigationDetailsAction(input: {
+  investigationId: number;
+  confirmedAt?: Date;
+  evaluationResult?: "APPROVED" | "SUPPLEMENT" | "REJECTED";
+  investigationNotes?: string;
+  attachments?: File[];
+}) {
+  try {
+    const updateData: any = {
+      updatedAt: new Date(),
+    };
+
+    if (input.confirmedAt !== undefined) {
+      updateData.confirmedAt = input.confirmedAt;
+    }
+
+    if (input.evaluationResult !== undefined) {
+      updateData.evaluationResult = input.evaluationResult;
+    }
+
+    if (input.investigationNotes !== undefined) {
+      updateData.investigationNotes = input.investigationNotes;
+    }
+    // evaluationResult가 APPROVED라면 investigationStatus를 "COMPLETED"(완료됨)로 변경
+    if (input.evaluationResult === "APPROVED") {
+      updateData.investigationStatus = "COMPLETED";
+    }
+
+    // 트랜잭션으로 실사 정보 업데이트와 첨부파일 저장을 함께 처리
+    await db.transaction(async (tx) => {
+      // 1. 실사 정보 업데이트
+      await tx
+        .update(vendorInvestigations)
+        .set(updateData)
+        .where(eq(vendorInvestigations.id, input.investigationId));
+
+      // 2. 첨부파일 처리
+      if (input.attachments && input.attachments.length > 0) {
+        for (const file of input.attachments) {
+          try {
+            console.log(`📁 실사 첨부파일 처리 중: ${file.name} (${file.size} bytes)`);
+            
+            // saveDRMFile을 사용하여 파일 저장
+            const saveResult = await saveDRMFile(
+              file,
+              decryptWithServerAction,
+              `vendor-investigation/${input.investigationId}`,
+              "investigation-update"
+            );
+
+            if (!saveResult.success) {
+              console.error(`❌ 파일 저장 실패: ${file.name}`, saveResult.error);
+              throw new Error(`파일 저장 실패: ${file.name} - ${saveResult.error}`);
+            }
+
+            console.log(`✅ 파일 저장 완료: ${file.name} -> ${saveResult.fileName}`);
+
+            // 파일 타입 결정
+            let attachmentType = "OTHER";
+            if (file.type.includes("pdf")) {
+              attachmentType = "REPORT";
+            } else if (file.type.includes("image")) {
+              attachmentType = "PHOTO";
+            } else if (
+              file.type.includes("word") ||
+              file.type.includes("document") ||
+              file.name.toLowerCase().includes("report")
+            ) {
+              attachmentType = "DOCUMENT";
+            }
+
+            // DB에 첨부파일 레코드 생성
+            await tx.insert(vendorInvestigationAttachments).values({
+              investigationId: input.investigationId,
+              fileName: saveResult.fileName!,
+              originalFileName: file.name,
+              filePath: saveResult.publicPath!,
+              fileSize: file.size,
+              mimeType: file.type || 'application/octet-stream',
+              attachmentType: attachmentType as "REPORT" | "PHOTO" | "DOCUMENT" | "CERTIFICATE" | "OTHER",
+            });
+            
+          } catch (error) {
+            console.error(`❌ 첨부파일 처리 오류: ${file.name}`, error);
+            throw new Error(`첨부파일 처리 중 오류가 발생했습니다: ${file.name}`);
+          }
+        }
+      }
+    });
+
+    revalidateTag("pq-submissions");
+    revalidatePath("/evcp/pq_new");
+
+    return {
+      success: true,
+      message: "실사 정보가 성공적으로 업데이트되었습니다."
+    };
+
+  } catch (error) {
+    console.error("실사 정보 업데이트 오류:", error);
+    const errorMessage = error instanceof Error ? error.message : "실사 정보 업데이트 중 오류가 발생했습니다.";
+    return {
+      success: false,
+      error: errorMessage
+    };
+  }
+}
+
+// 구매자체평가 첨부파일 조회
+export async function getInvestigationAttachments(investigationId: number) {
+  try {
+    const attachments = await db
+      .select({
+        id: vendorInvestigationAttachments.id,
+        fileName: vendorInvestigationAttachments.fileName,
+        originalFileName: vendorInvestigationAttachments.originalFileName,
+        filePath: vendorInvestigationAttachments.filePath,
+        fileSize: vendorInvestigationAttachments.fileSize,
+        mimeType: vendorInvestigationAttachments.mimeType,
+        attachmentType: vendorInvestigationAttachments.attachmentType,
+        createdAt: vendorInvestigationAttachments.createdAt,
+      })
+      .from(vendorInvestigationAttachments)
+      .where(eq(vendorInvestigationAttachments.investigationId, investigationId))
+      .orderBy(desc(vendorInvestigationAttachments.createdAt));
+
+    return {
+      success: true,
+      attachments,
+    };
+  } catch (error) {
+    console.error("첨부파일 조회 오류:", error);
+    return {
+      success: false,
+      error: "첨부파일 조회 중 오류가 발생했습니다.",
+      attachments: [],
+    };
+  }
+}
+
+// 구매자체평가 첨부파일 삭제
+export async function deleteInvestigationAttachment(attachmentId: number) {
+  try {
+    await db
+      .delete(vendorInvestigationAttachments)
+      .where(eq(vendorInvestigationAttachments.id, attachmentId));
+
+    revalidateTag("pq-submissions");
+    revalidatePath("/evcp/pq_new");
+
+    return {
+      success: true,
+      message: "첨부파일이 성공적으로 삭제되었습니다.",
+    };
+  } catch (error) {
+    console.error("첨부파일 삭제 오류:", error);
+    return {
+      success: false,
+      error: "첨부파일 삭제 중 오류가 발생했습니다.",
+    };
+  }
+}
+
+export async function autoDeactivateExpiredPQLists() {
+  try {
+    const now = new Date();
+    
+    // 유효기간이 지난 PQ 리스트들을 비활성화
+    const expiredLists = await db
+      .update(pqLists)
+      .set({ 
+        isDeleted: true, 
+        updatedAt: now 
+      })
+      .where(
+        and(
+          eq(pqLists.isDeleted, false),
+          lt(pqLists.validTo, now),
+          isNotNull(pqLists.validTo)
+        )
+      )
+      .returning();
+
+    console.log(`[PQ Auto Deactivation] ${expiredLists.length}개의 만료된 PQ 리스트가 비활성화되었습니다.`);
+    
+    if (expiredLists.length > 0) {
+      revalidateTag("pq-lists");
+    }
+
+    return {
+      success: true,
+      deactivatedCount: expiredLists.length,
+      message: `${expiredLists.length}개의 만료된 PQ 리스트가 비활성화되었습니다.`
+    };
+  } catch (error) {
+    console.error("Error auto-deactivating expired PQ lists:", error);
+    return {
+      success: false,
+      message: "만료된 PQ 리스트 자동 비활성화에 실패했습니다."
+    };
+  }
+}
+
+// PQ 유효일 수정 서버액션
+export async function updatePqValidToAction(input: UpdatePqValidToInput) {
+  try {
+    const validated = updatePqValidToSchema.parse(input);
+    const session = await getServerSession(authOptions);
+    const userId = session?.user?.id;
+
+    if (!userId) {
+      return {
+        success: false,
+        error: "인증이 필요합니다"
+      };
+    }
+
+    // PQ 목록 존재 확인
+    const existingPqList = await db
+      .select()
+      .from(pqLists)
+      .where(eq(pqLists.id, validated.pqListId))
+      .limit(1)
+      .then(rows => rows[0]);
+
+    if (!existingPqList) {
+      return {
+        success: false,
+        error: "PQ 목록을 찾을 수 없습니다"
+      };
+    }
+
+    // 유효일 업데이트
+    await db
+      .update(pqLists)
+      .set({
+        validTo: validated.validTo,
+        updatedAt: new Date(),
+        updatedBy: userId,
+      })
+      .where(eq(pqLists.id, validated.pqListId));
+
+    // 캐시 재검증
+    revalidateTag("pq-lists");
+
+    return {
+      success: true,
+      message: "유효일이 성공적으로 수정되었습니다"
+    };
+  } catch (error) {
+    console.error("Error updating PQ valid to:", error);
+    if (error instanceof z.ZodError) {
+      return {
+        success: false,
+        error: "입력 데이터가 올바르지 않습니다"
+      };
+    }
+    return {
+      success: false,
+      error: "유효일 수정에 실패했습니다"
+    };
+  }
+}
+
+
+// SHI 참석자 총 인원수 계산 함수
+
+export async function getTotalShiAttendees(shiAttendees: Record<string, unknown> | null): Promise<number> {
+  if (!shiAttendees) return 0
+
+  let total = 0
+  Object.entries(shiAttendees).forEach(([key, value]) => {
+    if (value && typeof value === 'object' && 'checked' in value && 'count' in value) {
+      const attendee = value as { checked: boolean; count: number }
+      if (attendee.checked) {
+        total += attendee.count
+      }
+    }
+  })
+  return total
 }
 \ No newline at end of file
diff --git a/lib/pq/table/pq-lists-toolbar.tsx b/lib/pq/table/pq-lists-toolbar.tsx
index 1feb9a1a..81ffc9d0 100644
--- a/lib/pq/table/pq-lists-toolbar.tsx
+++ b/lib/pq/table/pq-lists-toolbar.tsx
@@ -2,9 +2,10 @@
 
 import * as React from "react"
 import { Button } from "@/components/ui/button"
-import { Trash, CopyPlus, Plus, RefreshCw } from "lucide-react"
+import { CopyPlus, Plus, RefreshCw } from "lucide-react"
 import { type Table } from "@tanstack/react-table"
 import type { PQList } from "./pq-lists-columns"
+import { RedFlagManagersDialog } from "@/lib/compliance/table/red-flag-managers-dialog"
 // import { PqListForm } from "./add-pq-list-dialog"
 
 interface PQListsToolbarActionsProps {
@@ -38,6 +39,7 @@ export function PQListsToolbarActions({
   
   return (
     <div className="flex items-center gap-2">
+      <RedFlagManagersDialog mode="hse" />
       {selected.length > 0 && (allActive || allDeleted) && newState !== undefined && (
         <Button
           variant="outline"
diff --git a/lib/site-visit/client-site-visit-wrapper.tsx b/lib/site-visit/client-site-visit-wrapper.tsx
index e2664ac3..f2655475 100644
--- a/lib/site-visit/client-site-visit-wrapper.tsx
+++ b/lib/site-visit/client-site-visit-wrapper.tsx
@@ -100,6 +100,7 @@ interface SiteVisitRequest {
   // 협력업체 정보
   vendorInfo?: {
     id: number
+    country?: string
     siteVisitRequestId: number
     factoryName: string
     factoryLocation: string
@@ -495,6 +496,7 @@ export function ClientSiteVisitWrapper({
             hasAttachments: siteVisitRequests.find(r => r.id === selectedSiteVisitRequestId)?.vendorInfo?.hasAttachments || false,
             otherInfo: siteVisitRequests.find(r => r.id === selectedSiteVisitRequestId)?.vendorInfo?.otherInfo || "",
           } : null}
+          vendorCountry={siteVisitRequests.find(r => r.id === selectedSiteVisitRequestId)?.vendorInfo?.country || ""}
                  />
        )}
 
diff --git a/lib/site-visit/service.ts b/lib/site-visit/service.ts
index 684e73f1..54f2bf54 100644
--- a/lib/site-visit/service.ts
+++ b/lib/site-visit/service.ts
@@ -593,6 +593,7 @@ export async function getSiteVisitRequestAction(investigationId: number) {
           vendorName: vendors.vendorName,
           vendorCode: vendors.vendorCode,
           vendorEmail: vendors.email,
+          vendorCountry: vendors.country,
         })
         .from(siteVisitRequests)
         .leftJoin(
@@ -658,7 +659,9 @@ export async function getSiteVisitRequestAction(investigationId: number) {
             ...item,
             shiAttendees: item.shiAttendees as Record<string, unknown> | null,
             vendorRequests: item.vendorRequests as Record<string, unknown> | null,
-            vendorInfo,
+            vendorInfo: vendorInfo
+              ? { ...vendorInfo, country: (item as any).vendorCountry || "" }
+              : null,
             shiAttachments,
           };
         })
diff --git a/lib/site-visit/site-visit-detail-dialog.tsx b/lib/site-visit/site-visit-detail-dialog.tsx
index 7788454a..634d2aef 100644
--- a/lib/site-visit/site-visit-detail-dialog.tsx
+++ b/lib/site-visit/site-visit-detail-dialog.tsx
@@ -1,261 +1,261 @@
-"use client"
-
-import * as React from "react"
-import { format } from "date-fns"
-import { ko } from "date-fns/locale"
-import { FileText, Download } from "lucide-react"
-import { toast } from "sonner"
-
-import { Button } from "@/components/ui/button"
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog"
-import { Separator } from "@/components/ui/separator"
-import { formatDate } from "../utils"
-
-interface SiteVisitRequest {
-  id: number
-  investigationId: number
-  requesterId: number | null
-  inspectionDuration: string | null
-  requestedStartDate: Date | null
-  requestedEndDate: Date | null
-  shiAttendees: Record<string, unknown> | null
-  shiAttendeeDetails?: string | null
-  vendorRequests: Record<string, unknown> | null
-  additionalRequests: string | null
-  status: string
-  sentAt: Date | null
-  createdAt: Date
-  updatedAt: Date
-  
-  // 실사정보
-  investigationMethod: string | null // QM담당자가 작성한 실사방법
-  investigationAddress: string | null
-  investigationNotes: string | null
-  forecastedAt: Date | null
-  actualAt: Date | null
-  result: string | null
-  resultNotes: string | null
-  
-  // PQ 정보
-  pqItems: string | null | Array<{itemCode: string, itemName: string}>
-  
-  // 요청자 정보
-  requesterName: string | null
-  requesterEmail: string | null
-  requesterTitle: string | null
-  
-  // QM 매니저 정보
-  qmManagerName: string | null
-  qmManagerEmail: string | null
-  qmManagerTitle: string | null
-  
-  // 협력업체 정보
-  vendorInfo?: {
-    id: number
-    siteVisitRequestId: number
-    factoryName: string
-    factoryLocation: string
-    factoryAddress: string
-    factoryPicName: string
-    factoryPicPhone: string
-    factoryPicEmail: string
-    factoryDirections: string | null
-    accessProcedure: string | null
-    hasAttachments: boolean
-    otherInfo: string | null
-    submittedAt: Date
-    submittedBy: number
-    createdAt: Date
-    updatedAt: Date
-  } | null
-
-  // SHI 첨부파일
-  shiAttachments?: Array<{
-    id: number
-    siteVisitRequestId: number
-    vendorSiteVisitInfoId: number | null
-    fileName: string
-    originalFileName: string
-    filePath: string
-    fileSize: number
-    mimeType: string
-    createdAt: Date
-    updatedAt: Date
-  }> | null
-}
-
-interface SiteVisitDetailDialogProps {
-  isOpen: boolean
-  onOpenChange: (open: boolean) => void
-  selectedRequest: SiteVisitRequest | null
-}
-
-export function SiteVisitDetailDialog({
-  isOpen,
-  onOpenChange,
-  selectedRequest,
-}: SiteVisitDetailDialogProps) {
-
-  return (
-    <Dialog open={isOpen} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-4xl max-h-[90vh] overflow-y-auto">
-        <DialogHeader>
-          <DialogTitle>방문실사 상세 정보</DialogTitle>
-          <DialogDescription>
-            작성한 방문실사 정보의 상세 내용입니다.
-          </DialogDescription>
-        </DialogHeader>
-        
-        {selectedRequest && (
-          <div className="space-y-6">
-            {/* 기본 정보 */}
-
-            {/* 협력업체 정보 */}
-            {selectedRequest.vendorInfo && (
-              <>
-                <Separator />
-                <div>
-                  <h3 className="font-semibold mb-2">작성한 협력업체 정보</h3>
-                  <div className="bg-muted p-4 rounded-md">
-                    <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-                      <div className="space-y-4">
-                        <div>
-                          <h4 className="font-semibold mb-2">공장 기본 정보</h4>
-                          <div className="space-y-2 text-sm">
-                            <div><span className="font-medium">공장명:</span> {selectedRequest.vendorInfo.factoryName}</div>
-                            <div><span className="font-medium">공장위치:</span> {selectedRequest.vendorInfo.factoryLocation}</div>
-                            <div><span className="font-medium">공장주소:</span> {selectedRequest.vendorInfo.factoryAddress}</div>
-                          </div>
-                        </div>
-                        
-                        <div>
-                          <h4 className="font-semibold mb-2">공장 담당자 정보</h4>
-                          <div className="space-y-2 text-sm">
-                            <div><span className="font-medium">이름:</span> {selectedRequest.vendorInfo.factoryPicName}</div>
-                            <div><span className="font-medium">전화번호:</span> {selectedRequest.vendorInfo.factoryPicPhone}</div>
-                            <div><span className="font-medium">이메일:</span> {selectedRequest.vendorInfo.factoryPicEmail}</div>
-                          </div>
-                        </div>
-                      </div>
-                      
-                      <div className="space-y-4">
-                        {selectedRequest.vendorInfo.factoryDirections && (
-                          <div>
-                            <h4 className="font-semibold mb-2">공장 가는 법</h4>
-                            <div className="bg-background p-3 rounded-md">
-                              <p className="text-sm whitespace-pre-wrap">{selectedRequest.vendorInfo.factoryDirections}</p>
-                            </div>
-                          </div>
-                        )}
-                        
-                        {selectedRequest.vendorInfo.accessProcedure && (
-                          <div>
-                            <h4 className="font-semibold mb-2">공장 출입절차</h4>
-                            <div className="bg-background p-3 rounded-md">
-                              <p className="text-sm whitespace-pre-wrap">{selectedRequest.vendorInfo.accessProcedure}</p>
-                            </div>
-                          </div>
-                        )}
-                      </div>
-                    </div>
-                    
-                    {/* 기타 정보 */}
-                    {selectedRequest.vendorInfo.otherInfo && (
-                      <div className="mt-6">
-                        <h4 className="font-semibold mb-2">기타 정보</h4>
-                        <div className="bg-background p-3 rounded-md">
-                          <p className="text-sm whitespace-pre-wrap">{selectedRequest.vendorInfo.otherInfo}</p>
-                        </div>
-                      </div>
-                    )}
-                    
-                    {/* 제출 정보 */}
-                    <div className="mt-6">
-                      <h4 className="font-semibold mb-2">제출 정보</h4>
-                      <div className="space-y-2 text-sm">
-                        <div><span className="font-medium">제출일:</span> {formatDate(selectedRequest.vendorInfo.submittedAt, "kr")}</div>
-                        <div><span className="font-medium">첨부파일:</span> {selectedRequest.vendorInfo.hasAttachments ? "있음" : "없음"}</div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </>
-            )}
-
-            <Separator />
-
-            {/* SHI 첨부파일 */}
-            {selectedRequest.shiAttachments && selectedRequest.shiAttachments.length > 0 && (
-              <>
-                <div>
-                  <h3 className="font-semibold mb-2">SHI 첨부파일 ({selectedRequest.shiAttachments.length}개)</h3>
-                  <div className="bg-muted p-4 rounded-md">
-                    <div className="space-y-2">
-                      {selectedRequest.shiAttachments.map((attachment) => (
-                        <div key={attachment.id} className="flex items-center justify-between p-2 border rounded-md">
-                          <div className="flex items-center space-x-2 flex-1 min-w-0">
-                            <FileText className="h-4 w-4 text-muted-foreground" />
-                            <span className="text-sm truncate">{attachment.originalFileName}</span>
-                            <span className="text-xs text-muted-foreground">
-                              ({Math.round((attachment.fileSize || 0) / 1024)}KB)
-                            </span>
-                          </div>
-                          <Button
-                            type="button"
-                            variant="outline"
-                            size="sm"
-                            className="p-2"
-                            onClick={async () => {
-                              try {
-                                const { downloadFile } = await import('@/lib/file-download')
-                                await downloadFile(attachment.filePath, attachment.originalFileName || '', {
-                                  showToast: true,
-                                  onError: (error) => {
-                                    console.error('다운로드 오류:', error)
-                                    toast.error("다운로드 실패: " + error)
-                                  },
-                                  onSuccess: (fileName, fileSize) => {
-                                    console.log(`다운로드 성공: ${fileName} (${fileSize} bytes)`)
-                                  }
-                                })
-                              } catch (error) {
-                                console.error('다운로드 오류:', error)
-                                toast.error("파일 다운로드 중 오류가 발생했습니다.")
-                              }
-                            }}
-                            aria-label="파일 다운로드"
-                          >
-                            <Download className="h-4 w-4" />
-                          </Button>
-                        </div>
-                      ))}
-                    </div>
-                  </div>
-                </div>
-              </>
-            )}
-
-            {/* 추가 요청사항 */}
-            {selectedRequest.additionalRequests && (
-              <>
-                <div>
-                  <h3 className="font-semibold mb-2">SHI 추가 요청사항</h3>
-                  <div className="bg-muted p-4 rounded-md">
-                    <p className="text-sm whitespace-pre-wrap">{selectedRequest.additionalRequests}</p>
-                  </div>
-                </div>
-                <Separator />
-              </>
-            )}
-          </div>
-        )}
-      </DialogContent>
-    </Dialog>
-  )
+"use client"
+
+import * as React from "react"
+import { format } from "date-fns"
+import { ko } from "date-fns/locale"
+import { FileText, Download } from "lucide-react"
+import { toast } from "sonner"
+
+import { Button } from "@/components/ui/button"
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog"
+import { Separator } from "@/components/ui/separator"
+import { formatDate } from "../utils"
+
+interface SiteVisitRequest {
+  id: number
+  investigationId: number
+  requesterId: number | null
+  inspectionDuration: string | null
+  requestedStartDate: Date | null
+  requestedEndDate: Date | null
+  shiAttendees: Record<string, unknown> | null
+  shiAttendeeDetails?: string | null
+  vendorRequests: Record<string, unknown> | null
+  additionalRequests: string | null
+  status: string
+  sentAt: Date | null
+  createdAt: Date
+  updatedAt: Date
+  
+  // 실사정보
+  investigationMethod: string | null // QM담당자가 작성한 실사방법
+  investigationAddress: string | null
+  investigationNotes: string | null
+  forecastedAt: Date | null
+  actualAt: Date | null
+  result: string | null
+  resultNotes: string | null
+  
+  // PQ 정보
+  pqItems: string | null | Array<{itemCode: string, itemName: string}>
+  
+  // 요청자 정보
+  requesterName: string | null
+  requesterEmail: string | null
+  requesterTitle: string | null
+  
+  // QM 매니저 정보
+  qmManagerName: string | null
+  qmManagerEmail: string | null
+  qmManagerTitle: string | null
+  
+  // 협력업체 정보
+  vendorInfo?: {
+    id: number
+    siteVisitRequestId: number
+    factoryName: string
+    factoryLocation: string
+    factoryAddress: string
+    factoryPicName: string
+    factoryPicPhone: string
+    factoryPicEmail: string
+    factoryDirections: string | null
+    accessProcedure: string | null
+    hasAttachments: boolean
+    otherInfo: string | null
+    submittedAt: Date
+    submittedBy: number
+    createdAt: Date
+    updatedAt: Date
+  } | null
+
+  // SHI 첨부파일
+  shiAttachments?: Array<{
+    id: number
+    siteVisitRequestId: number
+    vendorSiteVisitInfoId: number | null
+    fileName: string
+    originalFileName: string
+    filePath: string
+    fileSize: number
+    mimeType: string
+    createdAt: Date
+    updatedAt: Date
+  }> | null
+}
+
+interface SiteVisitDetailDialogProps {
+  isOpen: boolean
+  onOpenChange: (open: boolean) => void
+  selectedRequest: SiteVisitRequest | null
+}
+
+export function SiteVisitDetailDialog({
+  isOpen,
+  onOpenChange,
+  selectedRequest,
+}: SiteVisitDetailDialogProps) {
+
+  return (
+    <Dialog open={isOpen} onOpenChange={onOpenChange}>
+      <DialogContent className="max-w-4xl max-h-[90vh] overflow-y-auto">
+        <DialogHeader>
+          <DialogTitle>방문실사 상세 정보</DialogTitle>
+          <DialogDescription>
+            작성한 방문실사 정보의 상세 내용입니다.
+          </DialogDescription>
+        </DialogHeader>
+        
+        {selectedRequest && (
+          <div className="space-y-6">
+            {/* 기본 정보 */}
+
+            {/* 협력업체 정보 */}
+            {selectedRequest.vendorInfo && (
+              <>
+                <Separator />
+                <div>
+                  <h3 className="font-semibold mb-2">작성한 협력업체 정보</h3>
+                  <div className="bg-muted p-4 rounded-md">
+                    <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
+                      <div className="space-y-4">
+                        <div>
+                          <h4 className="font-semibold mb-2">공장 기본 정보</h4>
+                          <div className="space-y-2 text-sm">
+                            <div><span className="font-medium">공장명:</span> {selectedRequest.vendorInfo.factoryName}</div>
+                            <div><span className="font-medium">공장위치:</span> {selectedRequest.vendorInfo.factoryLocation}</div>
+                            <div><span className="font-medium">공장주소:</span> {selectedRequest.vendorInfo.factoryAddress}</div>
+                          </div>
+                        </div>
+                        
+                        <div>
+                          <h4 className="font-semibold mb-2">공장 담당자 정보</h4>
+                          <div className="space-y-2 text-sm">
+                            <div><span className="font-medium">이름:</span> {selectedRequest.vendorInfo.factoryPicName}</div>
+                            <div><span className="font-medium">전화번호:</span> {selectedRequest.vendorInfo.factoryPicPhone}</div>
+                            <div><span className="font-medium">이메일:</span> {selectedRequest.vendorInfo.factoryPicEmail}</div>
+                          </div>
+                        </div>
+                      </div>
+                      
+                      <div className="space-y-4">
+                        {selectedRequest.vendorInfo.factoryDirections && (
+                          <div>
+                            <h4 className="font-semibold mb-2">공장 가는 법</h4>
+                            <div className="bg-background p-3 rounded-md">
+                              <p className="text-sm whitespace-pre-wrap">{selectedRequest.vendorInfo.factoryDirections}</p>
+                            </div>
+                          </div>
+                        )}
+                        
+                        {selectedRequest.vendorInfo.accessProcedure && (
+                          <div>
+                            <h4 className="font-semibold mb-2">공장 출입절차</h4>
+                            <div className="bg-background p-3 rounded-md">
+                              <p className="text-sm whitespace-pre-wrap">{selectedRequest.vendorInfo.accessProcedure}</p>
+                            </div>
+                          </div>
+                        )}
+                      </div>
+                    </div>
+                    
+                    {/* 기타 정보 */}
+                    {selectedRequest.vendorInfo.otherInfo && (
+                      <div className="mt-6">
+                        <h4 className="font-semibold mb-2">기타 정보</h4>
+                        <div className="bg-background p-3 rounded-md">
+                          <p className="text-sm whitespace-pre-wrap">{selectedRequest.vendorInfo.otherInfo}</p>
+                        </div>
+                      </div>
+                    )}
+                    
+                    {/* 제출 정보 */}
+                    <div className="mt-6">
+                      <h4 className="font-semibold mb-2">제출 정보</h4>
+                      <div className="space-y-2 text-sm">
+                        <div><span className="font-medium">제출일:</span> {formatDate(selectedRequest.vendorInfo.submittedAt, "kr")}</div>
+                        <div><span className="font-medium">첨부파일:</span> {selectedRequest.vendorInfo.hasAttachments ? "있음" : "없음"}</div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </>
+            )}
+
+            <Separator />
+
+            {/* SHI 첨부파일 */}
+            {selectedRequest.shiAttachments && selectedRequest.shiAttachments.length > 0 && (
+              <>
+                <div>
+                  <h3 className="font-semibold mb-2">SHI 첨부파일 ({selectedRequest.shiAttachments.length}개)</h3>
+                  <div className="bg-muted p-4 rounded-md">
+                    <div className="space-y-2">
+                      {selectedRequest.shiAttachments.map((attachment) => (
+                        <div key={attachment.id} className="flex items-center justify-between p-2 border rounded-md">
+                          <div className="flex items-center space-x-2 flex-1 min-w-0">
+                            <FileText className="h-4 w-4 text-muted-foreground" />
+                            <span className="text-sm truncate">{attachment.originalFileName}</span>
+                            <span className="text-xs text-muted-foreground">
+                              ({Math.round((attachment.fileSize || 0) / 1024)}KB)
+                            </span>
+                          </div>
+                          <Button
+                            type="button"
+                            variant="outline"
+                            size="sm"
+                            className="p-2"
+                            onClick={async () => {
+                              try {
+                                const { downloadFile } = await import('@/lib/file-download')
+                                await downloadFile(attachment.filePath, attachment.originalFileName || '', {
+                                  showToast: true,
+                                  onError: (error) => {
+                                    console.error('다운로드 오류:', error)
+                                    toast.error("다운로드 실패: " + error)
+                                  },
+                                  onSuccess: (fileName, fileSize) => {
+                                    console.log(`다운로드 성공: ${fileName} (${fileSize} bytes)`)
+                                  }
+                                })
+                              } catch (error) {
+                                console.error('다운로드 오류:', error)
+                                toast.error("파일 다운로드 중 오류가 발생했습니다.")
+                              }
+                            }}
+                            aria-label="파일 다운로드"
+                          >
+                            <Download className="h-4 w-4" />
+                          </Button>
+                        </div>
+                      ))}
+                    </div>
+                  </div>
+                </div>
+              </>
+            )}
+
+            {/* 추가 요청사항 */}
+            {selectedRequest.additionalRequests && (
+              <>
+                <div>
+                  <h3 className="font-semibold mb-2">SHI 추가 요청사항</h3>
+                  <div className="bg-muted p-4 rounded-md">
+                    <p className="text-sm whitespace-pre-wrap">{selectedRequest.additionalRequests}</p>
+                  </div>
+                </div>
+                <Separator />
+              </>
+            )}
+          </div>
+        )}
+      </DialogContent>
+    </Dialog>
+  )
 } 
 \ No newline at end of file
diff --git a/lib/site-visit/vendor-info-sheet.tsx b/lib/site-visit/vendor-info-sheet.tsx
index 2a20e212..ad2fa16b 100644
--- a/lib/site-visit/vendor-info-sheet.tsx
+++ b/lib/site-visit/vendor-info-sheet.tsx
@@ -61,6 +61,7 @@ interface VendorInfoSheetProps {
   onSubmit: (data: VendorInfoFormValues & { attachments?: File[] }) => Promise<void>
   siteVisitRequestId: number
   initialData?: VendorInfoFormValues | null
+  vendorCountry?: string
 }
 
 export function VendorInfoSheet({
@@ -69,10 +70,12 @@ export function VendorInfoSheet({
   onSubmit,
   siteVisitRequestId,
   initialData,
+  vendorCountry = "",
 }: VendorInfoSheetProps) {
   const [isPending, setIsPending] = React.useState(false)
   const [selectedFiles, setSelectedFiles] = React.useState<File[]>([])
   const fileInputRef = React.useRef<HTMLInputElement>(null)
+  const isDomestic = vendorCountry === "KR"
 
   const form = useForm<VendorInfoFormValues>({
     resolver: zodResolver(vendorInfoSchema),
@@ -114,6 +117,36 @@ export function VendorInfoSheet({
     }
   }, [isOpen, form, initialData])
 
+  // 도로명 주소 검색 결과 수신 (내자만 적용)
+  React.useEffect(() => {
+    if (!isOpen || !isDomestic) return
+
+    const handleMessage = (event: MessageEvent) => {
+      if (!event.data || event.data.type !== "JUSO_SELECTED") return
+      const { roadAddrPart1, roadAddrPart2, addrDetail } = event.data.payload || {}
+      const combinedRoad = [roadAddrPart1, roadAddrPart2].filter(Boolean).join(" ").trim()
+
+      if (combinedRoad) {
+        form.setValue("factoryLocation", combinedRoad, { shouldDirty: true })
+      }
+      if (addrDetail) {
+        form.setValue("factoryAddress", addrDetail, { shouldDirty: true })
+      }
+    }
+
+    window.addEventListener("message", handleMessage)
+    return () => window.removeEventListener("message", handleMessage)
+  }, [isOpen, isDomestic, form])
+
+  const handleJusoSearch = () => {
+    if (!isDomestic) return
+    window.open(
+      "/api/juso",
+      "jusoSearch",
+      "width=570,height=420,scrollbars=yes,resizable=yes"
+    )
+  }
+
   // 파일 업로드 핸들러
   const handleFileUpload = (event: React.ChangeEvent<HTMLInputElement>) => {
     const files = event.target.files
@@ -202,7 +235,25 @@ export function VendorInfoSheet({
                     <FormItem>
                       <FormLabel>실사 지역 *</FormLabel>
                       <FormControl>
-                        <Input placeholder="국가 또는 지역 (예: Finland, 부산)" {...field} disabled={isPending} />
+                        <div className="flex gap-2">
+                          <Input
+                            placeholder="국가 또는 지역 (예: Finland, 부산)"
+                            {...field}
+                            disabled={isPending || isDomestic}
+                            readOnly={isDomestic}
+                            className={isDomestic ? "bg-muted text-muted-foreground" : undefined}
+                          />
+                          {isDomestic && (
+                            <Button
+                              type="button"
+                              variant="secondary"
+                              onClick={handleJusoSearch}
+                              disabled={isPending}
+                            >
+                              주소 검색
+                            </Button>
+                          )}
+                        </div>
                       </FormControl>
                       <FormMessage />
                     </FormItem>
@@ -220,8 +271,9 @@ export function VendorInfoSheet({
                           <Textarea
                             placeholder="상세 주소를 입력하세요"
                             {...field}
-                            disabled={isPending}
-                            className="min-h-[80px]"
+                            disabled={isPending || isDomestic}
+                            readOnly={isDomestic}
+                            className={isDomestic ? "bg-muted text-muted-foreground min-h-[80px]" : "min-h-[80px]"}
                           />
                         </FormControl>
                         <FormMessage />
diff --git a/lib/vendor-investigation/table/investigation-table-columns.tsx b/lib/vendor-investigation/table/investigation-table-columns.tsx
index 03e66076..a1f09870 100644
--- a/lib/vendor-investigation/table/investigation-table-columns.tsx
+++ b/lib/vendor-investigation/table/investigation-table-columns.tsx
@@ -339,6 +339,28 @@ export function getColumns({
             }
         }
 
+        if (column.id === "pqType") {
+          if (!value) return <span className="text-muted-foreground">-</span>
+          const type = value as string
+          const label =
+            type === "PROJECT"
+              ? "프로젝트"
+              : type === "NON_INSPECTION"
+              ? "미실사"
+              : "일반"
+          const variant =
+            type === "PROJECT"
+              ? "default"
+              : type === "NON_INSPECTION"
+              ? "secondary"
+              : "outline"
+          return (
+            <Badge variant={variant}>
+              {label}
+            </Badge>
+          )
+        }
+
         // Handle IDs for pqSubmissionId (keeping for reference)
         if (column.id === "pqSubmissionId") {
           return value ? `#${value}` : ""
@@ -371,7 +393,7 @@ export function getColumns({
           
           return (
             <div className="flex flex-col">
-              <span>{value || "미배정"}</span>
+              <span>{(value as string) || "미배정"}</span>
               {row.original.requesterEmail ? (
                 <span className="text-xs text-muted-foreground">{row.original.requesterEmail}</span>
               ) : null}
@@ -386,7 +408,7 @@ export function getColumns({
           
           return (
             <div className="flex flex-col">
-              <span>{value || "미배정"}</span>
+              <span>{(value as string) || "미배정"}</span>
               {row.original.qmManagerEmail ? (
                 <span className="text-xs text-muted-foreground">{row.original.qmManagerEmail}</span>
               ) : null}
diff --git a/lib/vendors/service.ts b/lib/vendors/service.ts
index 6454bc7b..274997f9 100644
--- a/lib/vendors/service.ts
+++ b/lib/vendors/service.ts
@@ -2979,6 +2979,7 @@ interface RequestBasicContractInfoProps {
   requestedBy: number;
   templateId: number;
   pdfBuffer?: Buffer | Uint8Array | ArrayBuffer; // 생성된 PDF 버퍼 (선택적, 다양한 타입 지원)
+  pqSubmissionIdMap?: Record<number, number>; // vendorId -> pqSubmissionId 매핑 (PQ 연계용)
 }
 
 
@@ -3094,7 +3095,16 @@ export async function requestPQVendors(input: ApproveVendorsInput & {
 
       const vendorPQData = await Promise.all(vendorPQDataPromises);
 
-      await tx.insert(vendorPQSubmissions).values(vendorPQData);
+      const insertedPqSubmissions = await tx
+        .insert(vendorPQSubmissions)
+        .values(vendorPQData)
+        .returning({
+          id: vendorPQSubmissions.id,
+          vendorId: vendorPQSubmissions.vendorId,
+          pqNumber: vendorPQSubmissions.pqNumber,
+          projectId: vendorPQSubmissions.projectId,
+          type: vendorPQSubmissions.type,
+        });
 
       await Promise.all(
         vendorsBeforeUpdate.map(async (vendorBefore) => {
@@ -3121,20 +3131,13 @@ export async function requestPQVendors(input: ApproveVendorsInput & {
           try {
             const userLang = "en";
 
-            const vendorPQ = await tx
-              .select({ pqNumber: vendorPQSubmissions.pqNumber })
-              .from(vendorPQSubmissions)
-              .where(
-                and(
-                  eq(vendorPQSubmissions.vendorId, vendor.id),
-                  eq(vendorPQSubmissions.type, pqType),
-                  input.projectId
-                    ? eq(vendorPQSubmissions.projectId, input.projectId)
-                    : isNull(vendorPQSubmissions.projectId)
-                )
-              )
-              .limit(1)
-              .then((rows) => rows[0]);
+            const vendorPQ = insertedPqSubmissions.find(
+              (pq) =>
+                pq.vendorId === vendor.id &&
+                pq.type === pqType &&
+                ((input.projectId && pq.projectId === input.projectId) ||
+                  (!input.projectId && pq.projectId === null))
+            );
 
             const subject = input.projectId
               ? `[eVCP] You are invited to submit Project PQ ${vendorPQ?.pqNumber || ""} for ${projectInfo?.projectCode || "a project"}`
@@ -3199,7 +3202,10 @@ export async function requestPQVendors(input: ApproveVendorsInput & {
         })
       );
 
-      return updated;
+      return {
+        updated,
+        pqSubmissions: insertedPqSubmissions,
+      };
     });
 
     revalidateTag("vendors");
@@ -3225,7 +3231,8 @@ export async function requestBasicContractInfo({
   vendorIds,
   requestedBy,
   templateId,
-  pdfBuffer
+  pdfBuffer,
+  pqSubmissionIdMap
 }: RequestBasicContractInfoProps): Promise<{ success?: boolean; error?: string }> {
   unstable_noStore();
 
@@ -3325,6 +3332,7 @@ export async function requestBasicContractInfo({
               templateId: template.id,
               vendorId: vendor.id,
               requestedBy: requestedBy,
+            pqSubmissionId: pqSubmissionIdMap?.[vendor.id] ?? null,
               status: "PENDING",
               fileName: finalFileName, // PDF 변환된 파일 이름 사용
               filePath: finalFilePath, // PDF 변환된 파일 경로 사용
diff --git a/lib/vendors/table/request-pq-dialog.tsx b/lib/vendors/table/request-pq-dialog.tsx
index 83eab201..4197b879 100644
--- a/lib/vendors/table/request-pq-dialog.tsx
+++ b/lib/vendors/table/request-pq-dialog.tsx
@@ -1,1130 +1,1145 @@
-"use client"
-
-import * as React from "react"
-import { type Row } from "@tanstack/react-table"
-import { Loader, SendHorizonal, Search, X, Plus, Router } from "lucide-react"
-import { toast } from "sonner"
-import { useMediaQuery } from "@/hooks/use-media-query"
-import { Button } from "@/components/ui/button"
-import {
-  Dialog,
-  DialogClose,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog"
-import {
-  Drawer,
-  DrawerClose,
-  DrawerContent,
-  DrawerDescription,
-  DrawerFooter,
-  DrawerHeader,
-  DrawerTitle,
-  DrawerTrigger,
-} from "@/components/ui/drawer"
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select"
-import { Checkbox } from "@/components/ui/checkbox"
-import { Label } from "@/components/ui/label"
-import { Input } from "@/components/ui/input"
-import { Badge } from "@/components/ui/badge"
-import { Progress } from "@/components/ui/progress"
-import { Vendor } from "@/db/schema/vendors"
-import { requestBasicContractInfo, requestPQVendors, sendBasicContractEmail } from "../service"
-import { getProjectsWithPQList, getNonInspectionPQLists } from "@/lib/pq/service"
-import type { Project } from "@/lib/pq/service"
-import { useSession } from "next-auth/react"
-import { DatePicker } from "@/components/ui/date-picker"
-import { getALLBasicContractTemplates } from "@/lib/basic-contract/service"
-import type { BasicContractTemplate } from "@/db/schema"
-import { saveNdaAttachments, getVendorPQHistory } from "../service"
-import { useRouter } from "next/navigation"
-import { createGtcVendorDocuments, createProjectGtcVendorDocuments, getStandardGtcDocumentId, getProjectGtcDocumentId } from "@/lib/gtc-contract/service"
-import { MaterialGroupSelectorDialogMulti } from "@/components/common/material/material-group-selector-dialog-multi"
-import type { MaterialSearchItem } from "@/lib/material/material-group-service"
-// import { PQContractViewer } from "../pq-contract-viewer" // 더 이상 사용하지 않음
-
-interface RequestPQDialogProps extends React.ComponentPropsWithoutRef<typeof Dialog> {
-  vendors: Row<Vendor>["original"][]
-  showTrigger?: boolean
-  onSuccess?: () => void
-}
-
-// const AGREEMENT_LIST = [
-//   "준법서약",
-//   "표준하도급계약",
-//   "안전보건관리계약",
-//   "윤리규범 준수 서약",
-//   "동반성장협약",
-//   "내국신용장 미개설 합의",
-//   "기술자료 제출 기본 동의",
-//   "GTC 합의",
-// ]
-
-// PQ 대상 품목 타입 정의 (Material Group 기반) - MaterialSearchItem 사용
-
-export function RequestPQDialog({ vendors, showTrigger = true, onSuccess, ...props }: RequestPQDialogProps) {
-  const [isApprovePending, startApproveTransition] = React.useTransition()
-  const isDesktop = useMediaQuery("(min-width: 640px)")
-  const { data: session } = useSession()
-  const router = useRouter()
-  const [type, setType] = React.useState<"GENERAL" | "PROJECT" | "NON_INSPECTION" | null>(null)
-  const [dueDate, setDueDate] = React.useState<string | null>(null)
-  const [projects, setProjects] = React.useState<Project[]>([])
-  const [selectedProjectId, setSelectedProjectId] = React.useState<number | null>(null)
-  const [agreements, setAgreements] = React.useState<Record<string, boolean>>({})
-  const [extraNote, setExtraNote] = React.useState<string>("")
-  const [pqItems, setPqItems] = React.useState<MaterialSearchItem[]>([])
-
-  // PQ 품목 선택 관련 상태는 MaterialGroupSelectorDialogMulti에서 관리됨
-  const [isLoadingProjects, setIsLoadingProjects] = React.useState(false)
-  const [basicContractTemplates, setBasicContractTemplates] = React.useState<BasicContractTemplate[]>([])
-  const [selectedTemplateIds, setSelectedTemplateIds] = React.useState<number[]>([])
-  const [isLoadingTemplates, setIsLoadingTemplates] = React.useState(false)
-
-  // 미실사 PQ 관련 상태
-  const [activeNonInspectionPQList, setActiveNonInspectionPQList] = React.useState<any>(null)
-  const [isLoadingNonInspectionPQ, setIsLoadingNonInspectionPQ] = React.useState(false)
-  
-  // 비밀유지 계약서 첨부파일 관련 상태
-  const [ndaAttachments, setNdaAttachments] = React.useState<File[]>([])
-  const [isUploadingNdaFiles, setIsUploadingNdaFiles] = React.useState(false)
-  
-  // 프로그레스 관련 상태
-  const [progressValue, setProgressValue] = React.useState(0)
-  const [currentStep, setCurrentStep] = React.useState("")
-  const [showProgress, setShowProgress] = React.useState(false)
-
-  // PQ 히스토리 관련 상태
-  const [pqHistory, setPqHistory] = React.useState<Record<number, any[]>>({})
-  const [isLoadingHistory, setIsLoadingHistory] = React.useState(false)
-
-
-  React.useEffect(() => {
-    if (type === "PROJECT") {
-      setIsLoadingProjects(true)
-      getProjectsWithPQList().then(setProjects).catch(() => toast.error("프로젝트 로딩 실패"))
-        .finally(() => setIsLoadingProjects(false))
-    } else if (type === "NON_INSPECTION") {
-      setIsLoadingNonInspectionPQ(true)
-      // 활성화된 미실사 PQ 리스트 조회
-      getNonInspectionPQLists().then(result => {
-        if (result.success) {
-          setActiveNonInspectionPQList(result.data)
-        } else {
-          setActiveNonInspectionPQList(null)
-        }
-      }).catch(() => {
-        toast.error("미실사 PQ 리스트 로딩 실패")
-        setActiveNonInspectionPQList(null)
-      }).finally(() => setIsLoadingNonInspectionPQ(false))
-    }
-  }, [type])
-
-  // 기본계약서 템플릿 로딩 및 자동 선택, PQ 히스토리 로딩
-  React.useEffect(() => {
-    setIsLoadingTemplates(true)
-    const loadPQHistory = async () => {
-      if (vendors.length === 0) return
-
-      setIsLoadingHistory(true)
-      try {
-        const historyPromises = vendors.map(async (vendor) => {
-          console.log("vendor.id", vendor.id)
-          const result = await getVendorPQHistory(vendor.id)
-          console.log("result", result)
-          return { vendorId: vendor.id, history: result.success ? result.data : [] }
-        })
-
-        const results = await Promise.all(historyPromises)
-        const historyMap: Record<number, any[]> = {}
-
-        results.forEach(({ vendorId, history }) => {
-          historyMap[vendorId] = history
-        })
-
-        setPqHistory(historyMap)
-      } catch (error) {
-        console.error('PQ 히스토리 로딩 실패:', error)
-        toast.error('PQ 히스토리 로딩 중 오류가 발생했습니다')
-      } finally {
-        setIsLoadingHistory(false)
-      }
-    }
-    loadPQHistory()
-    getALLBasicContractTemplates()
-      .then((templates) => {
-
-        // 벤더 국가별 자동 선택 로직
-        if (vendors.length > 0) {
-          const isAllForeign = vendors.every(vendor => vendor.country !== 'KR')
-          const isAllDomestic = vendors.every(vendor => vendor.country === 'KR')
-          //외자면 리스트에 비밀유지계약, 기술자료, 내국신용장, 한글 제외
-          if(isAllForeign) {
-            const foreignTemplates = templates.filter(template => {
-              const name = template.templateName?.toLowerCase() || ''
-              return !name.includes('비밀유지') && !name.includes('기술자료') && !name.includes('내국신용장') && !name.includes('한글')
-            })
-            setBasicContractTemplates(foreignTemplates)
-          }
-          //내자면 리스트에 GTC 제외, 비밀유지, 기술자료, 영문서약 제외
-          if(isAllDomestic) {
-            const domesticTemplates = templates.filter(template => {
-              const name = template.templateName?.toLowerCase() || ''
-              return !name.includes('gtc') && !name.includes('비밀유지') && !name.includes('기술자료') && !name.includes('영문')
-            })
-            setBasicContractTemplates(domesticTemplates)
-          }
-          if (isAllForeign) {
-            // 외자: 준법서약 (영문), GTC 선택 (GTC는 1개만 선택하도록)
-            const foreignTemplates = templates.filter(template => {
-              const name = template.templateName?.toLowerCase() || ''
-              return (
-                (template.templateName?.includes('준법서약') && template.templateName?.includes('영문')) ||
-                template.templateName?.includes('gtc')
-              )
-            })
-            // GTC 템플릿 중 최신 리비전의 것만 선택
-            const gtcTemplates = foreignTemplates.filter(t => t.templateName?.includes('gtc'))
-            const nonGtcTemplates = foreignTemplates.filter(t => !t.templateName?.includes('gtc'))
-
-            if (gtcTemplates.length > 0) {
-              // GTC 템플릿 중 이름이 가장 긴 것 (프로젝트 GTC 우선) 선택
-              const selectedGtcTemplate = gtcTemplates.reduce((prev, current) =>
-                (prev.templateName?.length || 0) > (current.templateName?.length || 0) ? prev : current
-              )
-              setSelectedTemplateIds([...nonGtcTemplates.map(t => t.id), selectedGtcTemplate.id])
-            } else {
-              setSelectedTemplateIds(nonGtcTemplates.map(t => t.id))
-            }
-          } else if (isAllDomestic) {
-            // 내자: 준법서약 (영문), GTC 제외한 모든 템플릿 선택
-            // 비밀유지 계약서, 기술자료 요구서 제외
-            const domesticTemplates = templates.filter(template => {
-              const name = template.templateName?.toLowerCase() || ''
-              return !(name.includes('준법서약') && name.includes('영문')) && 
-                     !name.includes('gtc')
-            })
-            setSelectedTemplateIds(domesticTemplates.map(t => t.id))
-          }
-        }
-      })
-      .catch(() => toast.error("기본계약서 템플릿 로딩 실패"))
-      .finally(() => setIsLoadingTemplates(false))
-  }, [vendors])
-
-  React.useEffect(() => {
-    if (!props.open) {
-      setType(null)
-      setSelectedProjectId(null)
-      setAgreements({})
-      setDueDate(null)
-      setPqItems([])
-      setExtraNote("")
-      setSelectedTemplateIds([])
-      setNdaAttachments([])
-      setIsUploadingNdaFiles(false)
-      setProgressValue(0)
-      setCurrentStep("")
-      setShowProgress(false)
-      setPqHistory({})
-      setIsLoadingHistory(false)
-      setActiveNonInspectionPQList(null)
-      setIsLoadingNonInspectionPQ(false)
-    }
-  }, [props.open])
-
-  // PQ 품목 선택 함수 (MaterialGroupSelectorDialogMulti에서 호출됨)
-  const handlePQItemsChange = (items: MaterialSearchItem[]) => {
-    setPqItems(items)
-  }
-
-  // PQ 품목 제거 함수
-  const handleRemovePQItem = (materialGroupCode: string) => {
-    setPqItems(prev => prev.filter(item => item.materialGroupCode !== materialGroupCode))
-  }
-
-  // 비밀유지 계약서 첨부파일 추가 함수
-  const handleAddNdaAttachment = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const files = event.target.files
-    if (files) {
-      const newFiles = Array.from(files)
-      setNdaAttachments(prev => [...prev, ...newFiles])
-    }
-    // input 초기화
-    event.target.value = ''
-  }
-
-  // 비밀유지 계약서 첨부파일 제거 함수
-  const handleRemoveNdaAttachment = (fileIndex: number) => {
-    setNdaAttachments(prev => prev.filter((_, index) => index !== fileIndex))
-  }
-
-  // 비밀유지 계약서가 선택되었는지 확인하는 함수
-  const isNdaTemplateSelected = () => {
-    return basicContractTemplates.some(template => 
-      selectedTemplateIds.includes(template.id) && 
-      template.templateName?.includes("비밀유지")
-    )
-  }
-
-  const onApprove = () => {
-    if (!type) return toast.error("PQ 유형을 선택하세요.")
-    if (type === "PROJECT" && !selectedProjectId) return toast.error("프로젝트를 선택하세요.")
-    if (type === "NON_INSPECTION" && !activeNonInspectionPQList) return toast.error("활성화된 미실사 PQ 리스트가 없습니다.")
-    if (!dueDate) return toast.error("마감일을 선택하세요.")
-    if (pqItems.length === 0) return toast.error("PQ 대상 품목을 선택하세요.")
-    if (!session?.user?.id) return toast.error("인증 실패")
-
-    // GTC 템플릿 선택 검증
-    const selectedGtcTemplates = basicContractTemplates.filter(template =>
-      selectedTemplateIds.includes(template.id) &&
-      template.templateName?.toLowerCase().includes('gtc')
-    )
-
-    if (selectedGtcTemplates.length > 1) {
-      return toast.error("GTC 템플릿은 하나만 선택할 수 있습니다.")
-    }
-
-    // 프로그레스 바를 즉시 표시
-    setShowProgress(true)
-    setProgressValue(0)
-    setCurrentStep("시작 중...")
-
-    startApproveTransition(async () => {
-      try {
-        
-        // 전체 단계 수 계산
-        const gtcTemplates = basicContractTemplates.filter(template =>
-          selectedTemplateIds.includes(template.id) &&
-          template.templateName?.toLowerCase().includes('gtc')
-        )
-
-        const totalSteps = 1 +
-          (selectedTemplateIds.length > 0 ? 1 : 0) +
-          (isNdaTemplateSelected() && ndaAttachments.length > 0 ? 1 : 0) +
-          (gtcTemplates.length > 0 ? 1 : 0)
-        let completedSteps = 0
-        
-        // 1단계: PQ 생성
-        setCurrentStep("PQ 생성 중...")
-        console.log("🚀 PQ 생성 시작")
-        const { error: pqError } = await requestPQVendors({
-          ids: vendors.map((v) => v.id),
-          userId: Number(session.user.id),
-          agreements,
-          dueDate,
-          projectId: type === "PROJECT" ? selectedProjectId : null,
-          type: type || "GENERAL",
-          extraNote,
-          pqItems: JSON.stringify(pqItems.map(item => ({
-            materialGroupCode: item.materialGroupCode,
-            materialGroupDescription: item.materialGroupDescription
-          }))),
-          templateId: selectedTemplateIds.length > 0 ? selectedTemplateIds[0] : null,
-        })
-
-        if (pqError) {
-          setShowProgress(false)
-          toast.error(`PQ 생성 실패: ${pqError}`)
-          return
-        }
-        
-        completedSteps++
-        setProgressValue((completedSteps / totalSteps) * 100)
-        console.log("✅ PQ 생성 완료")
-        toast.success("PQ가 성공적으로 요청되었습니다")
-
-        // 2단계: 기본계약서 템플릿이 선택된 경우 백그라운드에서 처리
-        if (selectedTemplateIds.length > 0) {
-          const templates = basicContractTemplates.filter(t => 
-            selectedTemplateIds.includes(t.id)
-          )
-          
-          setCurrentStep(`기본계약서 생성 중... (${templates.length}개 템플릿)`)
-          console.log("📋 기본계약서 백그라운드 처리 시작", templates.length, "개 템플릿")
-          await processBasicContractsInBackground(templates, vendors)
-          
-          completedSteps++
-          setProgressValue((completedSteps / totalSteps) * 100)
-        }
-
-        // 3단계: 비밀유지 계약서 첨부파일이 있는 경우 저장
-        if (isNdaTemplateSelected() && ndaAttachments.length > 0) {
-          setCurrentStep(`비밀유지 계약서 첨부파일 저장 중... (${ndaAttachments.length}개 파일)`)
-          console.log("📎 비밀유지 계약서 첨부파일 처리 시작", ndaAttachments.length, "개 파일")
-          
-          const ndaResult = await saveNdaAttachments({
-            vendorIds: vendors.map((v) => v.id),
-            files: ndaAttachments,
-            userId: session.user.id.toString()
-          })
-
-          if (ndaResult.success) {
-            toast.success(`비밀유지 계약서 첨부파일이 모두 저장되었습니다 (${ndaResult.summary?.success}/${ndaResult.summary?.total})`)
-          } else {
-            toast.error(`첨부파일 처리 중 일부 오류가 발생했습니다: ${ndaResult.error}`)
-          }
-          
-          completedSteps++
-          setProgressValue((completedSteps / totalSteps) * 100)
-        }
-        //4단계: GTC 템플릿 처리
-        if (selectedGtcTemplates.length > 0) {
-          setCurrentStep(`GTC 문서 생성 중... (${selectedGtcTemplates.length}개 템플릿)`)
-          console.log("📋 GTC 문서 생성 시작", selectedGtcTemplates.length, "개 템플릿")
-
-          try {
-            await processGtcTemplates(selectedGtcTemplates, vendors)
-            completedSteps++
-            setProgressValue((completedSteps / totalSteps) * 100)
-          } catch (error) {
-            console.error("GTC 템플릿 처리 중 오류:", error)
-            toast.error(`GTC 템플릿 처리 중 오류가 발생했습니다`)
-            // GTC 처리 실패해도 PQ 생성은 성공으로 간주
-            completedSteps++
-            setProgressValue((completedSteps / totalSteps) * 100)
-          }
-        }
-        //5단계: 각 협력업체들에게 기본계약서 이메일 발송
-        if (selectedTemplateIds.length > 0) {
-          setCurrentStep(`기본계약서 이메일 발송 중... (${selectedTemplateIds.length}개 템플릿)`)
-          console.log("📋 기본계약서 이메일 발송 시작", selectedTemplateIds.length, "개 템플릿")
-          await processBasicContractsEmail(selectedTemplateIds, vendors)
-          completedSteps++
-          setProgressValue((completedSteps / totalSteps) * 100)
-        }
-
-        setCurrentStep("완료!")
-        setProgressValue(100)
-        
-        // 잠시 완료 상태를 보여준 후 다이얼로그 닫기
-        setTimeout(() => {
-          setShowProgress(false)
-          props.onOpenChange?.(false)
-          onSuccess?.()
-        }, 1000)
-
-      } catch (error) {
-        console.error('PQ 생성 오류:', error)
-        setShowProgress(false)
-        toast.error(`처리 중 오류가 발생했습니다: ${error instanceof Error ? error.message : '알 수 없는 오류'}`)
-      }
-    })
-  }
-
-  // 백그라운드에서 기본계약서 처리
-  const processBasicContractsInBackground = async (templates: BasicContractTemplate[], vendors: any[]) => {
-    if (!session?.user?.id) {
-      toast.error("인증 정보가 없습니다")
-      return
-    }
-
-    try {
-      const totalContracts = templates.length * vendors.length
-      let processedCount = 0
-
-      // 각 벤더별로, 각 템플릿을 처리
-      for (let vendorIndex = 0; vendorIndex < vendors.length; vendorIndex++) {
-        const vendor = vendors[vendorIndex]
-        
-        // 벤더별 템플릿 데이터 생성 (한글 변수명 사용)
-        const templateData = {
-          company_name: vendor.vendorName || '협력업체명',
-          company_address: vendor.address || '주소',
-          representative_name: vendor.representativeName || '대표자명',
-          signature_date: new Date().toLocaleDateString('ko-KR'),
-          tax_id: vendor.taxId || '사업자번호',
-          phone_number: vendor.phone || '전화번호',
-        }
-
-        console.log(`🔄 벤더 ${vendorIndex + 1}/${vendors.length} 템플릿 데이터:`, templateData)
-
-        // 해당 벤더에 대해 각 템플릿을 순차적으로 처리
-        for (let templateIndex = 0; templateIndex < templates.length; templateIndex++) {
-          const template = templates[templateIndex]
-          processedCount++
-          
-          // 진행률 업데이트 (2단계 범위 내에서)
-          const baseProgress = 33.33 // 1단계 완료 후
-          const contractProgress = (processedCount / totalContracts) * 33.33 // 2단계는 33.33% 차지
-          const newProgress = baseProgress + contractProgress
-          setProgressValue(newProgress)
-          setCurrentStep(`기본계약서 생성 중... (${processedCount}/${totalContracts})`)
-          
-          console.log(`📄 처리 중: ${vendor.vendorName} - ${template.templateName} (${processedCount}/${totalContracts})`)
-          
-          // 개별 벤더에 대한 기본계약 생성
-          await processTemplate(template, templateData, [vendor])
-          
-          console.log(`✅ 완료: ${vendor.vendorName} - ${template.templateName}`)
-        }
-      }
-
-      toast.success(`총 ${totalContracts}개 기본계약이 모두 생성되었습니다`)
-      router.refresh();
-
-    } catch (error) {
-      console.error('기본계약 처리 중 오류:', error)
-      toast.error(`기본계약 처리 중 오류가 발생했습니다: ${error instanceof Error ? error.message : '알 수 없는 오류'}`)
-    }
-  }
-
-  const processTemplate = async (template: BasicContractTemplate, templateData: any, vendors: any[]) => {
-    try {
-      // 1. 템플릿 파일 가져오기
-      const templateResponse = await fetch('/api/basic-contract/get-template', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ templateId: template.id })
-      })
-
-      if (!templateResponse.ok) {
-        throw new Error(`템플릿 파일을 가져올 수 없습니다: ${template.templateName}`)
-      }
-
-      const templateBlob = await templateResponse.blob()
-
-      // 2. PDFTron을 사용해서 변수 치환 및 PDF 변환
-      // @ts-ignore
-      const WebViewer = await import("@pdftron/webviewer").then(({ default: WebViewer }) => WebViewer)
-      
-      // 임시 WebViewer 인스턴스 생성 (DOM에 추가하지 않음)
-      const tempDiv = document.createElement('div')
-      tempDiv.style.display = 'none'
-      document.body.appendChild(tempDiv)
-
-      const instance = await WebViewer(
-        {
-          path: "/pdftronWeb",
-          licenseKey: process.env.NEXT_PUBLIC_PDFTRON_WEBVIEW_KEY,
-          fullAPI: true,
-        },
-        tempDiv
-      )
-
-      try {
-        const { Core } = instance
-        const { createDocument } = Core
-
-        // 3. 템플릿 문서 생성 및 변수 치환
-        const templateDoc = await createDocument(templateBlob, {
-          filename: template.fileName || 'template.docx',
-          extension: 'docx',
-        })
-
-        console.log("🔄 변수 치환 시작:", templateData)
-        await templateDoc.applyTemplateValues(templateData)
-        console.log("✅ 변수 치환 완료")
-
-        // 4. PDF 변환
-        const fileData = await templateDoc.getFileData()
-        const pdfBuffer = await Core.officeToPDFBuffer(fileData, { extension: 'docx' })
-
-        console.log(`✅ PDF 변환 완료: ${template.templateName}`, `크기: ${pdfBuffer.byteLength} bytes`)
-
-        // 5. 기본계약 생성 요청
-        const { error: contractError } = await requestBasicContractInfo({
-          vendorIds: vendors.map((v) => v.id),
-          requestedBy: Number(session!.user.id),
-          templateId: template.id,
-          pdfBuffer: new Uint8Array(pdfBuffer),
-        })
-
-        if (contractError) {
-          throw new Error(contractError)
-        }
-
-        console.log(`✅ 기본계약 생성 완료: ${template.templateName}`)
-        
-
-      } finally {
-        // 임시 WebViewer 정리
-        instance.UI.dispose()
-        document.body.removeChild(tempDiv)
-      }
-
-    } catch (error) {
-      console.error(`❌ 템플릿 처리 실패: ${template.templateName}`, error)
-      throw error
-    }
-  }
-
-  // GTC 템플릿 처리 함수
-  const processGtcTemplates = async (gtcTemplates: BasicContractTemplate[], vendors: any[]) => {
-    if (!session?.user?.id) {
-      toast.error("인증 정보가 없습니다")
-      return
-    }
-
-    try {
-      const vendorIds = vendors.map(v => v.id)
-      const userId = Number(session.user.id)
-
-      for (const template of gtcTemplates) {
-        const templateName = template.templateName?.toLowerCase() || ''
-
-        if (templateName.includes('general gtc') || (templateName.includes('gtc') && !templateName.includes(' '))) {
-          // General GTC 처리
-          console.log(`📄 General GTC 템플릿 처리: ${template.templateName}`)
-
-          const gtcDocument = await getStandardGtcDocumentId()
-          if (!gtcDocument) {
-            toast.error(`표준 GTC 문서를 찾을 수 없습니다.`)
-            continue
-          }
-
-          const result = await createGtcVendorDocuments({
-            baseDocumentId: gtcDocument.id,
-            vendorIds,
-            createdById: userId,
-            documentTitle: gtcDocument.title
-          })
-
-          if (result.success) {
-            console.log(`✅ General GTC 문서 생성 완료: ${result.count}개`)
-          } else {
-            toast.error(`General GTC 문서 생성 실패: ${result.error}`)
-          }
-
-        } else if (templateName.includes('gtc') && templateName.includes(' ')) {
-          // 프로젝트 GTC 처리 (프로젝트 코드 추출)
-          const projectCodeMatch = template.templateName?.match(/^([A-Z0-9]+)\s+GTC/)
-          console.log("🔄 프로젝트 GTC 템플릿 처리: ", template.templateName, projectCodeMatch)
-          console.log(`   - 템플릿 이름 분석: "${template.templateName}"`)
-          console.log(`   - 소문자 변환: "${templateName}"`)
-          if (projectCodeMatch) {
-            const projectCode = projectCodeMatch[1]
-            console.log(`📄 프로젝트 GTC 템플릿 처리: ${template.templateName} (프로젝트: ${projectCode})`)
-
-            // const gtcDocument = await getProjectGtcDocumentId(projectCode)
-            // if (!gtcDocument) {
-            //   toast.error(`프로젝트 "${projectCode}"의 GTC 문서를 찾을 수 없습니다.`)
-            //   continue
-            // }
-            // console.log("🔄 getProjectGtcDocumentId", gtcDocument)
-
-            const result = await createProjectGtcVendorDocuments({
-              projectCode,
-              vendorIds,
-              createdById: userId,
-              documentTitle: template.templateName
-            })
-
-            if (result.success) {
-              console.log(`✅ 프로젝트 GTC 문서 생성 완료: ${result.count}개`)
-            } else {
-              toast.error(`프로젝트 GTC 문서 생성 실패: ${result.error}`)
-            }
-          } else {
-            toast.error(`프로젝트 GTC 템플릿 이름 형식이 올바르지 않습니다: ${template.templateName}`)
-          }
-        } else {
-          console.log(`⚠️ GTC 템플릿이지만 처리할 수 없는 형식: ${template.templateName}`)
-        }
-      }
-
-      toast.success(`GTC 문서가 ${gtcTemplates.length}개 템플릿에 대해 생성되었습니다`)
-
-    } catch (error) {
-      console.error('GTC 템플릿 처리 중 오류:', error)
-      toast.error(`GTC 템플릿 처리 중 오류가 발생했습니다: ${error instanceof Error ? error.message : '알 수 없는 오류'}`)
-    }
-  }
-
-  const processBasicContractsEmail = async (templateIds: number[], vendors: any[]) => {
-    if (!session?.user?.id) {
-      toast.error("인증 정보가 없습니다")
-      return
-    }
-    try {
-      const vendorIds = vendors.map(v => v.id)
-      const userId = Number(session.user.id)
-
-    // 2. 성공한 템플릿이 있으면 이메일 발송
-    if (templateIds.length > 0) {
-      const emailResult = await sendBasicContractEmail({
-        vendorIds,
-        templateIds,
-        requestedBy: userId
-      })
-
-      if (emailResult.success) {
-        toast.success(`${vendorIds.length}개 협력업체에 이메일이 발송되었습니다`)
-      } else {
-        toast.warning(`계약서는 생성되었으나 일부 이메일 발송 실패: ${emailResult.error}`)
-      }
-    } else {
-      toast.error("기본계약서 생성에 실패했습니다")
-    }
-
-  } catch (error) {
-    console.error('기본계약서 이메일 발송 중 오류:', error)
-    toast.error(`기본계약서 이메일 발송 중 오류가 발생했습니다: ${error instanceof Error ? error.message : '알 수 없는 오류'}`)
-  }
-}
-
-  // PQ 히스토리 컴포넌트
-  const PQHistorySection = () => {
-    if (isLoadingHistory) {
-      return (
-        <div className="px-4 py-3 border-b bg-muted/30">
-          <div className="flex items-center gap-2 text-sm text-muted-foreground">
-            <Loader className="h-4 w-4 animate-spin" />
-            PQ 히스토리 로딩 중...
-          </div>
-        </div>
-      )
-    }
-
-    const hasAnyHistory = Object.values(pqHistory).some(history => history.length > 0)
-
-    if (!hasAnyHistory) {
-      return (
-        <div className="px-4 py-3 border-b bg-muted/30">
-          <div className="text-sm text-muted-foreground">
-            최근 PQ 요청 내역이 없습니다.
-          </div>
-        </div>
-      )
-    }
-
-    return (
-      <div className="px-4 py-3 border-b bg-muted/30 max-h-48 overflow-y-auto">
-        <div className="space-y-3">
-          <div className="text-sm font-medium text-muted-foreground">
-            최근 PQ 요청 내역
-          </div>
-          {vendors.map((vendor) => {
-            const vendorHistory = pqHistory[vendor.id] || []
-            if (vendorHistory.length === 0) return null
-
-            return (
-              <div key={vendor.id} className="space-y-2">
-                <div className="text-xs font-medium text-muted-foreground border-b pb-1">
-                  {vendor.vendorName}
-                </div>
-                <div className="space-y-1">
-                  {vendorHistory.slice(0, 3).map((pq) => {
-                    const createdDate = new Date(pq.createdAt).toLocaleDateString('ko-KR')
-                    const statusText =
-                      pq.status === 'REQUESTED' ? '요청됨' :
-                      pq.status === 'APPROVED' ? '승인됨' :
-                      pq.status === 'SUBMITTED' ? '제출됨' :
-                      pq.status === 'REJECTED' ? '거절됨' :
-                      pq.status
-
-                    return (
-                      <div key={pq.id} className="flex items-center justify-between text-xs bg-background rounded px-2 py-1">
-                        <div className="flex items-center gap-2 flex-1">
-                          <button
-                            type="button"
-                            onClick={() => router.push(`/evcp/pq_new?search=${encodeURIComponent(pq.pqNumber)}`)}
-                            className="font-mono text-blue-600 hover:text-blue-800 hover:underline cursor-pointer"
-                          >
-                            {pq.pqNumber}
-                          </button>
-                          <Badge variant={pq.status === 'SUBMITTED' ? 'default' : pq.status === 'COMPLETED' ? 'default' : 'outline'} className="text-xs">
-                            {statusText}
-                          </Badge>
-                        </div>
-                        <div className="text-right">
-                          <div className="text-muted-foreground">
-                            {pq.type === 'GENERAL' ? '일반' : pq.type === 'PROJECT' ? '프로젝트' : '미실사'}
-                          </div>
-                          <div className="text-muted-foreground text-xs">
-                            {createdDate}
-                          </div>
-                        </div>
-                      </div>
-                    )
-                  })}
-                  {vendorHistory.length > 3 && (
-                    <div className="text-xs text-muted-foreground text-center">
-                      외 {vendorHistory.length - 3}건 더 있음
-                    </div>
-                  )}
-                </div>
-              </div>
-            )
-          })}
-        </div>
-      </div>
-    )
-  }
-
-
-
-  const dialogContent = (
-    <div className="space-y-4 py-2">
-      {/* 선택된 협력업체 정보 */}
-      <div className="space-y-2">
-        <Label>선택된 협력업체 ({vendors.length}개)</Label>
-        <div className="max-h-40 overflow-y-auto border rounded-md p-3 space-y-2">
-          {vendors.map((vendor) => (
-            <div key={vendor.id} className="flex items-center justify-between text-sm">
-              <div className="flex-1">
-                <div className="font-medium">{vendor.vendorName}</div>
-                <div className="text-muted-foreground">
-                  {vendor.vendorCode} • {vendor.email || "이메일 없음"}
-                </div>
-              </div>
-            </div>
-          ))}
-        </div>
-      </div>
-
-      <div className="space-y-2">
-        <Label htmlFor="type">PQ 종류 선택</Label>
-        <Select onValueChange={(val: "GENERAL" | "PROJECT" | "NON_INSPECTION") => setType(val)} value={type ?? undefined}>
-          <SelectTrigger id="type"><SelectValue placeholder="PQ 종류를 선택하세요" /></SelectTrigger>
-          <SelectContent>
-            <SelectItem value="GENERAL">일반 PQ</SelectItem>
-            <SelectItem value="PROJECT">프로젝트 PQ</SelectItem>
-            <SelectItem value="NON_INSPECTION">미실사 PQ</SelectItem>
-          </SelectContent>
-        </Select>
-      </div>
-
-      {type === "PROJECT" && (
-        <div className="space-y-2">
-          <Label htmlFor="project">프로젝트 선택</Label>
-          <Select onValueChange={(val) => setSelectedProjectId(Number(val))}>
-            <SelectTrigger id="project">
-              <SelectValue placeholder="프로젝트 선택" />
-            </SelectTrigger>
-            <SelectContent>
-              {isLoadingProjects ? (
-                <SelectItem value="loading" disabled>로딩 중...</SelectItem>
-              ) : projects.map((p) => (
-                <SelectItem key={p.id} value={p.id.toString()}>{p.projectCode} - {p.projectName}</SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-        </div>
-      )}
-
-      {type === "NON_INSPECTION" && (
-        <div className="space-y-2">
-          <Label>활성화된 미실사 PQ 리스트</Label>
-          {isLoadingNonInspectionPQ ? (
-            <div className="text-sm text-muted-foreground">로딩 중...</div>
-          ) : activeNonInspectionPQList ? (
-            <div className="p-3 border rounded-md bg-muted/30">
-              <div className="flex items-center gap-2">
-                <Badge variant="secondary">미실사 PQ</Badge>
-                <span className="font-medium">{activeNonInspectionPQList.name}</span>
-              </div>
-              <div className="text-sm text-muted-foreground mt-1">
-                활성화된 미실사 PQ 리스트를 기준으로 요청합니다.
-              </div>
-            </div>
-          ) : (
-            <div className="p-3 border rounded-md bg-destructive/10 border-destructive/20">
-              <div className="text-sm text-destructive">
-                활성화된 미실사 PQ 리스트가 없습니다. 먼저 PQ 관리에서 미실사 PQ 리스트를 생성하고 활성화해주세요.
-              </div>
-            </div>
-          )}
-        </div>
-      )}
-
-      {/* 마감일 입력 */}
-      <div className="space-y-2">
-        <Label htmlFor="dueDate">PQ 제출 마감일</Label>
-        <DatePicker
-          date={dueDate ? new Date(dueDate) : undefined}
-          onSelect={(date?: Date) => {
-            if (date) {
-              // 한국 시간대로 날짜 변환 (UTC 변환으로 인한 날짜 변경 방지)
-              const kstDate = new Date(date.getTime() - date.getTimezoneOffset() * 60000)
-              setDueDate(kstDate.toISOString().slice(0, 10))
-            } else {
-              setDueDate("")
-            }
-          }}
-          placeholder="마감일 선택"
-          minDate={new Date()}
-        />
-      </div>
-
-      {/* PQ 대상품목 */}
-      <div className="space-y-2">
-        <Label>PQ 대상품목 *</Label>
-          <br />
-        <MaterialGroupSelectorDialogMulti
-          triggerLabel="자재 그룹 선택"
-          selectedMaterials={pqItems}
-          onMaterialsSelect={handlePQItemsChange}
-          maxSelections={10}
-          placeholder="PQ 대상 자재 그룹을 검색하세요"
-          title="PQ 대상 자재 그룹 선택"
-          description="PQ를 요청할 자재 그룹을 선택해주세요."
-        />
-
-        {pqItems.length > 0 && (
-          <div className="text-xs text-muted-foreground">
-            {pqItems.length}개 자재 그룹이 선택되었습니다.
-          </div>
-        )}
-      </div>
-
-      {/* 추가 안내사항 */}
-      <div className="space-y-2">
-        <Label htmlFor="extraNote">추가 안내사항</Label>
-        <textarea
-          id="extraNote"
-          value={extraNote}
-          onChange={(e) => setExtraNote(e.target.value)}
-          placeholder="추가 안내사항을 입력하세요 (선택사항)"
-          className="w-full rounded-md border px-3 py-2 text-sm min-h-20 resize-none"
-        />
-      </div>
-
-      {/* 기본계약서 템플릿 선택 (다중 선택) */}
-      <div className="space-y-2">
-        <Label>기본계약서 템플릿 (선택사항, 복수 선택 가능)</Label>
-        {isLoadingTemplates ? (
-          <div className="text-sm text-muted-foreground">템플릿 로딩 중...</div>
-        ) : (
-          <div className="space-y-2 max-h-40 overflow-y-auto border rounded-md p-3">
-            {basicContractTemplates.map((template) => (
-              <div key={template.id} className="flex items-center gap-2">
-                <Checkbox
-                  id={`template-${template.id}`}
-                  checked={selectedTemplateIds.includes(template.id)}
-                  onCheckedChange={(checked) => {
-                    if (checked) {
-                      setSelectedTemplateIds(prev => [...prev, template.id])
-                    } else {
-                      setSelectedTemplateIds(prev => prev.filter(id => id !== template.id))
-                    }
-                  }}
-                />
-                <Label htmlFor={`template-${template.id}`} className="text-sm">
-                  {template.templateName}
-                </Label>
-              </div>
-            ))}
-            {basicContractTemplates.length === 0 && (
-              <div className="text-sm text-muted-foreground">사용 가능한 템플릿이 없습니다.</div>
-            )}
-          </div>
-        )}
-        {/* {selectedTemplateIds.length > 0 && (
-          <div className="text-xs text-muted-foreground">
-            {selectedTemplateIds.length}개 템플릿이 선택되었습니다.
-            {vendors.length > 0 && vendors.every(v => v.country !== 'KR') && 
-              " (외자 벤더 - 자동 선택됨)"}
-            {vendors.length > 0 && vendors.every(v => v.country === 'KR') && 
-              " (내자 벤더 - 자동 선택됨)"}
-          </div>
-        )} */}
-      </div>
-
-      {/* 비밀유지 계약서 첨부파일 */}
-      {isNdaTemplateSelected() && (
-        <div className="space-y-2">
-          <Label>비밀유지 계약서 첨부파일</Label>
-          
-          {/* 선택된 파일들 표시 */}
-          {ndaAttachments.length > 0 && (
-            <div className="space-y-2">
-              <div className="text-sm text-muted-foreground">
-                선택된 파일 ({ndaAttachments.length}개)
-              </div>
-              <div className="space-y-1 max-h-32 overflow-y-auto border rounded-md p-2">
-                {ndaAttachments.map((file, index) => (
-                  <div key={index} className="flex items-center justify-between text-sm bg-muted/50 rounded px-2 py-1">
-                    <div className="flex-1 truncate">
-                      <span className="font-medium">{file.name}</span>
-                      <span className="text-muted-foreground ml-2">
-                        ({(file.size / 1024 / 1024).toFixed(2)} MB)
-                      </span>
-                    </div>
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      size="sm"
-                      className="h-6 w-6 p-0 hover:bg-destructive hover:text-destructive-foreground"
-                      onClick={() => handleRemoveNdaAttachment(index)}
-                    >
-                      <X className="h-3 w-3" />
-                    </Button>
-                  </div>
-                ))}
-              </div>
-            </div>
-          )}
-          
-          {/* 파일 선택 버튼 */}
-          <div className="flex items-center gap-2">
-            <input
-              type="file"
-              multiple
-              accept=".pdf,.doc,.docx,.xlsx,.xls,.png,.jpg,.jpeg"
-              onChange={handleAddNdaAttachment}
-              className="hidden"
-              id="nda-file-input"
-            />
-            <Button
-              type="button"
-              variant="outline"
-              size="sm"
-              className="gap-2"
-              onClick={() => document.getElementById('nda-file-input')?.click()}
-              disabled={isUploadingNdaFiles}
-            >
-              <Plus className="h-4 w-4" />
-              파일 추가
-            </Button>
-            {isUploadingNdaFiles && (
-              <div className="text-sm text-muted-foreground">
-                파일 업로드 중...
-              </div>
-            )}
-          </div>
-          
-          <div className="text-xs text-muted-foreground">
-            비밀유지 계약서와 관련된 첨부파일을 업로드하세요. 
-            각 벤더별로 동일한 파일이 저장됩니다.
-          </div>
-        </div>
-      )}
-
-      {/* <div className="space-y-2">
-        <Label>계약 항목 선택</Label>
-        {AGREEMENT_LIST.map((label) => (
-          <div key={label} className="flex items-center gap-2">
-            <Checkbox
-              id={label}
-              checked={agreements[label] || false}
-              onCheckedChange={(val) =>
-                setAgreements((prev) => ({ ...prev, [label]: Boolean(val) }))
-              }
-            />
-            <Label htmlFor={label}>{label}</Label>
-          </div>
-        ))}
-      </div> */}
-    </div>
-  )
-
-  if (isDesktop) {
-    return (
-      <Dialog {...props}>
-        {showTrigger && (
-          <DialogTrigger asChild>
-            <Button variant="outline" size="sm" className="gap-2">
-              <SendHorizonal className="size-4" /> PQ 요청 ({vendors.length})
-            </Button>
-          </DialogTrigger>
-        )}
-        <DialogContent className="max-h-[80vh] flex flex-col">
-          <DialogHeader>
-            <DialogTitle>PQ 요청</DialogTitle>
-            <DialogDescription>
-              <span className="font-medium">{vendors.length}</span>
-              {vendors.length === 1 ? "개 협력업체" : "개 협력업체들"}에게 PQ를 요청합니다.
-            </DialogDescription>
-          </DialogHeader>
-          <PQHistorySection />
-          <div className="flex-1 overflow-y-auto">
-            {dialogContent}
-          </div>
-          <DialogFooter className="flex-col gap-4">
-            {/* 프로그레스 바 */}
-            {(showProgress || isApprovePending) && (
-              <div className="w-full space-y-2">
-                <div className="flex items-center justify-between text-sm">
-                  <span className="text-muted-foreground">{currentStep || "처리 중..."}</span>
-                  <span className="font-medium">{Math.round(progressValue)}%</span>
-                </div>
-                <Progress value={progressValue} className="w-full" />
-              </div>
-            )}
-            
-            {/* 버튼들 */}
-            <div className="flex justify-end gap-2">
-              <DialogClose asChild>
-                <Button variant="outline" disabled={isApprovePending}>취소</Button>
-              </DialogClose>
-              <Button
-                onClick={onApprove}
-                disabled={isApprovePending || !type || (type === "PROJECT" && !selectedProjectId) || (type === "NON_INSPECTION" && !activeNonInspectionPQList)}
-              >
-                {isApprovePending && <Loader className="mr-2 size-4 animate-spin" />}
-                요청하기
-              </Button>
-            </div>
-          </DialogFooter>
-        </DialogContent>
-
-
-      </Dialog>
-    )
-  }
-
-  return (
-    <Drawer {...props}>
-      {showTrigger && (
-        <DrawerTrigger asChild>
-          <Button variant="outline" size="sm" className="gap-2">
-            <SendHorizonal className="size-4" /> PQ 요청 ({vendors.length})
-          </Button>
-        </DrawerTrigger>
-      )}
-      <DrawerContent className="max-h-[80vh] flex flex-col">
-        <DrawerHeader>
-          <DrawerTitle>PQ 요청</DrawerTitle>
-          <DrawerDescription>
-            <span className="font-medium">{vendors.length}</span>
-            {vendors.length === 1 ? "개 협력업체" : "개 협력업체들"}에게 PQ를 요청합니다.
-          </DrawerDescription>
-        </DrawerHeader>
-        <PQHistorySection />
-        <div className="flex-1 overflow-y-auto px-4">
-          {dialogContent}
-        </div>
-        <DrawerFooter className="gap-4">
-          {/* 프로그레스 바 */}
-          {(showProgress || isApprovePending) && (
-            <div className="w-full space-y-2">
-              <div className="flex items-center justify-between text-sm">
-                <span className="text-muted-foreground">{currentStep || "처리 중..."}</span>
-                <span className="font-medium">{Math.round(progressValue)}%</span>
-              </div>
-              <Progress value={progressValue} className="w-full" />
-            </div>
-          )}
-          
-          {/* 버튼들 */}
-          <div className="flex gap-2">
-            <DrawerClose asChild>
-              <Button variant="outline" disabled={isApprovePending} className="flex-1">취소</Button>
-            </DrawerClose>
-            <Button
-              onClick={onApprove}
-              disabled={isApprovePending || !type || (type === "PROJECT" && !selectedProjectId) || (type === "NON_INSPECTION" && !activeNonInspectionPQList)}
-              className="flex-1"
-            >
-              {isApprovePending && <Loader className="mr-2 size-4 animate-spin" />}
-              요청하기
-            </Button>
-          </div>
-        </DrawerFooter>
-      </DrawerContent>
-
-
-    </Drawer>
-  )
-}
+"use client"
+
+import * as React from "react"
+import { type Row } from "@tanstack/react-table"
+import { Loader, SendHorizonal, Search, X, Plus, Router } from "lucide-react"
+import { toast } from "sonner"
+import { useMediaQuery } from "@/hooks/use-media-query"
+import { Button } from "@/components/ui/button"
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "@/components/ui/dialog"
+import {
+  Drawer,
+  DrawerClose,
+  DrawerContent,
+  DrawerDescription,
+  DrawerFooter,
+  DrawerHeader,
+  DrawerTitle,
+  DrawerTrigger,
+} from "@/components/ui/drawer"
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select"
+import { Checkbox } from "@/components/ui/checkbox"
+import { Label } from "@/components/ui/label"
+import { Input } from "@/components/ui/input"
+import { Badge } from "@/components/ui/badge"
+import { Progress } from "@/components/ui/progress"
+import { Vendor } from "@/db/schema/vendors"
+import { requestBasicContractInfo, requestPQVendors, sendBasicContractEmail } from "../service"
+import { getProjectsWithPQList, getNonInspectionPQLists } from "@/lib/pq/service"
+import type { Project } from "@/lib/pq/service"
+import { useSession } from "next-auth/react"
+import { DatePicker } from "@/components/ui/date-picker"
+import { getALLBasicContractTemplates } from "@/lib/basic-contract/service"
+import type { BasicContractTemplate } from "@/db/schema"
+import { saveNdaAttachments, getVendorPQHistory } from "../service"
+import { useRouter } from "next/navigation"
+import { createGtcVendorDocuments, createProjectGtcVendorDocuments, getStandardGtcDocumentId, getProjectGtcDocumentId } from "@/lib/gtc-contract/service"
+import { MaterialGroupSelectorDialogMulti } from "@/components/common/material/material-group-selector-dialog-multi"
+import type { MaterialSearchItem } from "@/lib/material/material-group-service"
+// import { PQContractViewer } from "../pq-contract-viewer" // 더 이상 사용하지 않음
+
+interface RequestPQDialogProps extends React.ComponentPropsWithoutRef<typeof Dialog> {
+  vendors: Row<Vendor>["original"][]
+  showTrigger?: boolean
+  onSuccess?: () => void
+}
+
+// const AGREEMENT_LIST = [
+//   "준법서약",
+//   "표준하도급계약",
+//   "안전보건관리계약",
+//   "윤리규범 준수 서약",
+//   "동반성장협약",
+//   "내국신용장 미개설 합의",
+//   "기술자료 제출 기본 동의",
+//   "GTC 합의",
+// ]
+
+// PQ 대상 품목 타입 정의 (Material Group 기반) - MaterialSearchItem 사용
+
+export function RequestPQDialog({ vendors, showTrigger = true, onSuccess, ...props }: RequestPQDialogProps) {
+  const [isApprovePending, startApproveTransition] = React.useTransition()
+  const isDesktop = useMediaQuery("(min-width: 640px)")
+  const { data: session } = useSession()
+  const router = useRouter()
+  const [type, setType] = React.useState<"GENERAL" | "PROJECT" | "NON_INSPECTION" | null>(null)
+  const [dueDate, setDueDate] = React.useState<string | null>(null)
+  const [projects, setProjects] = React.useState<Project[]>([])
+  const [selectedProjectId, setSelectedProjectId] = React.useState<number | null>(null)
+  const [agreements, setAgreements] = React.useState<Record<string, boolean>>({})
+  const [extraNote, setExtraNote] = React.useState<string>("")
+  const [pqItems, setPqItems] = React.useState<MaterialSearchItem[]>([])
+
+  // PQ 품목 선택 관련 상태는 MaterialGroupSelectorDialogMulti에서 관리됨
+  const [isLoadingProjects, setIsLoadingProjects] = React.useState(false)
+  const [basicContractTemplates, setBasicContractTemplates] = React.useState<BasicContractTemplate[]>([])
+  const [selectedTemplateIds, setSelectedTemplateIds] = React.useState<number[]>([])
+  const [isLoadingTemplates, setIsLoadingTemplates] = React.useState(false)
+
+  // 미실사 PQ 관련 상태
+  const [activeNonInspectionPQList, setActiveNonInspectionPQList] = React.useState<any>(null)
+  const [isLoadingNonInspectionPQ, setIsLoadingNonInspectionPQ] = React.useState(false)
+  
+  // 비밀유지 계약서 첨부파일 관련 상태
+  const [ndaAttachments, setNdaAttachments] = React.useState<File[]>([])
+  const [isUploadingNdaFiles, setIsUploadingNdaFiles] = React.useState(false)
+  
+  // 프로그레스 관련 상태
+  const [progressValue, setProgressValue] = React.useState(0)
+  const [currentStep, setCurrentStep] = React.useState("")
+  const [showProgress, setShowProgress] = React.useState(false)
+
+  // PQ 히스토리 관련 상태
+  const [pqHistory, setPqHistory] = React.useState<Record<number, any[]>>({})
+  const [isLoadingHistory, setIsLoadingHistory] = React.useState(false)
+
+
+  React.useEffect(() => {
+    if (type === "PROJECT") {
+      setIsLoadingProjects(true)
+      getProjectsWithPQList().then(setProjects).catch(() => toast.error("프로젝트 로딩 실패"))
+        .finally(() => setIsLoadingProjects(false))
+    } else if (type === "NON_INSPECTION") {
+      setIsLoadingNonInspectionPQ(true)
+      // 활성화된 미실사 PQ 리스트 조회
+      getNonInspectionPQLists().then(result => {
+        if (result.success) {
+          setActiveNonInspectionPQList(result.data)
+        } else {
+          setActiveNonInspectionPQList(null)
+        }
+      }).catch(() => {
+        toast.error("미실사 PQ 리스트 로딩 실패")
+        setActiveNonInspectionPQList(null)
+      }).finally(() => setIsLoadingNonInspectionPQ(false))
+    }
+  }, [type])
+
+  // 기본계약서 템플릿 로딩 및 자동 선택, PQ 히스토리 로딩
+  React.useEffect(() => {
+    setIsLoadingTemplates(true)
+    const loadPQHistory = async () => {
+      if (vendors.length === 0) return
+
+      setIsLoadingHistory(true)
+      try {
+        const historyPromises = vendors.map(async (vendor) => {
+          console.log("vendor.id", vendor.id)
+          const result = await getVendorPQHistory(vendor.id)
+          console.log("result", result)
+          return { vendorId: vendor.id, history: result.success ? result.data : [] }
+        })
+
+        const results = await Promise.all(historyPromises)
+        const historyMap: Record<number, any[]> = {}
+
+        results.forEach(({ vendorId, history }) => {
+          historyMap[vendorId] = history
+        })
+
+        setPqHistory(historyMap)
+      } catch (error) {
+        console.error('PQ 히스토리 로딩 실패:', error)
+        toast.error('PQ 히스토리 로딩 중 오류가 발생했습니다')
+      } finally {
+        setIsLoadingHistory(false)
+      }
+    }
+    loadPQHistory()
+    getALLBasicContractTemplates()
+      .then((templates) => {
+
+        // 벤더 국가별 자동 선택 로직
+        if (vendors.length > 0) {
+          const isAllForeign = vendors.every(vendor => vendor.country !== 'KR')
+          const isAllDomestic = vendors.every(vendor => vendor.country === 'KR')
+          //외자면 리스트에 비밀유지계약, 기술자료, 내국신용장, 한글 제외
+          if(isAllForeign) {
+            const foreignTemplates = templates.filter(template => {
+              const name = template.templateName?.toLowerCase() || ''
+              return !name.includes('비밀유지') && !name.includes('기술자료') && !name.includes('내국신용장') && !name.includes('한글')
+            })
+            setBasicContractTemplates(foreignTemplates)
+          }
+          //내자면 리스트에 GTC 제외, 비밀유지, 기술자료, 영문서약 제외
+          if(isAllDomestic) {
+            const domesticTemplates = templates.filter(template => {
+              const name = template.templateName?.toLowerCase() || ''
+              return !name.includes('gtc') && !name.includes('비밀유지') && !name.includes('기술자료') && !name.includes('영문')
+            })
+            setBasicContractTemplates(domesticTemplates)
+          }
+          if (isAllForeign) {
+            // 외자: 준법서약 (영문), GTC 선택 (GTC는 1개만 선택하도록)
+            const foreignTemplates = templates.filter(template => {
+              const name = template.templateName?.toLowerCase() || ''
+              return (
+                (template.templateName?.includes('준법서약') && template.templateName?.includes('영문')) ||
+                template.templateName?.includes('gtc')
+              )
+            })
+            // GTC 템플릿 중 최신 리비전의 것만 선택
+            const gtcTemplates = foreignTemplates.filter(t => t.templateName?.includes('gtc'))
+            const nonGtcTemplates = foreignTemplates.filter(t => !t.templateName?.includes('gtc'))
+
+            if (gtcTemplates.length > 0) {
+              // GTC 템플릿 중 이름이 가장 긴 것 (프로젝트 GTC 우선) 선택
+              const selectedGtcTemplate = gtcTemplates.reduce((prev, current) =>
+                (prev.templateName?.length || 0) > (current.templateName?.length || 0) ? prev : current
+              )
+              setSelectedTemplateIds([...nonGtcTemplates.map(t => t.id), selectedGtcTemplate.id])
+            } else {
+              setSelectedTemplateIds(nonGtcTemplates.map(t => t.id))
+            }
+          } else if (isAllDomestic) {
+            // 내자: 준법서약 (영문), GTC 제외한 모든 템플릿 선택
+            // 비밀유지 계약서, 기술자료 요구서 제외
+            const domesticTemplates = templates.filter(template => {
+              const name = template.templateName?.toLowerCase() || ''
+              return !(name.includes('준법서약') && name.includes('영문')) && 
+                     !name.includes('gtc')
+            })
+            setSelectedTemplateIds(domesticTemplates.map(t => t.id))
+          }
+        }
+      })
+      .catch(() => toast.error("기본계약서 템플릿 로딩 실패"))
+      .finally(() => setIsLoadingTemplates(false))
+  }, [vendors])
+
+  React.useEffect(() => {
+    if (!props.open) {
+      setType(null)
+      setSelectedProjectId(null)
+      setAgreements({})
+      setDueDate(null)
+      setPqItems([])
+      setExtraNote("")
+      setSelectedTemplateIds([])
+      setNdaAttachments([])
+      setIsUploadingNdaFiles(false)
+      setProgressValue(0)
+      setCurrentStep("")
+      setShowProgress(false)
+      setPqHistory({})
+      setIsLoadingHistory(false)
+      setActiveNonInspectionPQList(null)
+      setIsLoadingNonInspectionPQ(false)
+    }
+  }, [props.open])
+
+  // PQ 품목 선택 함수 (MaterialGroupSelectorDialogMulti에서 호출됨)
+  const handlePQItemsChange = (items: MaterialSearchItem[]) => {
+    setPqItems(items)
+  }
+
+  // PQ 품목 제거 함수
+  const handleRemovePQItem = (materialGroupCode: string) => {
+    setPqItems(prev => prev.filter(item => item.materialGroupCode !== materialGroupCode))
+  }
+
+  // 비밀유지 계약서 첨부파일 추가 함수
+  const handleAddNdaAttachment = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const files = event.target.files
+    if (files) {
+      const newFiles = Array.from(files)
+      setNdaAttachments(prev => [...prev, ...newFiles])
+    }
+    // input 초기화
+    event.target.value = ''
+  }
+
+  // 비밀유지 계약서 첨부파일 제거 함수
+  const handleRemoveNdaAttachment = (fileIndex: number) => {
+    setNdaAttachments(prev => prev.filter((_, index) => index !== fileIndex))
+  }
+
+  // 비밀유지 계약서가 선택되었는지 확인하는 함수
+  const isNdaTemplateSelected = () => {
+    return basicContractTemplates.some(template => 
+      selectedTemplateIds.includes(template.id) && 
+      template.templateName?.includes("비밀유지")
+    )
+  }
+
+  const onApprove = () => {
+    if (!type) return toast.error("PQ 유형을 선택하세요.")
+    if (type === "PROJECT" && !selectedProjectId) return toast.error("프로젝트를 선택하세요.")
+    if (type === "NON_INSPECTION" && !activeNonInspectionPQList) return toast.error("활성화된 미실사 PQ 리스트가 없습니다.")
+    if (!dueDate) return toast.error("마감일을 선택하세요.")
+    if (pqItems.length === 0) return toast.error("PQ 대상 품목을 선택하세요.")
+    if (!session?.user?.id) return toast.error("인증 실패")
+
+    // GTC 템플릿 선택 검증
+    const selectedGtcTemplates = basicContractTemplates.filter(template =>
+      selectedTemplateIds.includes(template.id) &&
+      template.templateName?.toLowerCase().includes('gtc')
+    )
+
+    if (selectedGtcTemplates.length > 1) {
+      return toast.error("GTC 템플릿은 하나만 선택할 수 있습니다.")
+    }
+
+    // 프로그레스 바를 즉시 표시
+    setShowProgress(true)
+    setProgressValue(0)
+    setCurrentStep("시작 중...")
+
+    startApproveTransition(async () => {
+      try {
+        
+        // 전체 단계 수 계산
+        const gtcTemplates = basicContractTemplates.filter(template =>
+          selectedTemplateIds.includes(template.id) &&
+          template.templateName?.toLowerCase().includes('gtc')
+        )
+
+        const totalSteps = 1 +
+          (selectedTemplateIds.length > 0 ? 1 : 0) +
+          (isNdaTemplateSelected() && ndaAttachments.length > 0 ? 1 : 0) +
+          (gtcTemplates.length > 0 ? 1 : 0)
+        let completedSteps = 0
+        
+        // 1단계: PQ 생성
+        setCurrentStep("PQ 생성 중...")
+        console.log("🚀 PQ 생성 시작")
+        const { data: pqResult, error: pqError } = await requestPQVendors({
+          ids: vendors.map((v) => v.id),
+          userId: Number(session.user.id),
+          agreements,
+          dueDate,
+          projectId: type === "PROJECT" ? selectedProjectId : null,
+          type: type || "GENERAL",
+          extraNote,
+          pqItems: JSON.stringify(pqItems.map(item => ({
+            materialGroupCode: item.materialGroupCode,
+            materialGroupDescription: item.materialGroupDescription
+          }))),
+          templateId: selectedTemplateIds.length > 0 ? selectedTemplateIds[0] : null,
+        })
+
+        if (pqError) {
+          setShowProgress(false)
+          toast.error(`PQ 생성 실패: ${pqError}`)
+          return
+        }
+
+        const pqSubmissionMap = (pqResult?.pqSubmissions || []).reduce<Record<number, number>>((acc, cur) => {
+          acc[cur.vendorId] = cur.id
+          return acc
+        }, {})
+        
+        completedSteps++
+        setProgressValue((completedSteps / totalSteps) * 100)
+        console.log("✅ PQ 생성 완료")
+        toast.success("PQ가 성공적으로 요청되었습니다")
+
+        // 2단계: 기본계약서 템플릿이 선택된 경우 백그라운드에서 처리
+        if (selectedTemplateIds.length > 0) {
+          const templates = basicContractTemplates.filter(t => 
+            selectedTemplateIds.includes(t.id)
+          )
+          
+          setCurrentStep(`기본계약서 생성 중... (${templates.length}개 템플릿)`)
+          console.log("📋 기본계약서 백그라운드 처리 시작", templates.length, "개 템플릿")
+          await processBasicContractsInBackground(templates, vendors, pqSubmissionMap)
+          
+          completedSteps++
+          setProgressValue((completedSteps / totalSteps) * 100)
+        }
+
+        // 3단계: 비밀유지 계약서 첨부파일이 있는 경우 저장
+        if (isNdaTemplateSelected() && ndaAttachments.length > 0) {
+          setCurrentStep(`비밀유지 계약서 첨부파일 저장 중... (${ndaAttachments.length}개 파일)`)
+          console.log("📎 비밀유지 계약서 첨부파일 처리 시작", ndaAttachments.length, "개 파일")
+          
+          const ndaResult = await saveNdaAttachments({
+            vendorIds: vendors.map((v) => v.id),
+            files: ndaAttachments,
+            userId: session.user.id.toString()
+          })
+
+          if (ndaResult.success) {
+            toast.success(`비밀유지 계약서 첨부파일이 모두 저장되었습니다 (${ndaResult.summary?.success}/${ndaResult.summary?.total})`)
+          } else {
+            toast.error(`첨부파일 처리 중 일부 오류가 발생했습니다: ${ndaResult.error}`)
+          }
+          
+          completedSteps++
+          setProgressValue((completedSteps / totalSteps) * 100)
+        }
+        //4단계: GTC 템플릿 처리
+        if (selectedGtcTemplates.length > 0) {
+          setCurrentStep(`GTC 문서 생성 중... (${selectedGtcTemplates.length}개 템플릿)`)
+          console.log("📋 GTC 문서 생성 시작", selectedGtcTemplates.length, "개 템플릿")
+
+          try {
+            await processGtcTemplates(selectedGtcTemplates, vendors)
+            completedSteps++
+            setProgressValue((completedSteps / totalSteps) * 100)
+          } catch (error) {
+            console.error("GTC 템플릿 처리 중 오류:", error)
+            toast.error(`GTC 템플릿 처리 중 오류가 발생했습니다`)
+            // GTC 처리 실패해도 PQ 생성은 성공으로 간주
+            completedSteps++
+            setProgressValue((completedSteps / totalSteps) * 100)
+          }
+        }
+        //5단계: 각 협력업체들에게 기본계약서 이메일 발송
+        if (selectedTemplateIds.length > 0) {
+          setCurrentStep(`기본계약서 이메일 발송 중... (${selectedTemplateIds.length}개 템플릿)`)
+          console.log("📋 기본계약서 이메일 발송 시작", selectedTemplateIds.length, "개 템플릿")
+          await processBasicContractsEmail(selectedTemplateIds, vendors)
+          completedSteps++
+          setProgressValue((completedSteps / totalSteps) * 100)
+        }
+
+        setCurrentStep("완료!")
+        setProgressValue(100)
+        
+        // 잠시 완료 상태를 보여준 후 다이얼로그 닫기
+        setTimeout(() => {
+          setShowProgress(false)
+          props.onOpenChange?.(false)
+          onSuccess?.()
+        }, 1000)
+
+      } catch (error) {
+        console.error('PQ 생성 오류:', error)
+        setShowProgress(false)
+        toast.error(`처리 중 오류가 발생했습니다: ${error instanceof Error ? error.message : '알 수 없는 오류'}`)
+      }
+    })
+  }
+
+  // 백그라운드에서 기본계약서 처리
+  const processBasicContractsInBackground = async (
+    templates: BasicContractTemplate[],
+    vendors: any[],
+    pqSubmissionMap?: Record<number, number>
+  ) => {
+    if (!session?.user?.id) {
+      toast.error("인증 정보가 없습니다")
+      return
+    }
+
+    try {
+      const totalContracts = templates.length * vendors.length
+      let processedCount = 0
+
+      // 각 벤더별로, 각 템플릿을 처리
+      for (let vendorIndex = 0; vendorIndex < vendors.length; vendorIndex++) {
+        const vendor = vendors[vendorIndex]
+        
+        // 벤더별 템플릿 데이터 생성 (한글 변수명 사용)
+        const templateData = {
+          company_name: vendor.vendorName || '협력업체명',
+          company_address: vendor.address || '주소',
+          representative_name: vendor.representativeName || '대표자명',
+          signature_date: new Date().toLocaleDateString('ko-KR'),
+          tax_id: vendor.taxId || '사업자번호',
+          phone_number: vendor.phone || '전화번호',
+        }
+
+        console.log(`🔄 벤더 ${vendorIndex + 1}/${vendors.length} 템플릿 데이터:`, templateData)
+
+        // 해당 벤더에 대해 각 템플릿을 순차적으로 처리
+        for (let templateIndex = 0; templateIndex < templates.length; templateIndex++) {
+          const template = templates[templateIndex]
+          processedCount++
+          
+          // 진행률 업데이트 (2단계 범위 내에서)
+          const baseProgress = 33.33 // 1단계 완료 후
+          const contractProgress = (processedCount / totalContracts) * 33.33 // 2단계는 33.33% 차지
+          const newProgress = baseProgress + contractProgress
+          setProgressValue(newProgress)
+          setCurrentStep(`기본계약서 생성 중... (${processedCount}/${totalContracts})`)
+          
+          console.log(`📄 처리 중: ${vendor.vendorName} - ${template.templateName} (${processedCount}/${totalContracts})`)
+          
+          // 개별 벤더에 대한 기본계약 생성
+          await processTemplate(template, templateData, [vendor], pqSubmissionMap)
+          
+          console.log(`✅ 완료: ${vendor.vendorName} - ${template.templateName}`)
+        }
+      }
+
+      toast.success(`총 ${totalContracts}개 기본계약이 모두 생성되었습니다`)
+      router.refresh();
+
+    } catch (error) {
+      console.error('기본계약 처리 중 오류:', error)
+      toast.error(`기본계약 처리 중 오류가 발생했습니다: ${error instanceof Error ? error.message : '알 수 없는 오류'}`)
+    }
+  }
+
+  const processTemplate = async (
+    template: BasicContractTemplate,
+    templateData: any,
+    vendors: any[],
+    pqSubmissionMap?: Record<number, number>
+  ) => {
+    try {
+      // 1. 템플릿 파일 가져오기
+      const templateResponse = await fetch('/api/basic-contract/get-template', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ templateId: template.id })
+      })
+
+      if (!templateResponse.ok) {
+        throw new Error(`템플릿 파일을 가져올 수 없습니다: ${template.templateName}`)
+      }
+
+      const templateBlob = await templateResponse.blob()
+
+      // 2. PDFTron을 사용해서 변수 치환 및 PDF 변환
+      // @ts-ignore
+      const WebViewer = await import("@pdftron/webviewer").then(({ default: WebViewer }) => WebViewer)
+      
+      // 임시 WebViewer 인스턴스 생성 (DOM에 추가하지 않음)
+      const tempDiv = document.createElement('div')
+      tempDiv.style.display = 'none'
+      document.body.appendChild(tempDiv)
+
+      const instance = await WebViewer(
+        {
+          path: "/pdftronWeb",
+          licenseKey: process.env.NEXT_PUBLIC_PDFTRON_WEBVIEW_KEY,
+          fullAPI: true,
+        },
+        tempDiv
+      )
+
+      try {
+        const { Core } = instance
+        const { createDocument } = Core
+
+        // 3. 템플릿 문서 생성 및 변수 치환
+        const templateDoc = await createDocument(templateBlob, {
+          filename: template.fileName || 'template.docx',
+          extension: 'docx',
+        })
+
+        console.log("🔄 변수 치환 시작:", templateData)
+        await templateDoc.applyTemplateValues(templateData)
+        console.log("✅ 변수 치환 완료")
+
+        // 4. PDF 변환
+        const fileData = await templateDoc.getFileData()
+        const pdfBuffer = await Core.officeToPDFBuffer(fileData, { extension: 'docx' })
+
+        console.log(`✅ PDF 변환 완료: ${template.templateName}`, `크기: ${pdfBuffer.byteLength} bytes`)
+
+        // 5. 기본계약 생성 요청
+        const { error: contractError } = await requestBasicContractInfo({
+          vendorIds: vendors.map((v) => v.id),
+          requestedBy: Number(session!.user.id),
+          templateId: template.id,
+          pdfBuffer: new Uint8Array(pdfBuffer),
+          pqSubmissionIdMap: pqSubmissionMap,
+        })
+
+        if (contractError) {
+          throw new Error(contractError)
+        }
+
+        console.log(`✅ 기본계약 생성 완료: ${template.templateName}`)
+        
+
+      } finally {
+        // 임시 WebViewer 정리
+        instance.UI.dispose()
+        document.body.removeChild(tempDiv)
+      }
+
+    } catch (error) {
+      console.error(`❌ 템플릿 처리 실패: ${template.templateName}`, error)
+      throw error
+    }
+  }
+
+  // GTC 템플릿 처리 함수
+  const processGtcTemplates = async (gtcTemplates: BasicContractTemplate[], vendors: any[]) => {
+    if (!session?.user?.id) {
+      toast.error("인증 정보가 없습니다")
+      return
+    }
+
+    try {
+      const vendorIds = vendors.map(v => v.id)
+      const userId = Number(session.user.id)
+
+      for (const template of gtcTemplates) {
+        const templateName = template.templateName?.toLowerCase() || ''
+
+        if (templateName.includes('general gtc') || (templateName.includes('gtc') && !templateName.includes(' '))) {
+          // General GTC 처리
+          console.log(`📄 General GTC 템플릿 처리: ${template.templateName}`)
+
+          const gtcDocument = await getStandardGtcDocumentId()
+          if (!gtcDocument) {
+            toast.error(`표준 GTC 문서를 찾을 수 없습니다.`)
+            continue
+          }
+
+          const result = await createGtcVendorDocuments({
+            baseDocumentId: gtcDocument.id,
+            vendorIds,
+            createdById: userId,
+            documentTitle: gtcDocument.title
+          })
+
+          if (result.success) {
+            console.log(`✅ General GTC 문서 생성 완료: ${result.count}개`)
+          } else {
+            toast.error(`General GTC 문서 생성 실패: ${result.error}`)
+          }
+
+        } else if (templateName.includes('gtc') && templateName.includes(' ')) {
+          // 프로젝트 GTC 처리 (프로젝트 코드 추출)
+          const projectCodeMatch = template.templateName?.match(/^([A-Z0-9]+)\s+GTC/)
+          console.log("🔄 프로젝트 GTC 템플릿 처리: ", template.templateName, projectCodeMatch)
+          console.log(`   - 템플릿 이름 분석: "${template.templateName}"`)
+          console.log(`   - 소문자 변환: "${templateName}"`)
+          if (projectCodeMatch) {
+            const projectCode = projectCodeMatch[1]
+            console.log(`📄 프로젝트 GTC 템플릿 처리: ${template.templateName} (프로젝트: ${projectCode})`)
+
+            // const gtcDocument = await getProjectGtcDocumentId(projectCode)
+            // if (!gtcDocument) {
+            //   toast.error(`프로젝트 "${projectCode}"의 GTC 문서를 찾을 수 없습니다.`)
+            //   continue
+            // }
+            // console.log("🔄 getProjectGtcDocumentId", gtcDocument)
+
+            const result = await createProjectGtcVendorDocuments({
+              projectCode,
+              vendorIds,
+              createdById: userId,
+              documentTitle: template.templateName
+            })
+
+            if (result.success) {
+              console.log(`✅ 프로젝트 GTC 문서 생성 완료: ${result.count}개`)
+            } else {
+              toast.error(`프로젝트 GTC 문서 생성 실패: ${result.error}`)
+            }
+          } else {
+            toast.error(`프로젝트 GTC 템플릿 이름 형식이 올바르지 않습니다: ${template.templateName}`)
+          }
+        } else {
+          console.log(`⚠️ GTC 템플릿이지만 처리할 수 없는 형식: ${template.templateName}`)
+        }
+      }
+
+      toast.success(`GTC 문서가 ${gtcTemplates.length}개 템플릿에 대해 생성되었습니다`)
+
+    } catch (error) {
+      console.error('GTC 템플릿 처리 중 오류:', error)
+      toast.error(`GTC 템플릿 처리 중 오류가 발생했습니다: ${error instanceof Error ? error.message : '알 수 없는 오류'}`)
+    }
+  }
+
+  const processBasicContractsEmail = async (templateIds: number[], vendors: any[]) => {
+    if (!session?.user?.id) {
+      toast.error("인증 정보가 없습니다")
+      return
+    }
+    try {
+      const vendorIds = vendors.map(v => v.id)
+      const userId = Number(session.user.id)
+
+    // 2. 성공한 템플릿이 있으면 이메일 발송
+    if (templateIds.length > 0) {
+      const emailResult = await sendBasicContractEmail({
+        vendorIds,
+        templateIds,
+        requestedBy: userId
+      })
+
+      if (emailResult.success) {
+        toast.success(`${vendorIds.length}개 협력업체에 이메일이 발송되었습니다`)
+      } else {
+        toast.warning(`계약서는 생성되었으나 일부 이메일 발송 실패: ${emailResult.error}`)
+      }
+    } else {
+      toast.error("기본계약서 생성에 실패했습니다")
+    }
+
+  } catch (error) {
+    console.error('기본계약서 이메일 발송 중 오류:', error)
+    toast.error(`기본계약서 이메일 발송 중 오류가 발생했습니다: ${error instanceof Error ? error.message : '알 수 없는 오류'}`)
+  }
+}
+
+  // PQ 히스토리 컴포넌트
+  const PQHistorySection = () => {
+    if (isLoadingHistory) {
+      return (
+        <div className="px-4 py-3 border-b bg-muted/30">
+          <div className="flex items-center gap-2 text-sm text-muted-foreground">
+            <Loader className="h-4 w-4 animate-spin" />
+            PQ 히스토리 로딩 중...
+          </div>
+        </div>
+      )
+    }
+
+    const hasAnyHistory = Object.values(pqHistory).some(history => history.length > 0)
+
+    if (!hasAnyHistory) {
+      return (
+        <div className="px-4 py-3 border-b bg-muted/30">
+          <div className="text-sm text-muted-foreground">
+            최근 PQ 요청 내역이 없습니다.
+          </div>
+        </div>
+      )
+    }
+
+    return (
+      <div className="px-4 py-3 border-b bg-muted/30 max-h-48 overflow-y-auto">
+        <div className="space-y-3">
+          <div className="text-sm font-medium text-muted-foreground">
+            최근 PQ 요청 내역
+          </div>
+          {vendors.map((vendor) => {
+            const vendorHistory = pqHistory[vendor.id] || []
+            if (vendorHistory.length === 0) return null
+
+            return (
+              <div key={vendor.id} className="space-y-2">
+                <div className="text-xs font-medium text-muted-foreground border-b pb-1">
+                  {vendor.vendorName}
+                </div>
+                <div className="space-y-1">
+                  {vendorHistory.slice(0, 3).map((pq) => {
+                    const createdDate = new Date(pq.createdAt).toLocaleDateString('ko-KR')
+                    const statusText =
+                      pq.status === 'REQUESTED' ? '요청됨' :
+                      pq.status === 'APPROVED' ? '승인됨' :
+                      pq.status === 'SUBMITTED' ? '제출됨' :
+                      pq.status === 'REJECTED' ? '거절됨' :
+                      pq.status
+
+                    return (
+                      <div key={pq.id} className="flex items-center justify-between text-xs bg-background rounded px-2 py-1">
+                        <div className="flex items-center gap-2 flex-1">
+                          <button
+                            type="button"
+                            onClick={() => router.push(`/evcp/pq_new?search=${encodeURIComponent(pq.pqNumber)}`)}
+                            className="font-mono text-blue-600 hover:text-blue-800 hover:underline cursor-pointer"
+                          >
+                            {pq.pqNumber}
+                          </button>
+                          <Badge variant={pq.status === 'SUBMITTED' ? 'default' : pq.status === 'COMPLETED' ? 'default' : 'outline'} className="text-xs">
+                            {statusText}
+                          </Badge>
+                        </div>
+                        <div className="text-right">
+                          <div className="text-muted-foreground">
+                            {pq.type === 'GENERAL' ? '일반' : pq.type === 'PROJECT' ? '프로젝트' : '미실사'}
+                          </div>
+                          <div className="text-muted-foreground text-xs">
+                            {createdDate}
+                          </div>
+                        </div>
+                      </div>
+                    )
+                  })}
+                  {vendorHistory.length > 3 && (
+                    <div className="text-xs text-muted-foreground text-center">
+                      외 {vendorHistory.length - 3}건 더 있음
+                    </div>
+                  )}
+                </div>
+              </div>
+            )
+          })}
+        </div>
+      </div>
+    )
+  }
+
+
+
+  const dialogContent = (
+    <div className="space-y-4 py-2">
+      {/* 선택된 협력업체 정보 */}
+      <div className="space-y-2">
+        <Label>선택된 협력업체 ({vendors.length}개)</Label>
+        <div className="max-h-40 overflow-y-auto border rounded-md p-3 space-y-2">
+          {vendors.map((vendor) => (
+            <div key={vendor.id} className="flex items-center justify-between text-sm">
+              <div className="flex-1">
+                <div className="font-medium">{vendor.vendorName}</div>
+                <div className="text-muted-foreground">
+                  {vendor.vendorCode} • {vendor.email || "이메일 없음"}
+                </div>
+              </div>
+            </div>
+          ))}
+        </div>
+      </div>
+
+      <div className="space-y-2">
+        <Label htmlFor="type">PQ 종류 선택</Label>
+        <Select onValueChange={(val: "GENERAL" | "PROJECT" | "NON_INSPECTION") => setType(val)} value={type ?? undefined}>
+          <SelectTrigger id="type"><SelectValue placeholder="PQ 종류를 선택하세요" /></SelectTrigger>
+          <SelectContent>
+            <SelectItem value="GENERAL">일반 PQ</SelectItem>
+            <SelectItem value="PROJECT">프로젝트 PQ</SelectItem>
+            <SelectItem value="NON_INSPECTION">미실사 PQ</SelectItem>
+          </SelectContent>
+        </Select>
+      </div>
+
+      {type === "PROJECT" && (
+        <div className="space-y-2">
+          <Label htmlFor="project">프로젝트 선택</Label>
+          <Select onValueChange={(val) => setSelectedProjectId(Number(val))}>
+            <SelectTrigger id="project">
+              <SelectValue placeholder="프로젝트 선택" />
+            </SelectTrigger>
+            <SelectContent>
+              {isLoadingProjects ? (
+                <SelectItem value="loading" disabled>로딩 중...</SelectItem>
+              ) : projects.map((p) => (
+                <SelectItem key={p.id} value={p.id.toString()}>{p.projectCode} - {p.projectName}</SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        </div>
+      )}
+
+      {type === "NON_INSPECTION" && (
+        <div className="space-y-2">
+          <Label>활성화된 미실사 PQ 리스트</Label>
+          {isLoadingNonInspectionPQ ? (
+            <div className="text-sm text-muted-foreground">로딩 중...</div>
+          ) : activeNonInspectionPQList ? (
+            <div className="p-3 border rounded-md bg-muted/30">
+              <div className="flex items-center gap-2">
+                <Badge variant="secondary">미실사 PQ</Badge>
+                <span className="font-medium">{activeNonInspectionPQList.name}</span>
+              </div>
+              <div className="text-sm text-muted-foreground mt-1">
+                활성화된 미실사 PQ 리스트를 기준으로 요청합니다.
+              </div>
+            </div>
+          ) : (
+            <div className="p-3 border rounded-md bg-destructive/10 border-destructive/20">
+              <div className="text-sm text-destructive">
+                활성화된 미실사 PQ 리스트가 없습니다. 먼저 PQ 관리에서 미실사 PQ 리스트를 생성하고 활성화해주세요.
+              </div>
+            </div>
+          )}
+        </div>
+      )}
+
+      {/* 마감일 입력 */}
+      <div className="space-y-2">
+        <Label htmlFor="dueDate">PQ 제출 마감일</Label>
+        <DatePicker
+          date={dueDate ? new Date(dueDate) : undefined}
+          onSelect={(date?: Date) => {
+            if (date) {
+              // 한국 시간대로 날짜 변환 (UTC 변환으로 인한 날짜 변경 방지)
+              const kstDate = new Date(date.getTime() - date.getTimezoneOffset() * 60000)
+              setDueDate(kstDate.toISOString().slice(0, 10))
+            } else {
+              setDueDate("")
+            }
+          }}
+          placeholder="마감일 선택"
+          minDate={new Date()}
+        />
+      </div>
+
+      {/* PQ 대상품목 */}
+      <div className="space-y-2">
+        <Label>PQ 대상품목 *</Label>
+          <br />
+        <MaterialGroupSelectorDialogMulti
+          triggerLabel="자재 그룹 선택"
+          selectedMaterials={pqItems}
+          onMaterialsSelect={handlePQItemsChange}
+          maxSelections={10}
+          placeholder="PQ 대상 자재 그룹을 검색하세요"
+          title="PQ 대상 자재 그룹 선택"
+          description="PQ를 요청할 자재 그룹을 선택해주세요."
+        />
+
+        {pqItems.length > 0 && (
+          <div className="text-xs text-muted-foreground">
+            {pqItems.length}개 자재 그룹이 선택되었습니다.
+          </div>
+        )}
+      </div>
+
+      {/* 추가 안내사항 */}
+      <div className="space-y-2">
+        <Label htmlFor="extraNote">추가 안내사항</Label>
+        <textarea
+          id="extraNote"
+          value={extraNote}
+          onChange={(e) => setExtraNote(e.target.value)}
+          placeholder="추가 안내사항을 입력하세요 (선택사항)"
+          className="w-full rounded-md border px-3 py-2 text-sm min-h-20 resize-none"
+        />
+      </div>
+
+      {/* 기본계약서 템플릿 선택 (다중 선택) */}
+      <div className="space-y-2">
+        <Label>기본계약서 템플릿 (선택사항, 복수 선택 가능)</Label>
+        {isLoadingTemplates ? (
+          <div className="text-sm text-muted-foreground">템플릿 로딩 중...</div>
+        ) : (
+          <div className="space-y-2 max-h-40 overflow-y-auto border rounded-md p-3">
+            {basicContractTemplates.map((template) => (
+              <div key={template.id} className="flex items-center gap-2">
+                <Checkbox
+                  id={`template-${template.id}`}
+                  checked={selectedTemplateIds.includes(template.id)}
+                  onCheckedChange={(checked) => {
+                    if (checked) {
+                      setSelectedTemplateIds(prev => [...prev, template.id])
+                    } else {
+                      setSelectedTemplateIds(prev => prev.filter(id => id !== template.id))
+                    }
+                  }}
+                />
+                <Label htmlFor={`template-${template.id}`} className="text-sm">
+                  {template.templateName}
+                </Label>
+              </div>
+            ))}
+            {basicContractTemplates.length === 0 && (
+              <div className="text-sm text-muted-foreground">사용 가능한 템플릿이 없습니다.</div>
+            )}
+          </div>
+        )}
+        {/* {selectedTemplateIds.length > 0 && (
+          <div className="text-xs text-muted-foreground">
+            {selectedTemplateIds.length}개 템플릿이 선택되었습니다.
+            {vendors.length > 0 && vendors.every(v => v.country !== 'KR') && 
+              " (외자 벤더 - 자동 선택됨)"}
+            {vendors.length > 0 && vendors.every(v => v.country === 'KR') && 
+              " (내자 벤더 - 자동 선택됨)"}
+          </div>
+        )} */}
+      </div>
+
+      {/* 비밀유지 계약서 첨부파일 */}
+      {isNdaTemplateSelected() && (
+        <div className="space-y-2">
+          <Label>비밀유지 계약서 첨부파일</Label>
+          
+          {/* 선택된 파일들 표시 */}
+          {ndaAttachments.length > 0 && (
+            <div className="space-y-2">
+              <div className="text-sm text-muted-foreground">
+                선택된 파일 ({ndaAttachments.length}개)
+              </div>
+              <div className="space-y-1 max-h-32 overflow-y-auto border rounded-md p-2">
+                {ndaAttachments.map((file, index) => (
+                  <div key={index} className="flex items-center justify-between text-sm bg-muted/50 rounded px-2 py-1">
+                    <div className="flex-1 truncate">
+                      <span className="font-medium">{file.name}</span>
+                      <span className="text-muted-foreground ml-2">
+                        ({(file.size / 1024 / 1024).toFixed(2)} MB)
+                      </span>
+                    </div>
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="sm"
+                      className="h-6 w-6 p-0 hover:bg-destructive hover:text-destructive-foreground"
+                      onClick={() => handleRemoveNdaAttachment(index)}
+                    >
+                      <X className="h-3 w-3" />
+                    </Button>
+                  </div>
+                ))}
+              </div>
+            </div>
+          )}
+          
+          {/* 파일 선택 버튼 */}
+          <div className="flex items-center gap-2">
+            <input
+              type="file"
+              multiple
+              accept=".pdf,.doc,.docx,.xlsx,.xls,.png,.jpg,.jpeg"
+              onChange={handleAddNdaAttachment}
+              className="hidden"
+              id="nda-file-input"
+            />
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              className="gap-2"
+              onClick={() => document.getElementById('nda-file-input')?.click()}
+              disabled={isUploadingNdaFiles}
+            >
+              <Plus className="h-4 w-4" />
+              파일 추가
+            </Button>
+            {isUploadingNdaFiles && (
+              <div className="text-sm text-muted-foreground">
+                파일 업로드 중...
+              </div>
+            )}
+          </div>
+          
+          <div className="text-xs text-muted-foreground">
+            비밀유지 계약서와 관련된 첨부파일을 업로드하세요. 
+            각 벤더별로 동일한 파일이 저장됩니다.
+          </div>
+        </div>
+      )}
+
+      {/* <div className="space-y-2">
+        <Label>계약 항목 선택</Label>
+        {AGREEMENT_LIST.map((label) => (
+          <div key={label} className="flex items-center gap-2">
+            <Checkbox
+              id={label}
+              checked={agreements[label] || false}
+              onCheckedChange={(val) =>
+                setAgreements((prev) => ({ ...prev, [label]: Boolean(val) }))
+              }
+            />
+            <Label htmlFor={label}>{label}</Label>
+          </div>
+        ))}
+      </div> */}
+    </div>
+  )
+
+  if (isDesktop) {
+    return (
+      <Dialog {...props}>
+        {showTrigger && (
+          <DialogTrigger asChild>
+            <Button variant="outline" size="sm" className="gap-2">
+              <SendHorizonal className="size-4" /> PQ 요청 ({vendors.length})
+            </Button>
+          </DialogTrigger>
+        )}
+        <DialogContent className="max-h-[80vh] flex flex-col">
+          <DialogHeader>
+            <DialogTitle>PQ 요청</DialogTitle>
+            <DialogDescription>
+              <span className="font-medium">{vendors.length}</span>
+              {vendors.length === 1 ? "개 협력업체" : "개 협력업체들"}에게 PQ를 요청합니다.
+            </DialogDescription>
+          </DialogHeader>
+          <PQHistorySection />
+          <div className="flex-1 overflow-y-auto">
+            {dialogContent}
+          </div>
+          <DialogFooter className="flex-col gap-4">
+            {/* 프로그레스 바 */}
+            {(showProgress || isApprovePending) && (
+              <div className="w-full space-y-2">
+                <div className="flex items-center justify-between text-sm">
+                  <span className="text-muted-foreground">{currentStep || "처리 중..."}</span>
+                  <span className="font-medium">{Math.round(progressValue)}%</span>
+                </div>
+                <Progress value={progressValue} className="w-full" />
+              </div>
+            )}
+            
+            {/* 버튼들 */}
+            <div className="flex justify-end gap-2">
+              <DialogClose asChild>
+                <Button variant="outline" disabled={isApprovePending}>취소</Button>
+              </DialogClose>
+              <Button
+                onClick={onApprove}
+                disabled={isApprovePending || !type || (type === "PROJECT" && !selectedProjectId) || (type === "NON_INSPECTION" && !activeNonInspectionPQList)}
+              >
+                {isApprovePending && <Loader className="mr-2 size-4 animate-spin" />}
+                요청하기
+              </Button>
+            </div>
+          </DialogFooter>
+        </DialogContent>
+
+
+      </Dialog>
+    )
+  }
+
+  return (
+    <Drawer {...props}>
+      {showTrigger && (
+        <DrawerTrigger asChild>
+          <Button variant="outline" size="sm" className="gap-2">
+            <SendHorizonal className="size-4" /> PQ 요청 ({vendors.length})
+          </Button>
+        </DrawerTrigger>
+      )}
+      <DrawerContent className="max-h-[80vh] flex flex-col">
+        <DrawerHeader>
+          <DrawerTitle>PQ 요청</DrawerTitle>
+          <DrawerDescription>
+            <span className="font-medium">{vendors.length}</span>
+            {vendors.length === 1 ? "개 협력업체" : "개 협력업체들"}에게 PQ를 요청합니다.
+          </DrawerDescription>
+        </DrawerHeader>
+        <PQHistorySection />
+        <div className="flex-1 overflow-y-auto px-4">
+          {dialogContent}
+        </div>
+        <DrawerFooter className="gap-4">
+          {/* 프로그레스 바 */}
+          {(showProgress || isApprovePending) && (
+            <div className="w-full space-y-2">
+              <div className="flex items-center justify-between text-sm">
+                <span className="text-muted-foreground">{currentStep || "처리 중..."}</span>
+                <span className="font-medium">{Math.round(progressValue)}%</span>
+              </div>
+              <Progress value={progressValue} className="w-full" />
+            </div>
+          )}
+          
+          {/* 버튼들 */}
+          <div className="flex gap-2">
+            <DrawerClose asChild>
+              <Button variant="outline" disabled={isApprovePending} className="flex-1">취소</Button>
+            </DrawerClose>
+            <Button
+              onClick={onApprove}
+              disabled={isApprovePending || !type || (type === "PROJECT" && !selectedProjectId) || (type === "NON_INSPECTION" && !activeNonInspectionPQList)}
+              className="flex-1"
+            >
+              {isApprovePending && <Loader className="mr-2 size-4 animate-spin" />}
+              요청하기
+            </Button>
+          </div>
+        </DrawerFooter>
+      </DrawerContent>
+
+
+    </Drawer>
+  )
+}