From b753594a93c7f26c6550fe3f44ed30e9c6ae5dbe Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Mon, 23 Feb 2026 17:07:51 +0900
Subject: [PATCH] =?UTF-8?q?=ED=92=88=EC=9D=98=EC=84=9C=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1=20=EB=A1=9C=EC=A7=81=20=EA=B0=9C=EC=84=A0:=20?=
 =?UTF-8?q?=EB=8F=99=EC=9D=BC=20=ED=92=88=EB=B2=88=20=EA=B7=B8=EB=A3=B9?=
 =?UTF-8?q?=ED=95=91=20+=20QTY=20=EB=B6=84=EA=B8=B0=20+=20M-BOM=20?=
 =?UTF-8?q?=EB=B3=B5=EC=82=AC=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 품의서 대상 조회 시 구매리스트와 동일 기준(PART_OBJID+SUPPLY_TYPE+RAW_MATERIAL+SIZE)으로 동일 품번 그룹핑
- 소재 유무에 따라 QTY를 PO_QTY(소재O) 또는 PRODUCTION_QTY(소재X)로 분기
- INSERT 쿼리를 VALUES 기반으로 변경하여 그룹핑된 합산 데이터 직접 삽입
- M-BOM 복사 시 수주수량 기반 제작수량 자동계산 + PROPOSAL_DATE 초기화

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/com/pms/mapper/salesMng.xml               | 207 +++++++++++-------
 .../service/ContractMgmtService.java          |  12 +-
 .../salesmgmt/service/SalesMngService.java    |  16 +-
 .../service/ProductionPlanningService.java    |  19 +-
 4 files changed, 164 insertions(+), 90 deletions(-)

diff --git a/src/com/pms/mapper/salesMng.xml b/src/com/pms/mapper/salesMng.xml
index ed05500..d98ebda 100644
--- a/src/com/pms/mapper/salesMng.xml
+++ b/src/com/pms/mapper/salesMng.xml
@@ -3900,21 +3900,35 @@ ORDER BY V.PATH2
 
 <!-- ==================== 품의서 관리 ==================== -->
 
-<!-- 품의서 대상 품목 조회 - M-BOM 기반 (MBOM_DETAIL에서 조회) - 소재단가 기준 -->
+<!-- 품의서 대상 품목 조회 - M-BOM 기반 (MBOM_DETAIL에서 조회) - 공급업체 기준 -->
+<!-- 소재단가+공급업체가 입력된 품목 대상 (소재 유무에 따라 수량/합계 분기) -->
+<!-- 구매리스트와 동일 기준으로 동일 품번 그룹핑 (PART_OBJID + SUPPLY_TYPE + RAW_MATERIAL + RAW_MATERIAL_SIZE) -->
 <select id="getProposalTargetPartsFromMBom" parameterType="map" resultType="com.pms.common.UpperKeyMap">
 	SELECT
-		MD.OBJID,
+		MIN(MD.OBJID) AS OBJID,
+		STRING_AGG(MD.OBJID::VARCHAR, ',' ORDER BY MD.OBJID) AS ORIGINAL_OBJIDS,
 		MD.PART_OBJID,
