반품관련 정보 수정

src/main/webapp/app/collmng/COLLMNG01010.html

@@ -37,7 +37,7 @@
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_NM" class="form-control itp_input" name="sDlvPlace" placeholder="수거장소 (매장/창고)" readonly/>
-											<input type="hidden" id="ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_ID" class="form-control itp_input" name="swhsId"/>
+											<input type="hidden" id="ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_ID" class="form-control itp_input" name="srtnWhsId"/>
 										</div>
 										<div class="col-xs-1 itp_in" style="padding-left: 5px; width:10%;">
 											<button type="button" id="ITP_BTN_COLLMNG01010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>

src/main/webapp/app/collmng/COLLMNG03010.html

@@ -31,7 +31,7 @@
 										</div>
 										<div class="col-xs-2 itp_in itp_noMar">
 											<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="수거장소(매장/창고)" readonly/>
-											<input type="hidden" id="ITP_FORM_COLLMNG03010_SEARCH_WHS_ID" class="form-control itp_input" />
+											<input type="hidden" id="ITP_FORM_COLLMNG03010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId" />
 										</div>
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
 											<button type="button" id="ITP_BTN_COLLMNG03010_SEARCH_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>

src/main/webapp/app/rtnmng/RTNMNG03010.html

@@ -86,10 +86,10 @@
 								<input type="hidden" id="ITP_FORM_RTNMNG03010_DETAIL_STORE_ID" name="storeId" value="">
 								<input type="hidden" id="ITP_FORM_RTNMNG03010_DETAIL_RTN_REQ_DVSN" name="rtnReqDvsn" value="">
 								<input type="hidden" id="ITP_FORM_RTNMNG03010_DETAIL_SPPLY_ID" name="spplyId" value="">
-								<input type="text" id="ITP_FORM_RTNMNG03010_DETAIL_RTN_WHS_ID" name="rtnWhsId" value="">
-								<input type="text" id="ITP_FORM_RTNMNG03010_DETAIL_RTN_LOCATION" name="rtnLocation" value="">
-								<input type="text" id="ITP_FORM_RTNMNG03010_DETAIL_WHS_ID" name="whsId" value="">
-								<input type="text" id="ITP_FORM_RTNMNG03010_DETAIL_LOCATION" name="location" value="">
+								<input type="hidden" id="ITP_FORM_RTNMNG03010_DETAIL_RTN_WHS_ID" name="rtnWhsId" value="">
+								<input type="hidden" id="ITP_FORM_RTNMNG03010_DETAIL_RTN_LOCATION" name="rtnLocation" value="">
+								<input type="hidden" id="ITP_FORM_RTNMNG03010_DETAIL_WHS_ID" name="whsId" value="">
+								<input type="hidden" id="ITP_FORM_RTNMNG03010_DETAIL_LOCATION" name="location" value="">
 																
 								<input type="hidden" id="ITP_FORM_RTNMNG03010_DETAIL_JOB_CD" name="jobCd" value="R">
 					

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

@@ -231,7 +231,7 @@
 											<label class="col-xs-2 itp_lb">중량</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-3 itp_in">
-													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_WEIGHT" data-check-required="number" class="form-control itp_input" name="weight" value="">
+													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_WEIGHT"  class="form-control itp_input" name="weight" value="">
 												</div>
 												<div class="col-xs-4 itp_in">
 	              									<select id="ITP_FORM_STINFO04010_DETAIL_WEIGHT_UNIT" data-select-code="WEIGHT_UNIT" class="form-control itp_input detail_item_unit" name="weight_unit"></select>

src/main/webapp/js/app/collmng/ITP_COLLMNG01010.js

@@ -277,6 +277,7 @@ let listObj = {
 		search: function() {
 			listObj.itp_COLLMNG01010_search = true;
 			let param = $('#ITP_FORM_COLLMNG01010_SEARCH').serializeObject();
+			console.log(JSON.stringify(param));
 			param.gridSize = $.jgrid.defaults.rowNum;
             param.gridPage = $.jgrid.defaults.page;
             $(COLLMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');

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

@@ -169,7 +169,7 @@ const gridColModel = {
 		},
 		{
 			index: 'WHS_NM', name: 'whsNm',
-			label: ITP_MSG_LOCALE.label.whsNm, //입고창고명
+			label: ITP_MSG_LOCALE.label.locationNm, //입고창고명
 			width: '15', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		}

src/main/webapp/js/app/rtnmng/ITP_RTNMNG03010.js

@@ -233,6 +233,13 @@ const gridColModel = {
 			sortable: false, editable: false, edittype: 'text',
 			hidden: false
 		},
+		{
+			index: 'RTN_DVSN', name: 'rtnDvsn',
+			label: '반품구분', 
+			width: '6', fixed: false, align: 'left',
+			sortable: false, editable: false, edittype: 'text',
+			hidden: true
+		},
 		{
 			index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
 			label: '사유구분', 
@@ -240,6 +247,13 @@ const gridColModel = {
 			sortable: false, editable: false, edittype: 'text',
 			hidden: false
 		},
+		{
+			index: 'RTN_RSN_DVSN', name: 'rtnRsnDvsn',
+			label: '사유구분', 
+			width: '7', fixed: false, align: 'left',
+			sortable: false, editable: false, edittype: 'text',
+			hidden: true
+		},
 		{
 			index: 'RTN_RSN', name: 'rtnRsn',
 			label: '사유', 
@@ -970,9 +984,7 @@ let modifyObj = {
 			$('body').trigger('click');
 			const formId = (SCREEN_MODE == 'NPC' ? '#ITP_FORM_RTNMNG03010_NDETAIL' : '#ITP_FORM_RTNMNG03010_DETAIL');
 			itp_fn_form_clear_validate(null, formId);
-			console.log("111111111111111111");
 			if (itp_fn_form_event.isValid(formId)) {
-				console.log("222222222222222222");
 				if (SCREEN_MODE == 'NPC') {
 					const rowData1 = $(RTNMNG03010_NDETAIL_GRID_ID).getRowData();