From 52b0898b420d32619b71b6e47e70e5ed908a061a Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Thu, 19 Feb 2026 21:17:09 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EB=A9=94=EC=9D=B4=EC=BB=A4=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp | 2 +-
 src/com/pms/mapper/salesMng.xml                            | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp b/WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp
index 11e49a9..7cb14b8 100644
--- a/WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp
+++ b/WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp
@@ -459,7 +459,7 @@ function fn_initGrid() {
 			hozAlign: 'left',
 			width: 150,
 			title: '메이커',
-			field: 'VENDOR'
+			field: 'MAKER'
 		},
 		// 15. 범주 이름
 		{
diff --git a/src/com/pms/mapper/salesMng.xml b/src/com/pms/mapper/salesMng.xml
index b79cb49..54bfa3e 100644
--- a/src/com/pms/mapper/salesMng.xml
+++ b/src/com/pms/mapper/salesMng.xml
@@ -3161,7 +3161,8 @@ UPDATE SET
 		COALESCE(PM.HEAT_TREATMENT_HARDNESS, '') AS HEAT_TREATMENT_HARDNESS,
 		COALESCE(PM.HEAT_TREATMENT_METHOD, '') AS HEAT_TREATMENT_METHOD,
 		COALESCE(PM.SURFACE_TREATMENT, '') AS SURFACE_TREATMENT,
-		COALESCE(PM.MAKER, '') AS VENDOR,
+		COALESCE(PM.MAKER, '') AS MAKER,
+		'' AS VENDOR,
 		(SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = PM.PART_TYPE) AS PART_TYPE_TITLE,
 		'' AS SUPPLY_TYPE,
 		'' AS RAW_MATERIAL,
@@ -3492,6 +3493,7 @@ SELECT
 	P.WEIGHT,
 	P.PART_TYPE,
 	P.REVISION,
+	COALESCE(P.MAKER, '') AS MAKER,
 	G.VENDOR AS VENDOR,
 	P.THICKNESS,
 	P.WIDTH,
@@ -3757,7 +3759,8 @@ SELECT
 	P.WEIGHT,
 	P.PART_TYPE,
 	P.REVISION,
-	COALESCE(P.MAKER, V.VENDOR) AS VENDOR,
+	COALESCE(P.MAKER, '') AS MAKER,
+	V.VENDOR AS VENDOR,
 	P.THICKNESS,
 	P.WIDTH,
 	P.HEIGHT,

From 0a8d3154f656c51fe20c9ec9cde7a2ab641c53a1 Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Thu, 19 Feb 2026 21:18:07 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EC=86=8C=EC=9E=AC=ED=92=88=EB=B2=88=20?=
 =?UTF-8?q?=EC=9C=A0=EB=AC=B4=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/salesmgmt/service/SalesMngService.java   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/com/pms/salesmgmt/service/SalesMngService.java b/src/com/pms/salesmgmt/service/SalesMngService.java
index 616d505..636ff75 100644
--- a/src/com/pms/salesmgmt/service/SalesMngService.java
+++ b/src/com/pms/salesmgmt/service/SalesMngService.java
@@ -2389,14 +2389,26 @@ public class SalesMngService {
 						detailParam.put("RAW_MATERIAL", "");
 						detailParam.put("SIZE", "");
 						detailParam.put("QTY", partInfo.get("PRODUCTION_QTY"));
-					} else {
-						// 공급업체: 소재품번, 소재재질, 규격, 발주수량
+				} else {
+					// 공급업체: 소재품번 유무에 따라 분기
+					String rawMaterialNo = CommonUtils.checkNull(partInfo.get("RAW_MATERIAL_NO"));
+					
+					if(!rawMaterialNo.isEmpty()) {
+						// 소재품번이 있는 경우: 소재품번, 소재재질, 규격, 발주수량
 						detailParam.put("PART_NO", partInfo.get("RAW_MATERIAL_NO"));
 						detailParam.put("PART_NAME", partInfo.get("RAW_MATERIAL"));
 						detailParam.put("RAW_MATERIAL", partInfo.get("RAW_MATERIAL"));
 						detailParam.put("SIZE", partInfo.get("SIZE"));
 						detailParam.put("QTY", partInfo.get("PO_QTY"));
+					} else {
+						// 소재품번이 없는 경우: 부품품번, 부품명, 제작수량
+						detailParam.put("PART_NO", partInfo.get("PART_NO"));
+						detailParam.put("PART_NAME", partInfo.get("PART_NAME"));
+						detailParam.put("RAW_MATERIAL", "");
+						detailParam.put("SIZE", "");
+						detailParam.put("QTY", partInfo.get("PRODUCTION_QTY"));
 					}
+				}
 					detailParam.put("UNIT_PRICE", 0);  // 단가는 견적 수신 후 입력
 					detailParam.put("REMARK", "");