fix: 폐기결과이미지 중복 방지 처리 반영

src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtReceiptServiceBean.java

@@ -21,7 +21,7 @@ public class DsuseMgtReceiptServiceBean extends AbstractServiceBean implements D
 	
 	@Override
 	public List<DataObject> getDsuseMgtReceiptList(DsuseMgtReceiptQuery query){
-		query.setOrderBy("DSCDMNG_ID DESC");
+		//query.setOrderBy("DSCDMNG_ID DESC");
 
 		return dsuseMgtReceiptMapper.selectDsuseMgtReceiptList(query);
 	}

src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java

@@ -176,7 +176,6 @@ public class AddsNimsController extends ApplicationController {
     @RequestMapping(value = "dsuseMgtRslt-list.do", name="결과[통보] 처리 조회")
     public ModelAndView getDsuseMgtRsltList(DsuseMgtReceiptQuery query) {
         query.setOrderBy("DSUSE_DE DESC, DSUSE_MTH_CD, DSCDMNG_ID");
-        //query.setOrderBy("DSUSE_MTH_CD");
         setFetchSize(query);
 
         return setCollectionInfo(new ModelAndView("jsonView"), dsuseMgtReceiptService.getDsuseMgtReceiptList(query),"","");
@@ -275,7 +274,7 @@ public class AddsNimsController extends ApplicationController {
     //-------------------------------------------------------------------------------------------------
     @RequestMapping(value = "dsuseMgtDoc-list.do", name="보고문서관리 목록 조회")
     public ModelAndView getDsuseMgtDocList(DsuseMgtDocQuery query) {
-    	query.setOrderBy("dsuse_de DESC, dsuse_mth_cd, dscdmng_id DESC");
+    	query.setOrderBy("dsuse_de DESC, dsuse_mth_cd, dscdmng_id");
         setFetchSize(query);
 
         return setCollectionInfo(new ModelAndView("jsonView"), dsuseMgtDocService.getDsuseMgtDocList(query),"","");

src/main/resources/application.yml

@@ -1,7 +1,7 @@
 server:
   shutdown: graceful
   port: 9077
-  max-http-header-size: 100KB
+  max-http-header-size: 1024KB
 
   servlet:
     context-path: /

src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp

@@ -169,6 +169,44 @@
 	 * script 진입
 	 **************************************************************************/
 	$(document).ready(function() {
+		const fnBarcodeSearch = (barcode) => {
+			ajax.get({
+				url : wctx.url("/adds/nims/getNimsPrdMnfSeqInfoOfBarcode.do")
+				, data : {
+					barcodeStr : barcode,
+					userId : "${currentUser.account}"
+				}
+				, success : obj => {
+					if (!obj.success){
+						dialog.alert(obj.message);
+						$("#prductCd--${pageName}").val("");
+						$("#prductCd--${pageName}").prop("readonly", true);
+						return false;
+					}
+
+					let prdInfo = obj.data;
+					$P.productFormFields.set(
+						$P.productControl,
+						{
+							prductCd: prdInfo.prductCd,
+							prductNm: prdInfo.prductNm,
+							prdMinDistbQy: prdInfo.prdMinDistbQy,
+							stdPackngStleNm: prdInfo.stdPackngStleNm,
+							prdTotPceQy: prdInfo.prdTotPceQy,
+							pceCoUnitNm: prdInfo.pceCoUnitNm,
+							dsuseQy: prdInfo.dsuseQy,
+							prdValidDe: prdInfo.mnfSeqInfos[0].prdValidDe,
+							mnfNo: prdInfo.mnfSeqInfos[0].mnfNo,
+							mnfSeq: prdInfo.mnfSeqInfos[0].mnfSeq,
+
+						}
+					);
+					$("#prductCd--${pageName}").prop("readonly", true);
+					$("#dsuseQy--${pageName}").focus();
+				}
+			});
+		}
+
 		// pageObject
 		let $P = pageObject["${pageName}"];
 
@@ -573,40 +611,7 @@
 			$("#prductCd--${pageName}").on("change", () => {
 				let barcode = $("#prductCd--${pageName}").val();
 				if(barcode.length > 20){
-					ajax.get({
-						url : wctx.url("/adds/nims/getNimsPrdMnfSeqInfoOfBarcode.do")
-						, data : {
-							barcodeStr : barcode,
-							userId : "${currentUser.account}"
-						}
-						, success : obj => {
-							if (!obj.success){
-								dialog.alert(obj.message);
-								$("#prductCd--${pageName}").val("");
-								$("#prductCd--${pageName}").prop("readonly", true);
-								return false;
-							}
-
-							let prdInfo = obj.data;
-							$P.productFormFields.set(
-								$P.productControl,
-								{
-									prductCd: prdInfo.prductCd,
-									prductNm: prdInfo.prductNm,
-									prdMinDistbQy: prdInfo.prdMinDistbQy,
-									stdPackngStleNm: prdInfo.stdPackngStleNm,
-									prdTotPceQy: prdInfo.prdTotPceQy,
-									pceCoUnitNm: prdInfo.pceCoUnitNm,
-									dsuseQy: prdInfo.dsuseQy,
-									prdValidDe: prdInfo.mnfSeqInfos[0].prdValidDe,
-									mnfNo: prdInfo.mnfSeqInfos[0].mnfNo,
-									mnfSeq: prdInfo.mnfSeqInfos[0].mnfSeq,
-
-								}
-							);
-							$("#prductCd--${pageName}").prop("readonly", true);
-						}
-					});
+					fnBarcodeSearch(barcode);
 				}
 			});
 			//-------------------------------------------------------------------------
@@ -619,9 +624,6 @@
 			}
 			initDatepicker("bssh--${pageName}");	
 			$("#dsuseAcdtDe--${pageName}").datepicker("setDate", new Date());
-
-			//FIXME: 바코드 사용시 제거
-			//$("#btnProductBarcodeSearch--${pageName}").prop("disabled", true);
 		}
 
 

src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp

@@ -13,7 +13,6 @@
 			<!-- 입력 영역 -->
 			<form id="frmEdit--${pageName}" name="frmEdit">
 				<!-- hidden -->
-				<input type="hidden" id="usrRptIdNo--${pageName}" name="usrRptIdNo" data-map="usrRptIdNo">
 				<input type="hidden" name="prgrsSttsCd" data-map="prgrsSttsCd" />
 
 <%--                <label for="bssh--${pageName}">업체 정보</label>--%>
@@ -138,6 +137,28 @@
 	 * script 진입
 	 **************************************************************************/
 	$(document).ready(function() {
+		let initDataset = false;
+
+		const searchRsltImgList = () => {
+			alert('ddd');
+			return;
+			let param = {
+				dscdmngId: $("#dscdmngId--${pageName}").val(),
+				dsuseDe: $("#dsuseDe--${pageName}").val(),
+				dsuseMthCd: $("#dsuseMthCd--${pageName}").val(),
+				deptCd: "${currentUser.deptCode}"
+			};
+			$.ajax({
+				 url :wctx.url("/adds/nims/getDsuseMgtRsltImgList.do")
+				,type:"post"
+				,data:{ dtls : JSON.stringify(dtls) }
+				,dataType:"json"
+				,success:function(jsonStr){
+				}
+			});
+
+		}
+
 		const fnRsltImgList = (list) => {
 			if(!list || list.length === 0) return;
 
@@ -198,18 +219,23 @@
 		 * DatasetControl 이벤트
 		 **************************************************************************/
 		// Dataset 변경 이벤트
-		$P.control.onDatasetChange = (obj) => {
-
-			
-		};
-			
 		// 현재 선택 자료 변경 이벤트		
 		$P.control.onCurrentChange = item => {
 			if (!item) return;
 
+
+			//$("#dsuseDe--${pageName}, #dsuseMthCd--${pageName}").on("change", () => {
+				alert("item : "+item.data.dsuseDe)
+				alert($("#dsuseDe--${pageName}").val())
+			//});
+
 			// Dataset 셋팅
 			$P.formFields.set($P.control, item);
 
+							alert("item : "+item.data.dsuseDe)
+				alert($("#dsuseDe--${pageName}").val())
+
+
 			// 보고완료 상태인 경우 저장 버튼 비활성화
 			if($("input[name='prgrsSttsCd']").val() == '99') {
 				$("#btnSave--${pageName}").prop("disabled", true);
@@ -305,9 +331,9 @@
 
         $P.uploadSet.onDatasetChange  = () => {
 
-            var files = $P.uploadSet.getDataset();
+            let files = $P.uploadSet.getDataset();
             if(files != null && files.length > 0){
-				for(var i=0;i < files.length; i++){
+				for(let i=0;i < files.length; i++){
 					$P.fileArr.push(files[i]);
 				}
 			}
@@ -458,6 +484,10 @@
 			
 			// 버튼 이벤트
 			$("#btnSave--${pageName}").on("click", () => $P.fnSave());			// 저장
+
+			$("#dsuseDe--${pageName}, #dsuseMthCd--${pageName}").on("change", () => {
+				if(initDataset)		fnRsltImgList();
+			});
 		}
 
 		// 초기 화면 설정