eskim 5 лет назад
Родитель
Сommit
f744b906ab

+ 2 - 2
src/main/java/com/style24/scm/biz/service/TssGoodsService.java

@@ -2374,7 +2374,7 @@ public class TssGoodsService {
 			return goods;
 		}
 		goods.setTaxGb(goodsMass.getTaxGb().trim().toUpperCase());
-		if (!"10".equals(goods.getTaxGb()) && !"20".equals(goods.getTaxGb())) {
+		if (!"10".equals(goods.getTaxGb()) && !"20".equals(goods.getTaxGb()) && !"30".equals(goods.getTaxGb())) {
 			goods.setGoodsRegMsg("과세구분 오류");
 			goods.setGoodsStat("10");
 			return goods;
@@ -3182,7 +3182,7 @@ public class TssGoodsService {
 		}
 		goods.setTaxGb(goodsMass.getTaxGb().trim().toUpperCase());
 		if (!UPDATE_NO_PATTERN.equals(goodsMass.getTaxGb().trim())) {
-			if (!"Y".equals(goods.getTaxGb()) && !"N".equals(goods.getTaxGb())) {
+			if (!"10".equals(goods.getTaxGb()) && !"20".equals(goods.getTaxGb()) && !"30".equals(goods.getTaxGb())) {
 				goods.setGoodsRegMsg("과세구분 오류");
 				goods.setGoodsStat("10");
 				return goods;

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

@@ -261,6 +261,7 @@
 												<option value="">[선택]</option>
 												<option value="10">과세</option>
 												<option value="20">비과세</option>
+												<option value="30">면세</option>
 											</select>
 										</td>
 									</tr>

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

@@ -220,6 +220,7 @@
 												<option value="">[선택]</option>
 												<option value="10">과세</option>
 												<option value="20">비과세</option>
+												<option value="30">면세</option>
 											</select>
 										</td>
 										<th>성인용품여부<em class="required" title="필수"></em></th>