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

src/main/webapp/app/inoutmng/INOUTMNG01010.html

@@ -6,6 +6,7 @@
 				<div class="pull-right itp_cicon">
 					<button type="button" id="ITP_BTN_INOUTMNG01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_INOUTMNG01010_OUT" class="btn btn-success btn-sm OUD" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;출하지시&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_INOUTMNG01010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
 				</div>
 			</div>
 			<div class="itp_det_in">
@@ -63,6 +64,59 @@
 						</div>
 					</div>
 				</div>
+				<div id="ITP_AJAX_INOUTMNG01010_VIEW_CONTAINER" >
+					<div class="itp_form itp_type1 fix">
+						<div class="col-xs-12">
+							<form id="ITP_FORM_INOUTMNG01010_VIEW" class="form-horizontal">
+								<input type="hidden" id="ITP_FORM_INOUTMNG01010_VIEW_" name="" value="">
+								<section class="itp_form_sec">
+									<h4 class="itp_form_tit">출하지시 기본정보</h4>
+									<div class="itp_form_in">
+										<div class="form-group">
+											<label class="col-xs-2 itp_lb">브랜드</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-7 itp_in">
+													<div class="fnBrandNm"></div>
+												</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="date" id="ITP_FORM_INOUTMNG01010_VIEW_DLV_DT" data-check-required="empty" class="form-control itp_input" name="dlvDt" value="">
+												</div>
+											</div>
+										</div>
+										<div class="form-group border">
+											<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_INOUTMNG01010_VIEW_DLV_MGR_NM" data-check-required="empty" class="form-control itp_input" name="dlvMgrNm" value="">
+												</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_INOUTMNG01010_VIEW_DLV_MGR_TEL_NO" data-check-required="empty" class="form-control itp_input" name="dlvMgrTelNo" value="">
+												</div>
+											</div>
+										</div>
+									</div>
+								</section>
+							</form>
+						</div>
+					</div>
+					<div class="itp_table fix">
+						<div class="itp_table_head fix" style="background:#f5f5f5;">
+							<h4 class="itp_table_tit">출하지시 품목</h4>
+						</div>
+						<div id="ITP_INOUTMNG01010_VIEW_jqGrid_list" class="itp_tb_list">
+							<div id="ITP_INOUTMNG01010_VIEW_jqGridView" class="itp_views fix"></div>
+							<table id="ITP_INOUTMNG01010_VIEW_jqGrid"></table>
+							<div id="ITP_INOUTMNG01010_VIEW_jqGridPager"></div>
+							<div id="ITP_INOUTMNG01010_VIEW_jqGridEmpty" class="itp_no_data"></div>
+						</div>
+					</div>
+				</div>
 			</div>
 		</article>
 	</div>

src/main/webapp/app/inoutmng/INOUTMNG03010.html

@@ -5,6 +5,7 @@
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><strong>수거지시</strong></h2>
 				<div class="pull-right itp_cicon">
 					<button type="button" id="ITP_BTN_INOUTMNG03010_SRH" class="btn btn-success btn-sm CUD" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;수거지시&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_INOUTMNG03010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
 				</div>
 			</div>
 			<div class="itp_det_in">
@@ -62,6 +63,59 @@
 						</div>
 					</div>
 				</div>
+				<div id="ITP_AJAX_INOUTMNG03010_VIEW_CONTAINER" >
+					<div class="itp_form itp_type1 fix">
+						<div class="col-xs-12">
+							<form id="ITP_FORM_INOUTMNG03010_VIEW" class="form-horizontal">
+								<input type="hidden" id="ITP_FORM_INOUTMNG03010_VIEW_" name="" value="">
+								<section class="itp_form_sec">
+									<h4 class="itp_form_tit">수거지시 기본정보</h4>
+									<div class="itp_form_in">
+										<div class="form-group">
+											<label class="col-xs-2 itp_lb">브랜드</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-7 itp_in">
+													<div class="fnBrandNm"></div>
+												</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="date" id="ITP_FORM_INOUTMNG03010_VIEW_COL_DT" data-check-required="empty" class="form-control itp_input" name="colDt" value="">
+												</div>
+											</div>
+										</div>
+										<div class="form-group border">
+											<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_INOUTMNG03010_VIEW_COL_REQ_MGR_NM" data-check-required="empty" class="form-control itp_input" name="colReqMgrNm" value="">
+												</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_INOUTMNG03010_VIEW_COL_REQ_MGR_TEL_NO" data-check-required="empty" class="form-control itp_input" name="colReqMgrTelNo" value="">
+												</div>
+											</div>
+										</div>
+									</div>
+								</section>
+							</form>
+						</div>
+					</div>
+					<div class="itp_table fix">
+						<div class="itp_table_head fix" style="background:#f5f5f5;">
+							<h4 class="itp_table_tit">수거지시 품목</h4>
+						</div>
+						<div id="ITP_INOUTMNG03010_VIEW_jqGrid_list" class="itp_tb_list">
+							<div id="ITP_INOUTMNG03010_VIEW_jqGridView" class="itp_views fix"></div>
+							<table id="ITP_INOUTMNG03010_VIEW_jqGrid"></table>
+							<div id="ITP_INOUTMNG03010_VIEW_jqGridPager"></div>
+							<div id="ITP_INOUTMNG03010_VIEW_jqGridEmpty" class="itp_no_data"></div>
+						</div>
+					</div>
+				</div>
 			</div>
 		</article>
 	</div>

src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG02010.js

@@ -124,7 +124,6 @@ let mobContentObj = {
 		},
 		itemAdd: function(rows) {
 			var _this = this;
-			console.log(rows);
 			$.each(rows, function(index, item) {
 				$('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWCOPY').html());
 				var $li = $('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_AREA .panel-group > .list-row:last');
@@ -197,25 +196,24 @@ let mobContentObj = {
 			var formId = '#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH';
 			itp_fn_form_clear_validate(null, formId);
 			if (itp_fn_form_event.isValid(formId)) {
-				this.callbackFn('');
-				// location.replace('app:barcode');
+				// this.callbackApp('BRD2211000022211100000003005');
+				location.replace('app:barcode');
 				// location.href = 'app:barcode';
 			}
 		},
-		callbackFn: function(barcode) {
+		callbackApp: function(barcode) {
 			var infoFn = function(result) {
-				console.log(result);
+				if(result) {
+					mobContentObj.list.itemAdd([result]);
+				}
+			};
+			const param = {
+				'sBrandId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID').val(),
+				'sWhsId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID').val(),
+				'sLocation': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION').val(),
+				'sBarcode': barcode
 			};
-			// const param = {
-			// 	'sBrandId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID').val(),
-			// 	'sWhsId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID').val(),
-			// 	'sLocation': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION').val(),
-			// 	'sBarcode': barcode
-			// };
-			// fn_ajax_call(API_MOBILE_BARCODE, param, callbackFn, 'GET');
-			const param = $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH').serializeObject();
-			param['sBarcode'] = barcode;
-			fn_ajax_call(API_MOBILE_BARCODE, JSON.stringify(param), infoFn, 'GET');
+			fn_ajax_call(API_MOBILE_BARCODE, param, infoFn, 'GET');
 		}
 	}
 };