출하현황 작업-3

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

@@ -27,8 +27,8 @@
 											</div>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_ID" class="form-control itp_input" name="sshmtWhsId" placeholder="출하창고" />
-											<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_NM" class="form-control itp_input" name="" />
+											<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출하창고" />
+											<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_ID" class="form-control itp_input" name="sshmtWhsId" />
 										</div>
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
 											<button type="button" id="ITP_BTN_INOUTMNG02010_SEARCH_SHMT_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
@@ -37,13 +37,13 @@
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_INOUTMNG02010_SEARCH_SHMT_REQ_ST_CD" data-select-code="SHMT_DTL_ST_CD" class="form-control itp_input" name="sShmtReqStCd">
-												<option value="A">출하상태</option>											
+											<select id="ITP_FORM_INOUTMNG02010_SEARCH_SHMT_REQ_ST_CD" data-select-code="SHMT_DTL_ST_CD" class="form-control itp_input" name="sshmtReqStCd">
+												<option value="">출하상태</option>											
 											</select>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장" />
-											<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsId" />
+											<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId" />
 										</div>
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
 											<button type="button" id="ITP_BTN_INOUTMNG02010_SEARCH_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>

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

@@ -225,6 +225,8 @@ let pageObj = {
             fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG02010_SRH', '#ITP_BTN_INOUTMNG02010_NEWREG']);
             $('#ITP_AJAX_INOUTMNG02010_LIST_CONTAINER').show();
             $('#ITP_FORM_INOUTMNG02010_SEARCH #ITP_FORM_INOUTMNG02010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
+            $('#ITP_BTN_INOUTMNG02010_PRINT').show();
+            $('#ITP_BTN_INOUTMNG02010_SRH').show();            
             $('#ITP_BTN_INOUTMNG02010_SEARCH_SHMT_WHS_ID').show();
             $('#ITP_BTN_INOUTMNG02010_DELETE_SHMT_WHS_NM').show();
             $('#ITP_BTN_INOUTMNG02010_SEARCH_WHS_ID').show();
@@ -275,10 +277,10 @@ let pageObj = {
 			$('#ITP_FORM_INOUTMNG02010_DETAIL .itp_form_change').hide();
 
             $('#ITP_FORM_INOUTMNG02010_DETAIL #ITP_FORM_INOUTMNG02010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
-        } /*else if(mode == 'VIEW') { // 보기
+        } else if(mode == 'VIEW') { // 보기
             $('#ITP_AJAX_INOUTMNG02010_VIEW_CONTAINER').show();
             fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG02010_MODIFY', '#ITP_BTN_INOUTMNG02010_CANCELLIST']);
-        }*/
+        }
     }
 };
 
@@ -402,24 +404,27 @@ let listObj = {
 		});
 	},
 	popup: function(keyword) {
-		var popFn = this.callback.create;
-		// const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
-		if(keyword == 'shmtWhs'){
-			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', popFn, /*key*/null, 'S');
+		var popFn ;
+		if(keyword == 'shmtWhs') {
+			popFn = this.callback.shmtWhs;
 		} else if(keyword == 'whs'){
-			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, /*key*/null, 'S');
+			popFn = this.callback.whs;
 		}
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
+		
 	},
 	callback: {
-		create: function(rowDataPop) {
+		shmtWhs: function(rowDataPop) {
+			console.log(rowDataPop);
+			$('#ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_ID').val(rowDataPop.whsId);
+			$('#ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_NM').val(rowDataPop.whsNm);
+			
+		},
+		whs: function(rowDataPop) {
 			console.log(rowDataPop);
-			if(rowDataPop.hasOwnProperty('whsId') == false) {
-				$('#ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_ID').val(rowDataPop.spplyNm);
-				$('#ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_NM').val(rowDataPop.spplyId);
-			} else {
-				$('#ITP_FORM_INOUTMNG02010_DETAIL_WHS_NM').val(rowDataPop.whsNm);
-				$('#ITP_FORM_INOUTMNG02010_DETAIL_WHS_ID').val(rowDataPop.whsId);
-			}
+			$('#ITP_FORM_INOUTMNG02010_DETAIL_WHS_ID').val(rowDataPop.whsId);
+			$('#ITP_FORM_INOUTMNG02010_DETAIL_WHS_NM').val(rowDataPop.whsNm);
 		}
 	}
 }

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

@@ -408,11 +408,11 @@ let listObj = {
 	},
 	popup: function(keyword) {
 		var popFn = this.callback.create;
-		// const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
 		if(keyword === 'spply'){
-			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', popFn, /*key*/null, 'S');
+			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', popFn, key, 'S');
 		} else if(keyword === 'whs'){
-			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, /*key*/null, 'S');
+			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
 		}
 	},
 	callback: {