diff --git a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderFormPopup_new.jsp b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderFormPopup_new.jsp index 919b890..5d012a3 100644 --- a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderFormPopup_new.jsp +++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderFormPopup_new.jsp @@ -543,8 +543,8 @@ $(document).ready(function(){ $("#SALES_MNG_USER_HP").val($(this).find("option:selected").attr("data-cell_phone")); }); - - $("#PO_CLIENT_ID").val('-1130201617'); //우성 default + + $("#PO_CLIENT_ID").val('-1130201617'); //RPS default $("#PO_CLIENT_ID").trigger("change"); diff --git a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp index af19ad0..d26a567 100644 --- a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp +++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp @@ -7,6 +7,11 @@ <%--Expression Language ::: ${fn:escapeXml(str1)} --%> +<% +// DB에서 메뉴명 조회 (공통 유틸 사용) +String menuObjId = request.getParameter("menuObjId"); +String menuName = CommonUtils.getMenuName(menuObjId, "기본메뉴명"); +%> @@ -16,29 +21,8 @@ - - - + +
+ + + +
+
+ + <%-- + + --%> + +
+
+
+

+ 발주관리_발주관리 +

+ +
+ + + + + + + + +
+ +
+ +
+ + + + + + + + + + + <%-- + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ ~ + + + ~ + + + + + +
+ +
+
+ +
+
+ + <%@include file= "/WEB-INF/view/common/common_gridArea.jsp" %> + <%-- +
+
+
+ + + + +
+
+ +
+
+ + +
+ +
${PAGE_HTML}
+
+ + + --%> + +
+
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/view/salesMng/proposalMngList.jsp b/WebContent/WEB-INF/view/salesMng/proposalMngList.jsp index 8100c1e..6a0c85f 100644 --- a/WebContent/WEB-INF/view/salesMng/proposalMngList.jsp +++ b/WebContent/WEB-INF/view/salesMng/proposalMngList.jsp @@ -119,14 +119,45 @@ $(document).ready(function(){ return false; } - var status = fnc_checkNull(selectedRowIds[0].STATUS); - if(status != 'approvalComplete'){ + var statusTitle = fnc_checkNull(selectedRowIds[0].STATUS_TITLE); + if(statusTitle != '결재완료'){ Swal.fire("결재완료 상태만 발주서 생성이 가능합니다."); return false; } - // TODO: 발주서 생성 로직 구현 - Swal.fire("발주서 생성 기능은 준비 중입니다."); + Swal.fire({ + title: '발주서를 작성 하시겠습니까?', + text: '', + icon: 'warning', + + showCancelButton: true, // cancel버튼 보이기. 기본은 원래 없음 + confirmButtonColor: '#3085d6', // confrim 버튼 색깔 지정 + cancelButtonColor: '#d33', // cancel 버튼 색깔 지정 + confirmButtonText: '확인', // confirm 버튼 텍스트 지정 + cancelButtonText: '취소', // cancel 버튼 텍스트 지정 + reverseButtons: false, // 버튼 순서 거꾸로 + + }).then(result => { + // 만약 Promise리턴을 받으면, + if (result.isConfirmed) { // 만약 모달창에서 confirm 버튼을 눌렀다면 + $.ajax({ + url:"/purchaseOrder/purchaseOrder_salesRequest_Save.do" + ,type:"POST" + ,data: $("#form1").serialize() + "&jqGrid="+ encodeURIComponent(JSON.stringify(selectedRowIds)) + ,dataType:"json" + ,success:function(data){ + if(data =="SUCCESS"){ + alert("저장되었습니다."); + }; + /* if(typeof opener.fn_search =="function"){ opener.fn_search() }; */ + fn_search(); + //self.close(); + } + ,error: function(jqxhr, status, error){ + } + }); + } + }); }); fn_search(); diff --git a/src/com/pms/mapper/purchaseOrder.xml b/src/com/pms/mapper/purchaseOrder.xml index 499e730..f999a60 100644 --- a/src/com/pms/mapper/purchaseOrder.xml +++ b/src/com/pms/mapper/purchaseOrder.xml @@ -578,8 +578,8 @@ ( #{OBJID}, #{PO_CLIENT_ID}, - - (SELECT 'PO-'||TO_CHAR(NOW(),'YYMM')||'-'||(COALESCE(MAX(case when SPLIT_PART( PURCHASE_ORDER_NO, '-', 3) = '' or PURCHASE_ORDER_NO is null then '0' else SPLIT_PART( PURCHASE_ORDER_NO, '-', 3) end ::numeric ))::INTEGER+1)::TEXT FROM PURCHASE_ORDER_MASTER), + + (SELECT 'RPS'||TO_CHAR(NOW(),'YY')||'-'||TO_CHAR(NOW(),'MMDD')||'-'||LPAD((COALESCE(MAX(CASE WHEN PURCHASE_ORDER_NO LIKE 'RPS'||TO_CHAR(NOW(),'YY-MMDD')||'-%' THEN SPLIT_PART(PURCHASE_ORDER_NO, '-', 3) ELSE '0' END)::INTEGER, 0) + 1)::TEXT, 2, '0') FROM PURCHASE_ORDER_MASTER), #{CATEGORY_CD}, #{PRODUCT_GROUP}, #{PRODUCT}, @@ -757,8 +757,8 @@ ( #{OBJID}, #{PO_CLIENT_ID}, - (SELECT 'PO-'||TO_CHAR(NOW(),'YYMM')||'-'||(COALESCE(MAX(case when SPLIT_PART( PURCHASE_ORDER_NO, '-', 3) = '' or PURCHASE_ORDER_NO is null then '0' else SPLIT_PART( PURCHASE_ORDER_NO, '-', 3) end ::numeric ))::INTEGER+1)::TEXT FROM PURCHASE_ORDER_MASTER), - + (SELECT 'RPS'||TO_CHAR(NOW(),'YY')||'-'||TO_CHAR(NOW(),'MMDD')||'-'||LPAD((COALESCE(MAX(CASE WHEN PURCHASE_ORDER_NO LIKE 'RPS'||TO_CHAR(NOW(),'YY-MMDD')||'-%' THEN SPLIT_PART(PURCHASE_ORDER_NO, '-', 3) ELSE '0' END)::INTEGER, 0) + 1)::TEXT, 2, '0') FROM PURCHASE_ORDER_MASTER), + #{PARTNER_OBJID}, #{DELIVERY_REQUEST_DATE}, #{DELIVERY_PLACE}, @@ -839,6 +839,64 @@ GROUP BY PARTNER_OBJID + + + + + + + + + INSERT INTO PURCHASE_ORDER_MASTER ( @@ -887,7 +945,7 @@ ( #{OBJID}, #{PO_CLIENT_ID}, - (SELECT 'PO-'||TO_CHAR(NOW(),'YYMM')||'-'||LPAD((COALESCE(MAX(SUBSTR(PURCHASE_ORDER_NO,9,11)),'0')::INTEGER+1)::TEXT,3,'0') FROM PURCHASE_ORDER_MASTER), + (SELECT 'RPS'||TO_CHAR(NOW(),'YY')||'-'||TO_CHAR(NOW(),'MMDD')||'-'||LPAD((COALESCE(MAX(CASE WHEN PURCHASE_ORDER_NO LIKE 'RPS'||TO_CHAR(NOW(),'YY-MMDD')||'-%' THEN SPLIT_PART(PURCHASE_ORDER_NO, '-', 3) ELSE '0' END)::INTEGER, 0) + 1)::TEXT, 2, '0') FROM PURCHASE_ORDER_MASTER), #{CATEGORY_CD}, #{PRODUCT_GROUP}, #{PRODUCT}, @@ -2969,7 +3027,6 @@ SELECT - + +