diff --git a/WebContent/WEB-INF/view/productionplanning/mBomPopupLeft.jsp b/WebContent/WEB-INF/view/productionplanning/mBomPopupLeft.jsp index 6c7848a..f86b799 100644 --- a/WebContent/WEB-INF/view/productionplanning/mBomPopupLeft.jsp +++ b/WebContent/WEB-INF/view/productionplanning/mBomPopupLeft.jsp @@ -669,9 +669,9 @@ function fn_initGrid() { formatter: function(cell) { var value = cell.getValue(); - // 저장된 값이 없으면 기본값 '5001'(RPS) 설정 + // 저장된 값이 없으면 기본값 '0000008377'(RPS) 설정 if(value === undefined || value === null || value === '') { - value = '5001'; + value = '0000008377'; cell.getRow().update({PROCESSING_VENDOR: value}, false); } diff --git a/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp b/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp index 750315b..3da8dbb 100644 --- a/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp +++ b/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp @@ -60,6 +60,8 @@ $(document).ready(function(){ // 뷰 모드일 경우 입력 필드 비활성화 if(isViewMode){ $("#form1 input, #form1 textarea, #form1 select").prop("disabled", true); + // 닫기 버튼은 뷰 모드에서도 동작해야 하므로 다시 활성화 + $("#btnClose").prop("disabled", false); $("#btnSave, #btnUpload, #btnImgUpload, #file1, #imgFile1").hide(); $(".delete_btn").parent().hide(); } else { diff --git a/WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp b/WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp index c510365..381647f 100644 --- a/WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp +++ b/WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp @@ -678,9 +678,9 @@ function fn_initGrid() { formatter: function(cell) { var value = cell.getValue(); - // 저장된 값이 없으면 기본값 '5001'(RPS) 설정 + // 저장된 값이 없으면 기본값 '0000008377'(RPS) 설정 if(value === undefined || value === null || value === '') { - value = '5001'; + value = '0000008377'; cell.getRow().update({PROCESSING_VENDOR: value}, false); } 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/salesMng/quotationRequestList.jsp b/WebContent/WEB-INF/view/salesMng/quotationRequestList.jsp index 97957fe..86e7fd1 100644 --- a/WebContent/WEB-INF/view/salesMng/quotationRequestList.jsp +++ b/WebContent/WEB-INF/view/salesMng/quotationRequestList.jsp @@ -351,13 +351,13 @@ function fn_openMailFormPopup(quotationRequestObjId){ - + - - + + 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/WebContent/WEB-INF/view/salesmgmt/salesMgmt/splitShipmentForm.jsp b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/splitShipmentForm.jsp index 7ae4212..f417a83 100644 --- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/splitShipmentForm.jsp +++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/splitShipmentForm.jsp @@ -1,22 +1,45 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ include file="/init.jsp" %> +<%@ include file="/init_new.jsp" %> 분할출하 등록 - - @@ -74,122 +327,148 @@ + + + + + -
+

분할출하 등록

-
- +
+
- - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ +
+
@@ -200,7 +479,7 @@
- + diff --git a/src/com/pms/mapper/salesMng.xml b/src/com/pms/mapper/salesMng.xml index 3061ba6..91adefd 100644 --- a/src/com/pms/mapper/salesMng.xml +++ b/src/com/pms/mapper/salesMng.xml @@ -4992,8 +4992,16 @@ ORDER BY V.PATH2 AND QRM.VENDOR_OBJID::VARCHAR = #{VENDOR_OBJID} - - AND QRM.STATUS = #{STATUS} + + + + + AND QRM.MAIL_SEND_DATE IS NOT NULL + + + AND QRM.MAIL_SEND_DATE IS NULL + + @@ -5068,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, @@ -5078,6 +5087,14 @@ ORDER BY V.PATH2 ORDER BY QRD.OBJID + + +