-		PM.PART_NO,
-		PM.PART_NAME,
-		MD.QTY,
-		MD.UNIT_PRICE,
-		MD.TOTAL_PRICE,
-		MD.VENDOR AS VENDOR_PM,
-		(SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = MD.VENDOR) AS VENDOR_NAME,
-		MD.NET_QTY,
-		MD.PO_QTY,
-		MD.PRODUCTION_QTY,
+		MIN(PM.PART_NO) AS PART_NO,
+		MIN(PM.PART_NAME) AS PART_NAME,
+		CASE WHEN COALESCE(MIN(MD.RAW_MATERIAL_PART_NO), '') != ''
+			THEN SUM(COALESCE(MD.PO_QTY, 0))
+			ELSE SUM(COALESCE(MD.PRODUCTION_QTY, 0))
+		END AS QTY,
+		MIN(MD.UNIT_PRICE) AS UNIT_PRICE,
+		CASE WHEN COALESCE(MIN(MD.RAW_MATERIAL_PART_NO), '') != ''
+			THEN COALESCE(MIN(MD.UNIT_PRICE), 0) * SUM(COALESCE(MD.PO_QTY, 0))
+			ELSE COALESCE(MIN(MD.UNIT_PRICE), 0) * SUM(COALESCE(MD.PRODUCTION_QTY, 0))
+		END AS TOTAL_PRICE,
+		MIN(MD.VENDOR) AS VENDOR_PM,
+		(SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = MIN(MD.VENDOR)) AS VENDOR_NAME,
+		SUM(COALESCE(MD.NET_QTY, 0)) AS NET_QTY,
+		SUM(COALESCE(MD.PO_QTY, 0)) AS PO_QTY,
+		SUM(COALESCE(MD.PRODUCTION_QTY, 0)) AS PRODUCTION_QTY,
+		MIN(MD.RAW_MATERIAL_PART_NO) AS RAW_MATERIAL_NO,
+		COALESCE(MIN(MD.RAW_MATERIAL), '') AS RAW_MATERIAL,
+		COALESCE(MIN(MD.RAW_MATERIAL_SIZE), '') AS SIZE,
+		MIN(MD.UNIT) AS UNIT,
+		COALESCE(MIN(MD.USE_YN), 'Y') AS USE_YN,
 		'MBOM' AS DATA_SOURCE,
 		'MATERIAL' AS PROPOSAL_TYPE
 	FROM
@@ -3930,24 +3944,33 @@ ORDER BY V.PATH2
 		AND MD.VENDOR != ''
 		-- 소재 품의서가 생성되지 않은 품목만
 		AND MD.PROPOSAL_DATE IS NULL
-	ORDER BY MD.REGDATE
+	GROUP BY MD.PART_OBJID,
+		COALESCE(MD.SUPPLY_TYPE, ''),
+		COALESCE(MD.RAW_MATERIAL, ''),
+		COALESCE(MD.RAW_MATERIAL_SIZE, '')
+	ORDER BY MIN(MD.REGDATE)
 </select>
 
-<!-- 품의서 대상 품목 조회 - M-BOM 기반 (MBOM_DETAIL에서 조회) - 가공단가 기준 -->
+<!-- 품의서 대상 품목 조회 - M-BOM 기반 (MBOM_DETAIL에서 조회) - 가공업체 기준 -->
+<!-- 가공단가+가공업체가 입력된 품목 대상 (부품, 제작수량) -->
+<!-- 구매리스트와 동일 기준으로 동일 품번 그룹핑 -->
 <select id="getProposalTargetPartsFromMBomProcessing" parameterType="map" resultType="com.pms.common.UpperKeyMap">
 	SELECT
-		MD.OBJID,
+		MIN(MD.OBJID) AS OBJID,
+		STRING_AGG(MD.OBJID::VARCHAR, ',' ORDER BY MD.OBJID) AS ORIGINAL_OBJIDS,
 		MD.PART_OBJID,
-		PM.PART_NO,
-		PM.PART_NAME,
-		MD.QTY,
-		MD.PROCESSING_UNIT_PRICE AS UNIT_PRICE,
-		MD.PROCESSING_TOTAL_PRICE AS TOTAL_PRICE,
-		MD.PROCESSING_VENDOR AS VENDOR_PM,
-		(SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = MD.PROCESSING_VENDOR) AS VENDOR_NAME,
-		MD.NET_QTY,
-		MD.PO_QTY,
-		MD.PRODUCTION_QTY,
+		MIN(PM.PART_NO) AS PART_NO,
+		MIN(PM.PART_NAME) AS PART_NAME,
+		SUM(COALESCE(MD.PRODUCTION_QTY, 0)) AS QTY,
+		MIN(MD.PROCESSING_UNIT_PRICE) AS UNIT_PRICE,
+		COALESCE(MIN(MD.PROCESSING_UNIT_PRICE), 0) * SUM(COALESCE(MD.PRODUCTION_QTY, 0)) AS TOTAL_PRICE,
+		MIN(MD.PROCESSING_VENDOR) AS VENDOR_PM,
+		(SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = MIN(MD.PROCESSING_VENDOR)) AS VENDOR_NAME,
+		SUM(COALESCE(MD.NET_QTY, 0)) AS NET_QTY,
+		SUM(COALESCE(MD.PO_QTY, 0)) AS PO_QTY,
+		SUM(COALESCE(MD.PRODUCTION_QTY, 0)) AS PRODUCTION_QTY,
+		MIN(MD.UNIT) AS UNIT,
+		COALESCE(MIN(MD.USE_YN), 'Y') AS USE_YN,
 		'MBOM' AS DATA_SOURCE,
 		'PROCESSING' AS PROPOSAL_TYPE
 	FROM
