diff --git a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderFormPopup_general.jsp b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderFormPopup_general.jsp index 823c37d..697799d 100644 --- a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderFormPopup_general.jsp +++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderFormPopup_general.jsp @@ -201,8 +201,12 @@ input.date_icon { } + + diff --git a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderFormPopup_outsourcing.jsp b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderFormPopup_outsourcing.jsp index f47dfc5..85fa4eb 100644 --- a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderFormPopup_outsourcing.jsp +++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderFormPopup_outsourcing.jsp @@ -180,8 +180,12 @@ input.date_icon { } + + diff --git a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderMailFormPopup.jsp b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderMailFormPopup.jsp index 6ed486b..8fab87c 100644 --- a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderMailFormPopup.jsp +++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderMailFormPopup.jsp @@ -190,12 +190,13 @@ String purchaseOrderObjId = request.getParameter("purchaseOrderObjId");
- - 첨부파일: 발주서 및 도면 파일이 자동으로 첨부됩니다. + + 첨부파일: 발주서(PDF) 및 도면 파일이 자동으로 첨부됩니다.
+
@@ -261,6 +262,9 @@ function fn_loadPurchaseOrderInfo(){ if(data.result === "success" && data.purchaseOrderInfo){ purchaseOrderInfo = data.purchaseOrderInfo; + // 양식 타입 확인 (디버깅용) + console.log("발주서 양식 타입 (FORM_TYPE):", purchaseOrderInfo.FORM_TYPE); + // 발주서 정보 표시 $("#displayPoNo").text(fnc_checkNull(purchaseOrderInfo.PURCHASE_ORDER_NO) || '-'); $("#displayPartnerName").text(fnc_checkNull(purchaseOrderInfo.PARTNER_NAME) || '-'); @@ -471,24 +475,197 @@ function fn_sendMail(){ cancelButtonText: '취소' }).then((result) => { if(result.isConfirmed){ - fn_submitMailForm(); + // PDF 생성 및 발송 시작 + fn_generatePdfAndSend(); } }); } -// 메일 발송 요청 -function fn_submitMailForm(){ +// PDF 생성 및 발송 +function fn_generatePdfAndSend(){ + var purchaseOrderObjId = $("#purchaseOrderObjId").val(); + Swal.fire({ - title: '발송 중...', - text: '발주서 메일을 발송하고 있습니다.', + title: 'PDF 생성 중...', + text: '발주서를 PDF로 변환하고 있습니다.', allowOutsideClick: false, onOpen: () => { Swal.showLoading(); } }); + // 발주서 양식 타입 확인 (일반/외주) + var formType = fnc_checkNull(purchaseOrderInfo.FORM_TYPE) || 'general'; + var url = ""; + + if(formType === 'outsourcing') { + url = "/purchaseOrder/purchaseOrderFormPopup_outsourcing.do?actType=VIEW&PURCHASE_ORDER_MASTER_OBJID=" + purchaseOrderObjId; + } else { + url = "/purchaseOrder/purchaseOrderFormPopup_general.do?actType=VIEW&PURCHASE_ORDER_MASTER_OBJID=" + purchaseOrderObjId; + } + + // 숨겨진 iframe으로 발주서 페이지 로드 + var iframe = $('