diff --git a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesRegForm.jsp b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesRegForm.jsp index 4315d61..ea08651 100644 --- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesRegForm.jsp +++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesRegForm.jsp @@ -36,6 +36,15 @@ // 날짜 선택기 초기화 _fnc_datepick(); + // 출하일: 저장된 값이 없으면 오늘 날짜 설정 + if(!$("#shippingDate").val() || $("#shippingDate").val().trim() === '') { + var today = new Date(); + var yyyy = today.getFullYear(); + var mm = String(today.getMonth() + 1).padStart(2, '0'); + var dd = String(today.getDate()).padStart(2, '0'); + $("#shippingDate").val(yyyy + '-' + mm + '-' + dd); + } + // 기존 담당자 값 설정 var managerValue = "${saleInfo.MANAGER}"; console.log("MANAGER 값:", managerValue); diff --git a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml index 748127e..1ef2cef 100644 --- a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml +++ b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml @@ -1651,8 +1651,8 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC CODE_NAME(CM.CONTRACT_CURRENCY) AS SALES_CURRENCY_NAME, COALESCE(CM.EXCHANGE_RATE::NUMERIC, 0) AS SALES_EXCHANGE_RATE, - -- 수주 날짜 - VARCHAR 타입이므로 그대로 사용 - CM.ORDER_DATE AS SHIPPING_DATE, + -- 출하일 기본값: 오늘 날짜 + TO_CHAR(CURRENT_DATE, 'YYYY-MM-DD') AS SHIPPING_DATE, -- 담당자 CM.PM_USER_ID AS MANAGER @@ -1665,7 +1665,6 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC CM.OBJID, CM.CONTRACT_CURRENCY, CM.EXCHANGE_RATE, - CM.ORDER_DATE, CM.PM_USER_ID @@ -1699,8 +1698,8 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC CODE_NAME(CM.CONTRACT_CURRENCY) AS SALES_CURRENCY_NAME, COALESCE(NULLIF(CM.EXCHANGE_RATE, '')::NUMERIC, 0) AS SALES_EXCHANGE_RATE, - -- 수주 날짜 - VARCHAR 타입이므로 그대로 사용 - CM.ORDER_DATE AS SHIPPING_DATE, + -- 출하일 기본값: 오늘 날짜 + TO_CHAR(CURRENT_DATE, 'YYYY-MM-DD') AS SHIPPING_DATE, -- 담당자 CM.PM_USER_ID AS MANAGER @@ -1714,7 +1713,6 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC CM.OBJID, CM.CONTRACT_CURRENCY, CM.EXCHANGE_RATE, - CM.ORDER_DATE, CM.PM_USER_ID, PM.QUANTITY