@@ -3963,19 +3986,24 @@ ORDER BY V.PATH2
 		AND MD.PROCESSING_VENDOR != ''
 		-- 가공 품의서가 생성되지 않은 품목만
 		AND MD.PROCESSING_PROPOSAL_DATE IS NULL
-	ORDER BY MD.REGDATE
+	GROUP BY MD.PART_OBJID,
+		COALESCE(MD.SUPPLY_TYPE, ''),
+		COALESCE(MD.RAW_MATERIAL, ''),
+		COALESCE(MD.RAW_MATERIAL_SIZE, '')
+	ORDER BY MIN(MD.REGDATE)
 </select>
 
 <!-- 품의서 대상 제외 품목 조회 - M-BOM 기반 (소재단가O, 공급업체X) -->
+<!-- 동일 품번 그룹핑 -->
 <select id="getProposalExcludedPartsFromMBom" parameterType="map" resultType="com.pms.common.UpperKeyMap">
 	SELECT
-		MD.OBJID,
+		MIN(MD.OBJID) AS OBJID,
 		MD.PART_OBJID,
-		PM.PART_NO,
-		PM.PART_NAME,
-		MD.QTY,
-		MD.UNIT_PRICE,
-		MD.TOTAL_PRICE,
+		MIN(PM.PART_NO) AS PART_NO,
+		MIN(PM.PART_NAME) AS PART_NAME,
+		SUM(COALESCE(MD.QTY, 0)) AS QTY,
+		MIN(MD.UNIT_PRICE) AS UNIT_PRICE,
+		COALESCE(MIN(MD.UNIT_PRICE), 0) * SUM(COALESCE(MD.QTY, 0)) AS TOTAL_PRICE,
 		'MBOM' AS DATA_SOURCE,
 		'MATERIAL' AS PROPOSAL_TYPE
 	FROM
@@ -3990,19 +4018,24 @@ ORDER BY V.PATH2
 		AND (MD.VENDOR IS NULL OR MD.VENDOR = '')
 		-- 소재 품의서가 생성되지 않은 품목만
 		AND MD.PROPOSAL_DATE IS NULL
-	ORDER BY MD.REGDATE
+	GROUP BY MD.PART_OBJID,
+		COALESCE(MD.SUPPLY_TYPE, ''),
+		COALESCE(MD.RAW_MATERIAL, ''),
+		COALESCE(MD.RAW_MATERIAL_SIZE, '')
+	ORDER BY MIN(MD.REGDATE)
 </select>
 
 <!-- 품의서 대상 제외 품목 조회 - M-BOM 기반 (가공단가O, 가공업체X) -->
+<!-- 동일 품번 그룹핑 -->
 <select id="getProposalExcludedPartsFromMBomProcessing" parameterType="map" resultType="com.pms.common.UpperKeyMap">
 	SELECT
-		MD.OBJID,
+		MIN(MD.OBJID) AS OBJID,
 		MD.PART_OBJID,
-		PM.PART_NO,
-		PM.PART_NAME,
-		MD.QTY,
-		MD.PROCESSING_UNIT_PRICE AS UNIT_PRICE,
-		MD.PROCESSING_TOTAL_PRICE AS TOTAL_PRICE,
+		MIN(PM.PART_NO) AS PART_NO,
+		MIN(PM.PART_NAME) AS PART_NAME,
+		SUM(COALESCE(MD.QTY, 0)) AS QTY,
+		MIN(MD.PROCESSING_UNIT_PRICE) AS UNIT_PRICE,
+		COALESCE(MIN(MD.PROCESSING_UNIT_PRICE), 0) * SUM(COALESCE(MD.QTY, 0)) AS TOTAL_PRICE,
 		'MBOM' AS DATA_SOURCE,
 		'PROCESSING' AS PROPOSAL_TYPE
 	FROM
@@ -4017,24 +4050,38 @@ ORDER BY V.PATH2
 		AND (MD.PROCESSING_VENDOR IS NULL OR MD.PROCESSING_VENDOR = '')
 		-- 가공 품의서가 생성되지 않은 품목만
 		AND MD.PROCESSING_PROPOSAL_DATE IS NULL
