From f8af871104844bff85310decfa7d5c25d0823148 Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Fri, 5 Dec 2025 13:10:30 +0900
Subject: [PATCH] =?UTF-8?q?=ED=92=88=EC=9D=98=EC=84=9C=20=EC=B1=84?=
 =?UTF-8?q?=EB=B2=88=EA=B7=9C=EC=B9=99,=20=ED=92=88=EC=9D=98=EC=84=9C?=
 =?UTF-8?q?=EC=9E=91=EC=84=B1=EC=9D=BC=20=EC=97=85=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=8A=B8,=20=ED=92=88=EC=9D=98=EC=84=9C=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=B3=B5=EA=B5=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/pms/mapper/salesMng.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/com/pms/mapper/salesMng.xml b/src/com/pms/mapper/salesMng.xml
index 9279699..3cb547d 100644
--- a/src/com/pms/mapper/salesMng.xml
+++ b/src/com/pms/mapper/salesMng.xml
@@ -3378,7 +3378,6 @@ ORDER BY V.PATH2
 		VENDOR = #{VENDOR_PM},
 		UNIT_PRICE = COALESCE(NULLIF(TRIM(#{UNIT_PRICE}::TEXT), '')::NUMERIC, 0),
 		TOTAL_PRICE = COALESCE(NULLIF(TRIM(#{TOTAL_PRICE}::TEXT), '')::NUMERIC, 0),
-		PROPOSAL_DATE = COALESCE(PROPOSAL_DATE, NOW()),  -- 저장 시 품의서작성일 자동 설정 (기존 값 없으면 오늘 날짜)
 		EDITER = #{EDITER},
 		EDIT_DATE = NOW()
 	WHERE OBJID::VARCHAR = #{OBJID}
@@ -3393,7 +3392,6 @@ ORDER BY V.PATH2
 		VENDOR_PM = #{VENDOR_PM},
 		UNIT_PRICE = COALESCE(NULLIF(TRIM(#{UNIT_PRICE}::TEXT), '')::NUMERIC, 0),
 		TOTAL_PRICE = COALESCE(NULLIF(TRIM(#{TOTAL_PRICE}::TEXT), '')::NUMERIC, 0),
-		PROPOSAL_DATE = COALESCE(PROPOSAL_DATE, NOW()),  -- 저장 시 품의서작성일 자동 설정 (기존 값 없으면 오늘 날짜)
 		WRITER = #{EDITER}
 	WHERE OBJID::VARCHAR = #{OBJID}
 </update>
@@ -3420,12 +3418,12 @@ ORDER BY V.PATH2
 	WHERE DOC_TYPE = 'PURCHASE_REQUEST' OR DOC_TYPE IS NULL
 </select>
 
-<!-- 다음 품의서 번호 생성 (RPS + YY + - + MMDD + - + 2자리 순번) 예: RPS25-0926-01 -->
+<!-- 다음 품의서 번호 생성 (P + YYYYMMDD + - + 3자리 순번) - 품의서용 -->
 <select id="getNextProposalNo" resultType="string">
-	SELECT 'RPS'||TO_CHAR(NOW(),'YY')||'-'||TO_CHAR(NOW(),'MMDD')||'-'||LPAD((COALESCE(MAX(SUBSTR(REQUEST_MNG_NO,12,2)),'0')::INTEGER+1)::TEXT,2,'0') 
+	SELECT 'P'||TO_CHAR(NOW(),'YYYYMMDD')||'-'||LPAD((COALESCE(MAX(SUBSTR(REQUEST_MNG_NO,11,3))::INTEGER, 0)+1)::TEXT,3,'0') 
 	FROM SALES_REQUEST_MASTER
 	WHERE DOC_TYPE = 'PROPOSAL'
-	AND REQUEST_MNG_NO LIKE 'RPS'||TO_CHAR(NOW(),'YY')||'-'||TO_CHAR(NOW(),'MMDD')||'%'
+	AND REQUEST_MNG_NO LIKE 'P'||TO_CHAR(NOW(),'YYYYMMDD')||'%'
 </select>
 
 <!-- M-BOM에서 구매리스트 생성 - SALES_REQUEST_MASTER만 생성 (SALES_REQUEST_PART는 생성 안 함) -->
@@ -3832,7 +3830,7 @@ ORDER BY V.PATH2
 		) A ON SRM.OBJID::VARCHAR = A.TARGET_OBJID::VARCHAR
 	WHERE 1=1
 		AND SRM.STATUS IN ('create', 'approvalRequest', 'approvalComplete', 'reject')
-		-- AND SRM.DOC_TYPE = 'PROPOSAL'  -- DOC_TYPE 컬럼 없음, 주석처리
+		AND SRM.DOC_TYPE = 'PROPOSAL'
 	<if test="SEARCH_PROPOSAL_NO != null and !''.equals(SEARCH_PROPOSAL_NO)">
 		AND SRM.REQUEST_MNG_NO LIKE '%${SEARCH_PROPOSAL_NO}%'
 	</if>
@@ -3970,7 +3968,7 @@ ORDER BY V.PATH2
 		SRP.UNIT_PRICE,
 		SRP.TOTAL_PRICE,
 		SRP.VENDOR_PM,
-		(SELECT SUPPLY_NAME FROM ADMIN_SUPPLY_MNG WHERE OBJID::VARCHAR = SRP.VENDOR_PM) AS VENDOR_NAME,
+		(SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = SRP.VENDOR_PM) AS VENDOR_NAME,
 		SRP.REMARK,
 		SRP.DELIVERY_REQUEST_DATE,
 		SRP.DELIVERY_REQUEST_DATE AS DELIVERY_REQUEST_DATE_TITLE