충돌해결

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

@@ -30,8 +30,6 @@ let ITP_FORM_POMNG05010_DETAIL_IS_WRITING = false;
 /*API URL*/
 let API_DETAIL_GRID_LIST 	= '/api/pomng/inoutmng/deli-grid-list';// 목록
 let API_DETAIL_INFO 		= '/api/pomng/inoutmng/info-inv';	// 상세
-let API_DETAIL_SAVE 		= '/api/pomng/inoutmng/deli-grid-list';			// 저장
-let API_ITEM_CLASS_LEVEL	= '/api/item/class-level-list';		//품목분류 level 검색
 
 /*화면 Grid ColModel*/
 const gridColModel = {

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

@@ -417,7 +417,9 @@ let viewObj = {
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClass4').text(result.itemClass4Nm);
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClassMgntNo').text(result.itemClassMgntNo);
         $('#ITP_FORM_STINFO04010_VIEW .fnItemType').text(result.itemType);
-        $('#ITP_FORM_STINFO04010_VIEW .fnItemNm').text(result.itemClassNm);
+        
+        $('#ITP_FORM_STINFO04010_VIEW .fnItemNm').text(result.itemNm);
+        
         $('#ITP_FORM_STINFO04010_VIEW .fnImpDvsn').text(result.impDvsnNm);
         $('#ITP_FORM_STINFO04010_VIEW .fnPodrPssblDvsn').text(result.podrPssblDvsn);
         $('#ITP_FORM_STINFO04010_VIEW .fnUnit').text(result.unit);
@@ -469,7 +471,7 @@ let modifyObj = {
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_ITEM_ST_CD').val(result.itemStCd);
         $('#ITP_FORM_STINFO04010_DETAIL .fnItemClassMgntNo').text(result.itemId);
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_ITEM_TYPE').val(result.itemType);
-        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_ITEM_NM').val(result.itemClassNm);
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_ITEM_NM').val(result.itemNm);
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_IMP_DVSN').val(result.impDvsn);
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_PODR_PSSBL_DVSN').val(result.podrPssblDvsn);
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_UNIT').val(result.unit);

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

@@ -8,7 +8,7 @@
 			  <label>창고선택</label>
 			  <div class="search_wrap">
 				  <div class="float_left">
-					<input id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM" type="text" placeholder="A매장명">
+					<input id="ITP_FORM_MSTOCKMNG01010_LIST_WHS_NM" type="text" data-select-code="WHS_NM" data-check-required="empty" placeholder="A매장명">
 				  </div>
 				  <div class="float_left_btn">
 					<button id="ITP_BTN_MSTOCKMNG01010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -116,55 +116,85 @@
 						<label>창고명</label>
 					</div>
 					<div class="list_info">
-						<div class="pay_info fnPayNo">브랜드 창고 2</div>
+						<div class="pay_info fnWhsNm">브랜드 창고 2</div>
 					</div>
 				</div>
 				<div class="list_line">
 					<div class="list_label">
-						<label>구매자명</label>
+						<label>로케이션</label>
 					</div>
 					<div class="list_info">
-						<div class="pay_info fnPayNm">매장 대표자명</div>
+						<div class="pay_info fnLocation">로케이션 1</div>
 					</div>
 				</div>
 				<div class="list_line">
 					<div class="list_label">
-						<label>상품명</label>
+						<label>품목번호</label>
 					</div>
 					<div class="list_info">
-						<div class="pay_info fnItemNm">매장 아이디 + 월일 + 금액</div>
+						<div class="pay_info fnItemNo">2212110424155511</div>
 					</div>
 				</div>
 				<div class="list_line">
 					<div class="list_label">
-						<label>결제금액 *</label>
+						<label>품목명</label>
 					</div>
 					<div class="list_info">
-						<div class="pay_info fnItemNm">매장 아이디 + 월일 + 금액</div>
+						<div class="pay_info fnItemNm">누리 시럽</div>
 					</div>
 				</div>
 				<div class="list_line">
 					<div class="list_label">
-						<label>휴대전화번호 *</label>
+						<label>현재고</label>
 					</div>
-					<div class="list_info" style="padding-top:10px;">
-						<input id="ITP_FORM_MLOANMNG02010_VIEW_MBL_NO" name="mblNo" type="text">
+					<div class="list_info">
+						<div class="pay_info fnStck">100개</div>
 					</div>
 				</div>
 				<div class="list_line border">
 					<div class="list_label border">
-						<label>E-mail</label>
+						<label>관리등급</label>
+					</div>
+					<div class="list_info">
+						<div class="pay_info fnMgnt"></div>
+					</div>
+				</div>
+				<div class="list_line" style="margin-top:30px;">
+				  <div class="info">
+					<label>창고선택</label>
+				</div>
+			 	  <div class="line_right">
+					<select name="whsNm" id="ITP_FORM_MSTOCKMNG01010_POP_WHS_NM" data-select-code="WHS_NM" data-check-required="empty">
+					  <option value=""></option>
+					</select>
+				  </div>
+				</div>
+				<div class="list_line">
+				  	<div class="info">
+				  		<label>Location</label>
+					</div>
+				  <div class="line_right">
+					<select name="whsDvsn" id="ITP_FORM_MSTOCKMNG01010_POP_WHS_DVSN" data-select-code="EMAIL_CD" data-check-required="empty">
+					  <option value=""></option>
+					</select>
+				  </div>
+				</div>
+				<div class="list_line">
+			  		<div class="info">
+						<label>이동 수량</label>
 					</div>
-					<div class="list_info mail" style="padding-top:10px;">
-						<input id="ITP_FORM_MLOANMNG02010_VIEW_EMAIL" name="ordEmail" class="" type="hidden">
-						<input id="ITP_FORM_MLOANMNG02010_VIEW_EMAIL_ID" name="emailId" class="" type="text" data-check-required="empty">
-						<span>@</span>
-						<input id="ITP_FORM_MLOANMNG02010_VIEW_EMAIL_NM" name="emailNm" class="" type="text" data-check-required="empty">
-						<select name="emailCd" id="ITP_FORM_MLOANMNG02010_VIEW_EMAIL_CD" data-select-code="EMAIL_CD">
-							<option value="">선택</option>
-						</select>
+					<div class="line_right">
+						<input id="ITP_FORM_MSTOCKMNG01010_POP_QTY" type="text" data-select-code="QTY" data-check-required="empty" >
 					</div>
 				</div>
+			    <div class="search">
+	 				<div class="left">
+	 					<button id="ITP_BTN_MSTOCKMNG01010_POP_PAY_REQ_CANCEL" class="col_3 btn-danger btn-sm CLB">취소</button>
+	 				</div>
+					<div class="right">				  		
+			  			<button id="ITP_BTN_MSTOCKMNG01010_POP_PAY_REQ" class="col_3 btn-primary btn-sm ">저장</button>
+					</div>			  		
+			    </div>
 			</div>
 		</div>
 	</div>

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

@@ -66,6 +66,16 @@ section .popup2 .list_line .mail input {width:30%;}
 section .popup2 .list_line .mail select {width:30%;}
 section .popup2 .list_line .list_info .pay_info {text-align:left; padding-left:17px;}
 
+section .popup2 .list_line .line_right {float:right; width:70%;}
+section .popup2 .list_line .line_right select {width:200px; float:right;}
+section .popup2 .list_line .line_right input {width:200px; float:right;}
+section .popup2 .list_line .info{width:30%; padding-top:10px; padding-left:20px; text-align:left;}
+
+section .popup2 .search .left {width:20%; float:left; margin-left:20px;}
+section .popup2 .search .right {width:20%; float:right; margin-right:20px;}
+
+section .popup2 .search .left button,
+section .popup2 .search .right button {width:100%;}
 
 section .popup3 { position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
 section .popup3 .content {position: fixed; z-index: 10; width:100%; height:596px; background: #fff;}