모바일 입고/반품처리 수

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

@@ -119,8 +119,8 @@
 				</div>
 			</div>
 			<div class="button_bar">
-				<button id="ITP_BTN_MPOMNG06010_LIST_SAVE" class="col_12 btn-m-orange INPS">입고처리</button>
-				<!--<button id="ITP_BTN_MPOMNG06010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
+				<!--<button id="ITP_BTN_MPOMNG06010_LIST_SAVE" class="col_12 btn-m-orange INPS">입고처리</button>-->
+				<button id="ITP_BTN_MPOMNG06010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
 			</div>
 		</form>
 	</div>

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

@@ -119,8 +119,8 @@
 				</div>
 			</div>
 			<div class="button_bar">
-				<button id="ITP_BTN_MRTNMNG05010_LIST_MODIFY" class="btn_col_6 btn-m-orange INPS">반품처리</button>
-				<button id="ITP_BTN_MRTNMNG05010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
+				<!--<button id="ITP_BTN_MRTNMNG05010_LIST_MODIFY" class="btn_col_6 btn-m-orange INPS">반품처리</button>-->
+				<button id="ITP_BTN_MRTNMNG05010_LIST_CANCEL" class="btn_col_6 btn-gray CLB">취소</button>
 			</div>
 		</form>
 	</div>

src/main/webapp/mobile/app/popup/biz/BIZPOP_PO_WHS_QTY.html

@@ -10,15 +10,12 @@
 					<div class="col-xs-12">
 						<div class="form-horizontal">
 							<form id="ITP_FORM_PO_WHS_QTY_POPUP" target="_PAYMENT_FRAME" action="">
-								<input type="hidden" id="ITP_FORM_PO_WHS_QTY_POPUP_PAY_TP_CD" name="payTpCd" value="" />
-								<input type="hidden" id="ITP_FORM_PO_WHS_QTY_POPUP_BRAND_ID" name="brandId" value="" />
-								<input type="hidden" id="ITP_FORM_PO_WHS_QTY_POPUP_BRAND_NM" name="brandNm" value="" />
 								<div class="line shot">
 									<div class="label_box">
 										<label class="shot">품목번호</label>
 									</div>
 									<div class="info_box">
-										<div class="fnItemNo"></div>
+										<div class="fnItemId"></div>
 									</div>
 								</div>
 								<div class="line shot">
@@ -43,7 +40,7 @@
 									</div>
 									<div class="info_box">
 			              				<button id="ITP_BTN_PO_WHS_QTY_POPUP_ITEM_MINUS">-</button>
-										<input type="text" id="ITP_FORM_PO_WHS_QTY_POPUP" class="itp_input" name="whsQty" />
+										<input type="text" id="ITP_POP_FORM_PO_WHS_QTY" class="itp_input" name="whsQty" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" value="0" />
 										<button id="ITP_BTN_PO_WHS_QTY_POPUP_ITEM_PLUS">+</button>
 									</div>
 								</div>
@@ -54,7 +51,7 @@
 			</div>
 			<div class="modal-footer">
 				<div class="pop_btn_bar">
-					<button type="button" id="ITP_BTN_PO_WHS_QTY_CONFIRM_POP" class="btn btn-primary btn-sm SAB" style="display: inline-block;">&nbsp;&nbsp;확인&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_PO_WHS_QTY_CONFIRM_POP" class="btn btn-primary btn-sm SAB" style="display: inline-block;">&nbsp;&nbsp;입고처리&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_PO_WHS_QTY_CLOSE_POP" class="btn btn-danger btn-sm CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
 				</div>
 			</div>
@@ -62,4 +59,21 @@
 	</div>
 	<div id="ITP_POPUP_KICC_JS"></div>
 	<div id="ITP_POPUP_JS"></div>
+	<div id="ITP_POP_MODAL_ALERT" class="modal itp_modal">
+		<div class="modal-dialog modal-sm">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+					<h5 class="modal-title">알림</h5>
+				</div>
+				<div class="modal-body">
+					<div class="text-center itp_alert_txt"></div>
+				</div>
+				<div class="modal-bottom">
+					<button type="button" class="btn btn-default col_4" id="ITP_POP_MODAL_ALERT_CANCEL" data-dismiss="modal">취소</button>
+					<button type="button" class="btn btn-primary col_10" id="ITP_POP_MODAL_ALERT_CONFIRM">확인</button>
+				</div>
+			</div>
+		</div>
+	</div>
 </div>

src/main/webapp/mobile/app/popup/biz/BIZPOP_RT_COL_QTY.html