-	ORDER BY MD.REGDATE
+	GROUP BY MD.PART_OBJID,
+		COALESCE(MD.SUPPLY_TYPE, ''),
+		COALESCE(MD.RAW_MATERIAL, ''),
+		COALESCE(MD.RAW_MATERIAL_SIZE, '')
+	ORDER BY MIN(MD.REGDATE)
 </select>
 
-<!-- 품의서 대상 품목 조회 - 수동 작성 (SALES_REQUEST_PART에서 조회) - 소재단가 기준 -->
+<!-- 품의서 대상 품목 조회 - 수동 작성 (SALES_REQUEST_PART에서 조회) - 공급업체 기준 -->
+<!-- 소재단가+공급업체가 입력된 품목 대상 (소재 유무에 따라 수량/합계 분기) -->
 <select id="getProposalTargetPartsFromManual" parameterType="map" resultType="com.pms.common.UpperKeyMap">
 	SELECT
 		SRP.OBJID,
 		SRP.PART_OBJID,
 		PM.PART_NO,
 		PM.PART_NAME,
-		SRP.QTY,
+		CASE WHEN SRP.RAW_MATERIAL_NO IS NOT NULL AND SRP.RAW_MATERIAL_NO != ''
+			THEN SRP.PO_QTY
+			ELSE SRP.PRODUCTION_QTY
+		END AS QTY,
 		SRP.UNIT_PRICE,
-		SRP.TOTAL_PRICE,
+		CASE WHEN SRP.RAW_MATERIAL_NO IS NOT NULL AND SRP.RAW_MATERIAL_NO != ''
+			THEN COALESCE(SRP.UNIT_PRICE, 0) * COALESCE(SRP.PO_QTY, 0)
+			ELSE COALESCE(SRP.UNIT_PRICE, 0) * COALESCE(SRP.PRODUCTION_QTY, 0)
+		END AS TOTAL_PRICE,
 		SRP.VENDOR_PM,
 		(SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = SRP.VENDOR_PM) AS VENDOR_NAME,
 		SRP.NET_QTY,
 		SRP.PO_QTY,
 		SRP.PRODUCTION_QTY,
+		SRP.RAW_MATERIAL_NO,
+		SRP.RAW_MATERIAL,
+		SRP.SIZE,
 		'MANUAL' AS DATA_SOURCE,
 		'MATERIAL' AS PROPOSAL_TYPE
 	FROM
@@ -4053,14 +4100,15 @@ ORDER BY V.PATH2
 	ORDER BY SRP.REGDATE
 </select>
 
-<!-- 품의서 대상 품목 조회 - 수동 작성 (SALES_REQUEST_PART에서 조회) - 가공단가 기준 -->
+<!-- 품의서 대상 품목 조회 - 수동 작성 (SALES_REQUEST_PART에서 조회) - 가공업체 기준 -->
+<!-- 가공단가+가공업체가 입력된 품목 대상 (부품, 제작수량) -->
 <select id="getProposalTargetPartsFromManualProcessing" parameterType="map" resultType="com.pms.common.UpperKeyMap">
 	SELECT
 		SRP.OBJID,
 		SRP.PART_OBJID,
 		PM.PART_NO,
 		PM.PART_NAME,
-		SRP.QTY,
+		SRP.PRODUCTION_QTY AS QTY,
 		SRP.PROCESSING_UNIT_PRICE AS UNIT_PRICE,
 		SRP.PROCESSING_TOTAL_PRICE AS TOTAL_PRICE,
 		SRP.PROCESSING_VENDOR AS VENDOR_PM,
@@ -4177,7 +4225,8 @@ ORDER BY V.PATH2
 	)
 </insert>
 
