Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

src/main/webapp/app/popup/biz/BIZPOP_DLV_STTMT_PRN.html

@@ -2,6 +2,10 @@
 	<div class="modal-dialog" style="width:1200px;">
 		<div class="modal-content">
 			<form id="ITP_FORM_BIZPOP_DLV_STTMT_PRN">
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_FORM_DT" name="fromDt" value="">
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_TO_DT" name="toDt" value="">
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID" name="sbrandId" value="">
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_SPPLY_ID" name="sspplyId" value="">
 				<div id="ITP_POPUP_CONTAINER">
 					<div class="modal-header">
 						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@@ -31,23 +35,23 @@
 									<div>
 										<label style="width:100px;">발행일</label>
 										<label>:</label>
-										<span class="fnDlvRegDt">2022.01.01</span>
+										<span class="fnDlvRegDt"></span>
 									</div>
 									<div>
 										<label style="width:100px;">납품확인번호</label>
 										<label>:</label>
-										<span class="fnDlvSttmtUnqNo">2211020000002001</span>
+										<span class="fnDlvSttmtUnqNo"></span>
 									</div>
 									<div>
 										<label style="width:100px;">납품일</label>
 										<label>:</label>
-										<span class="fnDlvRegDt">2022.12.31</span>
+										<span class="fnDlvRegDt"></span>
 									</div>
 									<div>
 										<label style="width:100px;">납품담당</label>
 										<label>:</label>
-										<span class="fnDlvMgrNm">홍길동</span>
-										(<span class="fnDlvMgrTelNo">010-2525-2525</span>)
+										<span class="fnDlvMgrNm"></span>
+										<span class="fnDlvMgrTelNo"></span>
 									</div>
 								</div>
 								<div class="col-xs-6">
@@ -61,9 +65,7 @@
 										<div class="itp_sign_header">
 											<label>납품확인일</label>
 										</div>
-										<div class="itp_sign_area fnDlvCnfmDt">
-											2022.01.01
-										</div>
+										<div class="itp_sign_area fnDlvCnfmDt"></div>
 									</div>
 								</div>
 							</div>	
@@ -72,14 +74,14 @@
 									<div>
 										<label style="width:100px;">납품 장소</label>
 										<label>:</label>
-										(<span style="margin:0px; " class="fnZipNo">12345</span>)
-										<span class="fnLoadAddr">서울 송파구 문정동 100 ㅁㄴㄹㅇㅁㄴ</span>
-										<span class="fnDtlAddr">디 매장</span>
+										<span style="margin:0px; " class="fnZipNo"></span>
+										<span class="fnLoadAddr"></span>
+										<span class="fnDtlAddr"></span>
 									</div>
 									<div>
 										<label style="width:100px;">전화번호</label>
 										<label>:</label>
-										<span class="fnVndrTelNo">02-1234-1547</span>
+										<span class="fnVndrTelNo"></span>
 									</div>
 								</div>
 							</div>	
@@ -91,25 +93,25 @@
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBsnsRegNo">215-58-584887</div>
+											<div class="col-xs-12 itp_in fnBsnsRegNo"></div>
 										</div>
 									</div>	
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnSpplyNm">등록업체명</div>
+											<div class="col-xs-12 itp_in fnSpplyNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm">공길동</div>
+											<div class="col-xs-12 itp_in fnBrandNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm">서울 시송파구 ㄴㄻㄴㄹ</div>
+											<div class="col-xs-12 itp_in fnBrandNm"></div>
 										</div>
 									</div>
 								</div>	
@@ -122,33 +124,30 @@
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm">215-58-584887</div>
+											<div class="col-xs-12 itp_in fnBrandNm"></div>
 										</div>
 									</div>	
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm">등록업체명</div>
+											<div class="col-xs-12 itp_in fnBrandNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm">공길동</div>
+											<div class="col-xs-12 itp_in fnBrandNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm">서울 시송파구 ㄴㄻㄴㄹ</div>
+											<div class="col-xs-12 itp_in fnBrandNm"></div>
 										</div>
 									</div>
 								</div>	
 							</div>
 						</div>
-						
-						
-						
 						<div id="ITP_BIZPOP_DLV_STTMT_PRN_jqGrid_list" class="itp_tb_list" data-total-cnt="">
 							<div id="ITP_BIZPOP_DLV_STTMT_PRN_jqGridView" class="itp_views fix"></div>
 							<table id="ITP_BIZPOP_DLV_STTMT_PRN_jqGrid"></table>

src/main/webapp/js/app/ordmng/ITP_ORDMNG03010.js

@@ -306,7 +306,12 @@ let listObj = {
 					    if(selectedIds.length !== 1) {
 					    	return;
 					    }
-						var param = {'dlvSttmtUnqNo':selectedIds[0].dlvSttmtUnqNo};
+						var param = {
+							'dlvSttmtUnqNo':selectedIds[0].dlvSttmtUnqNo,
+							'fromDt': $('#ITP_FORM_ORDMNG03010_SEARCH #ITP_FORM_ORDMNG03010_SEARCH_DLV_REQ_DT').val(),
+							'toDt': $('#ITP_FORM_ORDMNG03010_SEARCH #ITP_FORM_ORDMNG03010_SEARCH_DLV_CMPLT_DT').val()
+						};
+						console.log(param);
 						fn_call_popup('biz', 'BIZPOP_DLV_STTMT_PRN', '#ITP_ASIDE', popFn, param, 'S');
 					}
 			}

src/main/webapp/js/app/pomng/ITP_POMNG04010.js

