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

src/main/webapp/app/oper/OPER01010.html

@@ -4,12 +4,12 @@
 			<div class="itp_det_head fix">
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><i class="glyphicon glyphicon-chevron-right"></i> <strong>사용자관리</strong></h2>
 				<div class="pull-right itp_cicon">
-					<button type="button" id="ITP_BTN_OPER01010_SRH" class="btn btn-success btn-md SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i>조회</button>
-					<button type="button" id="ITP_BTN_OPER01010_MODIFY" class="btn btn-success btn-md UPB" style="display: inline-block;"><i class="glyphicon "></i>수정</button>
-					<button type="button" id="ITP_BTN_OPER01010_NEWREG" class="btn btn-primary btn-md NEB" style="display: inline-block;"><i class="glyphicon "></i>신규등록</button>
-					<button type="button" id="ITP_BTN_OPER01010_DELETE" class="btn btn-danger btn-md DEB"><i class="glyphicon "></i>삭제</button>
-					<button type="button" id="ITP_BTN_OPER01010_SAVE" class="btn btn-success btn-md SAB"><i class="glyphicon "></i>저장</button>
-					<button type="button" id="ITP_BTN_OPER01010_CANCELLIST" class="btn btn-warning btn-md PRB"><i class="glyphicon "></i>취소/목록</button>
+					<button type="button" id="ITP_BTN_OPER01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i>조회</button>
+					<button type="button" id="ITP_BTN_OPER01010_MODIFY" class="btn btn-success btn-sm UPB" style="display: inline-block;"><i class="glyphicon "></i>수정</button>
+					<button type="button" id="ITP_BTN_OPER01010_NEWREG" class="btn btn-primary btn-sm NEB" style="display: inline-block;"><i class="glyphicon "></i>신규등록</button>
+					<button type="button" id="ITP_BTN_OPER01010_DELETE" class="btn btn-danger btn-sm DEB"><i class="glyphicon "></i>삭제</button>
+					<button type="button" id="ITP_BTN_OPER01010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon "></i>저장</button>
+					<button type="button" id="ITP_BTN_OPER01010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>취소/목록</button>
 				</div>
 			</div>
 			<div class="itp_det_in">
@@ -29,7 +29,9 @@
 											<button type="button" id="ITP_FORM_OPER01010_DELETE_AFFL_SHOP" class="btn btn-warning btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_OPER01010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId"></select>
+											<select id="ITP_FORM_OPER01010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId">
+												<option value="">브랜드명</option>											
+											</select>
 										</div>									
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
@@ -116,7 +118,7 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">사용자ID *</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-2 itp_in fnUserId" style="margin-top:5px;"></div>
+												<div class="col-xs-a itp_in fnUserId" style="margin-top:5px;"></div>
 												<div class="col-xs-7 itp_in">
 													<div class="input-group">
 														<input type="text" id="ITP_FORM_OPER01010_DETAIL_USER_ID" data-check-required="empty" class="form-control itp_input" name="userId" value="" maxlength="20">

src/main/webapp/app/oper/OPER02010.html

@@ -28,7 +28,9 @@
 											<button type="button" id="ITP_FORM_OPER02010_DELETE_AFFL_SHOP_BTN" class="btn btn-warning btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_OPER02010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId"></select>
+											<select id="ITP_FORM_OPER02010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId">
+												<option value="">브랜드명</option>
+											</select>
 										</div>
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">

src/main/webapp/app/oper/OPER06010.html

@@ -27,7 +27,9 @@
 											<button type="button" id="ITP_BTN_OPER06010_DELETE_AFFL_SHOP" class="btn btn-warning btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_OPER06010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId"></select>
+											<select id="ITP_FORM_OPER06010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId">
+												<option value="">브랜드명</option>
+											</select>
 										</div>
 									</div>
 									<div class="form-group">

src/main/webapp/app/ordmng/ORDMNG02010.html

@@ -70,7 +70,9 @@
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
 											<label class="col-xs-2 itp_lb">발주번호</label>
-											<div class="col-xs-4 itp_ip fnPchPodrUnqNo"></div>
+											<div class="col-xs-4 itp_ip fnPchPodrUnqNo">
+												<input type="hidden" id="ITP_FORM_ORDMNG02010_DETAIL_PCH_PODR_UNQ_NO" name="pchPodrUnqNo" value=""/>
+											</div>
 										</div>
 									</div>
 									<div class="itp_form_in">	
@@ -95,7 +97,7 @@
 											<div class="input-daterange input-group date">
 												<div class="col-xs-4 itp_ip">
 													<div class="col-xs-7 itp_in">
-														<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT" class="form-control itp_input" name="dlvSchDt" value="">
+														<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT" data-check-required="empty" class="form-control itp_input" name="dlvSchDt" value="">
 													</div>
 												</div>
 											</div>											
@@ -108,13 +110,13 @@
 											<label class="col-xs-2 itp_lb">납품담당자 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_NM" class="form-control itp_input" name="dlvMgrNm" />
+													<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_NM" data-check-required="empty" class="form-control itp_input" name="dlvMgrNm" />
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">납품담당자연락처 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_TEL_NO" data-key-up="tel" class="form-control itp_input" name="dlvMgrTelNo" value=""/>
+													<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_TEL_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="dlvMgrTelNo" value=""/>
 												</div>
 											</div>
 										</div>

src/main/webapp/css/style.css

@@ -181,7 +181,7 @@ a, button {outline:none !important; text-decoration:none !important;}
 #ITP_SIDEBAR .itp_nav .itp_svgs li a .itp_tt {float:left;}
 
 /* ITP_CONTAINER */
-#ITP_CONTAINER {height:calc(100vh - 100px); padding:8px; transition:all .25s ease; float:left; width:calc(100% - 240px);background:#fff;}
+#ITP_CONTAINER {height:calc(100vh - 100px); padding:5px 8px; transition:all .25s ease; float:left; width:calc(100% - 240px);background:#fff;}
 #ITP_CONTAINER.itp_open_conts {padding-left:8px; width:99.9%;}
 #ITP_CONTAINER .itp_contents {background:#fff; height:100%;}
 #ITP_CONTAINER .itp_contents .itp_sec {height:100%;}
@@ -300,8 +300,8 @@ html:lang(en) #ITP_CONTAINER .itp_detail .itp_form .itp_thumb_inline .itp_thumb_
 #ITP_CONTAINER .itp_detail .itp_form .itp_chk_list .itp_chk:first-child {margin-top:5px;}
 #ITP_CONTAINER .itp_detail .itp_form .itp_sch_btn {padding: 3px 6px;} /* 조회 버튼 */
 
-#ITP_CONTAINER .itp_detail .itp_lg_form {padding-top:10px;}
-#ITP_CONTAINER .itp_detail .itp_lg_form.itp_type1 {padding-left:15px; padding-right:15px; padding-bottom:15px; }
+#ITP_CONTAINER .itp_detail .itp_lg_form {padding-top:5px;}
+#ITP_CONTAINER .itp_detail .itp_lg_form.itp_type1 {padding-left:15px; padding-right:15px; padding-bottom:10px; }
 #ITP_CONTAINER .itp_detail .itp_lg_form.itp_type1 .itp_srh_border {border:1px solid #ddd; background:#fff; padding:15px 15px 5px 15px; border-radius:4px;box-shadow: 0px 0px 6px #ddd;}
 #ITP_CONTAINER .itp_detail .itp_lg_form .form-group {margin-bottom:10px;}
 #ITP_CONTAINER .itp_detail .itp_lg_form .form-control {font-size:13px; color:#333;}