-<!-- 품의서용 SALES_REQUEST_PART 생성 (M-BOM 기반 품목 복사) - 소재 -->
+<!-- 품의서용 SALES_REQUEST_PART 생성 (M-BOM 기반 품목 복사) - 공급업체 -->
+<!-- 그룹핑된 합산 데이터를 직접 INSERT (동일 품번 합산 대응) -->
 <insert id="insertProposalPartFromMBom" parameterType="map">
 	INSERT INTO SALES_REQUEST_PART (
 		OBJID,
@@ -4194,27 +4243,26 @@ ORDER BY V.PATH2
 		PROPOSAL_DATE,
 		WRITER,
 		REGDATE
-	)
-	SELECT
+	) VALUES (
 		#{NEW_OBJID},
 		#{PROPOSAL_MASTER_OBJID},
-		PART_OBJID,
-		QTY,
-		UNIT,
-		UNIT_PRICE,
-		TOTAL_PRICE,
-		VENDOR AS VENDOR_PM,
-		NET_QTY,
-		PO_QTY,
-		USE_YN,
-		NOW() AS PROPOSAL_DATE,
+		#{PART_OBJID},
+		#{QTY},
+		#{UNIT},
+		#{UNIT_PRICE},
+		#{TOTAL_PRICE},
+		#{VENDOR_PM},
+		#{NET_QTY},
+		#{PO_QTY},
+		#{USE_YN},
+		NOW(),
 		#{WRITER},
 		NOW()
-	FROM MBOM_DETAIL
-	WHERE OBJID = #{SOURCE_OBJID}
+	)
 </insert>
 
 <!-- 품의서용 SALES_REQUEST_PART 생성 (M-BOM 기반 품목 복사) - 가공 -->
+<!-- 그룹핑된 합산 데이터를 직접 INSERT (동일 품번 합산 대응) -->
 <insert id="insertProposalPartFromMBomProcessing" parameterType="map">
 	INSERT INTO SALES_REQUEST_PART (
 		OBJID,
@@ -4231,27 +4279,26 @@ ORDER BY V.PATH2
 		PROPOSAL_DATE,
 		WRITER,
 		REGDATE
-	)
-	SELECT
+	) VALUES (
 		#{NEW_OBJID},
 		#{PROPOSAL_MASTER_OBJID},
-		PART_OBJID,
-		PRODUCTION_QTY AS QTY,
-		UNIT,
-		PROCESSING_UNIT_PRICE AS UNIT_PRICE,
-		PROCESSING_TOTAL_PRICE AS TOTAL_PRICE,
-		PROCESSING_VENDOR AS VENDOR_PM,
-		NET_QTY,
-		PO_QTY,
-		USE_YN,
-		NOW() AS PROPOSAL_DATE,
+		#{PART_OBJID},
+		#{QTY},
+		#{UNIT},
+		#{UNIT_PRICE},
+		#{TOTAL_PRICE},
+		#{VENDOR_PM},
+		#{NET_QTY},
+		#{PO_QTY},
+		#{USE_YN},
+		NOW(),
 		#{WRITER},
 		NOW()
-	FROM MBOM_DETAIL
-	WHERE OBJID = #{SOURCE_OBJID}
+	)
 </insert>
 
-<!-- 품의서용 SALES_REQUEST_PART 생성 (수동 작성 품목 복사) - 소재 -->
+<!-- 품의서용 SALES_REQUEST_PART 생성 (수동 작성 품목 복사) - 공급업체 -->
+<!-- 소재 유무에 따라 QTY/TOTAL_PRICE 분기 -->
 <insert id="insertProposalPartFromManual" parameterType="map">
 	INSERT INTO SALES_REQUEST_PART (
 		OBJID,
@@ -4273,10 +4320,16 @@ ORDER BY V.PATH2
 		#{NEW_OBJID},
 		#{PROPOSAL_MASTER_OBJID},
 		PART_OBJID,
-		QTY,
+		CASE WHEN RAW_MATERIAL_NO IS NOT NULL AND RAW_MATERIAL_NO != ''
+			THEN PO_QTY
+			ELSE PRODUCTION_QTY
+		END AS QTY,
 		UNIT,
 		UNIT_PRICE,
-		TOTAL_PRICE,
+		CASE WHEN RAW_MATERIAL_NO IS NOT NULL AND RAW_MATERIAL_NO != ''
+			THEN COALESCE(UNIT_PRICE, 0) * COALESCE(PO_QTY, 0)
+			ELSE COALESCE(UNIT_PRICE, 0) * COALESCE(PRODUCTION_QTY, 0)
+		END AS TOTAL_PRICE,
 		VENDOR_PM,
 		NET_QTY,
 		PO_QTY,
diff --git a/src/com/pms/salesmgmt/service/ContractMgmtService.java b/src/com/pms/salesmgmt/service/ContractMgmtService.java
index 47d2ddb..51ac744 100644
--- a/src/com/pms/salesmgmt/service/ContractMgmtService.java
+++ b/src/com/pms/salesmgmt/service/ContractMgmtService.java
@@ -2793,7 +2793,8 @@ private String encodeImageToBase64(String imagePath) {
 											(String)projectParam.get("OBJID"), 
 											CommonUtils.checkNull(item.get("PART_NO")), 
 											CommonUtils.checkNull(item.get("PART_NAME")), 
-											person.getUserId());
+											person.getUserId(),
+											itemQuantity);
 								}
 								
 								// project_no - unit 폴더 생성
