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

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

@@ -18,7 +18,7 @@
 								<input type="hidden" id="ITP_FORM_STINFO07010_POP_PRN_SEQ" name="prnSeq" value="1">
 								<section class="itp_form_sec">
 									<div class="itp_form_in">
-										<div class="form-group">
+										<div class="form-group" style="position: relative; left: -38px;">
 											<label class="col-xs-3 itp_lb">상위 분류정보</label>
 											<div class="col-xs-9 itp_ip">
 												<div class="col-xs-3 itp_in">
@@ -45,7 +45,7 @@
 										</div>
 									</div>
 									<div class="itp_form_in">
-										<div class="form-group">
+										<div class="form-group" style="position: relative; left: -38px;">
 											<label class="col-xs-2 itp_lb">분류명</label>
 											<div class="col-xs-9 itp_ip">
 												<div class="col-xs-9 itp_in">

src/main/webapp/app/stinfo/STINFO04010.html

@@ -325,7 +325,7 @@
 								                	<input type="text" id="ITP_FORM_STINFO04010_DETAIL_EXPRY_PERIOD" data-key-up="comma" class="form-control itp_input" name="expryPeriod" value="" maxlength="7">
 												</div>
 												<div class="col-xs-a itp_in">
-													<label class="itp_in">(Day)</label>
+													<label class="itp_in">Day(s)</label>
 												</div>
 											</div>
 										</div>
@@ -482,7 +482,7 @@
 											<label class="col-xs-2 itp_lb">사용(유통)가능기간</label>
 											<div class="col-xs-3 itp_ip">
 												<div class="col-xs-5 itp_in fnExpryPeriod" style="width:auto;"></div>
-												<label class="col-xs-2 itp_in">day(s)</label>
+												<label class="col-xs-2 itp_in">Day(s)</label>
 											</div>
 										</div>
 									</div>

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

@@ -161,7 +161,7 @@
 											<label class="col-xs-2 itp_lb">사용(유통)가능기간</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-5 itp_in fnExpryPeriod" style="width:auto;"></div>
-												<label class="col-xs-2 itp_in">day(s)</label>
+												<label class="col-xs-2 itp_in">Day(s)</label>
 											</div>
 										</div>
 									</div>

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG01010.js

