Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.scm into develop

src/main/java/com/style24/persistence/mybatis/shop/TssGoods.xml

@@ -1226,9 +1226,9 @@
 		  , STR_TO_DATE(#{sellEddt},'%Y%m%d%H%i%S')
 		  , IFNULL(#{selfMallYn},'Y') 
 		  , #{goodsGb}
-		  , IFNULL(#{foreignBuyYn},'G056_N') 
-		  , IFNULL(#{orderMadeYn},'G056_N')
-		  , IFNULL(#{parallelImportYn},'G056_N')
+		  , IFNULL(#{foreignBuyYn},'N') 
+		  , IFNULL(#{orderMadeYn},'N')
+		  , IFNULL(#{parallelImportYn},'N')
 		  , #{distributionGb}
 		  , #{selfGoodsYn}
 		  , #{supplyCompCd}

src/main/java/com/style24/scm/biz/service/TssGoodsService.java

@@ -4012,6 +4012,7 @@ public class TssGoodsService {
 		regGoods.setGoodsGb("G073_11"); // 신규
 		regGoods.setTaxGb("10"); // 과세구분
 		regGoods.setTobeFormYn("N");
+		regGoods.setSeasonCd(goods.getSeasonCd());	//시즌
 
 		Collection<GoodsCompose> goodsComposeList = null;
 		try {

src/main/webapp/WEB-INF/views/goods/GoodsDealForm.html

@@ -74,7 +74,13 @@
 								<option th:if="${makOriginList}" th:each="oneData, status : ${makOriginList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
 						</td>
-						<td colspan="4"></td>
+						<th>시즌<em class="required" title="필수"></em></th>
+						<td ><select  name="seasonCd" id="seasonCd">
+								<option value="">[전체]</option>
+								<option th:if="${seasonList}" th:each="oneData, status : ${seasonList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							</select>
+						</td>
+						<td colspan="2"></td>
 					</tr>
 				</table>
 			</div>	
@@ -350,6 +356,16 @@
 			});	
 			return false;
 		}
+
+		if(gagajf.isNull($("#goodsDealForm select[name=seasonCd]").val())){
+			mcxDialog.alertC('시즌를 입력해 주세요.', {
+				sureBtnText: "확인",
+				sureBtnClick: function() {
+					$("#goodsDealForm select[name=seasonCd]").focus();
+				}
+			});	
+			return false;
+		}
 		
 		var makeYmd = $("#goodsDealForm input[name=makeYmd]").val();
 		

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

@@ -77,7 +77,7 @@
 						<ul>
 							<li class="on"><a href="#goodstab1">기본정보</a></li>
 							<li><a href="#goodstab2">옵션/재고정보</a></li>
-							<li><a href="#goodstab3">상품상세정보</a></li>
+							<li id="goodsDescTab"><a href="#goodstab3">상품상세정보</a></li>
 							<li id="goodsNotiTab"><a href="#goodstab4">고시정보</a></li>
 							<li id="goodsComposeTab" style="display:none;"><a href="#goodstab5">구성상품</a></li>
 							<li id="goodsSafeTab"><a href="#goodstab6">안전인증</a></li>
@@ -1141,6 +1141,7 @@
 				$('#goodsDetailForm input[name=currPrice]').attr('readonly', true);
 			}else if ("G056_D" == result.goodsType){
 				$('#goodsDetailForm #goodsComposeTab').css('display','block');
+				$('#goodsDetailForm #goodsDescTab').css('display','none');
 				$('#goodsDetailForm #goodsNotiTab').css('display','none');
 				$('#goodsDetailForm #goodsSafeTab').css('display','none');
 				$('#goodsDetailForm input[name=sellFeeRate]').attr('readonly', true);

src/main/webapp/WEB-INF/views/goods/GoodsListForm.html

@@ -304,13 +304,8 @@
 								<label class="chkBox"><input type="checkbox" name="blankFlag" value="Y"/>BLANK 적용<span></span></label>
 								<button type="button" class="btn btn-dark btn-sm" onclick="fnChangeGoodsState('goodsTnm')" >적용</button>
 							</td>
-							<th>무료배송기준</th>
-							<td>
-								<input id="minOrdAmtC" name="minOrdAmtC" type="text" class="w100"  data-valid-type="numeric" maxlength="10"/>이상 구매시 무료
-								<button type="button" class="btn btn-dark btn-sm" onclick="fnChangeGoodsState('minOrdAmt')" >적용</button>
-							</td>
 							<th>선물 주문가능</th>
-							<td>
+							<td colspan="3">
 								<select id="giftPackYnC" name="giftPackYnC">
 									<option value="">[선택]</option>
 									<option value="Y">가능</option>
@@ -331,12 +326,10 @@
 								<button type="button" class="btn btn-dark btn-sm" onclick="fnChangeGoodsState('maxOrdQty')" >적용</button>
 							</td>
 							<th>ID당1일최대구매수량</th>
-							<td>
+							<td  colspan="3">
 								<input id="dayMaxOrdQtyC" name="dayMaxOrdQtyC" type="text" class="w100" data-valid-type="numeric" />
 								<button type="button" class="btn btn-dark btn-sm" onclick="fnChangeGoodsState('dayMaxOrdQty')" >적용</button>
 							</td>
-							
-							<td colspan="2"></td>
 						</tr>
 						<tr>
 							<th>배송정책</th>