@@ -1,4 +1,4 @@
-<div id="ITP_BIZPOP_PO_COL_QTY" class="modal itp_modal">
+<div id="ITP_BIZPOP_RT_COL_QTY" class="modal itp_modal">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
@@ -9,16 +9,16 @@
 				<div class="itp_form itp_type1 fix">
 					<div class="col-xs-12">
 						<div class="form-horizontal">
-							<form id="ITP_FORM_PO_COL_QTY_POPUP" target="_PAYMENT_FRAME" action="">
-								<input type="hidden" id="ITP_FORM_PO_COL_QTY_POPUP_PAY_TP_CD" name="payTpCd" value="" />
-								<input type="hidden" id="ITP_FORM_PO_COL_QTY_POPUP_BRAND_ID" name="brandId" value="" />
-								<input type="hidden" id="ITP_FORM_PO_COL_QTY_POPUP_BRAND_NM" name="brandNm" value="" />
+							<form id="ITP_FORM_RT_COL_QTY_POPUP" target="_PAYMENT_FRAME" action="">
+								<input type="hidden" id="ITP_FORM_RT_COL_QTY_POPUP_PAY_TP_CD" name="payTpCd" value="" />
+								<input type="hidden" id="ITP_FORM_RT_COL_QTY_POPUP_BRAND_ID" name="brandId" value="" />
+								<input type="hidden" id="ITP_FORM_RT_COL_QTY_POPUP_BRAND_NM" name="brandNm" value="" />
 								<div class="line shot">
 									<div class="label_box">
 										<label class="shot">품목번호</label>
 									</div>
 									<div class="info_box">
-										<div class="fnItemNo"></div>
+										<div class="fnItemId"></div>
 									</div>
 								</div>
 								<div class="line shot">
@@ -42,9 +42,9 @@
 										<label class="itp_lb">수거수량</label>
 									</div>
 									<div class="info_box">
-			              				<button id="ITP_BTN_PO_COL_QTY_POPUP_ITEM_MINUS">-</button>
-										<input type="text" id="ITP_FORM_PO_COL_QTY_POPUP" class="itp_input" name="colQty" />
-										<button id="ITP_BTN_PO_COL_QTY_POPUP_ITEM_PLUS">+</button>
+			              				<button id="ITP_BTN_RT_COL_QTY_POPUP_ITEM_MINUS">-</button>
+										<input type="text" id="ITP_POP_FORM_RT_COL_QTY" class="itp_input" name="colQty" />
+										<button id="ITP_BTN_RT_COL_QTY_POPUP_ITEM_PLUS">+</button>
 									</div>
 								</div>
 							</form>
@@ -54,8 +54,8 @@
 			</div>
 			<div class="modal-footer">
 				<div class="pop_btn_bar">
-					<button type="button" id="ITP_BTN_PO_COL_QTY_CONFIRM_POP" class="btn btn-primary btn-sm SAB" style="display: inline-block;">&nbsp;&nbsp;확인&nbsp;&nbsp;</button>
-					<button type="button" id="ITP_BTN_PO_COL_QTY_CLOSE_POP" class="btn btn-danger btn-sm CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_RT_COL_QTY_CONFIRM_POP" class="btn btn-primary btn-sm SAB" style="display: inline-block;">&nbsp;&nbsp;반품처리&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_RT_COL_QTY_CLOSE_POP" class="btn btn-danger btn-sm CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
 				</div>
 			</div>
 		</div>

src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG06010.js

@@ -60,6 +60,7 @@ let mobPageObj = {
 					case 'ITP_BTN_MPOMNG06010_LIST_DELETE_WHS_NM'		: mobPopObj.popWhsNm.delete(); 	break;
 					case 'ITP_BTN_MPOMNG06010_LIST_SEARCH'				: mobContObj.list.search();		break;
 					case 'ITP_BTN_MPOMNG06010_LIST_SAVE'				: mobContObj.list.save();		break;
+					case 'ITP_BTN_MPOMNG06010_LIST_CANCEL'				: mobContObj.list.cancel();		break;
 				}
 				return false;
 			});
@@ -130,7 +131,7 @@ let mobContObj = {
 					$li.find('.fnWhsAmt').text(CommonObj.currency.add(item.whsAmt));
 					$li.find('.fnDlvQty').text(CommonObj.comma.set(item.dlvQty));
 					$li.find('.fnWhsQty').val(item.whsQty);
-					$('button[id="ITP_BTN_MPOMNG06010_WHS_QTY"]')[$li.index()].addEventListener('click', function() { _this.inputQty(this); });
+					$('button[id="ITP_BTN_MPOMNG06010_WHS_QTY"]')[$li.index()].addEventListener('click', function() { _this.popupQty(item); });
 					mobContObj.list.rows.push(item);
 				});
 			};