@@ -3017,7 +3018,8 @@ private String encodeImageToBase64(String imagePath) {
 										(String)projectParam.get("OBJID"), 
 										CommonUtils.checkNull(item.get("PART_NO")), 
 										CommonUtils.checkNull(item.get("PART_NAME")), 
-										person.getUserId());
+										person.getUserId(),
+										itemQuantity);
 							}
 							
 							// project_no - unit 폴더 생성
@@ -3814,7 +3816,7 @@ private String encodeImageToBase64(String imagePath) {
 	 * 프로젝트 자동생성 시 WBS TASK 등록 직후 호출
 	 */
 	private void copyMbomIfSamePartNoExists(SqlSession sqlSession, String projectObjId, 
-			String partNo, String partName, String userId) {
+			String partNo, String partName, String userId, int orderQuantity) {
 		try {
 			if(partNo == null || partNo.isEmpty()) return;
 			
@@ -3827,10 +3829,10 @@ private String encodeImageToBase64(String imagePath) {
 				template = CommonUtils.toUpperCaseMapKey(template);
 				String templateHeaderObjid = CommonUtils.checkNull(template.get("TEMPLATE_HEADER_OBJID"));
 				
-				System.out.println("동일 품번(" + partNo + ") M-BOM 발견 → 프로젝트(" + projectObjId + ")에 자동 복사");
+				System.out.println("동일 품번(" + partNo + ") M-BOM 발견 → 프로젝트(" + projectObjId + ")에 자동 복사 (수주수량: " + orderQuantity + ")");
 				
 				productionPlanningService.copyMbomFromTemplate(
-						sqlSession, userId, projectObjId, templateHeaderObjid, partNo, partName);
+						sqlSession, userId, projectObjId, templateHeaderObjid, partNo, partName, orderQuantity);
 			}
 		} catch(Exception e) {
 			System.out.println("M-BOM 자동 복사 중 오류 (프로젝트 생성에는 영향 없음): " + e.getMessage());
diff --git a/src/com/pms/salesmgmt/service/SalesMngService.java b/src/com/pms/salesmgmt/service/SalesMngService.java
index da7212a..c359a11 100644
--- a/src/com/pms/salesmgmt/service/SalesMngService.java
+++ b/src/com/pms/salesmgmt/service/SalesMngService.java
@@ -2199,20 +2199,30 @@ public class SalesMngService {
 			Map partParam = new HashMap();
 			partParam.put("NEW_OBJID", CommonUtils.createObjId());
 			partParam.put("PROPOSAL_MASTER_OBJID", proposalMasterObjid);
-			partParam.put("SOURCE_OBJID", sourceObjid);
 			partParam.put("WRITER", userId);
 			partParam.put("PROPOSAL_TYPE", proposalType);
 			
 			// M-BOM 기반 여부 + 소재/가공 구분에 따라 INSERT 쿼리 분기
 			if(!mbomHeaderObjid.isEmpty()) {
-				// M-BOM 기반
+				// M-BOM 기반: 그룹핑된 합산 데이터를 직접 파라미터로 전달
+				partParam.put("PART_OBJID", part.get("PART_OBJID"));
+				partParam.put("QTY", part.get("QTY"));
+				partParam.put("UNIT", CommonUtils.checkNull(part.get("UNIT")));
+				partParam.put("UNIT_PRICE", part.get("UNIT_PRICE"));
+				partParam.put("TOTAL_PRICE", part.get("TOTAL_PRICE"));
+				partParam.put("VENDOR_PM", CommonUtils.checkNull(part.get("VENDOR_PM")));
+				partParam.put("NET_QTY", part.get("NET_QTY"));
+				partParam.put("PO_QTY", part.get("PO_QTY"));
+				partParam.put("USE_YN", CommonUtils.checkNull(part.get("USE_YN")));
+				
 				if("PROCESSING".equals(proposalType)) {
 					sqlSession.insert("salesMng.insertProposalPartFromMBomProcessing", partParam);
 				} else {
 					sqlSession.insert("salesMng.insertProposalPartFromMBom", partParam);
 				}
 			} else {
-				// 수동 작성
+				// 수동 작성: 기존 방식 유지 (SALES_REQUEST_PART에서 개별 복사)
+				partParam.put("SOURCE_OBJID", sourceObjid);
 				if("PROCESSING".equals(proposalType)) {
 					sqlSession.insert("salesMng.insertProposalPartFromManualProcessing", partParam);
 				} else {
diff --git a/src/com/pms/service/ProductionPlanningService.java b/src/com/pms/service/ProductionPlanningService.java
index a3ea78e..5602f2e 100644
--- a/src/com/pms/service/ProductionPlanningService.java
+++ b/src/com/pms/service/ProductionPlanningService.java
@@ -1593,7 +1593,7 @@ public class ProductionPlanningService {
 	 * 동일 품번의 최신 M-BOM을 새 프로젝트에 자동 복사 (독립 트랜잭션)
 	 */
 	public String copyMbomFromTemplate(HttpServletRequest request, String projectObjId, 
-			String templateHeaderObjId, String partNo, String partName) {
+			String templateHeaderObjId, String partNo, String partName, int orderQuantity) {
 		SqlSession sqlSession = null;
 		String newHeaderObjid = null;
 		
@@ -1603,7 +1603,7 @@ public class ProductionPlanningService {
 			PersonBean person = (PersonBean)session.getAttribute(Constants.PERSON_BEAN);
 			String userId = CommonUtils.checkNull(person.getUserId());
 			
-			newHeaderObjid = copyMbomFromTemplate(sqlSession, userId, projectObjId, templateHeaderObjId, partNo, partName);
+			newHeaderObjid = copyMbomFromTemplate(sqlSession, userId, projectObjId, templateHeaderObjId, partNo, partName, orderQuantity);
 			
 			if(newHeaderObjid != null) {
 				sqlSession.commit();
@@ -1624,7 +1624,7 @@ public class ProductionPlanningService {
 	 * 수주 확정 → 프로젝트 자동생성 시 ContractMgmtService에서 호출
 	 */
 	public String copyMbomFromTemplate(SqlSession sqlSession, String userId, String projectObjId, 
-			String templateHeaderObjId, String partNo, String partName) {
+			String templateHeaderObjId, String partNo, String partName, int orderQuantity) {
 		String newHeaderObjid = null;
 		
 		try {
@@ -1696,9 +1696,18 @@ public class ProductionPlanningService {
 					insertParam.put("processingVendor", detail.get("PROCESSING_VENDOR"));
 					insertParam.put("processingDeadline", detail.get("PROCESSING_DEADLINE"));
 					insertParam.put("grindingDeadline", detail.get("GRINDING_DEADLINE"));
+					// REQUIRED_QTY(소요량)는 원본 복사, 나머지 수량은 수주수량 기준 재계산
+					double requiredQty = 0;
+					try {
+						Object reqObj = detail.get("REQUIRED_QTY");
+						if(reqObj != null) requiredQty = Double.parseDouble(String.valueOf(reqObj));
+					} catch(Exception ignore) {}
+					
+					double productionQty = requiredQty * orderQuantity;
+					
 					insertParam.put("requiredQty", detail.get("REQUIRED_QTY"));
 					insertParam.put("orderQty", null);
-					insertParam.put("productionQty", null);
+					insertParam.put("productionQty", productionQty > 0 ? productionQty : null);
 					insertParam.put("stockQty", null);
 					insertParam.put("shortageQty", null);
 					insertParam.put("netQty", null);
@@ -1710,7 +1719,7 @@ public class ProductionPlanningService {
 					insertParam.put("currency", detail.get("CURRENCY"));
 					insertParam.put("leadTime", detail.get("LEAD_TIME"));
 					insertParam.put("minOrderQty", detail.get("MIN_ORDER_QTY"));
-					insertParam.put("proposalDate", detail.get("PROPOSAL_DATE"));
+					insertParam.put("proposalDate", null);
 					insertParam.put("remark", detail.get("REMARK"));
 					insertParam.put("sessionUserId", userId);