@@ -184,10 +184,10 @@ let pageObj = {
 			// 조회일자 지정	
 			var now = new Date();
 			var defaultToDate = new Date(now);
-			defaultToDate.setDate(now.getDate() + 5);
+			defaultToDate.setDate(now.getDate() + 10);
 			$('#ITP_TAB_POMNG04010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_POMNG04010_SEARCH_FROM_DT').datepicker('setDate', '2020.10.01');
-			$('#ITP_FORM_POMNG04010_SEARCH_TO_DT').datepicker('setDate', '2024.10.01');
+			$('#ITP_FORM_POMNG04010_SEARCH_FROM_DT').datepicker('setDate', now);
+			$('#ITP_FORM_POMNG04010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(POMNG04010_GRID_ID, POMNG04010_GRID_LIST, 'lg');
@@ -234,7 +234,7 @@ let pageObj = {
             $('#ITP_BTN_POMNG04010_SEARCH_WHS_ID').show();
             $('#ITP_BTN_POMNG04010_DELETE_WHS_ID').show();
             
-        } else if(mode == 'ADD') { // 등록
+        } /*else if(mode == 'ADD') { // 등록
             $('#ITP_AJAX_POMNG04010_DETAIL_CONTAINER').show();
             fn_show_btn_auth_array(['#ITP_BTN_POMNG04010_CANCELLIST', '#ITP_BTN_POMNG04010_SAVE']);
 
@@ -260,7 +260,7 @@ let pageObj = {
             $('#ITP_FORM_POMNG04010_DETAIL #ITP_FORM_POMNG04010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
 
             $('.fnBrandId').text('(자동부여)');
-        } else if(mode == 'MODIFY') { // 수정
+        } */else if(mode == 'MODIFY') { // 수정
             $('#ITP_AJAX_POMNG04010_DETAIL_CONTAINER').show();
             fn_show_btn_auth_array(['#ITP_BTN_POMNG04010_CANCELLIST', '#ITP_BTN_POMNG04010_SAVE']);
 
@@ -279,10 +279,10 @@ let pageObj = {
 			$('#ITP_FORM_POMNG04010_DETAIL .itp_form_change').hide();
 
             $('#ITP_FORM_POMNG04010_DETAIL #ITP_FORM_POMNG04010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
-        } else if(mode == 'VIEW') { // 보기
+        } /*else if(mode == 'VIEW') { // 보기
             $('#ITP_AJAX_POMNG04010_VIEW_CONTAINER').show();
             fn_show_btn_auth_array(['#ITP_BTN_POMNG04010_MODIFY', '#ITP_BTN_POMNG04010_CANCELLIST']);
-        }
+        }*/
     }
 };
 
@@ -442,7 +442,6 @@ let modifyObj = {
 			listObj.grid.search();
 		},
 		del: function() {
-			console.log('here');
 			const formId = '#ITP_FORM_POMNG04010_DETAIL';
 			itp_fn_form_clear_validate(null, formId);
 			itp_fn_grid_save_rows(POMNG04010_DETAIL_GRID_ID);
@@ -451,24 +450,20 @@ let modifyObj = {
 				$(POMNG04010_DETAIL_GRID_ID).jqGrid('saveCell', i+1, 2)
 			}
 			const selection = $(POMNG04010_DETAIL_GRID_ID).getGridParam('selarrrow');
-			console.log(selection);
 			let param = $(formId).serializeObject();
 			let newData = [];
 			for(let i = 0; i < selection.length; i++){
 				let before = $(POMNG04010_DETAIL_GRID_ID).getRowData(selection[i]);
 				before.pchPodrUnqNo = param.pchPodrUnqNo;
-				//console.log(before)
 				newData.push(before);
 			}
-			console.log(newData);
 			param.gridUpdateData = newData;
 			console.log(JSON.stringify(param));
 			var searhFn = function() {
 				ITP_FORM_POMNG02010_DETAIL_IS_WRITING = false;
 				listObj.grid.search();
 			};
-			fn_ajax_call(API_POMNG_PO_CANCEL_PCHPO, JSON.stringify(param), searhFn, 'POST');
-			
+			fn_ajax_call(API_POMNG_PO_CANCEL_PCHPO, JSON.stringify(param), searhFn, 'POST');			
 		}
 	},
 	empty: {
@@ -547,28 +542,35 @@ let modifyObj = {
 				colModel: gridColModel.detail,
 				data: gridData,
 				multiselect: true,
+				onSelectRow: function(index, status) {
+					if(index) {
+						var row = $(POMNG04010_DETAIL_GRID_ID).jqGrid('getRowData', index);
+						if(row.podrDtlStCd == 'POD2') {
+							$("#jqg_ITP_POMNG04010_DETAIL_jqGrid_" + index).prop("checked", false);
+						}
+					}
+				},
 				onSelectAll: function(rowIds, status) {
 					for(let i = 0; i < rowIds.length; i++){
 						let podrDtlStCd = $(POMNG04010_DETAIL_GRID_ID).getCell(rowIds[i], 'podrDtlStCd');
-						if(podrDtlStCd == 'POD2'){
-							$("#jqg_list_" + rowIds[i]).prop("checked", false);
+						if(podrDtlStCd == 'POD2') {
+							$("#jqg_ITP_POMNG04010_DETAIL_jqGrid_" + rowIds[i]).prop("checked", false);
 						} else {
-							$("#jqg_list_" + rowIds[i]).prop("checked", status);
+							$("#jqg_ITP_POMNG04010_DETAIL_jqGrid_" + rowIds[i]).prop("checked", status);
 						}
 					}
 				},
 				loadComplete: function(data) {
 					console.log(data);
-					itp_fn_grid_load_complete(data, POMNG04010_DETAIL_GRID_ID, true, 'number', 'POMNG04010', modifyObj.itp_POMNG04010_search, modifyObj.empty, true, data.gridRecords, true);
 					let datas = data.rows;
-					console.log(datas);
 					for(let i = 0; i < datas.length; i++) {
 						let podrDtlStCd = datas[i].podrDtlStCd;
 						if(podrDtlStCd == 'POD2') {
-							$("#jqg_list_" + (i + 1)).attr('disabled', true);
+							$('#jqg_ITP_POMNG04010_DETAIL_jqGrid_' + (i + 1)).attr('disabled', true);
 						}
 					}
-				}				
+					itp_fn_grid_load_complete(data, POMNG04010_DETAIL_GRID_ID, true, 'number', 'POMNG04010', modifyObj.itp_POMNG04010_search, modifyObj.empty, true, data.gridRecords, true);
+				}
 			};
 			itp_fn_grid_make_local(option);
 		},

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_DLV_STTMT_PRN.js

@@ -7,18 +7,44 @@ require(['config'], function() {
 });
 
 let FRCOMP_POP_GRID_LIST = '/api/pomng/inoutmng/spply-deli-grid-list';
-
-function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
+let FRCOMP_POP_INFO_INV  = '/api/pomng/inoutmng/info-inv';	// 상세
+function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, schParam, returnType) {
 	// 공통코드
 	// fn_make_select(CODE_LIST, 'CMPY_TYPE_CD', 'ITP_FORM_BIZPOP_DLV_STTMT_PRN_CMPY_TYPE_CD', true, '가맹점타입 선택');
 	
+	console.log(args);
+	
 	let itp_BIZPOP_DLV_STTMT_PRN_param = {};
 	let itp_BIZPOP_DLV_STTMT_PRN_search = false;
 
 	const THIS_FORM_ID = '#ITP_FORM_BIZPOP_DLV_STTMT_PRN';
 	const THIS_GIRD_ID = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGrid';
 	const THIS_GIRD_PAGER = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGridPager';
-
+	
+let popObj = {	
+	init: function (param) {
+		this.load(param);
+	},
+	load: function(param) {
+		fn_ajax_call(FRCOMP_POP_INFO_INV, param, this.callback, 'GET');
+	},
+	callback: function (result) {
+		console.log(result);
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvMgrTelNo').val(args.dlvMgrTelNo);
+		var divMgrTelNo = "(" + args.divMgrTelNo + ")";
+		
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnZipNo').val(args.zipNo);
+		var zipNo = "(" + args.zipNo + ")";
+		//ord030 파일에서 따서 실험중 
+	}
+};
+	
+	
+	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_FORM_DT').val(args.fromDt);
+	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_TO_DT').val(args.toDt);
+	
+	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val(fn_make_user_info.get('brandId'));
+	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
 	if(args) {
 		$('#ITP_FORM_BIZPOP_DLV_STTMT_PRN_CMPY_NM').val(args.brandNm);
 	}
@@ -83,7 +109,7 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
 	$(THIS_GIRD_ID).jqGrid({
 		colModel: [
 			{
-				index: 'AFFL_SHOP_ID', name: 'pchPodrUnqNo',
+				index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
 				label: '발주번호', //
 				width: '5', fixed: false, align: 'center',
 				sortable: false, hidden: false
@@ -95,25 +121,25 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
 				sortable: false, hidden: false
 			},
 			{
-				index: 'BRAND_ID', name: 'itemNm',
+				index: 'ITEM_NM', name: 'itemNm',
 				label: '품목명', //
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
-				index: 'BRAND_NM', name: 'podrQty',
+				index: 'PODR_QTY', name: 'podrQty',
 				label: '발주수량', //
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
-				index: 'BRAND_ID', name: 'dlvQty',
+				index: 'DLV_QTY', name: 'dlvQty',
 				label: '납품서수량', //
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
-				index: 'BRAND_ID', name: 'expryDate',
+				index: 'EXPRY_DATE', name: 'expryDate',
 				label: '유통기한', //
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false

src/main/webapp/mobile/app/mcollmng/MCOLLMNG02010.html

@@ -1,237 +1,249 @@
-<section>
-  <div id="ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER" style="display: block;">
-    <div class="content">
-      <div class="line">
-        <label>수거장소</label>
-        <div class="search_wrap">
-	        <div class="float_left">
-	          <input id="ITP_FORM_MCOLLMNG02010_VIEW" type="text" placeholder="A매장명">
-	        </div>
-	        <div class="float_left_btn">
-	          <button id="ITP_BTN_MCOLLMNG02010"><img src="../img/search.png" alt=""></button>
-	          <button id="ITP_BTN_MCOLLMNG02010"><img src="../img/delete.png" alt=""></button>
-       		</div>
-        </div>
-      </div>
-      <div class="line">
-        <label>수거요청일</label>
-        <div class="date_to">
-          <input id="ITP_FORM_MCOLLMNG02010_VIEW" class="year" type="date">
-          <div class="at">~</div>
-          <input id="ITP_FORM_MCOLLMNG02010_VIEW" class="year" type="date">
-        </div>
-      </div>
-      <div class="line">
-        <select class="label" name="" id="ITP_FORM_MCOLLMNG02010_VIEW">
-          <option value="">발주번호/품목명</option>
-        </select>
-        <div class="search_wrap">
-          <input id="ITP_FORM_MCOLLMNG02010_VIEW" style="width: 262px;" type="text" placeholder="검색어입력">
-        </div>
-      </div>
-      <div class="line" style="height:45px;">
-        <div class="search">
-          <button id="ITP_BTN_MCOLLMNG02010" id="" class="btn-primary btn-sm ADB">검색</button>
-        </div>
-      </div>
-      <div class="table_header">
-        <h1>> 수거수주 내역</h1>
-      </div>
-    </div>
-    <div class="scroll_area row-2">
-      <li class="history_list3">
-        <div>
-          <div class="left">
-            <div class="nomal">
-              <label class="col_0">브랜드명 &nbsp;:</label>
-              <div class="space1">
-                <div class="fn">브랜드명</div>
-              </div>
-              <label class="col_0">반품발주번호&nbsp;:</label>
-              <div>
-                <div class="fn">PO1234123</div>
-              </div>
-            </div>
-          </div>
-          <div class="left">
-            <div class="nomal">
-              <label class="col_0">반품발주항번 &nbsp;:</label>
-              <div class="col_5">
-                <div class="col_5 fn">1</div>
-              </div>
-              <label class="col_0">수거요청일 &nbsp;:</label>
-              <div class="space1">
-                <div class="fn">2022.10.09</div>
-              </div>
-            </div>
-          </div>
-          <div class="left">
-            <div class="nomal">
-              <label class="col_0">수거장소&nbsp;:</label>
-              <div class="space1">
-                <div class="fn">A창고</div>
-              </div>
-              <label class="col_0">품목번호 &nbsp;:</label>
-              <div class="space1">
-                <div class="fn">asdf1324</div>
-              </div>
-            </div>
-          </div>
-          <div class="left">
-            <div class="nomal">
-              <label class="col_1">품목명 &nbsp;:</label>
-              <div class="space1">
-                <div class="fn">asdf1324</div>
-              </div>
-              <label class="col_0">수거수량&nbsp;:</label>
-              <div>
-                <div class="fn">3개</div>
-              </div>
-            </div>
-          </div>
-          <div class="left">
-            <div class="nomal">
-              <label class="col_0">단가금액 &nbsp;:</label>
-              <div class="col_5">
-                <div class="col_5 fn">1,000원</div>
-              </div>
-              <label class="col_0">수거금액&nbsp;:</label>
-              <div class="space0">
-                <div class="fn">20,000원</div>
-              </div>
-              <div class="scroll_btn">
-                <button id="ITP_BTN_MCOLLMNG02010">선택</button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </li>
-      <div class="button_bar">
-        <button id="ITP_BTN_MCOLLMNG02010" class="btn_col_6 btn-primary IVC">수거서생성</button>
-        <button id="ITP_BTN_MCOLLMNG02010" class="btn_col_3 btn-gray CLB">취소</button>
-      </div>
-    </div>
-  </div>
-  <div id="ITP_AJAX_MCOLLMNG02010_DETAIL_CONTAINER" style="display: none;">
-    <div class="content">
-      <div class="line">
-        <label>브랜드명</label>
-        <div class="line_right">
-          <div class="fn">A브랜드명</div>
-        </div>      
-      </div>
-      <div class="line">
-        <label>반품발주번호</label>
-        <div class="line_right">
-          <div class="fn">PO12345678</div>
-        </div>      
-      </div>
-      <div class="line">
-        <label class="col_6">수거서생성일자</label>
-        <div class="line_right">
-          <div class="fn">2022.10.09</div>
-        </div>      
-      </div>
-      <div class="line">
-        <label>수거총금액</label>
-        <div class="line_right">
-          <div class="fn">600,000원</div>
-        </div>      
-      </div>
-      <div class="line">
-        <label>수거장소</label>
-        <div class="line_right">
-          <div class="fn">A창고</div>
-        </div>      
-      </div>
-      <div class="line">
-        <label class="col_6">수거장소연락처</label>
-        <div class="line_right">
-          <div class="fn">02-0202-4544</div>
-        </div>      
-      </div>
-      <div class="line">
-        <label>수거담당자</label>
-        <div class="line_right">
-          <input id="ITP_FORM_MCOLLMNG02010_DETAIL" class="left" type="text" style="width:100px;margin-right: 5px;" placeholder="이름">
-          <input id="ITP_FORM_MCOLLMNG02010_DETAIL" class="left" type="text" style="width:140px;margin-right: 10px;" placeholder="연락처">
-        </div>
-      </div>
-      <div class="table_header">
-        <h1>> 수거수주 상세 내역</h1>
-      </div>
-    </div>
-    <div class="scroll_area row-5">
-      <li class="history_list2">
-        <div>
-          <div class="left">
-            <div class="nomal">
-              <label>발주항번 &nbsp;:</label>
-              <div class="space2">
-                <div class="fn">1</div>
-              </div>
-              <label class="col_0">품목아이디&nbsp;:</label>
-              <div class="space2">
-                <div class="fn">asdf1234</div>
-              </div>
-            </div>
-          </div>
-          <div class="left">
-            <div class="nomal">
-              <label>품목명 &nbsp;:</label>
-              <div class="space2">
-                <div class="fn">커피원두</div>
-              </div>
-              <label>가격단위&nbsp;:</label>
-              <div class="space2">
-                <div class="fn">1</div>
-              </div>
-            </div>
-          </div>
-          <div class="left">
-            <div class="nomal">
-              <label>단가 &nbsp;:</label>
-              <div>
-                <div class="fn">5,000원</div>
-              </div>
-              <label>단위&nbsp;:</label>
-              <div>
-                <div class="fn">Kg</div>
-              </div>
-            </div>
-          </div>
-          <div class="left">
-            <div class="nomal">
-              <label>수거수량 &nbsp;:</label>
-              <div>
-                <input id="ITP_FORM_MCOLLMNG02010_DETAIL" type="text">
-              </div>
-              <label>수거일자&nbsp;:</label>
-              <div>
-                <input id="ITP_FORM_MCOLLMNG02010_DETAIL" type="text">
-              </div>
-            </div>
-          </div>
-          <div class="left">
-            <div class="nomal">
-              <label>수거구분 &nbsp;:</label>
-              <div>
-                <select style="width:85px" name="" id="ITP_FORM_MCOLLMNG02010_DETAIL">
-                  <option value=""></option>
-                </select>
-              </div>
-              <label>비고 &nbsp;:</label>
-              <div class="space2">
-                <input id="ITP_FORM_MCOLLMNG02010_DETAIL" type="text">
-              </div>
-            </div>
-          </div>
-        </div>
-      </li>
-    </div>
-    <div class="button_bar">
-      <button id="ITP_BTN_MCOLLMNG02010" class="btn_col_6 btn-primary CRT">생성</button>
-      <button id="ITP_BTN_MCOLLMNG02010" class="btn_col_3 btn-gray CLB">취소</button>
-    </div>
-  </div>
-</section>
+<section id="ITP_MOBILE_MCOLLMNG02010">
+	<div id="ITP_AJAX_MCOLLMNG02010_DETAIL_CONTAINER" style="display: none;">
+		<form id="ITP_FORM_MCOLLMNG02010_DETAIL" class="form-horizontal" onsubmit="return false;">
+		<input type="hidden" id="ITP_FORM_MCOLLMNG02010_DETAIL_VIEW_CD" name="viewCd" value="C">
+		  <div class="content">
+		   <div class="line">
+			  <label>수거장소</label>
+			  <div class="search_wrap">
+				  <div class="float_left">
+					<input id="ITP_FORM_MCOLLMNG02010_DETAIL_COL_PLACE" name="colPlace" type="text" placeholder="A매장명">
+				  </div>
+				  <div class="float_left_btn">
+					<button id="ITP_BTN_MCOLLMNG02010_DETAIL_SEARCH_COL_PLACE" data-call-popup="ITP_POP_MCOLLMNG02010_COL_AREA"><img src="../img/search.png" alt=""></button>
+					<button id="ITP_BTN_MCOLLMNG02010_DETAIL_DETELE_COL_PLACE"><img src="../img/delete.png" alt=""></button>
+				  </div>	
+			  </div>
+			</div>
+			<div class="line">
+			  <label>수거요청일</label>
+			  <div class="date_to">
+				<input id="ITP_FORM_MCOLLMNG02010_DETAIL_COL_REQ_DT" name="colReqDt" class="year" type="date">
+				<div class="at">~</div>
+				<input id="ITP_FORM_MCOLLMNG02010_DETAIL" class="year" type="date">
+			  </div>
+			</div>
+			<div class="line">
+			  <select class="label" name="itemNm" id="ITP_FORM_MCOLLMNG02010_DETAIL_ITEM_NM">
+				<option value="">발주번호/품목명</option>
+			  </select>
+			  <div class="search_wrap">
+				<input id="ITP_FORM_MCOLLMNG02010_DETAIL_ITEM_NM" name="ITEM_NM" style="width: 262px;" type="text" placeholder="검색어입력">
+			  </div>
+			</div>
+			<div class="line" style="height:45px;">
+			  <div class="search">
+				<button id="ITP_BTN_MCOLLMNG02010_DETAIL_SEARCH" class="btn-primary btn-sm ADB">검색</button>
+			  </div>
+			</div>
+			<div class="table_header">
+			  <h1>> 수주 내역</h1>
+			</div>
+		  </div>
+		   <div id="ITP_LIST_MCOLLMNG02010_ITEM_AREA" class="scroll_area row-2">
+			  <ul id="ITP_LIST_MCOLLMNG02010_DETAIL_ROWS" class="panel-group"></ul>
+			  <div id="ITP_LIST_MCOLLMNG02010_DETAIL_ROWCOPY" style="display: block;">
+				<li class="history_list3">
+				  <div>
+					<div class="left">
+					  <div class="nomal">
+						<label class="col_0">브랜드명 &nbsp;:</label>
+						<div>
+						  <div class="fnBrandNm space1">브랜드명</div>
+						</div>
+						<label class="col_0">반품발주번호&nbsp;:</label>
+						<div>
+						  <div class="fnRtnPodrNo">PO1234123</div>
+						</div>
+					  </div>
+					</div>
+					<div class="left">
+					  <div class="nomal">
+						<label class="col_0">반품발주항번 &nbsp;:</label>
+						<div class="col_5">
+						  <div class="fnRtnPodrNo col_5">1</div>
+						</div>
+						<label class="col_6">수거요청일 &nbsp;:</label>
+						<div>
+						  <div class="fnColReqDt space1">2022.10.09</div>
+						</div>
+					  </div>
+					</div>
+					<div class="left">
+					  <div class="nomal">
+						<label class="col_0">수거장소&nbsp;:</label>
+						<div>
+						  <div class="fnColPlace space1">A창고</div>
+						</div>
+						<label class="col_0">품목번호 &nbsp;:</label>
+						<div>
+						  <div class="fnItemNo space1">asdf1324</div>
+						</div>
+					  </div>
+					</div>
+					<div class="left">
+					  <div class="nomal">
+						<label class="col_0">품목명 &nbsp;:</label>
+						<div>
+						  <div class="fnItemNm space1">asdf1324</div>
+						</div>
+						<label class="col_0">수거수량&nbsp;:</label>
+						<div>
+						  <div class="fnColQty">3개</div>
+						</div>
+					  </div>
+					</div>
+					<div class="left">
+					  <div class="nomal">
+						<label class="col_0">단가금액 &nbsp;:</label>
+						<div class="col_5">
+						  <div class="fnUnitAmt col_5">1,000원</div>
+						</div>
+						<label class="col_0">수거금액&nbsp;:</label>
+						<div>
+						  <div class="fnColAmt space0">20,000원</div>
+						</div>
+						<div class="scroll_btn">
+						  <button id="ITP_BTN_MCOLLMNG02010_DETAIL_CHOICE">선택</button>
+						</div>
+					  </div>
+					</div>
+				  </div>
+				</li>
+			</div>
+			<div class="button_bar">
+			  <button id="ITP_BTN_MCOLLMNG02010_DETAIL" class="btn_col_6 btn-primary IVC">수거서생성</button>
+			  <button id="ITP_BTN_MCOLLMNG02010_DETAIL_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
+			</div>
+		  </div>
+	  </form>
+	</div>
+	<div id="ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER" style="display: block;">
+		<form id="ITP_FORM_MCOLLMNG02010_VIEW" class="form-horizontal" onsubmit="return false;">
+		<input type="hidden" id="ITP_FORM_MCOLLMNG02010_VIEW_VIEW_CD" name="viewCd" value="C">
+		  <div class="content">
+			<div class="line">
+			  <label>브랜드명</label>
+			  <div class="line_right">
+				<div class="fnbrandNm">A브랜드명</div>
+			  </div>      
+			</div>
+			<div class="line">
+			  <label>반품발주번호</label>
+			  <div class="line_right">
+				<div class="fnRtnPodrNo">PO12345678</div>
+			  </div>      
+			</div>
+			<div class="line">
+			  <label class="col_6">수거서생성일자</label>
+			  <div class="line_right">
+				<div class="fnColRegDt">2022.10.09</div>
+			  </div>      
+			</div>
+			<div class="line">
+			  <label>수거총금액</label>
+			  <div class="line_right">
+				<div class="fnColAmt">600,000원</div>
+			  </div>      
+			</div>
+			<div class="line">
+			  <label>수거장소</label>
+			  <div class="line_right">
+				<div class="fnColPlace">A창고</div>
+			  </div>      
+			</div>
+			<div class="line">
+			  <label class="col_6">수거장소연락처</label>
+			  <div class="line_right">
+				<div class="fnColPlaceNum">02-0202-4544</div>
+			  </div>      
+			</div>
+			<div class="line">
+			  <label>수거담당자</label>
+			  <div class="line_right">
+				<input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_NM" name="ColMgrNm" class="left" type="text" style="width:100px;margin-right: 5px;" placeholder="이름">
+				<input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_TEL_NO" name="ColMgrTelNo" class="left" type="text" style="width:140px;margin-right: 10px;" placeholder="연락처">
+			  </div>
+			</div>
+			<div class="table_header">
+			  <h1>> 수거 상세 내역</h1>
+			</div>
+		  </div>
+			<div id="ITP_LIST_MCOLLMNG02010_ITEM_AREA" class="scroll_area row-5">
+			  <ul id="ITP_LIST_MCOLLMNG02010_VIEW_ROWS" class="panel-group"></ul>
+			  <div id="ITP_LIST_MCOLLMNG02010_VIEW_ROWCOPY" style="display: bl;">
+				<li class="history_list2">
+				  <div>
+					<div class="left">
+					  <div class="nomal">
+						<label>반품발주항번 &nbsp;:</label>
+						<div class="col_5">
+						  <div class="col_5 fnRtnPodrSeq">1</div>
+						</div>
+						<label class="col_0">품목아이디&nbsp;:</label>
+						<div class="space2">
+						  <div class="fnItemId">asdf1234</div>
+						</div>
+					  </div>
+					</div>
+					<div class="left">
+					  <div class="nomal">
+						<label>품목명 &nbsp;:</label>
+						<div class="space2">
+						  <div class="fnItemNm">커피원두</div>
+						</div>
+						<label>가격단위&nbsp;:</label>
+						<div class="space2">
+						  <div class="fnUnit">1</div>
+						</div>
+					  </div>
+					</div>
+					<div class="left">
+					  <div class="nomal">
+						<label>단가 &nbsp;:</label>
+						<div class="">
+						  <div class="fnUnit">1,000원</div>
+						</div>
+						<label>단위&nbsp;:</label>
+						<div class="">
+						  <div class="fnUnit">Kg</div>
+						</div>
+					  </div>
+					</div>
+					<div class="left">
+					  <div class="nomal">
+						<label>수거수량 &nbsp;:</label>
+						<div class="">
+						  <input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY" type="text">
+						</div>
+						<label>수거일자&nbsp;:</label>
+						<div class="">
+						  <input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_DT" type="text">
+						</div>
+					  </div>
+					</div>
+					<div class="left">
+					  <div class="nomal">
+						<label>수거구분 &nbsp;:</label>
+						<div>
+		                  <select style="width:85px" name="colYn" id="ITP_FORM_MCOLLMNG02010_VIEW_COL_YN">
+	                    	<option value=""></option>
+		                  </select>
+		              	</div>
+						<label>비고 &nbsp;:</label>
+						<div class="space2">
+						  <input id="ITP_FORM_MCOLLMNG02010_VIEW_NOTE" type="text">
+						</div>
+					  </div>
+					</div>
+				  </div>
+				</li>
+			</div>
+		  </div>
+		  <div class="button_bar">
+			<button id="ITP_BTN_MCOLLMNG02010_VIEW_ADD" class="btn_col_6 btn-primary CRT">생성</button>
+			<button id="ITP_BTN_MCOLLMNG02010_VIEW_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
+		  </div>
+	  </form>
+	</div>
+  </section>

src/main/webapp/mobile/app/mcollmng/MCOLLMNG03010.html

@@ -1,248 +1,260 @@
-<section>
-  <div id="ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER" style="display: block;">
-    <div class="content">
-      <div class="line">
-        <label>수거장소</label>
-        <div class="search_wrap">
-	        <div class="float_left">
-	          <input type="text" placeholder="A매장명">
+<section id="ITP_MOBILE_MCOLLMNG03010">
+  <div id="ITP_AJAX_MCOLLMNG03010_DETAIL_CONTAINER" style="display: none;">
+    <form id="ITP_FORM_MCOLLMNG03010_DETAIL" class="form-horizontal" onsubmit="return false;">
+      <input type="hidden" id="ITP_FORM_MCOLLMNG03010_DETAIL_VIEW_CD" name="viewCd" value="C">
+	    <div class="content">
+	      <div class="line">
+	        <label>수거장소</label>
+	        <div class="search_wrap">
+		        <div class="float_left">
+		          <input id="ITP_FORM_MCOLLMNG03010_DETAIL_COL_PLACE" name="colPlace" type="text" placeholder="A매장명">
+		        </div>
+		        <div class="float_left_btn">
+		          <button id="ITP_BTN_MCOLLMNG03010_DETAIL_SEARCH_COL_PLACE" data-call-popup="ITP_POP_MCOLLMNG03010_COL_AREA"><img src="../img/search.png" alt=""></button>
+		          <button id="ITP_BTN_MCOLLMNG03010_DETAIL_DETELE_COL_PLACE"><img src="../img/delete.png" alt=""></button>
+		        </div>
+	        </div>
+	      </div>
+	      <div class="line">
+	        <label>수거일자</label>
+	        <div class="date_to">
+	          <input id="ITP_FORM_MCOLLMNG03010_DETAIL_COL_REQ_DT" name="colReqDt" class="year" type="date">
+	          <div class="at">~</div>
+	          <input id="ITP_FORM_MCOLLMNG03010_DETAIL_COL_CMPLT_DT" name="colCmpltDt" class="year" type="date">
+	        </div>
+	      </div>
+	      <div class="line">
+	        <select class="label" name="itemNm" id="ITP_FORM_MCOLLMNG03010_DETAIL_ITEM_NM">
+	          <option value="">발주번호/품목명</option>
+	        </select>
+	        <div class="search_wrap">
+	          <input id="ITP_FORM_MCOLLMNG03010_DETAIL_ITEM_NM" name="itemNm" style="width: 262px;" type="text" placeholder="검색어입력">
+	        </div>
+	      </div>
+	      <div class="line" style="height:45px;">
+	        <div class="search">
+	          <button id="ITP_BTN_MCOLLMNG03010_DETAIL_SEARCH" class="btn-primary btn-sm ADB">검색</button>
 	        </div>
-	        <div class="float_left_btn">
-	          <button><img src="../img/search.png" alt=""></button>
-	          <button><img src="../img/delete.png" alt=""></button>
-        	</div>
-        </div>
-      </div>
-      <div class="line">
-        <label>수거요청일</label>
-        <div class="date_to">
-          <input class="year" type="date">
-          <div class="at">~</div>
-          <input class="year" type="date">
-        </div>
-      </div>
-      <div class="line">
-        <select class="label" name="" id="">
-          <option value="">수거서번호</option>
-        </select>
-        <div class="search_wrap">
-          <input style="width: 262px;" type="text" placeholder="검색어입력">
-        </div>
-      </div>
-      <div class="line" style="height:45px;">
-        <div class="search">
-          <button id="" class="btn-primary btn-sm ADB">검색</button>
-        </div>
-      </div>
-      <div class="table_header">
-        <h1>> 수거서 내역</h1>
-      </div>
-    </div>
-    <div class="scroll_area row-2">
-      <li class="history_list3">
-        <div>
-          <div class="left">
-            <div class="nomal">
-              <label class="col_0">브랜드명 :</label>
-              <div class="">
-                <div class="space1">브랜드명</div>
-              </div>
-              <label>수거서번호:</label>
-              <div class="">
-                <div class="">PO1234123</div>
-              </div>
-            </div>
-          </div>
-          <div class="left">
-            <div class="nomal">
-              <label>수거서상태 :</label>
-              <div class="">
-                <div class="space1">수거전</div>
-              </div>
-              <label>수거일자&nbsp;:</label>
-              <div class="">
-                <div class="space1">2022.10.09</div>
-              </div>
-            </div>
-          </div>
-          <div class="left">
-            <div class="nomal">
-              <label>수거요청일&nbsp;:</label>
-              <div class="">
-                <div class="space1">2022.10.09</div>
-              </div>
-              <label>수거예정일&nbsp;:</label>
-              <div class="">
-                <div class="space1">2022.10.10</div>
-              </div>
-            </div>
-          </div>
-          <div class="left">
-            <div class="nomal">
-              <label class="col_0">품목수량 :</label>
-              <div class="">
-                <div class="space1">2</div>
-              </div>
-              <label>수거총금액&nbsp;:</label>
-              <div class="">
-                <div class="">600,000</div>
-              </div>
-            </div>
-          </div>
-          <div class="left">
-            <div class="nomal">
-              <label class="col_0">수거장소 :</label>
-              <div class="">
-                <div class="space1">A창고</div>
-              </div>
-              <label>수거담당자&nbsp;:</label>
-              <div class="">
-                <div class="space0">홍길동</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </li>
-      <div class="button_bar">
-        <button id="" class="btn_col_6 btn-primary IVVIEW">납품서보기</button>
-        <button id="" class="btn_col_3 btn-gray CLB">취소</button>
-      </div>
-    </div>
+	      </div>
+	      <div class="table_header">
+	        <h1>> 수주 내역</h1>
+	      </div>
+	    </div>
+    	<div id="ITP_LIST_MCOLLMNG03010_ITEM_AREA" class="scroll_area row-2">
+        	<ul id="ITP_LIST_MCOLLMNG03010_DETAIL_ROWS" class="panel-group"></ul>
+        	<div id="ITP_LIST_MCOLLMNG03010_DETAIL_ROWCOPY" style="display: block;">
+		      <li class="history_list3">
+		        <div>
+		          <div class="left">
+		            <div class="nomal">
+		              <label class="col_0">브랜드명 &nbsp;:</label>
+		              <div>
+		                <div class="fnBrandNm space1">브랜드명</div>
+		              </div>
+		              <label>수거서번호&nbsp;:</label>
+		              <div>
+		                <div class="fnColNo">PO1234123</div>
+		              </div>
+		            </div>
+		          </div>
+		          <div class="left">
+		            <div class="nomal">
+		              <label class="col_6">수거서상태 &nbsp;:</label>
+		              <div>
+		                <div class="fnColStCd">수거전</div>
+		              </div>
+		              <label class="col_0">수거일자&nbsp;:</label>
+		              <div>
+		                <div class="fnColDt">2022.10.09</div>
+		              </div>
+		            </div>
+		          </div>
+		          <div class="left">
+		            <div class="nomal">
+		              <label>수거요청일&nbsp;:</label>
+		              <div>
+		                <div class="fnColReqDt">2022.10.09</div>
+		              </div>
+		              <label>수거예정일&nbsp;:</label>
+		              <div>
+		                <div class="fnColSchDt">2022.10.10</div>
+		              </div>
+		            </div>
+		          </div>
+		          <div class="left">
+		            <div class="nomal">
+		              <label class="col_0">품목수량 &nbsp;:</label>
+		              <div>
+		                <div class="fnItemQty space1">2</div>
+		              </div>
+		              <label>수거총금액&nbsp;:</label>
+		              <div>
+		                <div class="fnColAmt">600,000</div>
+		              </div>
+		            </div>
+		          </div>
+		          <div class="left">
+		            <div class="nomal">
+		              <label class="col_0">수거장소 &nbsp;:</label>
+		              <div>
+		                <div class="fnColPlace space1">A창고</div>
+		              </div>
+		              <label>수거담당자&nbsp;:</label>
+		              <div>
+		                <div class="fnColMgrNm space0">홍길동</div>
+		              </div>
+		            </div>
+		          </div>
+		        </div>
+		      </li>
+	      </div>
+	      <div class="button_bar">
+	        <button id="ITP_BTN_MCOLLMNG03010_DETAIL_DLV" class="btn_col_6 btn-primary IVDETAIL">납품서보기</button>
+	        <button id="ITP_BTN_MCOLLMNG03010_DETAIL_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
+	      </div>
+	    </div>
+    </form>
   </div>
-  <div id="ITP_AJAX_MCOLLMNG03010_DETAIL_CONTAINER" style="display: none;">
-    <div class="detail_content">
-      <div class="detail_header">
-        <div class="detail_logo">
-          <img src="../img/naver.png" alt="">
-        </div>
-        <div class="detail_ok">
-          <label>납품 확인서</label>
-        </div>
-      </div>
-      <div class="detail_confirmation">
-        <div class="detail_col">
-          <label>발행일</label>
-          <i>:</i>
-          <div class="fn">2022.10.09</div>
-        </div>
-        <div class="detail_col">
-          <label>수거확인번호</label>
-          <i>:</i>
-          <div class="fn">DL123445</div>
-        </div>
-        <div class="detail_col">
-          <label>수거일</label>
-          <i>:</i>
-          <div class="fn">2022.10.10</div>
-        </div>
-        <div class="detail_col">
-          <label>수거담당자</label>
-          <i>:</i>
-          <div class="fn">홍길동(010-1234-1548)</div>
-        </div>
-        <div class="detail_col">
-          <label>수거장소</label>
-          <i>:</i>
-          <div class="fn">(123450 서울 송파구 문정동 100 A창고)</div>
-        </div>
-        <div class="detail_col">
-          <label>전화번호</label>
-          <i>:</i>
-          <div class="fn">02-123-4567</div>
-        </div>
-      </div>
-      <div class="detail_company_info">
-        <div class="info_left">
-          <div class="weight">
-            <label>반품처</label>
-          </div>
-          <div class="company_info">
-            <label>등록번호&nbsp;:&nbsp;</label>
-            <div class="fn">215-12-23454</div>
-          </div>
-          <div class="company_info">
-            <label>상호&nbsp;:&nbsp;</label>
-            <div class="fn">공급업체명</div>
-          </div>
-          <div class="company_info">
-            <label>성명&nbsp;:&nbsp;</label>
-            <div class="fn">공급자</div>
-          </div>
-          <div class="company_info">
-            <label>주소&nbsp;:&nbsp;</label>
-            <div class="fn">서울 송파구 문정동</div>
-          </div>
-        </div>
-        <div class="info_left">
-          <div class="weight">
-            <label>수거처</label>
-          </div>
-          <div class="company_info">
-            <label>등록번호&nbsp;:&nbsp;</label>
-            <div class="fn">215-12-23454</div>
-          </div>
-          <div class="company_info">
-            <label>상호&nbsp;:&nbsp;</label>
-            <div class="fn">브랜드 회사명</div>
-          </div>
-          <div class="company_info">
-            <label>성명&nbsp;:&nbsp;</label>
-            <div class="fn">대표자명</div>
-          </div>
-          <div class="company_info">
-            <label>주소&nbsp;:&nbsp;</label>
-            <div class="fn">경기 성남시 상대원동</div>
-          </div>
-        </div>
-      </div>
-      <div class="table_header">
-        <h1>> 수거 상세 내역</h1>
-      </div>
-    </div>
-    <div class="scroll_area row-7">
-      <li class="history_list5">
-        <div>
-          <div class="left">
-            <div class="nomal">
-              <label class="col_0">수거발주번호 &nbsp;:</label>
-              <div class="col_5">
-                <div class="col_5 fn">P12345</div>
-              </div>
-              <label class="col_0">품목아이디&nbsp;:</label>
-              <div class="space2">
-                <div class="fn">asdf1234</div>
-              </div>
-            </div>
-          </div>
-          <div class="left">
-            <div class="nomal">
-              <label>품목명 &nbsp;:</label>
-              <div class="space2">
-                <div class="fn">커피원두</div>
-              </div>
-              <label class="col_0">수거요청수량&nbsp;:</label>
-              <div class="space2">
-                <div class="fn">5</div>
-              </div>
-            </div>
-          </div>
-          <div class="left">
-            <div class="nomal">
-              <label>수거수량 &nbsp;:</label>
-              <div class="fn">
-                <div class="">10</div>
-              </div>
-              <label class="col_0">수거사유구분&nbsp;:</label>
-              <div class="fn">
-                <div class="">불량</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </li>
-    </div>
-    <div class="button_bar">
-      <button id="ITP_BTN_MCOLLMNG03010" class="col_12 btn-gray COK">확인</button>
-    </div>
+  <div id="ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER" style="display: block;">
+  	<form id="ITP_FORM_MCOLLMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
+		<input type="hidden" id="ITP_FORM_MCOLLMNG03010_VIEW_VIEW_CD" name="viewCd" value="C">
+	    <div class="detail_content">
+	      <div class="detail_header">
+	        <div class="detail_logo">
+	          <img src="../img/naver.png" alt="">
+	        </div>
+	        <div class="detail_ok">
+	          <label>납품 확인서</label>
+	        </div>
+	      </div>
+	      <div class="detail_confirmation">
+	        <div class="detail_col">
+	          <label>발행일</label>
+	          <i>:</i>
+	          <div class="fnDt">2022.10.09</div>
+	        </div>
+	        <div class="detail_col">
+	          <label>수거확인번호</label>
+	          <i>:</i>
+	          <div class="fnColCnfmNo">DL123445</div>
+	        </div>
+	        <div class="detail_col">
+	          <label>수거일</label>
+	          <i>:</i>
+	          <div class="fnColDt">2022.10.10</div>
+	        </div>
+	        <div class="detail_col">
+	          <label>수거담당자</label>
+	          <i>:</i>
+	          <div class="fnCOLMgrNm">홍길동(010-1234-1548)</div>
+	        </div>
+	        <div class="detail_col">
+	          <label>수거장소</label>
+	          <i>:</i>
+	          <div class="fnColPlace">(123450 서울 송파구 문정동 100 A창고)</div>
+	        </div>
+	        <div class="detail_col">
+	          <label>전화번호</label>
+	          <i>:</i>
+	          <div class="fnTel">02-123-4567</div>
+	        </div>
+	      </div>
+	      <div class="detail_company_info">
+	        <div class="info_left">
+	          <div class="weight">
+	            <label>반품처</label>
+	          </div>
+	          <div class="company_info">
+	            <label>등록번호&nbsp;:&nbsp;</label>
+	            <div class="fnBsnsRegNo">215-12-23454</div>
+	          </div>
+	          <div class="company_info">
+	            <label>상호&nbsp;:&nbsp;</label>
+	            <div class="fnSag">공급업체명</div>
+	          </div>
+	          <div class="company_info">
+	            <label>성명&nbsp;:&nbsp;</label>
+	            <div class="fnNm">공급자</div>
+	          </div>
+	          <div class="company_info">
+	            <label>주소&nbsp;:&nbsp;</label>
+	            <div class="fnAddr">서울 송파구 문정동</div>
+	          </div>
+	        </div>
+	        <div class="info_left">
+	          <div class="weight">
+	            <label>수거처</label>
+	          </div>
+	          <div class="company_info">
+	            <label>등록번호&nbsp;:&nbsp;</label>
+	            <div class="fnBsnsRegNo">215-12-23454</div>
+	          </div>
+	          <div class="company_info">
+	            <label>상호&nbsp;:&nbsp;</label>
+	            <div class="fnSag">브랜드 회사명</div>
+	          </div>
+	          <div class="company_info">
+	            <label>성명&nbsp;:&nbsp;</label>
+	            <div class="fnNm">대표자명</div>
+	          </div>
+	          <div class="company_info">
+	            <label>주소&nbsp;:&nbsp;</label>
+	            <div class="fnAddr">경기 성남시 상대원동</div>
+	          </div>
+	        </div>
+	      </div>
+	      <div class="table_header">
+	        <h1>> 수거 상세 내역</h1>
+	      </div>
+	    </div>
+	  	<div id="ITP_LIST_MCOLLMNG03010_ITEM_AREA" class="scroll_area row-7">
+	       	<ul id="ITP_LIST_MCOLLMNG03010_DETAIL_ROWS" class="panel-group"></ul>
+	       	<div id="ITP_LIST_MCOLLMNG03010_DETAIL_ROWCOPY" style="display: block;">
+		      <li class="history_list5">
+		        <div>
+		          <div class="left">
+		            <div class="nomal">
+		              <label>수거발주번호 &nbsp;:</label>
+		              <div class="col_5">
+		                <div class="col_5 fnColPodrNo">P12345</div>
+		              </div>
+		              <label class="col_0">품목아이디&nbsp;:</label>
+		              <div class="space2">
+		                <div class="fnItemId">asdf1234</div>
+		              </div>
+		            </div>
+		          </div>
+		          <div class="left">
+		            <div class="nomal">
+		              <label>품목명 &nbsp;:</label>
+		              <div class="space2">
+		                <div class="fnItemNm">커피원두</div>
+		              </div>
+		              <label>수거요청수량&nbsp;:</label>
+		              <div class="space2">
+		                <div class="fnColReqQty">2023.12.02</div>
+		              </div>
+		            </div>
+		          </div>
+		          <div class="left">
+		            <div class="nomal">
+		              <label>수거수량 &nbsp;:</label>
+		              <div class="space2">
+		                <div class="fnColQty">10</div>
+		              </div>
+		              <label>수거사유구분&nbsp;:</label>
+		              <div>
+		                <div class="fnColRsnDvsn">파손</div>
+		              </div>
+		            </div>
+		          </div>
+		        </div>
+		      </li>
+	      </div>
+	    </div>
+	    <div class="button_bar">
+	      <button id="ITP_BTN_MCOLLMNG03010_VIEW" class="ok col_12 btn-gray COK">확인</button>
+	    </div>
+    </form>
   </div>
 </section>

src/main/webapp/mobile/app/mordmng/MORDMNG03010.html

@@ -16,11 +16,11 @@
 	        </div>
 	      </div>
 	      <div class="line">
-	        <label>납품요청일</label>
+	        <label>납품일자</label>
 	        <div class="date_to">
 	          <input id="ITP_FORM_MORDMNG03010_DETAIL_DLV_REQ_DT" name="dlvReqDt" class="year" type="date">
 	          <div class="at">~</div>
-	          <input id="ITP_FORM_MORDMNG03010_DETAIL" class="year" type="date">
+	          <input id="ITP_FORM_MORDMNG03010_DETAIL_DLV_CMPLT_DT" name="dlvCmpltDt" class="year" type="date">
 	        </div>
 	      </div>
 	      <div class="line">
@@ -28,7 +28,7 @@
 	          <option value="">발주번호/품목명</option>
 	        </select>
 	        <div class="search_wrap">
-	          <input id="ITP_FORM_MORDMNG03010_DETAIL_ITEM_NM" name="ITEM_NM" style="width: 262px;" type="text" placeholder="검색어입력">
+	          <input id="ITP_FORM_MORDMNG03010_DETAIL_ITEM_NM" name="itemNm" style="width: 262px;" type="text" placeholder="검색어입력">
 	        </div>
 	      </div>
 	      <div class="line" style="height:45px;">
@@ -116,142 +116,145 @@
     </form>
   </div>
   <div id="ITP_AJAX_MORDMNG03010_VIEW_CONTAINER" style="display: none;">
-    <div class="detail_content">
-      <div class="detail_header">
-        <div class="detail_logo">
-          <img src="../img/naver.png" alt="">
-        </div>
-        <div class="detail_ok">
-          <label>납품 확인서</label>
-        </div>
-      </div>
-      <div class="detail_confirmation">
-        <div class="detail_col">
-          <label>발행일</label>
-          <i>:</i>
-          <div class="fnDt">2022.10.09</div>
-        </div>
-        <div class="detail_col">
-          <label>납품서확인번호</label>
-          <i>:</i>
-          <div class="fnDlvNo">DL123445</div>
-        </div>
-        <div class="detail_col">
-          <label>납품일</label>
-          <i>:</i>
-          <div class="fnDlvDt">2022.10.10</div>
-        </div>
-        <div class="detail_col">
-          <label>납품담당자</label>
-          <i>:</i>
-          <div class="fnDlvMgrNm">홍길동(010-1234-1548)</div>
-        </div>
-        <div class="detail_col">
-          <label>납품장소</label>
-          <i>:</i>
-          <div class="fnDlvPlace">(123450 서울 송파구 문정동 100 A창고)</div>
-        </div>
-        <div class="detail_col">
-          <label>전화번호</label>
-          <i>:</i>
-          <div class="fnTel">02-123-4567</div>
-        </div>
-      </div>
-      <div class="detail_company_info">
-        <div class="info_left">
-          <div class="weight">
-            <label>공급처</label>
-          </div>
-          <div class="company_info">
-            <label>등록번호&nbsp;:&nbsp;</label>
-            <div class="fnBsnsRegNo">215-12-23454</div>
-          </div>
-          <div class="company_info">
-            <label>상호&nbsp;:&nbsp;</label>
-            <div class="fnSag">공급업체명</div>
-          </div>
-          <div class="company_info">
-            <label>성명&nbsp;:&nbsp;</label>
-            <div class="fnNm">공급자</div>
-          </div>
-          <div class="company_info">
-            <label>주소&nbsp;:&nbsp;</label>
-            <div class="fnAddr">서울 송파구 문정동</div>
-          </div>
-        </div>
-        <div class="info_left">
-          <div class="weight">
-            <label>발주처</label>
-          </div>
-          <div class="company_info">
-            <label>등록번호&nbsp;:&nbsp;</label>
-            <div class="fnBsnsRegNo">215-12-23454</div>
-          </div>
-          <div class="company_info">
-            <label>상호&nbsp;:&nbsp;</label>
-            <div class="fnSag">브랜드 회사명</div>
-          </div>
-          <div class="company_info">
-            <label>성명&nbsp;:&nbsp;</label>
-            <div class="fnNm">대표자명</div>
-          </div>
-          <div class="company_info">
-            <label>주소&nbsp;:&nbsp;</label>
-            <div class="fnAddr">경기 성남시 상대원동</div>
-          </div>
-        </div>
-      </div>
-      <div class="table_header">
-        <h1>> 납품 상세 내역</h1>
-      </div>
-    </div>
-  	<div id="ITP_LIST_MORDMNG03010_ITEM_AREA" class="scroll_area row-7">
-       	<ul id="ITP_LIST_MORDMNG03010_DETAIL_ROWS" class="panel-group"></ul>
-       	<div id="ITP_LIST_MORDMNG03010_DETAIL_ROWCOPY" style="display:none;">
-	      <li class="history_list5">
-	        <div>
-	          <div class="left">
-	            <div class="nomal">
-	              <label>발주번호 &nbsp;:</label>
-	              <div class="space2">
-	                <div class="fnpodrNo">P12345</div>
-	              </div>
-	              <label class="col_0">품목아이디&nbsp;:</label>
-	              <div class="space2">
-	                <div class="fnItemId">asdf1234</div>
-	              </div>
-	            </div>
+	<form id="ITP_FORM_MORDMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
+		<input type="hidden" id="ITP_FORM_MORDMNG03010_VIEW_VIEW_CD" name="viewCd" value="C">
+	    <div class="detail_content">
+	      <div class="detail_header">
+	        <div class="detail_logo">
+	          <img src="../img/naver.png" alt="">
+	        </div>
+	        <div class="detail_ok">
+	          <label>납품 확인서</label>
+	        </div>
+	      </div>
+	      <div class="detail_confirmation">
+	        <div class="detail_col">
+	          <label>발행일</label>
+	          <i>:</i>
+	          <div class="fnDt">2022.10.09</div>
+	        </div>
+	        <div class="detail_col">
+	          <label>납품서확인번호</label>
+	          <i>:</i>
+	          <div class="fnDlvCnfmNo">DL123445</div>
+	        </div>
+	        <div class="detail_col">
+	          <label>납품일</label>
+	          <i>:</i>
+	          <div class="fnDlvDt">2022.10.10</div>
+	        </div>
+	        <div class="detail_col">
+	          <label>납품담당자</label>
+	          <i>:</i>
+	          <div class="fnDlvMgrNm">홍길동(010-1234-1548)</div>
+	        </div>
+	        <div class="detail_col">
+	          <label>납품장소</label>
+	          <i>:</i>
+	          <div class="fnDlvPlace">(123450 서울 송파구 문정동 100 A창고)</div>
+	        </div>
+	        <div class="detail_col">
+	          <label>전화번호</label>
+	          <i>:</i>
+	          <div class="fnTel">02-123-4567</div>
+	        </div>
+	      </div>
+	      <div class="detail_company_info">
+	        <div class="info_left">
+	          <div class="weight">
+	            <label>공급처</label>
+	          </div>
+	          <div class="company_info">
+	            <label>등록번호&nbsp;:&nbsp;</label>
+	            <div class="fnBsnsRegNo">215-12-23454</div>
+	          </div>
+	          <div class="company_info">
+	            <label>상호&nbsp;:&nbsp;</label>
+	            <div class="fnSag">공급업체명</div>
 	          </div>
-	          <div class="left">
-	            <div class="nomal">
-	              <label>품목명 &nbsp;:</label>
-	              <div class="space2">
-	                <div class="fnItemNm">커피원두</div>
-	              </div>
-	              <label>유통기한&nbsp;:</label>
-	              <div class="space2">
-	                <div class="fnExpryDate">2023.12.02</div>
-	              </div>
-	            </div>
+	          <div class="company_info">
+	            <label>성명&nbsp;:&nbsp;</label>
+	            <div class="fnNm">공급자</div>
 	          </div>
-	          <div class="left">
-	            <div class="nomal">
-	              <label>발주수량 &nbsp;:</label>
-	              <div class="space2">
-	                <div class="fnPodrQty">10</div>
-	              </div>
-	              <label>납품수량&nbsp;:</label>
-	              <div>
-	                <div class="fnDlvQty">10</div>
-	              </div>
-	            </div>
+	          <div class="company_info">
+	            <label>주소&nbsp;:&nbsp;</label>
+	            <div class="fnAddr">서울 송파구 문정동</div>
 	          </div>
 	        </div>
-	      </li>
-      </div>
-    </div>
-    <div class="button_bar">
-      <button id="ITP_BTN_MORDMNG03010_VIEW" class="ok col_12 btn-gray COK">확인</button>
-    </div>
+	        <div class="info_left">
+	          <div class="weight">
+	            <label>발주처</label>
+	          </div>
+	          <div class="company_info">
+	            <label>등록번호&nbsp;:&nbsp;</label>
+	            <div class="fnBsnsRegNo">215-12-23454</div>
+	          </div>
+	          <div class="company_info">
+	            <label>상호&nbsp;:&nbsp;</label>
+	            <div class="fnSag">브랜드 회사명</div>
+	          </div>
+	          <div class="company_info">
+	            <label>성명&nbsp;:&nbsp;</label>
+	            <div class="fnNm">대표자명</div>
+	          </div>
+	          <div class="company_info">
+	            <label>주소&nbsp;:&nbsp;</label>
+	            <div class="fnAddr">경기 성남시 상대원동</div>
+	          </div>
+	        </div>
+	      </div>
+	      <div class="table_header">
+	        <h1>> 납품 상세 내역</h1>
+	      </div>
+	    </div>
+	  	<div id="ITP_LIST_MORDMNG03010_ITEM_AREA" class="scroll_area row-7">
+	       	<ul id="ITP_LIST_MORDMNG03010_DETAIL_ROWS" class="panel-group"></ul>
+	       	<div id="ITP_LIST_MORDMNG03010_DETAIL_ROWCOPY" style="display:none;">
+		      <li class="history_list5">
+		        <div>
+		          <div class="left">
+		            <div class="nomal">
+		              <label>발주번호 &nbsp;:</label>
+		              <div class="space2">
+		                <div class="fnPodrNo">P12345</div>
+		              </div>
+		              <label class="col_0">품목아이디&nbsp;:</label>
+		              <div class="space2">
+		                <div class="fnItemId">asdf1234</div>
+		              </div>
+		            </div>
+		          </div>
+		          <div class="left">
+		            <div class="nomal">
+		              <label>품목명 &nbsp;:</label>
+		              <div class="space2">
+		                <div class="fnItemNm">커피원두</div>
+		              </div>
+		              <label>유통기한&nbsp;:</label>
+		              <div class="space2">
+		                <div class="fnExpryDate">2023.12.02</div>
+		              </div>
+		            </div>
+		          </div>
+		          <div class="left">
+		            <div class="nomal">
+		              <label>발주수량 &nbsp;:</label>
+		              <div class="space2">
+		                <div class="fnPodrQty">10</div>
+		              </div>
+		              <label>납품수량&nbsp;:</label>
+		              <div>
+		                <div class="fnDlvQty">10</div>
+		              </div>
+		            </div>
+		          </div>
+		        </div>
+		      </li>
+	      </div>
+	    </div>
+	    <div class="button_bar">
+	      <button id="ITP_BTN_MORDMNG03010_VIEW" class="ok col_12 btn-gray COK">확인</button>
+	    </div>
+    </form>
   </div>
 </section>

src/main/webapp/mobile/app/mrtnmng/MRTNMNG03010.html

@@ -1,6 +1,6 @@
 <section id="ITP_MOBILE_MRTNMNG03010">
    <div id="ITP_AJAX_MRTNMNG03010_DETAIL_CONTAINER" style="display: none;">
-  	<form id="ITP_FORM_MRTNMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
+  	<form id="ITP_FORM_MRTNMNG03010_DETAIL" class="form-horizontal" onsubmit="return false;">
 	  <input type="hidden" id="ITP_FORM_MRTNMNG03010_DETAIL_VIEW_CD" name="viewCd" value="C">
       	<div class="content">
        	<div class="line">

src/main/webapp/mobile/css/style.css

@@ -249,7 +249,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .detail_content .detail_company_info .weight label{font-size: 1.2rem; font-weight: 700;}
 .detail_content .detail_company_info div{font-size: 1rem;}
 .detail_content .detail_company_info .info_left {width: 50%; height: 150px; float: left;}
-.detail_content .detail_company_info .info_left .company_info {width: 100%; float: left; display: flex; margin-left: 15px;}
+.detail_content .detail_company_info .info_left .company_info {width: 100%; float: left; display: flex; margin-left: 15px; margin-top:3px;}
 .detail_content .table_header {margin: 0% auto; width: 100%; height: 45px; background-color: skyblue; align-items: center; position: fixed; z-index: 10;}
 .detail_content .table_header h1 {margin-top: 12px; margin-left: 15px; font-size: 1.2rem; float: left;}
 .detail_content .table_header button {float: right; width: 200px; font-size: 2rem; padding: 5px 20px; margin: 20px;}