@@ -139,8 +140,12 @@ let mobContObj = {
 			param.gridSize = mobile_list_size;
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
 		},
-		inputQty: function() {
-
+		popupQty: function(item) {
+			var popFn = function(result) {
+				mobContObj.list.search();
+			};
+			var args = { 'item': item };
+			fn_call_popup('biz', 'BIZPOP_PO_WHS_QTY', '#ITP_ASIDE', popFn, args, 'M');
 		},
 		save: function() {
 			var _this = this;
@@ -199,6 +204,9 @@ let mobContObj = {
 				};
 				itp_fn_modal_confirm('입고처리 하시겠습니까?', modalFn);
 			}
+		},
+		cancel: function () {
+			$(location).attr('href', MOBILE_CONTEXTPATH + '/app/main.html');
 		}
 	}
 };

src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG05010.js

@@ -124,6 +124,7 @@ let mobContObj = {
 					$li.find('.fncolReqAmt').text(CommonObj.currency.add(item.colReqAmt));
 					$li.find('.fnRodrQty').text(CommonObj.currency.add(item.rodrQty, ''));
 					$li.find('#ITP_FORM_MRTNMNG05010_LIST_COL_QTY').val(item.colQty);
+					$('button[id="ITP_BTN_MRTNMNG05010_COL_QTY"]')[$li.index()].addEventListener('click', function() { _this.popupQty(item); });
 					mobContObj.list.rows.push(item);
 				});
 			};
@@ -133,6 +134,13 @@ let mobContObj = {
 			// console.log(JSON.stringify(param));
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
 		},
