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

src/main/webapp/app/vendinfo/VENDINFO02010.html

@@ -80,6 +80,7 @@
 											<div class="col-xs-4 itp_ip fnItemNm"></div>
 											<label class="col-xs-2 itp_lb">내외자구분</label>
 											<div class="col-xs-4 itp_ip fnImpDvsnNm"></div>
+											<select id="ITP_FORM_VENDINFO02010_VIEW_IMP_DVSN" data-select-code="IMP_DVSN" class="form-control itp_input" name="impDvsn" style="display: none;"></select>
 										</div>
 									</div>
 									<div class="itp_form_in">

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

@@ -208,7 +208,7 @@ const gridColModel = {
 		{
 			index: 'PCH_REQ_UNQ_NO', name: 'pchReqUnqNo',
 			label: ITP_MSG_LOCALE.label.pchReqUnqNo,  //구매요청번호
-			width: '16', fixed: false, align: 'center',
+			width: '12', fixed: false, align: 'center',
 			sortable: false, hidden: false, edittype: 'text',
 			editable: false
 		},
@@ -231,7 +231,7 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
 			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: false, edittype: 'text',
-			hidden: false
+			hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',

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

@@ -77,7 +77,7 @@ function itp_fn_BIZPOP_PO_REJECT(parentPopFn, args, returnType) {
 			{
 				index: 'PCH_REQ_QTY', name: 'pchReqQty',
 				label: '구매요청수량', //
-				width: '10', fixed: false, align: 'right',
+				width: '8', fixed: false, align: 'right',
 				sortable: false, hidden: false,
 				formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 			},

src/main/webapp/js/app/stinfo/ITP_STINFO04010.js

@@ -56,13 +56,13 @@ let API_GET_KEY			 	= '/api/session/get-key';
 let SCREEN_MODE;
 
 function checkNumberPoint(event) {
-    if(event.key === '.' 
-       || event.key === '-'
-       || event.key >= 0 && event.key <= 9) {
-      return true;
+	if(event.key === '.' 
+		|| event.key === '-'
+    	|| event.key >= 0 && event.key <= 9) {
+    	return true;
     }
     return false;
-  }
+}
 
 /*화면 Grid ColModel*/
 const gridColModel = {
@@ -657,15 +657,15 @@ let viewObj = {
         //$('#ITP_FORM_STINFO04010_VIEW .fnSaleUnit').text(result.saleUnit);
         $('#ITP_FORM_STINFO04010_VIEW .fnBarcode').text(result.barcode);
         //$('#ITP_FORM_STINFO04010_VIEW .fnStckUnit').text(result.stckUnit);
-        $('#ITP_FORM_STINFO04010_VIEW .fnWeight').text(result.weight);
+        $('#ITP_FORM_STINFO04010_VIEW .fnWeight').text(result.weight.toFixed(2));
         $('#ITP_FORM_STINFO04010_VIEW .fnWeightUnit').text(result.weightUnitNm);
-        $('#ITP_FORM_STINFO04010_VIEW .fnVolume').text(result.volume);
+        $('#ITP_FORM_STINFO04010_VIEW .fnVolume').text(result.volume.toFixed(2));
         $('#ITP_FORM_STINFO04010_VIEW .fnVolumeUnit').text(result.volumeUnitNm);
-        $('#ITP_FORM_STINFO04010_VIEW .fnWidth').text(result.width);
+        $('#ITP_FORM_STINFO04010_VIEW .fnWidth').text(result.width.toFixed(2));
         $('#ITP_FORM_STINFO04010_VIEW .fnWidthUnit').text(result.widthUnitNm);
-        $('#ITP_FORM_STINFO04010_VIEW .fnHeight').text(result.height);
+        $('#ITP_FORM_STINFO04010_VIEW .fnHeight').text(result.height.toFixed(2));
         $('#ITP_FORM_STINFO04010_VIEW .fnHeightUnit').text(result.heightUnitNm);
-        $('#ITP_FORM_STINFO04010_VIEW .fnHigh').text(result.high);
+        $('#ITP_FORM_STINFO04010_VIEW .fnHigh').text(result.high.toFixed(2));
         $('#ITP_FORM_STINFO04010_VIEW .fnHighUnit').text(result.highUnitNm);
         $('#ITP_FORM_STINFO04010_VIEW .fnOneBoxQty').text(result.oneBoxQty);
         $('#ITP_FORM_STINFO04010_VIEW .fnExpryYn').text(result.expryYn);

src/main/webapp/js/app/vendinfo/ITP_VENDINFO02010.js

@@ -29,61 +29,61 @@ let API_ITEM_INFO 		= '/api/item/info-item';			// 상세
 /*화면 Grid ColModel*/
 const gridColModel = {
 	list: [
-			{
-				index: 'ITEM_ID', name: 'itemId',  			//서버로 전송시 데이터 명 , 데이터명
-				label: ITP_MSG_LOCALE.label.itemId, 		//품목번호
-				width: '12', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
-				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
-			},
-			{
-				index: 'ITEM_NM', name: 'itemNm',			//서버로 전송시 데이터 명 , 데이터명
-				label: ITP_MSG_LOCALE.label.itemNm, 		//품목명
-				width: '13', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
-				sortable: false, hidden: false, 			//정렬가능 여부,화면표시 여부
-				classes: 'ui-ellipsis'
-			},
-			{
-				index: 'ITEM_TYPE_NM', name: 'itemTypeNm',	//서버로 전송시 데이터 명 , 데이터명
-				label: ITP_MSG_LOCALE.label.itemTypeNm, 	//품목유형
-				width: '10', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
-				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
-			},
-			{
-				index: 'ITEM_CLASS_NM', name: 'itemClassNm',//서버로 전송시 데이터 명 , 데이터명
-				label: ITP_MSG_LOCALE.label.itemClassNm, 	//품목분류
-				width: '12', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
-				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
-			},
-			{
-				index: 'ITEM_ST_NM', name: 'itemStNm',		//서버로 전송시 데이터 명 , 데이터명
-				label: "상태", 								//상태
-				width: '8', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
-				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
-			},
-			{
-				index: 'PODR_PSSBLDVSN_NM', name: 'podrPssblDvsnNm',//서버로 전송시 데이터 명 , 데이터명
-				label: ITP_MSG_LOCALE.label.podrPssblDvsnNm, //발주여부
-				width: '6', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
-				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
-			},
-			{
-				index: 'UNIT', name: 'unit',				//서버로 전송시 데이터 명 , 데이터명		
-				label: ITP_MSG_LOCALE.label.unit, 			//기본단위
-				width: '6', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
-				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
-			},
-			{
-				index: 'PCH_ITEM_YN', name: 'pchItemYn',	//서버로 전송시 데이터 명 , 데이터명
-				label: ITP_MSG_LOCALE.label.pchItemYn, 		//구매품목여부
-				width: '8', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
-				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
-			},
-			{
-				index: 'SALE_ITEM_YN', name: 'saleItemYn',	//서버로 전송시 데이터 명 , 데이터명
-				label: ITP_MSG_LOCALE.label.saleItemYn, 	//판매품목여부
-				width: '8', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
-				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
-			}
+		{
+			index: 'ITEM_ID', name: 'itemId',  			//서버로 전송시 데이터 명 , 데이터명
+			label: ITP_MSG_LOCALE.label.itemId, 		//품목번호
+			width: '12', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
+			sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
+		},
+		{
+			index: 'ITEM_NM', name: 'itemNm',			//서버로 전송시 데이터 명 , 데이터명
+			label: ITP_MSG_LOCALE.label.itemNm, 		//품목명
+			width: '13', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
+			sortable: false, hidden: false, 			//정렬가능 여부,화면표시 여부
+			classes: 'ui-ellipsis'
+		},
+		{
+			index: 'ITEM_TYPE_NM', name: 'itemTypeNm',	//서버로 전송시 데이터 명 , 데이터명
+			label: ITP_MSG_LOCALE.label.itemTypeNm, 	//품목유형
+			width: '10', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
+			sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
+		},
+		{
+			index: 'ITEM_CLASS_NM', name: 'itemClassNm',//서버로 전송시 데이터 명 , 데이터명
+			label: ITP_MSG_LOCALE.label.itemClassNm, 	//품목분류
+			width: '12', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
+			sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
+		},
+		{
+			index: 'ITEM_ST_NM', name: 'itemStNm',		//서버로 전송시 데이터 명 , 데이터명
+			label: "상태", 								//상태
+			width: '8', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
+			sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
+		},
+		{
+			index: 'PODR_PSSBLDVSN_NM', name: 'podrPssblDvsnNm',//서버로 전송시 데이터 명 , 데이터명
+			label: ITP_MSG_LOCALE.label.podrPssblDvsnNm, //발주여부
+			width: '6', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
+			sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
+		},
+		{
+			index: 'UNIT', name: 'unit',				//서버로 전송시 데이터 명 , 데이터명		
+			label: ITP_MSG_LOCALE.label.unit, 			//기본단위
+			width: '6', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
+			sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
+		},
+		{
+			index: 'PCH_ITEM_YN', name: 'pchItemYn',	//서버로 전송시 데이터 명 , 데이터명
+			label: ITP_MSG_LOCALE.label.pchItemYn, 		//구매품목여부
+			width: '8', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
+			sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
+		},
+		{
+			index: 'SALE_ITEM_YN', name: 'saleItemYn',	//서버로 전송시 데이터 명 , 데이터명
+			label: ITP_MSG_LOCALE.label.saleItemYn, 	//판매품목여부
+			width: '8', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
+			sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
+		}
 	]
 };
 /*화면공통 Object*/
@@ -258,6 +258,7 @@ let viewObj = {
 		}
 	},
 	callback: function (result) { 
+		console.log(result);
 		pageObj.switchScreen('VIEW'); //VIEW로 화면 전환시
 		
 		var itemClassNm = ""; //itemClassNm 값 없음
@@ -290,7 +291,14 @@ let viewObj = {
 		$('#ITP_FORM_VENDINFO02010_VIEW .fnItemId').text(result.itemId);
 		$('#ITP_FORM_VENDINFO02010_VIEW .fnItemTypeNm').text(result.itemTypeNm);
 		$('#ITP_FORM_VENDINFO02010_VIEW .fnItemNm').text(result.itemClassNm);
-		$('#ITP_FORM_VENDINFO02010_VIEW .fnImpDvsnNm').text(result.impDvsnNm);
+		$('#ITP_FORM_VENDINFO02010_VIEW #ITP_FORM_VENDINFO02010_VIEW_IMP_DVSN').val(result.impDvsn);
+		let impDvsnNm;
+		if (result.impDvsn == '') {
+        	impDvsnNm = '';
+		} else {
+			impDvsnNm = $('#ITP_FORM_VENDINFO02010_VIEW_IMP_DVSN option:selected').text(); 
+		}
+		$('#ITP_FORM_VENDINFO02010_VIEW .fnImpDvsnNm').text(impDvsnNm);
 		$('#ITP_FORM_VENDINFO02010_VIEW .fnPodrPssblDvsn').text(result.podrPssblDvsnNm);
 		$('#ITP_FORM_VENDINFO02010_VIEW .fnUnit').text(result.unit);
 		$('#ITP_FORM_VENDINFO02010_VIEW .fnWeightUnit').text(result.weightUnit);
@@ -304,11 +312,11 @@ let viewObj = {
 		$('#ITP_FORM_VENDINFO02010_VIEW .fnSaleUnit').text(result.saleUnit);
 		$('#ITP_FORM_VENDINFO02010_VIEW .fnAssetInfo').text(result.assetInfo);
 		$('#ITP_FORM_VENDINFO02010_VIEW .fnStckUnit').text(result.stckUnit);
-		$('#ITP_FORM_VENDINFO02010_VIEW .fnWeight').text(result.weight);
-		$('#ITP_FORM_VENDINFO02010_VIEW .fnVolume').text(result.volume);
-		$('#ITP_FORM_VENDINFO02010_VIEW .fnWidth').text(result.width);
-		$('#ITP_FORM_VENDINFO02010_VIEW .fnHeight').text(result.height);
-		$('#ITP_FORM_VENDINFO02010_VIEW .fnHigh').text(result.high);
+		$('#ITP_FORM_VENDINFO02010_VIEW .fnWeight').text(result.weight.toFixed(2));
+		$('#ITP_FORM_VENDINFO02010_VIEW .fnVolume').text(result.volume.toFixed(2));
+		$('#ITP_FORM_VENDINFO02010_VIEW .fnWidth').text(result.width.toFixed(2));
+		$('#ITP_FORM_VENDINFO02010_VIEW .fnHeight').text(result.height.toFixed(2));
+		$('#ITP_FORM_VENDINFO02010_VIEW .fnHigh').text(result.high.toFixed(2));
 		$('#ITP_FORM_VENDINFO02010_VIEW .fnOneBoxQty').text(result.oneBoxQty);
 		$('#ITP_FORM_VENDINFO02010_VIEW .fnExpryYn').text(result.expryYn);
 		$('#ITP_FORM_VENDINFO02010_VIEW .fnExpryPeriod').text(result.expryPeriod);

src/main/webapp/main.html

@@ -437,7 +437,7 @@
 									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_DELI_CHART">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">입고</div>
-											<select id="ITP_FORM_MAIN_SEARCH_PO_TYPE" name="prType">
+											<select id="MAIN_CHART_DELI_CHART" name="prType">
 												<option value="A">당일</option>
 												<option value="B">1주일</option>
 												<option value="C">15일</option>
@@ -450,7 +450,7 @@
 									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_ORDERS_CHART">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">수주내역</div>
-											<select id="ITP_FORM_MAIN_SEARCH_ITEM_CNT_TYPE" name="prType">
+											<select id="ITP_FORM_MAIN_SEARCH_ORDERS_TYPE" name="prType"	>
 												<option value="A">당일</option>
 												<option value="B">1주일</option>
 												<option value="C">15일</option>
@@ -463,7 +463,7 @@
 									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_RELEASE_CHART">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">출고</div>
-											<select id="ITP_FORM_MAIN_SEARCH_DELI_TYPE" name="prType">
+											<select id="ITP_FORM_MAIN_SEARCH_RELEASE_TYPE" name="prType">
 												<option value="A">당일</option>
 												<option value="B">1주일</option>
 												<option value="C">15일</option>
@@ -476,7 +476,7 @@
 									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_CHART_PODR">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">구매발주</div>
-											<select id="ITP_FORM_MAIN_SEARCH_RELEASE_TYPE" name="prType">
+											<select id="ITP_FORM_MAIN_SEARCH_PO_TYPE" name="prType">
 												<option value="A">당일</option>
 												<option value="B">1주일</option>
 												<option value="C">15일</option>
@@ -489,7 +489,7 @@
 									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_CHART_REQ_UP">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">매출순위</div>
-											<select id="ITP_FORM_MAIN_SEARCH_ORDERS_TYPE" name="prType">
+											<select id="ITP_FORM_MAIN_SEARCH_ITEM_CNT_TYPE" name="prType">
 												<option value="A">당일</option>
 												<option value="B">1주일</option>
 												<option value="C">15일</option>

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

@@ -32,9 +32,10 @@
 		.itp_notify_row {
 			display: flex;
 			margin-top: 10px;
+			width:100%;
 		}
 		.noti_label  {
-			width: 65px;
+			min-width: 55px;
 			text-align: left;
 			margin-left: 8px;
 		}
@@ -46,13 +47,13 @@
 			margin-left: 10px;
 		}
 		.noti_content  {
-			width: 98%;
+			width: 96%;
 			overflow: auto;
 			padding:5px;
 			height: 170px; 
 			text-align: left;
 			word-break:break-all;
-			margin:0 1%;
+			margin:0 2%;
 			border:1px solid #aaa;
 		}
 	</style>
@@ -348,7 +349,7 @@
 	<aside id="ITP_ASIDE"></aside>
 	<section>
 		<div id="ITP_POP_NOTICE" class="popup2 mobile-pop-close" style="display: none;">
-			<div class="pop" style="height:400px;">
+			<div class="pop" style="height:350px;">
 				<div class="header">
 					<div class="header_left">
 						<label>공지내용</label>
@@ -357,9 +358,9 @@
 						<button type="button" class="btn-pop-close"><img src="../img/close.png"></button>
 					</div>
 				</div>
-				<div id="ITP_POP_NOTICE_AREA" class="popup_scroll">
+				<div id="ITP_POP_NOTICE_AREA" style="position:relative; top:-40px;">
 					<div class="itp_notify_row">
-						<span class="noti_label">공지제목</span>
+						<label class="noti_label">공지제목</label>
 						<span>:</span>
 						<div class="fnNoteNm noti_text"></div>
 					</div> 
@@ -367,12 +368,13 @@
 						<div class="fnNote noti_content"></div>
 					</div>
 					<div class="itp_notify_row">
-						<span class="noti_label">공지일</span>
+						<label class="noti_label">공지일</label>
 						<span>:</span>
 						<div class="fnNoteFromTo noti_text"></div>
 					</div>
 					<div class="itp_notify_row">
-						<span class="noti_label">첨부파일</span>
+						<label class="noti_label">첨부파일</label>
+						<span>:</span>
 						<table></table>
 					</div>
 				</div>

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

@@ -93,14 +93,14 @@
 					  <div class="nomal">
 						<label class="">납품장소</label>
 						<span>:</span>
-					    <div class="fnWhsNm"></div>
+					    <div class="full fnWhsNm"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
 						<label class="">품목명</label>
 						<span>:</span>
-					    <div class="fnItemNm"></div>
+					    <div class="full fnItemNm"></div>
 					  </div>
 					</div>
 				    <div class="left">

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

@@ -13,7 +13,7 @@
 			   <div class="line">
 				  <label>납품장소</label>
 				   <div class="float_left">
-					   <input id="ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="">
+					   <input id="ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="납품장소">
 					   <input type="hidden" id="ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
 	       			   <div class="itp_input_btn">
 		   			  		<button type="button" id="ITP_BTN_MORDMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -49,7 +49,7 @@
 		  </div>
 		   <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_AREA" class="scroll_area row-2">
 			  <ul id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
-			  <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWCOPY" style="display: block;">
+			  <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWCOPY" style="display: none;">
 				<li class="history_list12 item-row">
 					<div class="left">
 					  <div class="nomal">
@@ -62,10 +62,7 @@
 					  <div class="nomal">
 						<label class="col_4">발주번호</label>
 						<span>:</span>
-					    <div class="col_9 fnPchPodrUnqNo"></div>
-						<label class="col_4">발주항번</label>
-						<span>:</span>
-					    <div class="fnPchPodrDtlNo"></div>
+					    <div class="full fnPchPodrUnqNo"></div> 
 					  </div>
 					</div>
 					<div class="left">

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

@@ -211,7 +211,7 @@ body.eee {height: 700px; background: #eee;}
 #ITP_LOGIN .login_popup .itp_del_btn.reg_no {width:50px; right:123px; top:4px;}
 #ITP_LOGIN .login_popup .itp_del_btn.reg_no button {width:45px; border:none; background:transparent;}
 #ITP_LOGIN .login_popup .itp_del_btn {position:absolute; top:12px; right:66px; background:transparent;}
-#ITP_LOGIN .login_popup .itp_del_btn button {width:25px; border:none; padding:0;}
+#ITP_LOGIN .login_popup .itp_del_btn button {width:25px; border:none; padding:0; background:transparent;}
 #ITP_LOGIN .login_popup .itp_del_btn button img{width:18px;}
 #ITP_LOGIN .login_popup .num_area .brand_list select {padding-left: 10px; width: 70%; height: 45px; font-size: 0.8rem; border:2px solid #ddd; border-radius:10px; background: url(../img/downarrow.png)no-repeat 95% 50%/20px auto; -webkit-appearance:none; appearance:none;}
 #ITP_LOGIN .login_popup .num_area .brand_list select option {text-align: left; width: 70%; height: 50px; border: 1px solid #000; font-size: 20px;} 

src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG01010.js

@@ -123,7 +123,7 @@ let mobContObj = {
 				mobContObj.list.pager(result.gridTotal);
 				$.each(result.gridRows, function (i, item) {
 					$('#ITP_LIST_MCOLLMNG01010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWCOPY').html());
-					var $li = $('#ITP_LIST_MCOLLMNG01010_LIST_ITEM_AREA .panel-group > .list-row:last');
+					var $li = $('#ITP_LIST_MCOLLMNG01010_LIST_ITEM_AREA .panel-group > .item-row:last');
 					$li.find('.fnBrandNm').text(item.brandNm);
 					$li.find('.fnRtnPodrUnqNo').text(item.rtnPodrUnqNo);
 					$li.find('.fnRtnOdrStNm').text(item.rtnOdrStNm);
@@ -172,7 +172,7 @@ let mobContObj = {
 			$(id).find('.fnPodrMgrNm').text(result.podrMgrNm);
 			$.each(result.rtnOdrDtlList, function (i, item) {
 				$('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group > .item-row:last');
 				$li.find('.fnRtnPodrDtlNo').text(item.rtnPodrDtlNo);
 				$li.find('.fnItemid').text(item.itemId);
 				$li.find('.fnItemNm').text(item.itemNm);
@@ -224,7 +224,7 @@ let mobPopObj = {
 			this.rows = gridRows;
 			$.each(gridRows, function (i, item) {
 				$('#ITP_LIST_MCOLLMNG01010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG01010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MCOLLMNG01010_POP_WHS_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MCOLLMNG01010_POP_WHS_AREA .panel-group > .item-row:last');
 				$li.find('.fnWhsNm').text(item.whsNm);
 				$li.find('.fnLocationNm').text(item.locationNm);
 				$li.find('.fnWhsId').data('whs-id', item.whsId);

src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG02010.js

@@ -130,7 +130,7 @@ let mobContObj = {
 				mobContObj.list.pager(result.gridTotal);
 				$.each(result.gridRows, function (i, item) {
 					$('#ITP_LIST_MCOLLMNG02010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWCOPY').html());
-					var $li = $('#ITP_LIST_MCOLLMNG02010_LIST_ITEM_AREA .panel-group > .list-row:last');
+					var $li = $('#ITP_LIST_MCOLLMNG02010_LIST_ITEM_AREA .panel-group > .item-row:last');
 					$li.find('.fnBrandNm').text(item.brandNm);
 					$li.find('.fnRtnPodrUnqNo').text(item.rtnPodrUnqNo);
 					$li.find('.fnRtnPodrNo').text(item.rtnPodrNo);
@@ -138,9 +138,9 @@ let mobContObj = {
 					$li.find('.fnRtnWhsNm').text(item.rtnWhsNm);
 					$li.find('.fnItemId').text(item.itemId);
 					$li.find('.fnItemNm').text(item.itemNm);
-					$li.find('.fnRtnDodrItemQty').text(CommonObj.currency.add(item.rtnDodrItemQty, '개'));
+					$li.find('.fnRtnDodrItemQty').text(CommonObj.currency.add(item.rtnOdrQty, '개'));
 					$li.find('.fnUnitAmt').text(CommonObj.comma.set(item.unitAmt));
-					$li.find('.fnRtnDodrTotalAmt').text(CommonObj.comma.set(item.rtnDodrTotalAmt));
+					$li.find('.fnRtnDodrTotalAmt').text(CommonObj.comma.set(item.rtnOdrAmt));
 					mobContObj.list.rows.push(item);
 				});
 			};
@@ -198,7 +198,7 @@ let mobContObj = {
 			$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_TEL_NO').val(result.rtnMgrTelNo);
 			$.each(result.pickRtnDtlInfo, function (i, item) {
 				$('#ITP_LIST_MCOLLMNG02010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG02010_VIEW_ITEM_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MCOLLMNG02010_VIEW_ITEM_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MCOLLMNG02010_VIEW_ITEM_AREA .panel-group > .item-row:last');
 				$li.find('.fnRtnPodrDtlNo').text(item.rtnPodrDtlNo);
 				$li.find('.fnItemId').text(item.itemId);
 				$li.find('.fnItemNm').text(item.itemNm);
@@ -231,7 +231,7 @@ let mobContObj = {
 			}
 			var gridInsertData = [];
 			var isValid = false;
-			$('#ITP_LIST_MCOLLMNG02010_VIEW_ITEM_AREA .panel-group > .list-row').each(function(index) {
+			$('#ITP_LIST_MCOLLMNG02010_VIEW_ITEM_AREA .panel-group > .item-row').each(function(index) {
 				var row = _this.rows[index];
 				var item = {
 					'rtnPodrDtlNo': row.rtnPodrDtlNo,
@@ -315,7 +315,7 @@ let mobPopObj = {
 			this.rows = gridRows;
 			$.each(gridRows, function (i, item) {
 				$('#ITP_LIST_MCOLLMNG02010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG02010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MCOLLMNG02010_POP_WHS_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MCOLLMNG02010_POP_WHS_AREA .panel-group > .item-row:last');
 				$li.find('.fnWhsNm').text(item.whsNm);
 				$li.find('.fnLocationNm').text(item.locationNm);
 				$li.find('.fnWhsId').data('whs-id', item.whsId);

src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG03010.js

@@ -128,8 +128,9 @@ let mobContObj = {
 				mobContObj.list.pager(result.gridTotal);
 				$.each(result.gridRows, function (i, item) {
 					$('#ITP_LIST_MCOLLMNG03010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWCOPY').html());
-					var $li = $('#ITP_LIST_MCOLLMNG03010_LIST_ITEM_AREA .panel-group > .list-row:last');
+					var $li = $('#ITP_LIST_MCOLLMNG03010_LIST_ITEM_AREA .panel-group > .item-row:last');
 					$li.find('.fnBrandNm').text(item.brandNm);
+					$li.find('.fnItemNm').text(item.itemNm);
 					$li.find('.fnColPickUnqNo').text(item.colPickUnqNo);
 					$li.find('.fnPickStNm').text(item.pickStNm);
 					$li.find('.fnColRegDt').text(item.colRegDt);
@@ -203,7 +204,7 @@ let mobContObj = {
 			$(id).find('.fnColAddr').text(result.colAddr);
 			$.each(result.pickDtlInfoList, function (i, item) {
 				$('#ITP_LIST_MCOLLMNG03010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG03010_VIEW_ITEM_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MCOLLMNG03010_VIEW_ITEM_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MCOLLMNG03010_VIEW_ITEM_AREA .panel-group > .item-row:last');
 				$li.find('.fnRtnPodrUnqNo').text(item.rtnPodrUnqNo);
 				$li.find('.fnItemId').text(item.itemId);
 				$li.find('.fnItemNm').text(item.itemNm);
@@ -265,7 +266,7 @@ let mobPopObj = {
 			this.rows = gridRows;
 			$.each(gridRows, function (i, item) {
 				$('#ITP_LIST_MCOLLMNG03010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG03010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MCOLLMNG03010_POP_WHS_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MCOLLMNG03010_POP_WHS_AREA .panel-group > .item-row:last');
 				$li.find('.fnWhsNm').text(item.whsNm);
 				$li.find('.fnLocationNm').text(item.locationNm);
 				$li.find('.fnWhsId').data('whs-id', item.whsId);

src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG01010.js

@@ -172,7 +172,7 @@ let mobContObj = {
 			$(id).find('.fnPodrMgrNm').text(result.podrMgrNm);
 			$.each(result.pchOdrDtlList, function (i, item) {
 				$('#ITP_LIST_MORDMNG01010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MORDMNG01010_VIEW_ITEM_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MORDMNG01010_VIEW_ITEM_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MORDMNG01010_VIEW_ITEM_AREA .panel-group > .item-row:last');
 				$li.find('.fnPchPodrDtlNo').text(item.pchPodrDtlNo);
 				$li.find('.fnItemId').text(item.itemId);
 				$li.find('.fnItemNm').text(item.itemNm);
@@ -224,7 +224,7 @@ let mobPopObj = {
 			this.rows = gridRows;
 			$.each(gridRows, function (i, item) {
 				$('#ITP_LIST_MORDMNG01010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MORDMNG01010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MORDMNG01010_POP_WHS_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MORDMNG01010_POP_WHS_AREA .panel-group > .item-row:last');
 				$li.find('.fnWhsNm').text(item.whsNm);
 				$li.find('.fnLocationNm').text(item.locationNm);
 				$li.find('.fnWhsId').data('whs-id', item.whsId);
@@ -233,6 +233,7 @@ let mobPopObj = {
 		choice: function(elem) {
 			var _this = this;
 			var whsId = $(elem).data('whs-id');
+			console.log("choice =====================", whsId, this.rows)
 			$.each(this.rows, function (i, item) {
 				if(whsId === item.whsId) {
 					$('#ITP_FORM_MORDMNG01010_LIST_SEARCH #ITP_FORM_MORDMNG01010_LIST_SEARCH_WHS_ID').val(item.whsId);

src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG02010.js

@@ -128,23 +128,27 @@ let mobContObj = {
 			var _this = this;
 			var callbackFn = function(result) {
 				console.log(result);
-				mobContObj.list.pager(result.gridTotal);
-				$.each(result.gridRows, function (i, item) {
-					$('#ITP_LIST_MORDMNG02010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MORDMNG02010_LIST_ITEM_ROWCOPY').html());
-					var $li = $('#ITP_LIST_MORDMNG02010_LIST_ITEM_AREA .panel-group > .list-row:last');
-					$li.find('.fnBrandNm').text(item.brandNm);
-					$li.find('.fnPchPodrUnqNo').text(item.pchPodrUnqNo);
-					$li.find('.fnPchPodrDtlNo').text(item.pchPodrDtlNo);
-					$li.find('.fnDlvReqDt').text(item.dlvReqDt);
-					$li.find('.fnWhsNm').text(item.whsNm);
-					$li.find('.fnPodrDt').text(item.podrDt);
-					$li.find('.fnItemId').text(item.itemId);
-					$li.find('.fnItemNm').text(item.itemNm);
-					$li.find('.fnPodrQty').text(CommonObj.currency.add(item.podrQty, '개'));
-					$li.find('.fnUnitAmt').text(CommonObj.comma.set(item.unitAmt));
-					$li.find('.fnPodrAmt').text(CommonObj.comma.set(item.podrAmt));
-					mobContObj.list.rows.push(item);
-				});
+				mobContObj.list.pager(result.gridTotal); 
+				if( result.gridRows && result.gridRows.length ) {
+					$.each(result.gridRows, function (i, item) {
+						$('#ITP_LIST_MORDMNG02010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MORDMNG02010_LIST_ITEM_ROWCOPY').html());
+						var $li = $('#ITP_LIST_MORDMNG02010_LIST_ITEM_AREA .panel-group > .item-row:last');
+						$li.find('.fnBrandNm').text(item.brandNm);
+						$li.find('.fnPchPodrUnqNo').text(item.pchPodrUnqNo+' - '+item.pchPodrDtlNo);
+						// $li.find('.fnPchPodrDtlNo').text();
+						$li.find('.fnDlvReqDt').text(item.dlvReqDt);
+						$li.find('.fnWhsNm').text(item.whsNm);
+						$li.find('.fnPodrDt').text(item.podrDt);
+						$li.find('.fnItemId').text(item.itemId);
+						$li.find('.fnItemNm').text(item.itemNm);
+						$li.find('.fnPodrQty').text(CommonObj.currency.add(item.podrQty, '개'));
+						$li.find('.fnUnitAmt').text(CommonObj.comma.set(item.unitAmt));
+						$li.find('.fnPodrAmt').text(CommonObj.comma.set(item.podrAmt));
+						mobContObj.list.rows.push(item);
+					});
+				} else {
+					$('#ITP_LIST_MORDMNG02010_LIST_ITEM_AREA .panel-group').html('조회된 데이터가 없습니다');
+				}
 			};
 			const param = $('#ITP_FORM_MORDMNG02010_LIST_SEARCH').serializeObject();
 			param.gridPage = mobContObj.list.listPage;
@@ -199,7 +203,7 @@ let mobContObj = {
 			$(id).find('.fnDeliTelNo').text(result.deliTelNo);
 			$.each(result.invPoInfoList, function (i, item) {
 				$('#ITP_LIST_MORDMNG02010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MORDMNG02010_VIEW_ITEM_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MORDMNG02010_VIEW_ITEM_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MORDMNG02010_VIEW_ITEM_AREA .panel-group > .item-row:last');
 				$li.find('.fnPchPodrDtlNo').text(item.pchPodrDtlNo);
 				$li.find('.fnItemId').text(item.itemId);
 				$li.find('.fnItemNm').text(item.itemNm);
@@ -232,7 +236,7 @@ let mobContObj = {
 			}
 			var gridInsertData = [];
 			var isValid = false;
-			$('#ITP_LIST_MORDMNG02010_VIEW_ITEM_AREA .panel-group > .list-row').each(function(index) {
+			$('#ITP_LIST_MORDMNG02010_VIEW_ITEM_AREA .panel-group > .item-row').each(function(index) {
 				isValid = false;
 				var row = _this.rows[index];
 				var item = {
@@ -322,7 +326,7 @@ let mobPopObj = {
 			this.rows = gridRows;
 			$.each(gridRows, function (i, item) {
 				$('#ITP_LIST_MORDMNG02010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MORDMNG02010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MORDMNG02010_POP_WHS_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MORDMNG02010_POP_WHS_AREA .panel-group > .item-row:last');
 				$li.find('.fnWhsNm').text(item.whsNm);
 				$li.find('.fnLocationNm').text(item.locationNm);
 				$li.find('.fnWhsId').data('whs-id', item.whsId);

src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG03010.js

@@ -130,7 +130,7 @@ let mobContObj = {
 				mobContObj.list.pager(result.gridTotal);
 				$.each(result.gridRows, function (i, item) {
 					$('#ITP_LIST_MORDMNG03010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MORDMNG03010_LIST_ITEM_ROWCOPY').html());
-					var $li = $('#ITP_LIST_MORDMNG03010_LIST_ITEM_AREA .panel-group > .list-row:last');
+					var $li = $('#ITP_LIST_MORDMNG03010_LIST_ITEM_AREA .panel-group > .item-row:last');
 					$li.find('.fnBrandNm').text(item.brandNm);
 					$li.find('.fnDlvShmtUnqNo').text(item.dlvSttmtUnqNo);
 					$li.find('.fnDlvStNm').text(item.dlvStNm);
@@ -204,7 +204,7 @@ let mobContObj = {
 			$(id).find('.fnPoAddr').text(result.poAddr);
 			$.each(result.invDtlInfoList, function (i, item) {
 				$('#ITP_LIST_MORDMNG03010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MORDMNG03010_VIEW_ITEM_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MORDMNG03010_VIEW_ITEM_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MORDMNG03010_VIEW_ITEM_AREA .panel-group > .item-row:last');
 				$li.find('.fnPchPodrUnqNo').text(item.pchPodrUnqNo);
 				$li.find('.fnItemId').text(item.itemId);
 				$li.find('.fnItemNm').text(item.itemNm);
@@ -269,7 +269,7 @@ let mobPopObj = {
 			this.rows = gridRows;
 			$.each(gridRows, function (i, item) {
 				$('#ITP_LIST_MORDMNG03010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MORDMNG03010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MORDMNG03010_POP_WHS_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MORDMNG03010_POP_WHS_AREA .panel-group > .item-row:last');
 				$li.find('.fnWhsNm').text(item.whsNm);
 				$li.find('.fnLocationNm').text(item.locationNm);
 				$li.find('.fnWhsId').data('whs-id', item.whsId);