From 7816c8fdab1d3e2aa92244d9eb639d221c05461b Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Thu, 20 Jun 2024 09:42:30 +0900 Subject: [PATCH 01/14] =?UTF-8?q?fix:=20=ED=8F=90=EA=B8=B0=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/adds/nims/web/AddsNimsController.java | 9 +++++---- .../WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java index e50111f..54b9d50 100644 --- a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java +++ b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java @@ -58,18 +58,19 @@ public class AddsNimsController extends ApplicationController { @RequestMapping(value = "/dsuseMgtReceipt-info.do", name="신청서 접수 상세") public ModelAndView getDsuseMgtReceiptInfo(DsuseRsltInfo dsuseReceptInfo) { - ModelAndView mav = new ModelAndView(); + ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtReceipt-info"); setCmmCode("ADDS04", mav); if(!isEmpty(dsuseReceptInfo) && !isEmpty(dsuseReceptInfo.getDscdmngId())){ - mav.setViewName("adds/nims/dsuseMgtReceiptMain-detail"); + //mav.setViewName("adds/nims/dsuseMgtReceiptMain-detail"); mav.addObject("dsuseReceptInfo", toJson(dsuseReceptInfo)); // DsuseMgtReceiptQuery query = new DsuseMgtReceiptQuery(); // query.setDscdmngId(dscdmngId); // mav.addObject("dsuseReceptDetails", toJson(dsuseMgtReceiptService.getDsuseMgtReceiptList(query))); - }else{ - mav.setViewName("adds/nims/dsuseMgtReceipt-info"); } + // else{ + // mav.setViewName("adds/nims/dsuseMgtReceipt-info"); + // } return mav .addObject("pageName", "dsuseMgtReceiptInfo") // View(jsp)에서 사용할 id 뒤에 붙일 suffix diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp index 789ff62..3248de0 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp @@ -123,7 +123,7 @@ {prductCd} {prductNm} - {pceQy} + {dsuseQy} {prdValidDe} {mnfNo} @@ -511,7 +511,7 @@ $P.initForm(); // 3. Dataset 설정 - //$P.control.setData([${dsuseReceptInfo}]); + $P.control.setData([${dsuseReceptInfo}]); //$P.productControl.setData([${opnnDlbrMbrInfo}]); }); From 00845fe0d5b6ca1d2d7ba41a3a7d22f7976586d2 Mon Sep 17 00:00:00 2001 From: leebj Date: Thu, 20 Jun 2024 10:20:20 +0900 Subject: [PATCH 02/14] =?UTF-8?q?=EB=B3=B4=EA=B3=A0=EB=AC=B8=EC=84=9C?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EB=A9=94=EC=9D=B8=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=95=EC=B2=98=EB=A6=AC=EB=B0=A9=EC=8B=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD(=EB=AC=B4=ED=95=9C=EC=8A=A4=ED=81=AC=EB=A1=A4=20->=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EB=84=A4=EC=9D=B4=EC=85=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp | 125 ++++++++---------- 1 file changed, 57 insertions(+), 68 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp index 7a04ed9..699a102 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp @@ -78,62 +78,62 @@ -
-
-
- - - - - - - - - - - - - - - - - - - - - + +
No.폐기관리번호취급일자폐기일자업체명폐기건수처리상태폐기결과보고서폐기처리내역및사진폐기사유폐기구분폐기방법폐기장소
+
+
+
+
- -
@@ -185,10 +185,10 @@ // Dataset 변경 이벤트 $P.control.onDatasetChange = (obj) => { $P.renderList(obj.${infoPrefix}Total); - - $("#paging--${pageName}").setPaging({ + + $("#${infoPrefix}Paging--${pageName}").setPaging({ list: $P.control.dataset - , prefix: "paging--${pageName}" + , prefix: "${infoPrefix}Paging--${pageName}" , start: obj.${infoPrefix}Start , totalSize: obj.${infoPrefix}Total , fetchSize: obj.${infoPrefix}Fetch @@ -253,10 +253,7 @@ let trs = empty ? [document.getElementById("${infoPrefix}NotFound--${pageName}").content.outerHTML] : ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer); - let noMore = (totalSize == ${infoPrefix}List.length); - let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0); - - $("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore); + $("#tbody--${pageName}").html(trs.join()); if ($P.control.untilPageNum != 0) { $P.control.query.fetchSize = $P.control.defaultFetchSize; @@ -266,12 +263,6 @@ } - // DataTables에 스크롤이 맨 밑으로 이동했을 때 이벤트 - $P.scrollDataList = () => { - $P.control.tableRenderComplete = false; // dataTables 에 자료 추가 false - - $P.control.load($P.control.query.pageNum + 1); - } $P.control.getBsshInfo = (gdccId) => { let dialogTitle = "마약류 취급자 조회"; @@ -408,8 +399,6 @@ // DataTables width 변경 조정 (업무별 그리드가 존재 한다면.. crdn06010-main.jsp 참고) fnMakeResizableTable($("#table-responsive--${pageName}")[0]); - // DataTables 스크롤 이벤트 생성 - fnMakeScrollableTable($("#table-responsive--${pageName}")[0], $P.scrollDataList); } // 초기 화면 설정 From ef3c026073e0e393d4fe8bf5403e9d58ca7e6747 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Thu, 20 Jun 2024 10:21:50 +0900 Subject: [PATCH 03/14] =?UTF-8?q?fix:=20=EA=B0=81=20=EB=A9=94=EC=9D=B8?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=83=81=EC=84=B8=20=EA=B7=B8=EB=A6=AC?= =?UTF-8?q?=EB=93=9C=EC=97=90=20=EC=A0=9C=EC=A1=B0=EB=B2=88=ED=98=B8,=20?= =?UTF-8?q?=EC=9D=BC=EB=A0=A8=EB=B2=88=ED=98=B8=20=ED=95=84=EB=93=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/adds/nims/dsuseMgtMapping-main.jsp | 4 ++++ .../jsp/adds/nims/dsuseMgtReceipt-info.jsp | 15 +++++++++------ .../jsp/adds/nims/dsuseMgtReceipt-main.jsp | 4 ++++ .../WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp | 4 ++++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp index 07befae..ecac463 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp @@ -141,6 +141,8 @@ 제품코드 폐기수량 유효기간 + 제조번호 + 일련번호 유통단위 수량 낱개단위 수량 @@ -154,6 +156,8 @@ {PRDUCT_CD} {DSUSE_QY} {PCE_UNIT} {PRD_VALID_DE} + {MNF_NO} + {MNF_SEQ} {MIN_DISTB_QY} {MIN_DISTB_UNIT} {PCE_QY} {PCE_UNIT} diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp index 3248de0..6b2342e 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp @@ -64,15 +64,15 @@
- +
- +
- +
@@ -318,7 +318,7 @@ } //$P.control.onSave(resp) - dialog.alert("저장됐습니다."); + dialog.alert("처리 되었습니다."); dialog.close("dsuseMgtReceiptDialog"); //this._load(); } @@ -440,14 +440,17 @@ return false; } + const prdFrm = $P.productFormFields.get(); + const prdInfo = ""+prdFrm.prductCd+prdFrm.prdValidDe+prdFrm.mnfNo+prdFrm.mnfSeq; let isDup = $P.productList .getDataset() - .filter(item => item.prductCd == $P.productFormFields.get().prductCd) + .filter(item => prdInfo == ""+item.prductCd+item.prdValidDe+item.mnfNo+item.mnfSeq) .length > 0; if(isDup){ + const msg = "추가된 제품 입니다
[제품코드:" + prdFrm.prductCd +", 유효기간:"+ prdFrm.prdValidDe +", 제조번호:"+ prdFrm.mnfNo +", 제조일련번호:"+ prdFrm.mnfSeq +"]"; dialog.alert({ - content: "등록한 상품[" + $P.productFormFields.get().prductCd + "]입니다" + content: msg }); return false; } diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp index ab9b1a3..139c5d7 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp @@ -146,6 +146,8 @@ 제품코드 폐기수량 유효기간 + 제조번호 + 일련번호 최소 유통단위 수량 낱개 단위 수량 @@ -159,6 +161,8 @@ {PRDUCT_CD} {DSUSE_QY} {PCE_UNIT} {PRD_VALID_DE} + {MNF_NO} + {MNF_SEQ} {MIN_DISTB_QY} {MIN_DISTB_UNIT} {PCE_QY} {PCE_UNIT} diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp index 9983289..b90299c 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp @@ -142,6 +142,8 @@ 제품코드 폐기수량 유효기간 + 제조번호 + 일련번호 유통단위 수량 낱개단위 수량 @@ -155,6 +157,8 @@ {PRDUCT_CD} {DSUSE_QY} {PCE_UNIT} {PRD_VALID_DE} + {MNF_NO} + {MNF_SEQ} {MIN_DISTB_QY} {MIN_DISTB_UNIT} {PCE_QY} {PCE_UNIT} From a2882ced52b6d62af17d7e7ad194e21cf984fda9 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Thu, 20 Jun 2024 11:48:04 +0900 Subject: [PATCH 04/14] =?UTF-8?q?fix:=20=EA=B3=B5=ED=86=B5=ED=8C=9D?= =?UTF-8?q?=EC=97=85(=EC=97=85=EC=B2=B4,=EC=A0=9C=ED=92=88)=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=ED=8C=9D=EC=97=85=20=EC=98=A4=EB=A5=98=20fix=20=20?= =?UTF-8?q?=20=20=20=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EC=A0=9C=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/adds/nims/bssh-popup.jsp | 14 ++--------- .../WEB-INF/jsp/adds/nims/product-popup.jsp | 24 +++++++------------ 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp index f7c374d..decf818 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp @@ -92,7 +92,6 @@ **************************************************************************/ $P.control = new DatasetControl({ urls : { - //load : wctx.url("/adds/nims/bssh-list.do") load : '', } , prefix: "bsshPopup" @@ -179,7 +178,7 @@ let noMore = (totalSize == ${infoPrefix}List.length); let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0); - $("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore); + $("#tbody--${pageName}").html(trs.join()); if ($P.control.untilPageNum != 0) { $P.control.query.fetchSize = $P.control.defaultFetchSize; @@ -214,7 +213,6 @@ // 저장 $P.fnSave = () => { - console.log("#${openPage}"); dialog.alert({ content: "현재 " + $P.control.prefixName + " 정보를 선택 하시겠습니까?" , init: () => { setDialogZindex(); } @@ -239,13 +237,8 @@ // DataTables width 변경 조정 (업무별 그리드가 존재 한다면.. crdn06010-main.jsp 참고) fnMakeResizableTable($("#table-responsive--${pageName}")[0]); - // DataTables 스크롤 이벤트 생성 - fnMakeScrollableTable($("#table-responsive--${pageName}")[0], $P.scrollDataList); - // 초기 화면 설정 - $P.initForm = () => { - - } + $P.initForm = () => {} /************************************************************************** * 최초 실행 함수 @@ -255,9 +248,6 @@ // 2. 초기 화면 설정 $P.initForm(); - - // 3. Dataset 설정 - //$P.control.setData([${opnnDlbrMbrInfo}]); }); diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp index 2533c0f..a0fb913 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp @@ -53,7 +53,7 @@