+		popupQty: function(item) {
+			var popFn = function(result) {
+				mobContObj.list.search();
+			};
+			var args = { 'item': item };
+			fn_call_popup('biz', 'BIZPOP_RT_COL_QTY', '#ITP_ASIDE', popFn, args, 'M');
+		},
 		save: function() {
 			var _this = this;
 			var chkQtyYn1 = true;

src/main/webapp/mobile/js/app/popup/biz/ITP_BIZPOP_PO_WHS_QTY.js

@@ -10,14 +10,120 @@ const API_MOBILE_SAVE 		= '/api/pomng/inoutmng/save-warehouse';				// 저장
 
 var popPageObj = {
 	init: function () {
-		this.button();
-		this.change();
 		this.view();
+		this.action();
 	},
-	button: function() {
-	}, 
-	change: function() {
-	}, 	
 	view: function() {
+		console.log(popPageObj.args.item);
+		$('#ITP_FORM_PO_WHS_QTY_POPUP .fnItemId').text(popPageObj.args.item.itemId);
+		$('#ITP_FORM_PO_WHS_QTY_POPUP .fnItemNm').text(popPageObj.args.item.itemNm);
+		$('#ITP_FORM_PO_WHS_QTY_POPUP .fnDlvQty').text(popPageObj.args.item.dlvQty);
+	},
+	action: function() {
+		$('button[id^="ITP_BTN_PO_WHS_QTY_"]').on('click', function() {
+			var id = $(this).attr('id');
+			switch (id) {
+				case 'ITP_BTN_PO_WHS_QTY_POPUP_ITEM_PLUS'		: popPageObj.qty.plus($(this));		break;
+				case 'ITP_BTN_PO_WHS_QTY_POPUP_ITEM_MINUS'		: popPageObj.qty.minus($(this));	break;
+				case 'ITP_BTN_PO_WHS_QTY_CONFIRM_POP'			: popPageObj.save();				break;
+				case 'ITP_BTN_PO_WHS_QTY_CLOSE_POP'				: popPageObj.close();				break;
+			}
+			return false;
+		});
+
+	},
+	qty: {
+		plus: function(elem) {
+			var whsQty = $(elem).prev();
+			var num = Number($(whsQty).val());
+			$(whsQty).val((num + 1).toString());
+		},
+		minus: function(elem) {
+			var whsQty = $(elem).next();
+			var num = Number($(whsQty).val());
+			if(num > 0)  $(whsQty).val((num - 1).toString());
+		}
+	},
+	save: function() {
+		var value = popPageObj.args.item;
+		var whsQty = $('#ITP_POP_FORM_PO_WHS_QTY').val();
+		if (whsQty === '') {
+			alert("입고수량을 입력해주세요!");
+			// itp_fn_pop_modal_alert("입고수량을 입력해주세요!");
+			return;
+		}
+		if (parseInt(whsQty) > parseInt(value.dlvQty)) {
+			alert("납품수량보다 입고수량이 더 많습니다.");
+			return;
+		}
+		var gridInsertData = [];
+		var item = {
+			'dlvSttmtDtlNo'	: value.dlvSttmtDtlNo,
+			'dlvSttmtUnqNo'	: value.dlvSttmtUnqNo,
+			'itemId'		: value.itemId,
+			'whsQty'		: whsQty
+		};
+		gridInsertData.push(item);
+		if(gridInsertData.length > 0) {
+			var modalFn = {
+				callBack: () => {
+					let param = {};
+					param['viewCd'] = 'C';
+					param['brandId'] = fn_make_user_info.get('brandId');
+					param['storeId'] = fn_make_user_info.get('storeId');
+					param['whsId'] = value.whsId;
+					param['gridInsertData'] = gridInsertData;
+					console.log(JSON.stringify(param));
+					var saveFn = function () {
+						$('#ITP_BIZPOP_PO_WHS_QTY').modal('hide'); // 팝업닫기
+						popPageObj.parentPopFn();
+					};
+					fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
+				}
+			};
+			if(confirm('입고처리 하시겠습니까?')) {
+				modalFn.callBack();
+			}
+			// itp_fn_pop_modal_confirm('입고처리 하시겠습니까?', modalFn);
+		}
+	},
+	close: function() {
+		$('#ITP_BIZPOP_PO_WHS_QTY').modal('hide'); // 팝업닫기
 	}
 };
+
+function itp_fn_pop_modal_alert(msg) {
+	$('#ITP_POP_MODAL_ALERT_CANCEL').hide();
+	$('#ITP_POP_MODAL_ALERT').modal('show');
+	$('#ITP_POP_MODAL_ALERT').find('.itp_alert_txt').html(msg);
+	$('#ITP_POP_MODAL_ALERT_CONFIRM').off('click');
+	$('#ITP_POP_MODAL_ALERT_CONFIRM').on('click', function() {
+		$('#ITP_POP_MODAL_ALERT').modal('hide');
+	});
+};
+
+function itp_fn_pop_modal_confirm(msg, fn, args) {
+	$('#ITP_POP_MODAL_ALERT_CANCEL').show();
+	$('#ITP_POP_MODAL_ALERT').modal('show');
+	$('#ITP_POP_MODAL_ALERT').find('.itp_alert_txt').html(msg);
+	if (fn !== undefined || typeof fn !== 'undefined') {
+		$('#ITP_POP_MODAL_ALERT_CONFIRM').off('click');
+		$('#ITP_POP_MODAL_ALERT_CONFIRM').on('click', function() {
+			fn.callBack(args);
+			$('#ITP_POP_MODAL_ALERT').modal('hide');
+		});
+	}
+}
+
+function itp_fn_BIZPOP_PO_WHS_QTY(parentPopFn, args, returnType) {
+	$('#ITP_BIZPOP_PO_WHS_QTY').one('shown.bs.modal', function(e) {
+		itp_fn_fire_window_resize();
+	}).one('hidden.bs.modal', function(e) {
+		$('#ITP_BIZPOP_PO_WHS_QTY').remove();
+	}).modal('show');
+
+	popPageObj.parentPopFn = parentPopFn;
+	popPageObj.args = args;
+	popPageObj.returnType = returnType;
+	popPageObj.init();
+}

src/main/webapp/mobile/js/app/popup/biz/ITP_BIZPOP_RT_COL_QTY.js

@@ -0,0 +1,130 @@
+require(['config'], function() {
+	require([
+		'jquery'
+	], function($) {
+
+	});
+});
+
+const API_MOBILE_SAVE 		= '/api/rtnmng/inoutmng/save-retstock';				// 반품처리
+
+var popPageObj = {
+	init: function () {
+		this.view();
+		this.action();
+	},
+	view: function() {
+		console.log(popPageObj.args.item);
+		$('#ITP_FORM_RT_COL_QTY_POPUP .fnItemId').text(popPageObj.args.item.itemId);
+		$('#ITP_FORM_RT_COL_QTY_POPUP .fnItemNm').text(popPageObj.args.item.itemNm);
+		$('#ITP_FORM_RT_COL_QTY_POPUP .fnColReqQty').text(popPageObj.args.item.colReqQty);
+	},
+	action: function() {
+		$('button[id^="ITP_BTN_RT_COL_QTY_"]').on('click', function() {
+			var id = $(this).attr('id');
+			switch (id) {
+				case 'ITP_BTN_RT_COL_QTY_POPUP_ITEM_PLUS'		: popPageObj.qty.plus($(this));		break;
+				case 'ITP_BTN_RT_COL_QTY_POPUP_ITEM_MINUS'		: popPageObj.qty.minus($(this));	break;
+				case 'ITP_BTN_RT_COL_QTY_CONFIRM_POP'			: popPageObj.save();				break;
+				case 'ITP_BTN_RT_COL_QTY_CLOSE_POP'				: popPageObj.close();				break;
+			}
+			return false;
+		});
+
+	},
+	qty: {
+		plus: function(elem) {
+			var whsQty = $(elem).prev();
+			var num = Number($(whsQty).val());
+			$(whsQty).val((num + 1).toString());
+		},
+		minus: function(elem) {
+			var whsQty = $(elem).next();
+			var num = Number($(whsQty).val());
+			if(num > 0)  $(whsQty).val((num - 1).toString());
+		}
+	},
+	save: function() {
+		var value = popPageObj.args.item;
+		var colQty = $('#ITP_POP_FORM_RT_COL_QTY').val();
+		if (colQty === '') {
+			alert("수거수량을 입력해주세요!");
+			// itp_fn_pop_modal_alert("수거수량을 입력해주세요!");
+			return;
+		}
+		if (parseInt(colQty) > parseInt(value.colReqQty)) {
+			alert("수거요청수량보다 수거수량이 더 많습니다.");
+			return;
+		}
+		var gridInsertData = [];
+		var item = {
+			'colPickDtlNo'	: value.colPickDtlNo,
+			'colPickUnqNo'	: value.colPickUnqNo,
+			'itemId'		: value.itemId,
+			'colQty'		: colQty
+		};
+		gridInsertData.push(item);
+		if(gridInsertData.length > 0) {
+			var modalFn = {
+				callBack: () => {
+					let param = {};
+					param['viewCd'] = 'C';
+					param['whsId'] = value.whsId;
+					param['rtnWhsId'] = value.rtnWhsId;
+					param['brandId'] = fn_make_user_info.get('brandId');
+					param['storeId'] = fn_make_user_info.get('storeId');
+					param['gridInsertData'] = gridInsertData;
+					var saveFn = function () {
+						$('#ITP_BIZPOP_RT_COL_QTY').modal('hide'); // 팝업닫기
+						popPageObj.parentPopFn();
+					};
+					console.log(JSON.stringify(param));
+					fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
+				}
+			};
+			if(confirm('반품처리 하시겠습니까?')) {
+				modalFn.callBack();
+			}
+			// itp_fn_pop_modal_confirm('입고처리 하시겠습니까?', modalFn);
+		}
+	},
+	close: function() {
+		$('#ITP_BIZPOP_RT_COL_QTY').modal('hide'); // 팝업닫기
+	}
+};
+
+function itp_fn_pop_modal_alert(msg) {
+	$('#ITP_POP_MODAL_ALERT_CANCEL').hide();
+	$('#ITP_POP_MODAL_ALERT').modal('show');
+	$('#ITP_POP_MODAL_ALERT').find('.itp_alert_txt').html(msg);
+	$('#ITP_POP_MODAL_ALERT_CONFIRM').off('click');
+	$('#ITP_POP_MODAL_ALERT_CONFIRM').on('click', function() {
+		$('#ITP_POP_MODAL_ALERT').modal('hide');
+	});
+};
+
+function itp_fn_pop_modal_confirm(msg, fn, args) {
+	$('#ITP_POP_MODAL_ALERT_CANCEL').show();
+	$('#ITP_POP_MODAL_ALERT').modal('show');
+	$('#ITP_POP_MODAL_ALERT').find('.itp_alert_txt').html(msg);
+	if (fn !== undefined || typeof fn !== 'undefined') {
+		$('#ITP_POP_MODAL_ALERT_CONFIRM').off('click');
+		$('#ITP_POP_MODAL_ALERT_CONFIRM').on('click', function() {
+			fn.callBack(args);
+			$('#ITP_POP_MODAL_ALERT').modal('hide');
+		});
+	}
+}
+
+function itp_fn_BIZPOP_RT_COL_QTY(parentPopFn, args, returnType) {
+	$('#ITP_BIZPOP_RT_COL_QTY').one('shown.bs.modal', function(e) {
+		itp_fn_fire_window_resize();
+	}).one('hidden.bs.modal', function(e) {
+		$('#ITP_BIZPOP_RT_COL_QTY').remove();
+	}).modal('show');
+
+	popPageObj.parentPopFn = parentPopFn;
+	popPageObj.args = args;
+	popPageObj.returnType = returnType;
+	popPageObj.init();
+}