Преглед изворни кода

상품 필수여부 표시 변경

eskim пре 5 година
родитељ
комит
f73684bb3c

+ 2 - 0
src/main/java/com/style24/persistence/mybatis/shop/TsaGoods.xml

@@ -4260,6 +4260,8 @@
 		WHERE 1 = 1 
 		<if test='condition != null and condition != "" '>
 		AND (UPPER(A.GOODS_NUM) LIKE CONCAT('%',UPPER(#{condition}),'%')
+		     OR 
+		     UPPER(A.GOODS_CD) LIKE CONCAT('%',UPPER(#{condition}),'%')
 		     OR 
 		     UPPER(A.SUPPLY_GOODS_CD) LIKE CONCAT('%',UPPER(#{condition}),'%')
 		    )

+ 1 - 1
src/main/webapp/WEB-INF/views/goods/GoodsDetailSizeStockForm.html

@@ -67,7 +67,7 @@
 			<col width="7%"/>
 		</colgroup>
 		<tr th:if="${goods.selfGoodsYn == 'Y' and goods.goodsType == 'G056_N'}">
-			<th colspan="2">WMS재고연동여부<i class="star"></i></th>
+			<th colspan="2">WMS재고연동여부<em class="required" title="필수"></em></th>
 			<td colspan="2">
 				<label class="rdoBtn"><input type="radio" name="erpStockLinkYn" id="erpStockLinkYnY" value="Y" th:checked="${goods.erpStockLinkYn == 'Y'}"/>Y</label>
 				<label class="rdoBtn"><input type="radio" name="erpStockLinkYn" id="erpStockLinkYnN" value="N" th:checked="${goods.erpStockLinkYn == 'N'}"/>N</label>

+ 4 - 4
src/main/webapp/WEB-INF/views/goods/GoodsMassRegisterForm.html

@@ -41,7 +41,7 @@
 									or sessionInfo.roleCd == 'G001_A101'
 								}" 
 							th:style="'padding-left:80px;'">
-						<button type="button" class="btn btn-default btn-lg" id="btnInit" onclick="cfnDownloadSampleFile('SF014');">상품대량수정 등록양식 다운로드</button>
+						<button type="button" class="btn btn-default btn-lg" onclick="cfnDownloadSampleFile('SF014');">상품대량수정 등록양식 다운로드</button>
 						<button th:if="${wmsSyncYn == 'Y'}" type="button" class="btn btn-primary btn-lg" id="btnGoodsUpdate" >상품 수정</button>
 					</span>
 				</li>
@@ -50,7 +50,7 @@
 		<div class="panelStyle" >
 			<!-- 검색조건 영역 -->
 			<div class="panelTitle">
-				<h3><i class="fa fa-info-circle"></i>아래 검색조건 중 하나를 꼭 입력해 주세요.</h3>
+				<h3><i class="fa fa-info-circle"></i>아래 검색조건 중 상품코드나 등록일을 꼭 입력해 주세요.</h3>
 			</div>
 			<div class="panelContent">
 				<table class="frmStyle">
@@ -61,7 +61,7 @@
 						<col/>
 					</colgroup>
 					<tr>
-						<th>상품코드<i class="star"></i></th>
+						<th>상품코드<em class="required" title="필수"></em></th>
 						<td><input type="text" class="w130" name="condition" id="condition" maxlength="50"/></td>
 						<th>등록여부</th>
 						<td>
@@ -72,7 +72,7 @@
 						</td>
 					</tr>
 					<tr>
-						<th>등록일<i class="star"></i></th>
+						<th>등록일<em class="required" title="필수"></em></th>
 						<td colspan="3" id="sellTerms"></td>
 					</tr>
 				</table>

+ 3 - 3
src/main/webapp/WEB-INF/views/goods/GoodsWmsIncomelotForm.html

@@ -38,7 +38,7 @@
 						<col/>
 					</colgroup>
 					<tr>
-						<th>업체/브랜드<i class="star"></i></th>
+						<th>업체/브랜드<em class="required" title="필수"></em></th>
 						<td>
 							<select name="supplyCompCd" id="supplyCompCd">
 								<option value="" th:if="${sessionInfo.roleCd} != 'B000'">[전체]</option>
@@ -48,13 +48,13 @@
 								<option value="">[전체]</option>
 							</select>
 						</td>
-						<th>모델번호<i class="star"></i></th>
+						<th>모델번호<em class="required" title="필수"></em></th>
 						<td>
 							<input id="modelNo" name=modelNo type="text" class="w150"  maxlength="20"/>
 						</td>
 					</tr>
 					<tr>
-						<th>등록일<i class="star"></i></th>
+						<th>등록일<em class="required" title="필수"></em></th>
 						<td colspan="3" id="sellTerms"></td>
 					</tr>
 				</table>