@@ -60,7 +60,7 @@ const gridColModel = {
 		{
 			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
 			label: ITP_MSG_LOCALE.label.pchPodrDtlNo, //구매발주항번
-			width: '10', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -86,8 +86,8 @@ const gridColModel = {
 		{
 			index: 'WHS_NM', name: 'whsNm',
 			label: ITP_MSG_LOCALE.label.whsNm, //납품창고명
-			width: '15', fixed: false, align: 'left',
-			minwidth: 220,
+			width: '14', fixed: false, align: 'left',
+			minwidth: 210,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
@@ -99,29 +99,28 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
-			width: '6', fixed: false, align: 'right',
-			minwidth: 80,
+			width: '11', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PODR_QTY', name: 'podrQty',
 			label: ITP_MSG_LOCALE.label.podrQty, //발주수량
-			width: '10', fixed: false, align: 'right',
+			width: '11', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'SHMT_QTY', name: 'shmtQty',
 			label: ITP_MSG_LOCALE.label.shmtQty, //출고수량
-			width: '10', fixed: false, align: 'right',
+			width: '11', fixed: false, align: 'right',
 			sortable: true, editable: false, edittype: 'text',
 			hidden: true
 		},
 		{
 			index: 'STCK_QTY', name: 'stckQty',
 			label: ITP_MSG_LOCALE.label.stckQty, //현 재고
-			width: '10', fixed: false, align: 'right',
+			width: '11', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -149,15 +148,14 @@ const gridColModel = {
 		{
 			index: 'PODR_AMT', name: 'podrAmt',
 			label: ITP_MSG_LOCALE.label.podrAmt, //발주금액
-			width: '10', fixed: false, align: 'right',
+			width: '11', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'DLV_REQ_DT', name: 'dlvReqDt',
 			label: ITP_MSG_LOCALE.label.dlvReqDt, //납품요청일
-			width: '10', fixed: false, align: 'center',
-			minwidth: 100,
+			width: '9', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG03010.js

@@ -110,36 +110,35 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
-			width: '6', fixed: false, align: 'right',
+			width: '11', fixed: false, align: 'right',
 			sortable: false, hidden: false,
-			minwidth: 60,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'RTN_REQ_QTY', name: 'rtnReqQty',
 			label: ITP_MSG_LOCALE.label.rtnReqQty, //반품요청수량
-			width: '10', fixed: false, align: 'right',
+			width: '11', fixed: false, align: 'right',
 			sortable: false, hidden: true,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'COL_QTY', name: 'colQty',
 			label: ITP_MSG_LOCALE.label.colQty, //반품요청수량
-			width: '10', fixed: false, align: 'right',
+			width: '11', fixed: false, align: 'right',
 			sortable: false, hidden: true,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'RTN_ODR_QTY', name: 'rtnOdrQty',
 			label: ITP_MSG_LOCALE.label.rtnOdrQty, //반품발주수량
-			width: '10', fixed: false, align: 'right',
+			width: '11', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'RTN_AMT', name: 'rtnAmt',
 			label: ITP_MSG_LOCALE.label.rtnAmt, //반품발주금액
-			width: '10', fixed: false, align: 'right',
+			width: '11', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},

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

@@ -11,8 +11,12 @@ let API_ITEM_CLASS_SAVE_POP		= '/api/item/save-itemClassMng';	// 저장
 var popPageObj = {
 	init: function () {
 		this.form();
-		this.button();
+		this.button(); 
 		popItemClassLevel.init('ITP_FORM_STINFO07010_POP_ITEM_CLASS', 1);
+		fn_ajax_call("/api/item/info-itemClassMng","brandId="+this.args.brandId+"&itemClassMgnNo="+this.args.itemClassMgntNo ,  res => {
+			popItemClassLevel.addValue(res);
+			$('#ITP_FORM_SITP_TAB_STINFO07010_POP_ITEM_CLASS_NM').val(this.args.itemClassNm);
+		}, 'GET');
 	},
 	parentPopFn: null,
 	args: null,
@@ -45,6 +49,7 @@ var popPageObj = {
 					$('#ITP_BIZPOP_ITEM_CLASS_MANAGE').modal('hide'); // 팝업닫기
 				};
 				fn_ajax_call(API_ITEM_CLASS_SAVE_POP, JSON.stringify(param), saveFn, 'POST');
+				
 			}
 		});
 	},
@@ -69,10 +74,20 @@ var popPageObj = {
 
 var popItemClassLevel = {
 	levelID: '',
+	values: [],
 	init: function(id, level) {
 		this.levelID = id;
 		this.clear(level);
 		this.make(level);
+		this.values=[];
+	},
+	addValue(node) {
+		console.log("add value ==== ", node);
+		this.values.push(node.itemClass1);
+		this.values.push(node.itemClass2);
+		this.values.push(node.itemClass3);
+		this.values.push(node.itemClass4);
+		this.call(1);
 	},
 	make: function(level) {
 		this.call(level);
@@ -85,17 +100,23 @@ var popItemClassLevel = {
 		var _this = this;
 		var callbackFn = function(result) {
 			fn_make_select_item_class(result.searchList, _this.levelID + level, true,'품목분류Level' + level);
-		};
-		var keys =  function() {
-			var keys = {sBrandId:fn_make_user_info.get('brandId'), sItemLevel: level};
-			for(var i=1; i<level; i++) {
-				var key = 'sItemClass' + i;
-				var id = '#' + _this.levelID + i;
-				keys[key] = $(id + ' option:selected').val();
+			let idx=level-1;
+			console.log("add value  callback start ", idx, _this.levelID, _this.values);
+			if(_this.values && idx<_this.values.length ) {
+				const id=_this.levelID + level;
+				const val=_this.values[idx++];
+				console.log("add value  callback ", id, val)
+				if(idx<_this.values.length) _this.call(level+1);
+				$('#'+id).val(val);
 			}
-			return keys;
 		};
-		fn_ajax_call(API_ITEM_CLASS_LEVEL_POP, $.param(keys(level)), callbackFn, 'GET');
+		var keys = {sBrandId:fn_make_user_info.get('brandId'), sItemLevel: level};
+		for(var i=1; i<=level; i++) {
+			var key = 'sItemClass' + i;
+			var id = '#' + _this.levelID + i;
+			keys[key] = $(id + ' option:selected').val();
+		}
+		fn_ajax_call(API_ITEM_CLASS_LEVEL_POP, $.param(keys), callbackFn, 'GET');
 	},
 	clear: function(level) {
 		for(var i=level; i<5; i++) {

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

@@ -447,13 +447,13 @@ let pageObj = {
         $('#ITP_TAB_STINFO04010').find('div[id$="_CONTAINER"]').each(function(i) {
             $(this).hide();
         });
-        itemClassLevel.switchScreen(mode);
+        
         if(mode == 'LIST') { // 목록
             itp_fn_fire_window_resize();
             $('#ITP_AJAX_STINFO04010_LIST_CONTAINER').show();
             fn_show_btn_auth_array(['#ITP_BTN_STINFO04010_SRH', '#ITP_BTN_STINFO04010_NEWREG', '#ITP_BTN_STINFO04010_UPLOAD']);
             $('#ITP_FORM_STINFO04010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
-
+            itemClassLevel.switchScreen(mode);
         } else if(mode == 'UPLOAD') { // 엑셀업로드
 			$('#ITP_AJAX_STINFO04010_UPLOAD_CONTAINER').show();
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO04010_FILE_UPLOAD','#ITP_BTN_STINFO04010_TEMPLATE_DOWNLOAD','#ITP_BTN_STINFO04010_SAVE', '#ITP_BTN_STINFO04010_CANCELLIST']);
@@ -479,6 +479,7 @@ let pageObj = {
             $('#ITP_FORM_STINFO04010_DETAIL .fnBrandNm').text(fn_make_user_info.get('brandNm'));
 			//$('#ITP_FORM_STINFO04010_DETAIL .fnItemClassMgntNo').text('(자동부여)');
 			$('#ITP_FORM_STINFO04010_DETAIL_OQ_BRAND_ID').val(fn_make_user_info.get('oqBrandId'));
+            itemClassLevel.switchScreen(mode);
         } else if(mode == 'MODIFY') { // 수정
             $('#ITP_AJAX_STINFO04010_DETAIL_CONTAINER').show();
             fn_show_btn_auth_array(['#ITP_BTN_STINFO04010_CANCELLIST', '#ITP_BTN_STINFO04010_SAVE', '#ITP_BTN_STINFO04010_RESET_PW']);
@@ -496,6 +497,7 @@ let pageObj = {
             $('#ITP_AJAX_STINFO04010_VIEW_CONTAINER').show();
             $('#ITP_FORM_STINFO04010_VIEW .fnBrandNm').text(fn_make_user_info.get('brandNm'));
             fn_show_btn_auth_array(['#ITP_BTN_STINFO04010_MODIFY', '#ITP_BTN_STINFO04010_CANCELLIST']);
+            itemClassLevel.switchScreen(mode);
         }
     }
 };
@@ -750,11 +752,10 @@ let modifyObj = {
         pageObj.fileUpload();
         itp_fn_attach_file.view('ITP_STINFO040100_DETAIL_LOGO_FILE', result.fileLogNoList
                 , 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
-        itemClassLevel.data.push(result.itemClass1);
-        itemClassLevel.data.push(result.itemClass2);
-        itemClassLevel.data.push(result.itemClass3);
-        itemClassLevel.data.push(result.itemClass4);
-        itemClassLevel.make(1, 'MODIFY');
+
+        // itemClassLevel.make(1, 'MODIFY');
+        itemClassLevel.addEditData(result ); 
+        itemClassLevel.switchScreen('MODIFY');
     }
 };
 
@@ -991,10 +992,9 @@ let createObj = {
         pageObj.fileUpload();
         itp_fn_form_clear_validate(null, '#ITP_FORM_STINFO04010_DETAIL');
         this.button.init();
-        itemClassLevel.make(1, 'ADD');
+        // itemClassLevel.make(1, 'ADD');
     },
 	load: function() {
-		// console.log("====================");
 		var param = {keyType:"It"};
         fn_ajax_call(API_GET_KEY, param, this.callback, 'GET');
     },
@@ -1006,15 +1006,7 @@ let createObj = {
 	},
     button: {
         init: function() {
-            $('#ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS1').off('change').on('change', function() {
-                ($(this).val() === '') ? itemClassLevel.clear(2): itemClassLevel.change(2);
-            });
-            $('#ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS2').off('change').on('change', function() {
-                ($(this).val() === '') ? itemClassLevel.clear(3): itemClassLevel.change(3);
-            });
-            $('#ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS3').off('change').on('change', function() {
-                ($(this).val() === '') ? itemClassLevel.clear(4): itemClassLevel.change(4);
-            });
+            
         },
         cancel: function() {
         	let childrens = $('#ITP_FORM_STINFO04010_VIEW_FILE').children();
@@ -1083,10 +1075,10 @@ let createObj = {
 
 var itemClassLevel = {
     level: 1,
-    startLevel: 1,
     levelID: '',
     data: [],
-    mode: '',
+    itemMode: '',
+    eventCheck: false,
     keys: function() {
         var keys = {sBrandId:fn_make_user_info.get('brandId'), sItemLevel: this.level};
         for(var i=1; i<=this.level; i++) {
@@ -1096,9 +1088,72 @@ var itemClassLevel = {
         }
         return keys;
     },
+    addEditData: function(node) {
+        this.initData();
+        this.data.push(node.itemClass1);
+        this.data.push(node.itemClass2);
+        this.data.push(node.itemClass3);
+        this.data.push(node.itemClass4);
+        console.log("edit add data ===> ", this.data);
+    },
+    setComboEvent() {
+        if(this.eventCheck) return;
+        const me=this;
+        $('#ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS1').off('change').on('change', function() {
+            ($(this).val() === '') ? me.clear(2): me.change(2);
+        });
+        $('#ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS2').off('change').on('change', function() {
+            ($(this).val() === '') ? me.clear(3): me.change(3);
+        });
+        $('#ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS3').off('change').on('change', function() {
+            ($(this).val() === '') ? me.clear(4): me.change(4);
+        });
+        this.eventCheck=true;
+    },
+    initData: function() {
+        this.data=[];
+    },
     switchScreen: function(mode) {
-        this.level=this.startLevel;
+        this.itemMode=mode;
         this.levelID = (mode === 'LIST' ? 'ITP_FORM_STINFO04010_SEARCH_ITEM_CLASS' : 'ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS');
+        
+        if(this.data.length && mode!='MODIFY') {
+            this.initData();
+        }
+        if(mode=='MODIFY'|| mode=='ADD' ) {
+            this.setComboEvent();
+            this.setComboData(1);
+        }
+    },
+    setComboData: function(level) {
+        var _this=this, mode=this.itemMode, id=this.levelID + level;
+        if(level==1) this.clear(1);
+        var callbackFn = function(result) {
+            var titleVal='품목분류Level' + level, nextLevel=0;  
+            fn_make_select_item_class(result.searchList, id, true, titleVal);
+            if(mode=='MODIFY') { 
+                let idx=level-1, ok=false;
+                if( idx<_this.data.length ) { 
+                    const val=_this.data[idx++];
+                    $('#'+id).val(val);
+                    if(idx<_this.data.length ) {
+                        ok=true;
+                    }
+                }
+                if(ok) {
+                    _this.setComboData(level+1);
+                } else {
+                    _this.initData();
+                }
+            }
+        };
+        var keys = {sBrandId:fn_make_user_info.get('brandId'), sItemLevel: level};
+        for(var i=1; i<=level; i++) {
+            var idx=i-1;
+            var key = 'sItemClass' + i;
+            keys[key] = this.data[idx];
+        } 
+        fn_ajax_call(API_ITEM_CLASS_LEVEL, $.param(keys), callbackFn, 'GET');
     },
     make: function(level, mode) {
         this.level = level;
@@ -1111,11 +1166,13 @@ var itemClassLevel = {
         this.call($.param(this.keys()), mode === 'MODIFY');
     },
     change: function(level) {
+        if(this.data.length>0 ) return;
         this.level = level;
         this.clear(level);
         this.call($.param(this.keys()), false);
     },
     call: function(param, isModify) {
+        
         var _this = this;
         var callbackFn = function(result) {
             var id = _this.levelID + _this.level;
@@ -1136,6 +1193,7 @@ var itemClassLevel = {
         return '품목분류Level' + this.level;
     },
     clear: function(level) {
+         if(this.data.length>0 ) return;
         for(var i=level; i<5; i++) {
             $('#' + (this.levelID + i)).find('option:not(:first)').remove();
         }

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

@@ -4,7 +4,7 @@ require(['config'], function() {
 		pageObj.init();	//config 적용
 	});
 });
-
+console.log(CONN_KEY);
 /********************************************************
 --------------------------------------------------------
 - Object 목록								            -
@@ -292,7 +292,7 @@ let viewObj = {
 		$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClassMgntNo').text(result.itemClassMgntNo);
 		$('#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 .fnItemNm').text(result.itemNm);
 		$('#ITP_FORM_VENDINFO02010_VIEW #ITP_FORM_VENDINFO02010_VIEW_IMP_DVSN').val(result.impDvsn);
 		let impDvsnNm;
 		if (result.impDvsn == '') {

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

@@ -47,20 +47,20 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, 	//단가
-			width: '5', fixed: false, align: 'right',
+			width: '6', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
 			index: 'CONT_STT_DT', name: 'contSttDt',
 			label: ITP_MSG_LOCALE.label.contSttDt, 	//시작일
-			width: '7', fixed: false, align: 'center',
+			width: '6', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'CONT_END_DT', name: 'contEndDt',
 			label: ITP_MSG_LOCALE.label.contEndDt, 	//종료일
-			width: '7', fixed: false, align: 'center',
+			width: '6', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{

src/main/webapp/js/app/vsettmng/ITP_VSETTMNG01010.js

@@ -138,7 +138,7 @@ const gridColModel = {
 		{
 			index: 'WHS_COL_QTY', name: 'whsColQty',
 			label: "입고/수거수량",
-			width: '13', fixed: false, align: 'right',
+			width: '14', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		}, 
@@ -152,7 +152,7 @@ const gridColModel = {
 		{
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
 			label: "입고/수거금액",
-			width: '16', fixed: false, align: 'right',
+			width: '15', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},

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

@@ -332,7 +332,86 @@
 		</div>
 	</footer>
 	<aside id="ITP_ASIDE">
-	
+	<div id="ITP_BIZPOP_PO_WHS_QTY" class="modal itp_modal">
+	<div class="modal-dialog">
+		<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="itp_form itp_type1 fix">
+					<div class="col-xs-12">
+						<div class="form-horizontal">
+							<form id="ITP_FORM_PO_WHS_QTY_POPUP" target="_PAYMENT_FRAME" action="">
+								<div class="line shot">
+									<div class="label_box">
+										<label class="shot">품목번호</label>
+									</div>
+									<div class="info_box">
+										<div class="fnItemId"></div>
+									</div>
+								</div>
+								<div class="line shot">
+									<div class="label_box">
+										<label class="shot">품목명</label>
+									</div>
+									<div class="info_box">
+										<div class="fnItemNm"></div>
+									</div>
+								</div>
+								<div class="line shot">
+									<div class="label_box">
+										<label class="itp_lb shot">납품수량</label>
+									</div>
+									<div class="info_box">
+										<div class="fnDlvQty"></div>
+									</div>
+								</div>
+								<div class="line border">
+									<div class="label_box">
+										<label class="itp_lb">입고수량</label>
+									</div>
+									<div class="info_box">
+			              				<button id="ITP_BTN_PO_WHS_QTY_POPUP_ITEM_MINUS">-</button>
+										<input type="number" id="ITP_POP_FORM_PO_WHS_QTY" maxlength="6" oninput="maxLengthCheck(this)" class="itp_input" name="whsQty" placeholder="0" />
+										<!--<input type="text" id="ITP_POP_FORM_PO_WHS_QTY" class="itp_input" name="whsQty" onKeyup="this.value=this.value.replace(/(\d)(?=(?:\d{3})+(?!\d))/g,'$1,');" value="0" />-->
+										<button id="ITP_BTN_PO_WHS_QTY_POPUP_ITEM_PLUS">+</button>
+									</div>
+								</div>
+							</form>
+						</div>
+					</div>
+				</div>
+			</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_CLOSE_POP" class="btn btn-danger btn-sm CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
+				</div>
+			</div>
+		</div>
+	</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>
 	</aside>
 	<section>
 		<div id="ITP_POP_NOTICE" class="popup2 mobile-pop-close" style="display: none;">

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

@@ -103,8 +103,8 @@
 				</li>
 			</div>
 			<div class="button_bar">
-			  <button id="ITP_BTN_MCOLLMNG02010_LIST_CREATE" class="ok col_12 btn-m-orange IVC">수거서생성</button>
-			  <!--<button id="ITP_BTN_MCOLLMNG02010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
+			  <button id="ITP_BTN_MCOLLMNG02010_LIST_CREATE" class="ok btn_col_6 btn-m-orange IVC">수거서생성</button>
+			  <button id="ITP_BTN_MCOLLMNG02010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
 			</div>
 		  </div>
 	  </form>

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

@@ -124,11 +124,9 @@
 				</li>
 			</div>
 		  </div>
-		  <!--
 		<div class="button_bar">
 		  <button id="ITP_BTN_MCOLLMNG03010_LIST_COL_VIEW" class="ok col_12 btn-m-orange IVDETAIL">수거서보기</button>
 		</div>
-		-->
 	  </form>
 	</div>
 	<div id="ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER" style="display: none;">

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

@@ -107,7 +107,7 @@
 							<div class="nomal">
 								<label class="">납품수량</label>
 								<span>:</span>
-								<div class="text_6 fnDlvQty"></div>
+								<div class="fnDlvQty"></div>
 								<label class="">입고수량</label>
 								<span>:</span>
 								<div class="auto fnWhsQty"></div>

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

@@ -548,11 +548,11 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal .btn_bar button{width: 25px; height: 30px; font-size: 1rem; padding: 0;}
 .scroll_area li .left .nomal .btn_bar .col_0{min-width: auto; margin: 5px 20px;}
 
-.scroll_area li .left .nomal .m_btn_bar{position: relative; display:inline-flex; width: 80px; height:25px; font-size: 12pt; margin-left:10px;}
-.scroll_area li .left .nomal .m_btn_bar button{width: 20px; height: 25px; font-size: 12pt; padding: 0; border:1px solid #E0B8AB; background: #e1cac1; color:#fff;}
-.scroll_area li .left .nomal .m_btn_bar button div{position:relative; width:10px; top:-2px; left:2px;}
+.scroll_area li .left .nomal .m_btn_bar{position: relative; display:inline-flex; width:90px; height:25px; font-size: 12pt; margin-left:10px;}
+.scroll_area li .left .nomal .m_btn_bar button{width: 25px; height: 25px; font-size: 12pt; padding: 0; margin:0; border:1px solid #E0B8AB; border-radius:0; background: #e1cac1; color:#fff;}
+.scroll_area li .left .nomal .m_btn_bar button div{position:relative; width:10px; top:0px; left:1px;}
 .scroll_area li .left .nomal .m_btn_bar .col_0{width: 40px; text-align:center; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
-.scroll_area li .left .nomal .m_btn_bar input {width:40px; height:25px; margin:0; text-align:center; border-radius:0px; border:1px solid #E0B8AB;}
+.scroll_area li .left .nomal .m_btn_bar input {width:40px; height:25px; top:0; padding:3px; margin:0; text-align:center; border-radius:0px; border:1px solid #E0B8AB;}
 .scroll_area li .left .nomal .m_btn_bar input:focus {outline:none;}
 
 .scroll_area li .left .nomal label{position:relative; font-size:12pt; font-weight:100; min-width:70px; padding-left:5px; text-align:left;}
@@ -662,7 +662,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .modal-dialog .line .info_box {width: calc(100% - 100px); padding:10px; display:flex;}
 .modal-dialog .line .info_box .email {width:30%;}
 .modal-dialog .line .info_box button {position:relative; padding:0; height:27px; width:40px; top:-4px; font-size:14pt; border:1px solid #aaa; border-radius:4px; margin:0 3px;}
-.modal-dialog .line .info_box input{position:relative; top:-4px; width:100%; height:27px; margin:0;}
+.modal-dialog .line .info_box input{position:relative; text-align:center; top:-4px; width:100%; height:27px; margin:0;}
 .modal-dialog .line .info_box select{position:relative; top:-4px; width:100%; height:27px;}
 .modal-dialog .line .info_box div{text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:100%; text-align:left; font-size:14px; font-weight:100;}
 .modal-content {position: relative; background-color: #fff; background-clip: padding-box; border: 1px solid #999; border: 1px solid rgba(0,0,0,.2); border-radius: 6px; outline: 0; box-shadow: 0 3px 9px rgb(0 0 0 / 50%);}