From 8eb82bd0ee69815a289258de87b4f68a8fc33f5d Mon Sep 17 00:00:00 2001 From: hjjeong Date: Mon, 9 Feb 2026 18:08:44 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=9A=94=EC=B2=AD=EC=84=9C?= =?UTF-8?q?=20=EC=9E=85=EA=B3=A0=EC=9A=94=EC=B2=AD=EC=9D=BC=20=EC=BB=AC?= =?UTF-8?q?=EB=9F=BC=20=EC=B6=94=EA=B0=80,=20=EA=B2=AC=EC=A0=81=20?= =?UTF-8?q?=EC=88=98=EC=8B=A0=20=ED=9B=84=20=EB=8B=A8=EA=B0=80,=20?= =?UTF-8?q?=EC=9E=85=EA=B3=A0=EC=9A=94=EC=B2=AD=EC=9D=BC=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=EC=8B=9C=20mbom=5Fdetail=20=EC=97=90=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8(=ED=92=88=EC=9D=98=EC=84=9C?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=9D=BC=EA=B0=80=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=B4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/salesMng/quotationRequestFormPopup.jsp | 11 +++++++++++ .../view/salesmgmt/salesMgmt/salesMgmtList.jsp | 8 ++++---- src/com/pms/mapper/salesMng.xml | 7 ++++++- src/com/pms/salesmgmt/service/SalesMngService.java | 7 +++++-- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/WebContent/WEB-INF/view/salesMng/quotationRequestFormPopup.jsp b/WebContent/WEB-INF/view/salesMng/quotationRequestFormPopup.jsp index 08d95b6..e9976de 100644 --- a/WebContent/WEB-INF/view/salesMng/quotationRequestFormPopup.jsp +++ b/WebContent/WEB-INF/view/salesMng/quotationRequestFormPopup.jsp @@ -306,6 +306,17 @@ function fn_initGrid() { } }); + // 입고요청일 (수정가능 - 달력 선택) + columns.push({ + headerHozAlign: 'center', + hozAlign: 'center', + width: 130, + title: '입고요청일', + field: 'DELIVERY_REQUEST_DATE', + editor: 'date', + editable: true + }); + // // 총단가 (자동계산) - 주석처리 // columns.push({ // headerHozAlign: 'center', diff --git a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp index d471f83..514f289 100644 --- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp +++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp @@ -175,7 +175,7 @@ function fn_openSaleRegPopup(orderNo, saleNo){ var popup_width = 850; - var popup_height = 550; + var popup_height = 400; // 한글 프로젝트 번호 인코딩 처리 var url = "/salesMgmt/salesRegForm.do?orderNo=" + encodeURIComponent(orderNo) + "&saleNo=" + (saleNo ? encodeURIComponent(saleNo) : ""); fn_centerPopup(popup_width, popup_height, url); @@ -187,7 +187,7 @@ console.log("rowData:", rowData); var popup_width = 850; - var popup_height = 550; + var popup_height = 420; // 신규 판매등록: orderNo와 잔량 전달 (saleNo 없음) var params = "orderNo=" + encodeURIComponent(rowData.PROJECT_NO); @@ -649,8 +649,8 @@ function fn_splitShipment(){ } // 분할출하 팝업 열기 - var popup_width = 800; - var popup_height = 600; + var popup_width = 900; + var popup_height = 450; var url = "/salesMgmt/splitShipmentForm.do?projectNo=" + encodeURIComponent(projectNo); fn_centerPopup(popup_width, popup_height, url); } diff --git a/src/com/pms/mapper/salesMng.xml b/src/com/pms/mapper/salesMng.xml index a442284..91adefd 100644 --- a/src/com/pms/mapper/salesMng.xml +++ b/src/com/pms/mapper/salesMng.xml @@ -5076,6 +5076,7 @@ ORDER BY V.PATH2 QRD.UNIT_PRICE, QRD.REMARK, QRD.REG_DATE, + QRD.DELIVERY_REQUEST_DATE, -- 마스터 정보 QRM.VENDOR_TYPE, QRM.VENDOR_OBJID, @@ -5160,11 +5161,12 @@ ORDER BY V.PATH2 ) - + UPDATE QUOTATION_REQUEST_DETAIL SET UNIT_PRICE = #{UNIT_PRICE}::NUMERIC, TOTAL_PRICE = #{QTY}::NUMERIC * #{UNIT_PRICE}::NUMERIC, + DELIVERY_REQUEST_DATE = CASE WHEN #{DELIVERY_REQUEST_DATE} IS NOT NULL AND #{DELIVERY_REQUEST_DATE} != '' THEN #{DELIVERY_REQUEST_DATE} ELSE NULL END, EDIT_DATE = NOW() WHERE OBJID = #{OBJID}::NUMERIC @@ -5191,6 +5193,9 @@ ORDER BY V.PATH2 PROCESSING_UNIT_PRICE = #{UNIT_PRICE}::NUMERIC + + , DELIVERY_REQUEST_DATE = #{DELIVERY_REQUEST_DATE} + , EDIT_DATE = NOW() WHERE OBJID IN ( SELECT MD2.OBJID diff --git a/src/com/pms/salesmgmt/service/SalesMngService.java b/src/com/pms/salesmgmt/service/SalesMngService.java index 8abb060..616d505 100644 --- a/src/com/pms/salesmgmt/service/SalesMngService.java +++ b/src/com/pms/salesmgmt/service/SalesMngService.java @@ -2458,19 +2458,22 @@ public class SalesMngService { String salesRequestPartObjid = CommonUtils.checkNull(detail.get("SALES_REQUEST_PART_OBJID")); String unitPrice = CommonUtils.checkNull(detail.get("UNIT_PRICE")); String qty = CommonUtils.checkNull(detail.get("QTY")); + String deliveryRequestDate = CommonUtils.checkNull(detail.get("DELIVERY_REQUEST_DATE")); - // 1. 견적요청서 상세 단가 업데이트 + // 1. 견적요청서 상세 단가/입고요청일 업데이트 Map updateParam = new HashMap(); updateParam.put("OBJID", detailObjid); updateParam.put("UNIT_PRICE", unitPrice); updateParam.put("QTY", qty); + updateParam.put("DELIVERY_REQUEST_DATE", deliveryRequestDate); sqlSession.update("salesMng.updateQuotationRequestDetailPrice", updateParam); - // 2. 구매리스트 단가 업데이트 + // 2. 구매리스트 단가/입고요청일 업데이트 Map purchaseUpdateParam = new HashMap(); purchaseUpdateParam.put("SALES_REQUEST_PART_OBJID", salesRequestPartObjid); purchaseUpdateParam.put("UNIT_PRICE", unitPrice); purchaseUpdateParam.put("VENDOR_TYPE", vendorType); + purchaseUpdateParam.put("DELIVERY_REQUEST_DATE", deliveryRequestDate); sqlSession.update("salesMng.updatePurchaseListPriceFromQuotation", purchaseUpdateParam); }