@@ -356,7 +356,7 @@ html:lang(en) #ITP_CONTAINER .itp_detail .itp_form .itp_thumb_inline .itp_thumb_
 #ITP_CONTAINER .itp_tb_list .itp_no_data u {color:#337ab7; cursor:pointer;}
 
 #ITP_CONTAINER .itp_tb_list .itp_views {font-size:12px; margin-bottom:8px; display:none;}
-#ITP_CONTAINER .itp_tb_list .itp_views .itp_shrv {float:left; width:50%;}
+#ITP_CONTAINER .itp_tb_list .itp_views .itp_shrv {float:left; width:50%; padding-left:5px;}
 #ITP_CONTAINER .itp_tb_list .itp_views .itp_shrv span {float:left;}
 #ITP_CONTAINER .itp_tb_list .itp_views .itp_shrv em {font-style:normal;}
 #ITP_CONTAINER .itp_tb_list .itp_views .itp_shrv .shrv_txt {margin-right:4px;}

src/main/webapp/css/ui.jqgrid-bootstrap.css

@@ -192,7 +192,7 @@ div.tablediv > .table-bordered {
 }
 .ui-jqgrid tr.jqgrow {
 	outline-style: none;
-	height:32px;
+	height:25.5px;
 }
 .ui-jqgrid tr.jqgroup {
 	outline-style: none;
@@ -212,7 +212,7 @@ div.tablediv > .table-bordered {
 .ui-jqgrid .ui-jqgrid-btable tbody tr.jqgrow td {
 	overflow: hidden;
 	white-space: pre;
-	/* padding-right: 2px; */
+	padding:0 5px;
 }
 .itp_tb_list.itp_gOver .ui-jqgrid .ui-jqgrid-btable tbody tr.jqgrow td {
 	overflow: visible;
@@ -232,7 +232,7 @@ div.tablediv > .table-bordered {
 .ui-jqgrid tr.jqfoot td {
 	white-space: nowrap;
 }
-.ui-jqgrid tr.ui-row-ltr td {font-size:13px;color:#333;}
+.ui-jqgrid tr.ui-row-ltr td {font-size:13px;color:#333; font-weight:bold;}
 .ui-jqgrid tr.ui-row-rtl td {font-size:13px;color:#333;}
 .ui-jqgrid .ui-jqgrid-resize-mark {
 	width:2px;

src/main/webapp/js/app/oper/ITP_OPER01010.js

@@ -275,7 +275,6 @@ let pageObj = {
 			fn_show_btn_auth_array(['#ITP_BTN_OPER01010_SRH', '#ITP_BTN_OPER01010_NEWREG']);
 		} else if(mode == 'ADD') { // 등록
 			$('#ITP_AJAX_OPER01010_DETAIL_CONTAINER').show();
-			$('.fnUserId').hide(); //사용자 아이디 신규등록에서 보이지 않게하기
 			fn_show_btn_auth_array(['#ITP_BTN_OPER01010_CANCELLIST', '#ITP_BTN_OPER01010_SAVE']);
 
 			$('#ITP_FORM_OPER01010_DETAIL').find('input, textarea, select, checkbox').each(function(i, elem) {
@@ -325,7 +324,7 @@ let pageObj = {
 						}
 					});
 					$((pageObj.pageMode === 'MODIFY') ? OPER01010_NEW_GRID_EMPTY : OPER01010_DETAIL_GRID_EMPTY).hide();
-					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //행 추가할때 2번째 마다 색변경
+					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //행 추가할때 2번째 마다 색변경
 				};
 				fn_call_popup('comm', 'AUTH_SCH_POPUP', '#ITP_ASIDE', popFn, null, 'S');
 			},
@@ -349,7 +348,7 @@ let pageObj = {
 				url: DOMAIN + API_USERAUTH_GRID_LIST,
 				multiselect: (this.mode !== 'VIEW'),
 				loadComplete: function(data) {
-					$("tr.jqgrow:odd").css("background", "#CEDFED"); //2번째 마다 색변경
+					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
 
 					console.log(data);
 					itp_fn_grid_load_complete(data, gridId, true, undefined, 'OPER01010_' + this.mode);
@@ -435,7 +434,7 @@ let listObj = {
 					}
 				},
 				loadComplete: function(data) {
-					$("tr.jqgrow:odd").css("background", "#F2F8FF"); //2번째 마다 색변경
+					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
 					console.log(data);
 					itp_fn_grid_load_complete(data, OPER01010_GRID_ID, true, 'number', 'OPER01010', listObj.itp_OPER01010_search, _this.itp_fn_OPER01010_empty, true, data.gridRecords, true);
 					var ids = $(OPER01010_GRID_ID).getDataIDs();
@@ -678,7 +677,7 @@ let createObj = {
 				data: gridData,
 				multiselect: true,
 				loadComplete: function(data) {
-					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
+					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
 					_this.clearData();
 				}
 			};

src/main/webapp/js/app/oper/ITP_OPER02010.js

@@ -444,7 +444,7 @@ let listObj = {
 					}
 				},
 				loadComplete: function(data) {
-					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
+					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
 					console.log(data);
 					itp_fn_grid_load_complete(data, OPER02010_GRID_ID, true, 'number', 'OPER02010', listObj.grid.itp_OPER02010_search, _this.itp_fn_OPER02010_empty, true, data.gridRecords, true);
 					var ids = $(OPER02010_GRID_ID).getDataIDs();

src/main/webapp/js/app/oper/ITP_OPER03010.js

@@ -316,7 +316,7 @@ let pageObj = {
 						}
 					});
 					$(OPER03010_DETAIL_GRID_EMPTY).hide();
-					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
+					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
 				};
 				fn_call_popup('biz', 'BIZPOP_APPL_SALES_USER_SCH', '#ITP_ASIDE', popFn, null, 'S');
 			},
@@ -332,7 +332,7 @@ let pageObj = {
 				data: gridData,
 				multiselect: (this.mode !== 'VIEW'),
 				loadComplete: function(data) {
-					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
+					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
 					$(_this.mode === 'VIEW' ? OPER03010_VIEW_GRID_LIST : OPER03010_DETAIL_GRID_LIST).find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
 					data.records === 0 ? _this.clearData() : $(this.mode === 'VIEW' ? OPER03010_VIEW_GRID_EMPTY : OPER03010_DETAIL_GRID_EMPTY).hide();
 				}
@@ -374,7 +374,13 @@ let listObj = {
 	},
 	empty: {
 		init: function() {
+			var _this = this;
 			this.push();
+			$(OPER03010_GRID_EMPTY).on('click', function() {
+				_this.back();
+				_this.itp_OPER03010_param.gridSize = $.jgrid.defaults.rowNum;
+				$(OPER03010_GRID_ID).setGridParam({'postData': JSON.stringify(_this.itp_OPER03010_param)}).trigger('reloadGrid');
+			});
 		},
 		itp_OPER03010_param: {},
 		push: function() {
@@ -394,6 +400,7 @@ let listObj = {
 			listObj.empty.push();
 			itp_fn_jqgrid_resize(OPER03010_GRID_ID, OPER03010_GRID_LIST, 'lg');
 			itp_fn_fire_window_resize();
+			this.reload();
 			this.search();
 		},
 		colModel: gridColModel.list,
@@ -423,7 +430,7 @@ let listObj = {
 					}
 				},
 				loadComplete: function(data) {
-					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
+					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
 					console.log(data);
 					itp_fn_grid_load_complete(data, OPER03010_GRID_ID, true, 'number', 'OPER03010', pageObj.itp_OPER03010_search, listObj.empty, true, data.gridRecords, true);
 					var ids = $(OPER03010_GRID_ID).getDataIDs();
@@ -434,6 +441,13 @@ let listObj = {
 			};
 			itp_fn_grid_make_remote(option);
 		},
+		reload : function() {
+			var _this = this;
+			$(OPER03010_GRID_EMPTY).off('click').on('click', function() {
+				pageObj.itp_OPER03010_param.gridSize = $.jgrid.defaults.rowNum;
+				$(OPER03010_GRID_ID).setGridParam({'postData': JSON.stringify(pageObj.itp_OPER03010_param)}).trigger('reloadGrid');
+			});
+		},
 		clearData : function() {
 			$(OPER03010_GRID_ID).jqGrid('clearGridData', true);
 			$(OPER03010_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');

src/main/webapp/js/app/oper/ITP_OPER04010.js

@@ -248,7 +248,7 @@ let listObj = {
                     }
                 },
                 loadComplete: function(data) {
-                	$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
+                	$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
                     // console.log(data);
                     itp_fn_grid_load_complete(data, OPER04010_GRID_ID, true, 'number', 'OPER04010', listObj.itp_OPER04010_search, listObj.empty, true, data.gridRecords, true);
                     var ids = $(OPER04010_GRID_ID).getDataIDs();

src/main/webapp/js/app/oper/ITP_OPER06010.js

@@ -337,7 +337,7 @@ let listObj = {
                     }
                 },
                 loadComplete: function(data) {
-                	$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경ㄴ
+                	$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경ㄴ
                     console.log(data);
                     itp_fn_grid_load_complete(data, OPER06010_GRID_ID, true, 'number', 'OPER06010', listObj.itp_OPER06010_search, listObj.empty, true, data.gridRecords, true);
                     var ids = $(OPER06010_GRID_ID).getDataIDs();

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

@@ -191,23 +191,7 @@ let pageObj = {
             $('#ITP_FORM_ORDMNG02010_SEARCH #ITP_FORM_ORDMNG02010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
             $('#ITP_BTN_ORDMNG02010_SEARCH_WHS_ID').show();
             $('#ITP_BTN_ORDMNG02010_DELETE_WHS_ID').show();
-		}/* else if(mode == 'ADD') { // 등록
-			$('#ITP_AJAX_ORDMNG02010_DETAIL_CONTAINER').show();
-			fn_show_btn_auth_array(['#ITP_BTN_ORDMNG02010_CANCELLIST', '#ITP_BTN_ORDMNG02010_SAVE']);
-
-			$('#ITP_FORM_ORDMNG02010_DETAIL').find('input, textarea, select, checkbox').each(function(i, elem) {
-				$(this).attr('id') === 'ITP_FORM_ORDMNG02010_DETAIL_VIEW_CD' ? $(this).val('C') : $(this).val('');
-				if(elem.type === 'select') {
-					$(this).val('').prop('selected', true);
-				}
-			});
-
-			$('#ITP_FORM_ORDMNG02010_DETAIL_USER_ID').removeAttr('readonly');
-			$('#ITP_FORM_ORDMNG02010_DETAIL_DUP').removeAttr('disabled');
-			$('#ITP_FORM_ORDMNG02010_DETAIL_SEARCH_BRAND_ID option').remove();
-			$('#ITP_FORM_ORDMNG02010_DETAIL_SEARCH_AFFL_SHOP').show();
-			$('#ITP_FORM_ORDMNG02010_DETAIL_DELETE_AFFL_SHOP').show();
-		}*/ else if(mode === 'MODIFY') { // 수정
+		} else if(mode === 'MODIFY') { // 수정
 			$('#ITP_AJAX_ORDMNG02010_DETAIL_CONTAINER').show();
 			fn_show_btn_auth_array(['#ITP_BTN_ORDMNG02010_CANCELLIST', '#ITP_BTN_ORDMNG02010_SAVE', '#ITP_BTN_ORDMNG02010_RESET_PW']);
 			$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
@@ -220,10 +204,7 @@ let pageObj = {
 			$('#ITP_FORM_ORDMNG02010_DETAIL_DELETE_AFFL_SHOP').hide();
 			$('#ITP_BTN_ORDMNG02010_CANCELLIST').show();
             $('#ITP_BTN_ORDMNG02010_SAVE').show();
-		} /*else if(mode === 'VIEW') { // 보기
-			$('#ITP_AJAX_ORDMNG02010_VIEW_CONTAINER').show();
-			fn_show_btn_auth_array(['#ITP_BTN_ORDMNG02010_MODIFY', '#ITP_BTN_ORDMNG02010_CANCELLIST']);
-		}*/
+		}
 	}
 };
 
@@ -242,7 +223,6 @@ let listObj = {
 			let param = $('#ITP_FORM_ORDMNG02010_SEARCH').serializeObject();
 			param.gridSize = $.jgrid.defaults.rowNum;
             param.gridPage = $.jgrid.defaults.page;
-            console.log(1234);
             console.log(JSON.stringify(param));
             $(ORDMNG02010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
         },
@@ -307,18 +287,7 @@ let listObj = {
             	pager: ORDMNG02010_GRID_PAGER,
             	multiselect: true,
 				multiboxonly : false,
-				rownumbers: false,/*
-            	onCellSelect: function(rowId, cellIdx, cellValue) {
-                    var cm = $(this).jqGrid('getGridParam', 'colModel');
-                    var colNm = cm[cellIdx].name;
-                    if (colNm === 'pchPodrUnqNo') {
-                        const pchPodrUnqNoVal = $(this).jqGrid('getCell', rowId, 'pchPodrUnqNo');
-                        const brandIdVal = $(this).jqGrid('getCell', rowId, 'brandId');
-                        const key = {pchPodrUnqNo: pchPodrUnqNoVal, brandId: brandIdVal};
-                        var param = $.param(key);
-                        modifyObj.init(param);
-                    }
-				},*/
+				rownumbers: false,
 				loadComplete: function(data) {
 					console.log(data);
                     itp_fn_grid_load_complete(data, ORDMNG02010_GRID_ID, true, 'number', 'ORDMNG02010', listObj.itp_ORDMNG02010_search, listObj.empty, true, data.gridRecords, true);
@@ -370,7 +339,6 @@ let listObj = {
 /*수정화면 Object*/
 let modifyObj = {
 	init: function(param) {
-		console.log(param);
 		this.load(param);
 	},
 	itp_ORDMNG02010_param: {},
@@ -380,38 +348,29 @@ let modifyObj = {
 			listObj.grid.search();
 		},
 		save: function() {
-			console.log(111111);
 			const formId = '#ITP_FORM_ORDMNG02010_DETAIL';
 			itp_fn_form_clear_validate(null, formId);
-			console.log(22222);
 			itp_fn_grid_save_rows(ORDMNG02010_DETAIL_GRID_ID);
 			let gridInsertData = [];
 			for(var i=0; i<$(ORDMNG02010_DETAIL_GRID_ID).getGridParam('reccount'); i++) {
 				$(ORDMNG02010_DETAIL_GRID_ID).jqGrid('saveCell', i+1, 2)
 			}
+			let param = $(formId).serializeObject();
 			const rowData = $(ORDMNG02010_DETAIL_GRID_ID).getRowData();
-			console.log(rowData);
-			const keyValue = $(formId + '_BRAND_ID').val();
-			$.each(rowData, function(key, value) {
-				if (value.viewCd != 'R') {
-						value.userId = keyValue;
-					if (value.viewCd == 'C') {
-						gridInsertData.push(value);
-					}
-				}
-			});
+			for (var i = 0; i < rowData.length; i++) {
+				rowData[i].podrQty = Number(rowData[i].podrQty);
+				rowData[i].shmtQty = Number(rowData[i].shmtQty);
+			}
+			
 			var modalFn = {
 				callBack: (args) => {
-					console.log(444444444);
-					let param = $(formId).serializeObject();
-					param.gridInsertData = gridInsertData;
-					console.log(5555);
+					param.gridInsertData = rowData;
 					console.log(param);
 					var searhFn = function () {
 						ITP_FORM_OPER03010_DETAIL_IS_WRITING = false;
 						listObj.grid.search();
 					}
-					//fn_ajax_call(API_POMNG_INOUTMNG_SAVE_SPPLY_INV, JSON.stringify(param), searhFn, 'POST');
+					fn_ajax_call(API_POMNG_INOUTMNG_SAVE_SPPLY_INV, JSON.stringify(param), searhFn, 'POST');
 				}
 			};
 			itp_fn_modal_confirm('저장 하시겠습니까?', modalFn);
@@ -444,13 +403,13 @@ let modifyObj = {
 		console.log(result);
 		pageObj.switchScreen('MODIFY');
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnBrandNm').text(result.brandNm);										// 브랜드
-		$('#ITP_FORM_ORDMNG02010_DETAIL .fnPchPodrUnqNo').text(result.invPoInfoList[0].pchPodrUnqNo);			// 발주번호
-		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvRegDt);									// 납품서생성일자
+		$('#ITP_FORM_ORDMNG02010_DETAIL .fnPchPodrUnqNo').text(result.invPoInfoList[0].pchPodrUnqNo);			// 발주번호		
+		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvReqDt);									// 납품서생성일자
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnPodrTotalAmt').text(result.podrTotalAmt);							// 발주총금액
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnWhsNm').text(result.whsNm);											// 발주총금액
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDeliTelNo').text(result.deliTelNo);									// 납품장소연락처
 		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT').val(result.dlvSchDt);			// 납품예정일
-		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvRegDt);									// 납품요청일
+		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvReqDt);									// 납품요청일
 		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_NM').val(result.dlvMgrNm);			// 납품담당자
 		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_TEL_NO').val(result.dlvMgrTelNo);	// 납품담당자연락처
 
@@ -462,11 +421,11 @@ let modifyObj = {
     			selRowData = $(ORDMNG02010_DETAIL_GRID_ID).jqGrid('getRowData', selectedIds[i]);		//cell 선택
     		}
     		let podrQty = selRowData.podrQty;
-    		if(value > podrQty) {
-    			console.log(podrQty);
+    		if(Number(value) > Number(podrQty)) {
 				return [false, '발주수량 이하 값 입력'];
+			} else if (Number(value) < 0) {
+				return [false, '음수 입력 불가'];
 			} else {
-				console.log(podrQty);
 				return [true, ''];
 			}
 		};		
@@ -479,13 +438,11 @@ let modifyObj = {
     		}
     		let expryYn = selRowData.expryYn;
     		if (expryYn !== 'Y' && value.length > 0) {
-				console.log(expryYn);
 				return [false, '유통기한여부 N'];
 			} else {
-				console.log(expryYn);0
 				return [true, ''];
 			}
-		}		
+		};
 		modifyObj.grid.init('MODIFY', result.invPoInfoList);		
 	},
 	grid: {
@@ -504,6 +461,12 @@ let modifyObj = {
 			var option = {
 				gridId: _this.gridId,
 				colModel: [
+					{
+						index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
+						label: ITP_MSG_LOCALE.label.pchPodrUnqNo,
+						width: '10', fixed: false, align: 'center',
+						sortable: false, hidden: true
+					},
 					{
 						index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
 						label: ITP_MSG_LOCALE.label.pchPodrDtlNo,  		//발주항번
@@ -557,14 +520,14 @@ let modifyObj = {
 						index: 'EXPRY_DATE', name: 'expryDate',
 						label: ITP_MSG_LOCALE.label.expryDate,  		//유통기한일자
 						width: '20', fixed: false, align: 'center',
-						sortable: false, hidden: false, /*edittype: 'text',*/
+						sortable: false, hidden: false, 
 						editable: true, sorttype: 'date',
 				        editoptions: {dataInit: function(e) {$(e).datepicker(ITP_DATE_LANGUAGE);}},
 				        editrules: {custom: true, custom_func: isExpryDate}
 					},
 					{
-						index: 'REMARK', name: 'remark',
-						label: ITP_MSG_LOCALE.label.remark,  			//비고
+						index: 'REMARK', name: 'deliDesc',				//API 비고 키
+						label: ITP_MSG_LOCALE.label.remark,  			//locale-ko 비고 값
 						width: '20', fixed: false, align: 'center',
 						sortable: false, hidden: false, edittype: 'text',
 						editable: true
@@ -586,12 +549,5 @@ let modifyObj = {
 		unload: function() {
 			$.jgrid.gridUnload(this.gridId);
 		}
-	}/*,
-	changeRows: function(gridRows) {
-		var modifyRows = [];
-		var chkColums = ['podrQty', 'expryDate', 'remark'];
-		$.each(this.rows, function(index, item) {
-			var row = gridRows[index];
-		});
-	}*/
+	}
 };

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

@@ -90,7 +90,7 @@
 						</div>
 						<label class="col_0">수거수량&nbsp;:</label>
 						<div>
-						  <div class="fnRtnDodrItemQty">3개</div>
+						  <div class="fnRtnDodrItemQty"></div>
 						</div>
 					  </div>
 					</div>
@@ -98,11 +98,11 @@
 					  <div class="nomal">
 						<label class="col_0">단가금액 &nbsp;:</label>
 						<div class="col_5">
-						  <div class="fnUnitAmt col_5">1,000원</div>
+						  <div class="fnUnitAmt col_5"></div>
 						</div>
 						<label class="col_0">수거금액&nbsp;:</label>
 						<div>
-						  <div class="fnRtnDodrTotalAmt space0">20,000원</div>
+						  <div class="fnRtnDodrTotalAmt space0"></div>
 						</div>
 						<div class="scroll_btn">
 						  <button id="ITP_BTN_MCOLLMNG02010_LIST_CHOICE">선택</button>
@@ -199,9 +199,9 @@
 						<div class="space2">
 						  <div class="fnItemNm"></div>
 						</div>
-						<label>가격단위&nbsp;:</label>
+						<label>수거주문수량&nbsp;:</label>
 						<div class="space2">
-						  <div class="fnUnit"></div>
+						  <div class="fnRtnOdrQty"></div>
 						</div>
 					  </div>
 					</div>
@@ -235,7 +235,7 @@
 					  <div class="nomal">
 						<label>비고 &nbsp;:</label>
 						<div>
-							<input id="ITP_FORM_MCOLLMNG02010_VIEW_NOTE" type="text" name="rtnRsn">
+							<input id="ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN" type="text" name="rtnRsn">
 		              	</div>
 						<label></label>
 						<div class="space2">

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

@@ -51,11 +51,11 @@
 					  <div class="nomal">
 						<label class="col_0">브랜드명 &nbsp;:</label>
 						<div>
-						  <div class="fnBrandNm space1">브랜드명</div>
+						  <div class="fnBrandNm space1"></div>
 						</div>
 						<label>수거서번호&nbsp;:</label>
 						<div>
-						  <div class="fnColNo">PO1234123</div>
+						  <div class="fnColPickUnqNo"></div>
 						</div>
 					  </div>
 					</div>
@@ -63,11 +63,11 @@
 					  <div class="nomal">
 						<label class="col_6">수거서상태 &nbsp;:</label>
 						<div>
-						  <div class="fnColStCd">수거전</div>
+						  <div class="fnPickStNm"></div>
 						</div>
 						<label class="col_0">수거일자&nbsp;:</label>
 						<div>
-						  <div class="fnColDt">2022.10.09</div>
+						  <div class="fnColRegDt"></div>
 						</div>
 					  </div>
 					</div>
@@ -75,11 +75,11 @@
 					  <div class="nomal">
 						<label>수거요청일&nbsp;:</label>
 						<div>
-						  <div class="fnColReqDt">2022.10.09</div>
+						  <div class="fnColReqDt"></div>
 						</div>
 						<label>수거예정일&nbsp;:</label>
 						<div>
-						  <div class="fnColSchDt">2022.10.10</div>
+						  <div class="fnColSchDt"></div>
 						</div>
 					  </div>
 					</div>
@@ -87,11 +87,11 @@
 					  <div class="nomal">
 						<label class="col_0">품목수량 &nbsp;:</label>
 						<div>
-						  <div class="fnItemQty space1">2</div>
+						  <div class="fnColReqQty space1"></div>
 						</div>
 						<label>수거총금액&nbsp;:</label>
 						<div>
-						  <div class="fnColAmt">600,000</div>
+						  <div class="fnColReqAmt"></div>
 						</div>
 					  </div>
 					</div>
@@ -99,11 +99,11 @@
 					  <div class="nomal">
 						<label class="col_0">수거장소 &nbsp;:</label>
 						<div>
-						  <div class="fnColPlace space1">A창고</div>
+						  <div class="fnWhsAddr space1"></div>
 						</div>
 						<label>수거담당자&nbsp;:</label>
 						<div>
-						  <div class="fnColMgrNm space0">홍길동</div>
+						  <div class="fnPickMgrNm space0"></div>
 						</div>
 					  </div>
 					</div>
@@ -133,32 +133,32 @@
 			  <div class="detail_col">
 				<label>발행일</label>
 				<i>:</i>
-				<div class="fnDt">2022.10.09</div>
+				<div class="fnColRegDt"></div>
 			  </div>
 			  <div class="detail_col">
 				<label>수거확인번호</label>
 				<i>:</i>
-				<div class="fnColCnfmNo">DL123445</div>
+				<div class="fnColPickUnqNo"></div>
 			  </div>
 			  <div class="detail_col">
 				<label>수거일</label>
 				<i>:</i>
-				<div class="fnColDt">2022.10.10</div>
+				<div class="fnColSchDt"></div>
 			  </div>
 			  <div class="detail_col">
 				<label>수거담당자</label>
 				<i>:</i>
-				<div class="fnCOLMgrNm">홍길동(010-1234-1548)</div>
+				<div class="fnColMgrNm">홍길동(010-1234-1548)</div>
 			  </div>
 			  <div class="detail_col">
 				<label>수거장소</label>
 				<i>:</i>
-				<div class="fnColPlace">(123450 서울 송파구 문정동 100 A창고)</div>
+				<div class="fnWhsAddr"></div>
 			  </div>
 			  <div class="detail_col">
 				<label>전화번호</label>
 				<i>:</i>
-				<div class="fnTel">02-123-4567</div>
+				<div class="fnPndrTelNo"></div>
 			  </div>
 			</div>
 			<div class="detail_company_info">
@@ -168,19 +168,19 @@
 				</div>
 				<div class="company_info">
 				  <label>등록번호&nbsp;:&nbsp;</label>
-				  <div class="fnBsnsRegNo">215-12-23454</div>
+				  <div class="fnRtnBsnsRegno"></div>
 				</div>
 				<div class="company_info">
 				  <label>상호&nbsp;:&nbsp;</label>
-				  <div class="fnSag">공급업체명</div>
+				  <div class="fnRtnNm"></div>
 				</div>
 				<div class="company_info">
 				  <label>성명&nbsp;:&nbsp;</label>
-				  <div class="fnNm">공급자</div>
+				  <div class="fnRtnOwnerNm"></div>
 				</div>
 				<div class="company_info">
 				  <label>주소&nbsp;:&nbsp;</label>
-				  <div class="fnAddr">서울 송파구 문정동</div>
+				  <div class="fnRtnAddr"></div>
 				</div>
 			  </div>
 			  <div class="info_left">
@@ -189,19 +189,19 @@
 				</div>
 				<div class="company_info">
 				  <label>등록번호&nbsp;:&nbsp;</label>
-				  <div class="fnBsnsRegNo">215-12-23454</div>
+				  <div class="fnColBsnsRegNo"></div>
 				</div>
 				<div class="company_info">
 				  <label>상호&nbsp;:&nbsp;</label>
-				  <div class="fnSag">브랜드 회사명</div>
+				  <div class="fnColNm"></div>
 				</div>
 				<div class="company_info">
 				  <label>성명&nbsp;:&nbsp;</label>
-				  <div class="fnNm">대표자명</div>
+				  <div class="fnColOwnerNm"></div>
 				</div>
 				<div class="company_info">
 				  <label>주소&nbsp;:&nbsp;</label>
-				  <div class="fnAddr">경기 성남시 상대원동</div>
+				  <div class="fnColAddr"></div>
 				</div>
 			  </div>
 			</div>
@@ -218,11 +218,11 @@
 					  <div class="nomal">
 						<label>수거발주번호 &nbsp;:</label>
 						<div class="col_5">
-						  <div class="col_5 fnColPodrNo">P12345</div>
+						  <div class="col_5 fnRtnPodrUnqNo"></div>
 						</div>
 						<label class="col_0">품목아이디&nbsp;:</label>
 						<div class="space2">
-						  <div class="fnItemId">asdf1234</div>
+						  <div class="fnItemId"></div>
 						</div>
 					  </div>
 					</div>
@@ -230,11 +230,11 @@
 					  <div class="nomal">
 						<label>품목명 &nbsp;:</label>
 						<div class="space2">
-						  <div class="fnItemNm">커피원두</div>
+						  <div class="fnItemNm"></div>
 						</div>
 						<label>수거요청수량&nbsp;:</label>
 						<div class="space2">
-						  <div class="fnColReqQty">2023.12.02</div>
+						  <div class="fnRodrQty"></div>
 						</div>
 					  </div>
 					</div>
@@ -242,11 +242,11 @@
 					  <div class="nomal">
 						<label>수거수량 &nbsp;:</label>
 						<div class="space2">
-						  <div class="fnColQty">10</div>
+						  <div class="fnColReqQty"></div>
 						</div>
 						<label>수거사유구분&nbsp;:</label>
 						<div>
-						  <div class="fnColRsnDvsn">파손</div>
+						  <div class="fnRtnRsnDvsnNm"></div>
 						</div>
 					  </div>
 					</div>

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

@@ -52,9 +52,10 @@ let mobPageObj = {
 			$('button[id^="ITP_BTN_MCOLLMNG02010_LIST"]').on('click', function() {
 				var id = $(this).attr('id');
 				switch (id) {
-					case 'ITP_BTN_MCOLLMNG02010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 	break;
-					case 'ITP_BTN_MCOLLMNG02010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 	break;
-					case 'ITP_BTN_MCOLLMNG02010_LIST_SEARCH'			: mobContentObj.list.search();	break;
+					case 'ITP_BTN_MCOLLMNG02010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 		break;
+					case 'ITP_BTN_MCOLLMNG02010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 		break;
+					case 'ITP_BTN_MCOLLMNG02010_LIST_SEARCH'		: mobContentObj.list.search();		break;
+					case 'ITP_BTN_MCOLLMNG02010_LIST_CREATE'		: mobContentObj.list.colPrint();	break;
 				}
 				return false;
 			});
@@ -119,6 +120,7 @@ let mobContentObj = {
 		totPage: 0,
 		isSearch: false,
 		rows: [],
+		iChoice: -1,
 		init: function() {
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
 			this.search();
@@ -127,6 +129,7 @@ let mobContentObj = {
 			this.listPage = 0;
 			this.totPage = 0;
 			this.rows.length = 0;
+			this.iChoice = -1;
 			$('#ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWS').empty();
 			this.load();
 		},
@@ -141,16 +144,15 @@ let mobContentObj = {
 					$('#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');
 					$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('.fnRtnPodrUnqNo').text(item.rtnPodrUnqNo);
+					$li.find('.fnRtnPodrNo').text(item.rtnPodrNo);
+					$li.find('.fnColReqDt').text(item.colReqDt);
+					$li.find('.fnRtnWhsNm').text(item.rtnWhsNm);
 					$li.find('.fnItemId').text(item.itemId);
 					$li.find('.fnItemNm').text(item.itemNm);
-					$li.find('.fnPodrQty').text(CommonObj.currency.add(item.podrQty, '개'));
+					$li.find('.fnRtnDodrItemQty').text(CommonObj.currency.add(item.rtnDodrItemQty, '개'));
 					$li.find('.fnUnitAmt').text(CommonObj.comma.set(item.unitAmt));
-					$li.find('.fnPodrAmt').text(CommonObj.comma.set(item.podrAmt));
+					$li.find('.fnRtnDodrTotalAmt').text(CommonObj.comma.set(item.rtnDodrTotalAmt));
 					_this.rows.push(item);
 				});
 			};
@@ -162,6 +164,13 @@ let mobContentObj = {
 			param.toDt = CommonObj.onlyNumber(param.toDt);
 			console.log(JSON.stringify(param));
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
+		},
+		colPrint: function() {
+			if(this.iChoice < 0) {
+				alert("수거서를 선택해주세요 (대표 수거서번호)");
+				return;
+			}
+			mobContentObj.view.init(this.rows[this.iChoice]);
 		}
 	},
 	view: {
@@ -187,40 +196,43 @@ let mobContentObj = {
 			var _this = this;
 			var id = '#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER';
 			$(id).find('.fnBrandNm').text(result.brandNm);
-			$(id).find('.fnPchPodrUnqNo').text(result.pchPodrUnqNo);
-			$(id).find('.fnDlvRegDt').text(result.dlvReqDt);
-			$(id).find('.fnPodrTotalAmt').text(CommonObj.currency.add(result.podrTotalAmt));
-			$(id).find('.fnWhsNm').text(result.whsNm);
-			$(id).find('.fnDeliTelNo').text(result.deliTelNo);
-			$.each(result.invPoInfoList, function (i, item) {
+			$(id).find('.fnRtnPodrDtlNo').text(result.rtnPodrUnqNo);
+			$(id).find('.fnRtnOdrRegDt').text(result.rtnOdrRegDt);
+			$(id).find('.fnRtnDodrTotalAmt').text(CommonObj.currency.add(result.rtnDodrTotalAmt));
+			$(id).find('.fnRtnWhsNm').text(result.rtnWhsNm);
+			$(id).find('.fnPickTelNo').text(result.pickTelNo);
+			$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_NM').val(result.rtnMgrNm);
+			$(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');
-				$li.find('.fnPchPodrDtlNo').text(item.pchPodrDtlNo);
+				$li.find('.fnRtnPodrDtlNo').text(item.rtnPodrDtlNo);
 				$li.find('.fnItemId').text(item.itemId);
 				$li.find('.fnItemNm').text(item.itemNm);
-				$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty));
+				$li.find('.fnRtnOdrQty').text(CommonObj.comma.set(item.rtnOdrQty));
 				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
 				$li.find('.fnUnit').text(item.unit);
-				$li.find('.fnPodrAmt').text(CommonObj.currency.add(item.podrAmt));
-				$li.find('.fnDlvReqDt').text(item.dlvReqDt);
+				$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY').val(result.coltQty);
+				$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN_DVSN').val(result.rtnRsnDvsn);
+				$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN').val(result.rtnRsn);
 				_this.rows.push(item);
 			});
 		},
 		add: function() {
 			var _this = this;
 			var param = {};
-			var dlvSchDt = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG02010_VIEW_DLV_SCH_DT').val();
-			var dlvMgrNm = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG02010_VIEW_DLV_MGR_NM').val();
-			var dlvMgrTelNo = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG02010_VIEW_DLV_MGR_TEL_NO').val();
-			if(dlvSchDt.length < 1) {
-				alert('납품일자를 입력해 주세요.');
+			var colSchDt = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MORDMNG02010_VIEW_COL_SCH_DT').val();
+			var pickMgrNm = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_NM').val();
+			var colMgrTelNo = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_TEL_NO').val();
+			if(colSchDt.length < 1) {
+				alert('수거수량을 입력해 주세요.');
 				return false;
 			}
-			if(dlvMgrNm.length < 1) {
+			if(colMgrNm.length < 1) {
 				alert('발주담당자를 입력해 주세요.');
 				return false;
 			}
-			if(dlvMgrTelNo.length < 1) {
+			if(colMgrTelNo.length < 1) {
 				alert('발주담당자 연락처를 입력해 주세요.');
 				return false;
 			}
@@ -229,22 +241,18 @@ let mobContentObj = {
 			$('#ITP_LIST_MCOLLMNG02010_VIEW_ITEM_AREA .panel-group > .list-row').each(function(index) {
 				var row = _this.rows[index];
 				var item = {
-					'pchPodrDtlNo': row.pchPodrDtlNo,
-					'pchPodrUnqNo': row.pchPodrUnqNo,
-					'shmtQty': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_SHMT_QTY').val(),
-					'expryDate': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_EXPRY_DATE').val(),
-					'deliDesc': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_DELI_DESC').val()
+					'rtnPodrDtlNo': row.rtnPodrDtlNo,
+					'rtnPodrUnqNo': row.rtnPodrUnqNo,
+					'coltQty': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY').val(),
+					'rtnRsnDvsn': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN_DVSN').val(),
+					'rtnRsn': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN').val()
 				};
-				if(row.expryYn === 'Y' && item.expryDate.length < 1) {
-					alert('유통기한을 입력해 주세요.');
-					return false;
-				}
-				if(item.shmtQty.length < 1) {
-					alert('납품수량을 입력해 주세요.');
+				if(item.coltQty.length < 1) {
+					alert('수거수량을 입력해 주세요.');
 					return false;
 				}
-				if(row.podrQty < item.shmtQty) {
-					alert('납품수량은 발주수량을 초과할 수 없습니다.');
+				if(row.rtnOdrQty < item.coltQty) {
+					alert('수거수량은 수거요청수량을 초과할 수 없습니다.');
 					return false;
 				}
 				item.expryDate = item.expryDate.replace(/-/g, ".");
@@ -255,9 +263,9 @@ let mobContentObj = {
 				param['viewCd'] = 'C';
 				param['brandId'] = fn_make_user_info.get('brandId');
 				param['spplyId'] = fn_make_user_info.get('userId');
-				param['dlvSchDt'] = dlvSchDt.replace(/-/g, ".");
-				param['dlvMgrNm'] = dlvMgrNm;
-				param['dlvMgrTelNo'] = dlvMgrTelNo;
+				param['colSchDt'] = colSchDt.replace(/-/g, ".");
+				param['pickMgrNm'] = pickMgrNm;
+				param['pickMgrTelNo'] = pickMgrTelNo;
 				param['gridInsertData'] = gridInsertData;
 				console.log(JSON.stringify(param));
 				var callbackFn = function(result) {
@@ -269,18 +277,16 @@ let mobContentObj = {
 		},
 		cancel: function () {
 			var id = '#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER';
-			$(id + ' #ITP_FORM_MCOLLMNG02010_VIEW_DLV_SCH_DT').val('');
-			$(id + ' #ITP_FORM_MCOLLMNG02010_VIEW_DLV_MGR_NM').val('');
-			$(id + ' #ITP_FORM_MCOLLMNG02010_VIEW_DLV_MGR_TEL_NO').val('');
-			$(id).find('.fnPchPodrDtlNo').text('');
-			$(id).find('.fnItemid').text('');
-			$(id).find('.fnItemNm').text('');
-			$(id).find('.fnUPodrQty').text('');
-			$(id).find('.fnUnitAmt').text('');
-			$(id).find('.fnUnit').text('');
-			$(id).find('.fnPodrQty').text('');
-			$(id).find('.fnPodrAmt').text('');
-			$(id).find('.fnDlvReqDt').text('');
+			$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_NM').val('');
+			$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_TEL_NO').val('');
+			$(id).find('.fnBrandNm').text('');
+			$(id).find('.fnRtnPodrDtlNo').text('');
+			$(id).find('.fnRtnOdrRegDt').text('');
+			$(id).find('.fnRtnDodrTotalAmt').text('');
+			$(id).find('.fnRtnWhsNm').text('');
+			$(id).find('.fnPickTelNo').text('');
+			$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_NM').val('');
+			$(id).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_TEL_NO').val('');
 			$('#ITP_LIST_MCOLLMNG02010_VIEW_ITEM_AREA .panel-group').empty();
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
 		}

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

@@ -6,9 +6,9 @@ require(['config'], function() {
 });
 
 /*API URL*/
-const API_MOBILE_GRID_LIST 			= '/api/pomng/inoutmng/spply-deli-grid-list';	// 목록
-const API_MOBILE_INFO 				= '/api/pomng/inoutmng/info-inv';				// 상세
+const API_MOBILE_GRID_LIST 			= '/api/rtnmng/inoutmng/spply-pick-grid-list';	// 목록
 const API_POP_SEARCH_LIST			= '/api/whs/mng/pop-whs-search';
+const API_POP_INV_PICK 				= '/api/pomng/inoutmng/info-inv';
 
 const PAGE_MODE_LIST				= "LIST";
 const PAGE_MODE_VIEW				= "VIEW";
@@ -140,16 +140,15 @@ let mobContentObj = {
 					$('#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');
 					$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));
+					$li.find('.fnColPickUnqNo').text(item.colPickUnqNo);
+					$li.find('.fnPickStNm').text(item.pickStNm);
+					$li.find('.fnColRegDt').text(item.colRegDt);
+					$li.find('.fnColReqDt').text(item.colReqDt);
+					$li.find('.fnColSchDt').text(item.colSchDt);
+					$li.find('.fnColReqQty').text(CommonObj.currency.add(item.colReqQty, '개'));
+					$li.find('.fnColReqAmt').text(CommonObj.currency.add(item.colReqAmt));
+					$li.find('.fnWhsAddr').text(item.whsAddr);
+					$li.find('.fnPickMgrNm').text(item.pickMgrNm);
 					_this.rows.push(item);
 				});
 			};
@@ -166,6 +165,7 @@ let mobContentObj = {
 		rows: [],
 		init: function(item) {
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
+			this.cancel();
 			this.search(item);
 		},
 		search: function(item) {
@@ -179,106 +179,57 @@ let mobContentObj = {
 				'spplyId': fn_make_user_info.get('userId'),
 				'pchPodrUnqNo': item.pchPodrUnqNo
 			};
-			fn_ajax_call(API_MOBILE_INFO, param, callbackFn, 'GET');
+			fn_ajax_call(API_POP_INV_PICK, param, callbackFn, 'GET');
 		},
 		view: function(result) {
 			var _this = this;
 			var id = '#ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER';
-			$(id).find('.fnBrandNm').text(result.brandNm);
-			$(id).find('.fnPchPodrUnqNo').text(result.pchPodrUnqNo);
-			$(id).find('.fnDlvRegDt').text(result.dlvReqDt);
-			$(id).find('.fnPodrTotalAmt').text(CommonObj.currency.add(result.podrTotalAmt));
-			$(id).find('.fnWhsNm').text(result.whsNm);
-			$(id).find('.fnDeliTelNo').text(result.deliTelNo);
-			$.each(result.invPoInfoList, function (i, item) {
+			$(id).find('.fnColRegDt').text(result.colRegDt);
+			$(id).find('.fnColPickUnqNo').text(result.colPickUnqNo);
+			$(id).find('.fnColSchDt').text(result.colSchDt);
+			$(id).find('.fnColMgrNm').text(result.colMgrNm + '('+ result.pndrTelNo + ')');
+			$(id).find('.fnWhsAddr').text(result.whsAddr);
+			$(id).find('.fnPndrTelNo').text(result.pndrTelNo);
+
+			$(id).find('.fnRtnBsnsRegno').text(result.rtnBsnsRegno);
+			$(id).find('.fnRtnNm').text(result.rtnNm);
+			$(id).find('.fnRtnOwnerNm').text(result.rtnOwnerNm);
+			$(id).find('.fnRtnAddr').text(result.rtnAddr);
+
+			$(id).find('.fnColBsnsRegNo').text(result.colBsnsRegNo);
+			$(id).find('.fnColNm').text(result.colNm);
+			$(id).find('.fnColOwnerNm').text(result.colOwnerNm);
+			$(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');
-				$li.find('.fnPchPodrDtlNo').text(item.pchPodrDtlNo);
+				$li.find('.fnRtnPodrUnqNo').text(item.rtnPodrUnqNo);
 				$li.find('.fnItemId').text(item.itemId);
 				$li.find('.fnItemNm').text(item.itemNm);
-				$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty));
-				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
-				$li.find('.fnUnit').text(item.unit);
-				$li.find('.fnPodrAmt').text(CommonObj.currency.add(item.podrAmt));
-				$li.find('.fnDlvReqDt').text(item.dlvReqDt);
+				$li.find('.fnRodrQty').text(CommonObj.comma.set(item.rodrQty));
+				$li.find('.fnColReqQty').text(CommonObj.comma.set(item.colReqQty));
+				$li.find('.fnRtnRsnDvsnNm').text(item.rtnRsnDvsnNm);
 				_this.rows.push(item);
 			});
 		},
-		add: function() {
-			var _this = this;
-			var param = {};
-			var dlvSchDt = $('#ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG03010_VIEW_DLV_SCH_DT').val();
-			var dlvMgrNm = $('#ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG03010_VIEW_DLV_MGR_NM').val();
-			var dlvMgrTelNo = $('#ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG03010_VIEW_DLV_MGR_TEL_NO').val();
-			if(dlvSchDt.length < 1) {
-				alert('납품일자를 입력해 주세요.');
-				return false;
-			}
-			if(dlvMgrNm.length < 1) {
-				alert('발주담당자를 입력해 주세요.');
-				return false;
-			}
-			if(dlvMgrTelNo.length < 1) {
-				alert('발주담당자 연락처를 입력해 주세요.');
-				return false;
-			}
-			var gridInsertData = [];
-			var isValid = false;
-			$('#ITP_LIST_MCOLLMNG03010_VIEW_ITEM_AREA .panel-group > .list-row').each(function(index) {
-				var row = _this.rows[index];
-				var item = {
-					'pchPodrDtlNo': row.pchPodrDtlNo,
-					'pchPodrUnqNo': row.pchPodrUnqNo,
-					'shmtQty': $(this).find('#ITP_FORM_MCOLLMNG03010_VIEW_SHMT_QTY').val(),
-					'expryDate': $(this).find('#ITP_FORM_MCOLLMNG03010_VIEW_EXPRY_DATE').val(),
-					'deliDesc': $(this).find('#ITP_FORM_MCOLLMNG03010_VIEW_DELI_DESC').val()
-				};
-				if(row.expryYn === 'Y' && item.expryDate.length < 1) {
-					alert('유통기한을 입력해 주세요.');
-					return false;
-				}
-				if(item.shmtQty.length < 1) {
-					alert('납품수량을 입력해 주세요.');
-					return false;
-				}
-				if(row.podrQty < item.shmtQty) {
-					alert('납품수량은 발주수량을 초과할 수 없습니다.');
-					return false;
-				}
-				item.expryDate = item.expryDate.replace(/-/g, ".");
-				gridInsertData.push(item);
-				isValid = true;
-			});
-			if(isValid) {
-				param['viewCd'] = 'C';
-				param['brandId'] = fn_make_user_info.get('brandId');
-				param['spplyId'] = fn_make_user_info.get('userId');
-				param['dlvSchDt'] = dlvSchDt.replace(/-/g, ".");
-				param['dlvMgrNm'] = dlvMgrNm;
-				param['dlvMgrTelNo'] = dlvMgrTelNo;
-				param['gridInsertData'] = gridInsertData;
-				console.log(JSON.stringify(param));
-				var callbackFn = function(result) {
-					console.log(result);
-					_this.cancel();
-				};
-				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), callbackFn, 'POST');
-			}
-		},
 		cancel: function () {
 			var id = '#ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER';
-			$(id + ' #ITP_FORM_MCOLLMNG03010_VIEW_DLV_SCH_DT').val('');
-			$(id + ' #ITP_FORM_MCOLLMNG03010_VIEW_DLV_MGR_NM').val('');
-			$(id + ' #ITP_FORM_MCOLLMNG03010_VIEW_DLV_MGR_TEL_NO').val('');
-			$(id).find('.fnPchPodrDtlNo').text('');
-			$(id).find('.fnItemid').text('');
-			$(id).find('.fnItemNm').text('');
-			$(id).find('.fnUPodrQty').text('');
-			$(id).find('.fnUnitAmt').text('');
-			$(id).find('.fnUnit').text('');
-			$(id).find('.fnPodrQty').text('');
-			$(id).find('.fnPodrAmt').text('');
-			$(id).find('.fnDlvReqDt').text('');
+			$(id).find('.fnColRegDt').text('');
+			$(id).find('.fnColPickUnqNo').text('');
+			$(id).find('.fnColSchDt').text('');
+			$(id).find('.fnColMgrNm').text('');
+			$(id).find('.fnWhsAddr').text('');
+			$(id).find('.fnPndrTelNo').text('');
+
+			$(id).find('.fnRtnBsnsRegno').text('');
+			$(id).find('.fnRtnNm').text('');
+			$(id).find('.fnRtnOwnerNm').text('');
+			$(id).find('.fnRtnAddr').text('');
+
+			$(id).find('.fnColBsnsRegNo').text('');
+			$(id).find('.fnColNm').text('');
+			$(id).find('.fnColOwnerNm').text('');
+			$(id).find('.fnColAddr').text('');
 			$('#ITP_LIST_MCOLLMNG03010_VIEW_ITEM_AREA .panel-group').empty();
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
 		}

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

@@ -60,6 +60,7 @@ let mobPageObj = {
 					case 'ITP_BTN_MORDMNG02010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 	break;
 					case 'ITP_BTN_MORDMNG02010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 	break;
 					case 'ITP_BTN_MORDMNG02010_LIST_SEARCH'			: mobContentObj.list.search();	break;
+					case 'ITP_BTN_MORDMNG02010_LIST_DLV_VIEW'		: mobContentObj.list.dlvPrint();	break;
 				}
 				return false;
 			});
@@ -134,6 +135,7 @@ let mobContentObj = {
 			this.listPage = 0;
 			this.totPage = 0;
 			this.rows.length = 0;
+			this.iChoice = -1;
 			$('#ITP_LIST_MORDMNG02010_LIST_ITEM_ROWS').empty();
 			this.load();
 		},
@@ -168,6 +170,13 @@ let mobContentObj = {
 			param.fromDt = CommonObj.onlyNumber(param.fromDt);
 			param.toDt = CommonObj.onlyNumber(param.toDt);
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
+		},
+		dlvPrint: function() {
+			if(this.iChoice < 0) {
+				alert("납품서를 선택해주세요 (대표 납품서번호)");
+				return;
+			}
+			mobContentObj.view.init(this.rows[this.iChoice]);
 		}
 	},
 	view: {
@@ -176,6 +185,7 @@ let mobContentObj = {
 			this.item = item;
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
 			$('#ITP_FORM_MORDMNG02010_VIEW_DLV_SCH_DT').val(itp_fn_date_add('M', 0));
+			this.cancel();
 			this.search(item);
 		},
 		search: function(item) {

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

@@ -7,7 +7,6 @@ require(['config'], function() {
 
 /*API URL*/
 const API_MOBILE_GRID_LIST 			= '/api/pomng/inoutmng/spply-deli-grid-list';	// 목록
-const API_MOBILE_INFO 				= '/api/pomng/inoutmng/info-inv';				// 상세
 const API_POP_SEARCH_LIST			= '/api/whs/mng/pop-whs-search';
 const API_POP_INV_INFO 				= '/api/pomng/inoutmng/info-inv';
 
@@ -177,6 +176,7 @@ let mobContentObj = {
 		rows: [],
 		init: function(item) {
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
+			this.cancel();
 			this.search(item);
 		},
 		search: function(item) {
@@ -227,18 +227,22 @@ let mobContentObj = {
 		},
 		cancel: function () {
 			var id = '#ITP_AJAX_MORDMNG03010_VIEW_CONTAINER';
-			$(id + ' #ITP_FORM_MORDMNG03010_VIEW_DLV_SCH_DT').val('');
-			$(id + ' #ITP_FORM_MORDMNG03010_VIEW_DLV_MGR_NM').val('');
-			$(id + ' #ITP_FORM_MORDMNG03010_VIEW_DLV_MGR_TEL_NO').val('');
-			$(id).find('.fnPchPodrDtlNo').text('');
-			$(id).find('.fnItemid').text('');
-			$(id).find('.fnItemNm').text('');
-			$(id).find('.fnUPodrQty').text('');
-			$(id).find('.fnUnitAmt').text('');
-			$(id).find('.fnUnit').text('');
-			$(id).find('.fnPodrQty').text('');
-			$(id).find('.fnPodrAmt').text('');
-			$(id).find('.fnDlvReqDt').text('');
+			$(id).find('.fnDlvRegDt').text('');
+			$(id).find('.fnDlvSttmtUnqNo').text('');
+			$(id).find('.fnDlvSchDt').text('');
+			$(id).find('.fnDlvMgrNm').text('');
+			$(id).find('.fnWhsAddr').text('');
+			$(id).find('.fnWhsMgrTelNo').text('');
+
+			$(id).find('.fnDlvBsnsRegno').text('');
+			$(id).find('.fnDlvNm').text('');
+			$(id).find('.fnDlvOwnerNm').text('');
+			$(id).find('.fnDlvAddr').text('');
+
+			$(id).find('.fnPoBsnsRegno').text('');
+			$(id).find('.fnPoNm').text('');
+			$(id).find('.fnPoOwnerNm').text('');
+			$(id).find('.fnPoAddr').text('');
 			$('#ITP_LIST_MORDMNG03010_VIEW_ITEM_AREA .panel-group').empty();
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
 		}