From 19ea7b5e0c23214d2d2cf948d6bae4134ead6696 Mon Sep 17 00:00:00 2001
From: leeheejin <imleesinok@gmail.com>
Date: Thu, 11 Dec 2025 09:33:32 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EC=84=9C=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=20=EA=B2=B0=EC=9E=AC=EC=83=81=EC=8B=A0=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=ED=99=9C=EC=84=B1=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp b/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp
index 621be4b..f2dcc45 100644
--- a/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp
+++ b/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp
@@ -667,7 +667,7 @@ function openProjectFormPopUp(objId){
 	                <div class="btnArea">
 						<input type="button" value="조회" 		class="plm_btns" id="btnSearch" name="btnSearch">
 	                    <input type="button" value="수주등록"	 class="plm_btns btnRegist">
-	                    <!-- <input type="button" value="결재상신"	 class="plm_btns" id="btnApproval"> -->
+	                    <input type="button" value="결재상신"	 class="plm_btns" id="btnApproval">
 	                </div>
 		            </div>
             <div id="plmSearchZon">

From 988d717dc466e178c6eca76a0a63244337288391 Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Thu, 11 Dec 2025 11:52:51 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?=
 =?UTF-8?q?=EC=84=A0=ED=83=9D=20=EC=97=86=EC=9D=B4=20=EB=B0=9C=EC=A3=BC?=
 =?UTF-8?q?=EC=8B=9C=20=EC=98=A4=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

---
 src/com/pms/mapper/purchaseOrder.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/pms/mapper/purchaseOrder.xml b/src/com/pms/mapper/purchaseOrder.xml
index ad07671..d7b2ffb 100644
--- a/src/com/pms/mapper/purchaseOrder.xml
+++ b/src/com/pms/mapper/purchaseOrder.xml
@@ -611,7 +611,7 @@
 		    #{FORM_TYPE}
 		    ,#{TITLE}
 		    ,#{PURCHASE_DATE}
-		    ,#{CONTRACT_MGMT_OBJID}::NUMERIC
+		    ,#{CONTRACT_MGMT_OBJID}
 		    ,#{TYPE                   }
 		    ,#{INSPECT_METHOD         }
 		    ,#{TOTAL_PRICE_TXT        }
@@ -668,7 +668,7 @@
 			    </if>
 				,TITLE            = #{TITLE}
 				,PURCHASE_DATE    = #{PURCHASE_DATE}
-				,CONTRACT_MGMT_OBJID = #{CONTRACT_MGMT_OBJID}::NUMERIC
+				,CONTRACT_MGMT_OBJID = #{CONTRACT_MGMT_OBJID}
 				,TYPE                    = #{TYPE                   }
 				,INSPECT_METHOD          = #{INSPECT_METHOD         }
 				,TOTAL_PRICE_TXT         = #{TOTAL_PRICE_TXT        }
@@ -829,7 +829,7 @@
 			    SALES_MNG_USER_ID = #{SALES_MNG_USER_ID}
 				,TITLE            = #{TITLE}
 				,PURCHASE_DATE    = #{PURCHASE_DATE}
-				,CONTRACT_MGMT_OBJID = NULLIF(#{CONTRACT_MGMT_OBJID}::TEXT, '')::NUMERIC
+				,CONTRACT_MGMT_OBJID = #{CONTRACT_MGMT_OBJID}
 				,TYPE                    = #{TYPE                   }
 				,INSPECT_METHOD          = #{INSPECT_METHOD         }
 				,TOTAL_PRICE_TXT         = #{TOTAL_PRICE_TXT        }
@@ -986,7 +986,7 @@
 		    #{SALES_MNG_USER_ID}
 		    ,#{TITLE}
 		    ,#{PURCHASE_DATE}
-		    ,#{CONTRACT_MGMT_OBJID}::NUMERIC
+		    ,#{CONTRACT_MGMT_OBJID}
 		    ,#{TYPE                   }
 		    ,#{INSPECT_METHOD         }
 		    ,#{TOTAL_PRICE_TXT        }