구매관리>입고일별입고관리 리스트에 마감정보입력 항목 컬럼 추가

Merge pull request 'V20260210' (#178 ) from V20260210 into main
Reviewed-on: #178
2026-03-20 14:58:12 +09:00 · 2026-03-20 05:29:49 +00:00 · 2026-03-20 05:19:58 +00:00
3 changed files with 13 additions and 1 deletions
--- a/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml
+++ b/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml
@@ -6625,10 +6625,12 @@ FROM(

 			<!-- 마감정보 -->
 			,COALESCE(AP.tax_type, '') AS TAX_TYPE
+			,(SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = AP.tax_type) AS TAX_TYPE_NAME
 			,COALESCE(AP.tax_invoice_date, '') AS TAX_INVOICE_DATE
 			,COALESCE(AP.export_decl_no, '') AS EXPORT_DECL_NO
 			,COALESCE(AP.loading_date, '') AS LOADING_DATE
 			,COALESCE(AP.foreign_type, '') AS FOREIGN_TYPE
+			,(SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = AP.foreign_type) AS FOREIGN_TYPE_NAME	
 			,COALESCE(AP.duty, 0) AS DUTY
 			,COALESCE(AP.exchange_rate, 0) AS EXCHANGE_RATE
 			,COALESCE(AP.import_vat, 0) AS IMPORT_VAT
--- a/WebContent/WEB-INF/view/purchaseOrder/purchaseCloseList.jsp
+++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseCloseList.jsp
@@ -320,7 +320,15 @@ var columns = [
 	{headerHozAlign:'center', hozAlign:'right',  minWidth:100,  widthGrow:0.9, title:'확정입고수량', field:'CONFIRMED_QTY',
 		formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false}
 	},
-	{headerHozAlign:'center', hozAlign:'left', minWidth:100, widthGrow:1.2, title:'계정과목', field:'SUB_LOCATION_NAME'},
+	{headerHozAlign:'center', hozAlign:'center', minWidth:100, widthGrow:1.2, title:'계정과목', field:'SUB_LOCATION_NAME'},
+	{headerHozAlign:'center', hozAlign:'center', minWidth:100, widthGrow:1.2, title:'국내/해외', field:'FOREIGN_TYPE_NAME'},
+	{headerHozAlign:'center', hozAlign:'right', minWidth:100, widthGrow:1.2, title:'환율', field:'EXCHANGE_RATE'},
+	{headerHozAlign:'center', hozAlign:'center', minWidth:100, widthGrow:1.2, title:'과세구분', field:'TAX_TYPE_NAME'},
+	{headerHozAlign:'center', hozAlign:'center', minWidth:100, widthGrow:1.2, title:'세금계산서발행일', field:'TAX_INVOICE_DATE'},
+	{headerHozAlign:'center', hozAlign:'center', minWidth:100, widthGrow:1.2, title:'수출신고필증신고번호', field:'EXPORT_DECL_NO'},
+	{headerHozAlign:'center', hozAlign:'center', minWidth:100, widthGrow:1.2, title:'선적일자', field:'LOADING_DATE'},
+	{headerHozAlign:'center', hozAlign:'right', minWidth:100, widthGrow:1.2, title:'관세', field:'DUTY'},
+	{headerHozAlign:'center', hozAlign:'right', minWidth:100, widthGrow:1.2, title:'수입부가세', field:'IMPORT_VAT'},
 	{headerHozAlign:'center', hozAlign:'center', minWidth:85,  widthGrow:0.6, title:'매입마감', field:'PURCHASE_CLOSE_DATE'}
 ];

--- a/src/com/pms/mapper/purchaseOrder.xml
+++ b/src/com/pms/mapper/purchaseOrder.xml
@@ -6625,10 +6625,12 @@ FROM(

 			<!-- 마감정보 -->
 			,COALESCE(AP.tax_type, '') AS TAX_TYPE
+			,COALESCE((SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = AP.tax_type), '') AS TAX_TYPE_NAME
 			,COALESCE(AP.tax_invoice_date, '') AS TAX_INVOICE_DATE
 			,COALESCE(AP.export_decl_no, '') AS EXPORT_DECL_NO
 			,COALESCE(AP.loading_date, '') AS LOADING_DATE
 			,COALESCE(AP.foreign_type, '') AS FOREIGN_TYPE
+			,COALESCE((SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = AP.foreign_type), '') AS FOREIGN_TYPE_NAME
 			,COALESCE(AP.duty, 0) AS DUTY
 			,COALESCE(AP.exchange_rate, 0) AS EXCHANGE_RATE
 			,COALESCE(AP.import_vat, 0) AS IMPORT_VAT
Author	SHA1	Message	Date
syc0123	24036b9abd	구매관리>입고일별입고관리 리스트에 마감정보입력 항목 컬럼 추가	2026-03-20 14:58:12 +09:00
hjjeong	fa6021d77b	Merge pull request 'V20260210' (#178 ) from V20260210 into main Reviewed-on: #178	2026-03-20 05:29:49 +00:00
hjjeong	58fe844597	Merge pull request 'V20260210' (#177 ) from V20260210 into main Reviewed-on: #177	2026-03-20 05:19:58 +00:00