상품구분관련 변경내용 적용

src/main/java/com/style24/persistence/domain/Goods.java

@@ -42,6 +42,9 @@ public class Goods extends TscBaseDomain {
 	private String goodsStat;		//상품상태(공통코드G008)
 	private String selfMallYn;		//자사몰노출여부
 	private String goodsGb;		//해외구매대행/병행수입 상품일 경우 주문 시 통관부호 입력 란이 추가되어야 한다
+	private String foreignBuyYn;		//해외구매대행여부
+	private String parallelImportYn;	//병행수입여부
+	private String orderMadeYn;			//주문제작여부
 	private String distributionGb;		//유통구분(공콩코드 G065)
 	private String selfGoodsYn;		//자사상품여부
 	private String supplyCompCd;		//공급업체코드

src/main/java/com/style24/persistence/domain/GoodsHst.java

@@ -39,6 +39,9 @@ public class GoodsHst extends TscBaseDomain {
 	private String goodsStat;		//상품상태(공통코드G008)
 	private String dispYn;		//노출여부
 	private String goodsGb;		//해외구매대행/병행수입 상품일 경우 주문 시 통관부호 입력 란이 추가되어야 한다
+	private String foreignBuyYn;		//해외구매대행여부
+	private String parallelImportYn;	//병행수입여부
+	private String orderMadeYn;			//주문제작여부
 	private String distributionGb;		//유통구분(공콩코드 G065)
 	private String selfGoodsYn;		//자사상품여부
 	private String supplyCompCd;		//공급업체코드

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

@@ -540,6 +540,9 @@
 		     , G.SELF_GOODS_YN
 		     , G.SELF_MALL_YN
 		     , G.GOODS_GB
+		     , G.FOREIGN_BUY_YN
+		     , G.PARALLEL_IMPORT_YN
+		     , G.ORDER_MADE_YN
 		     , G.DISTRIBUTION_GB
 		     , G.SUPPLY_COMP_CD
 		     , G.SUPPLY_GOODS_CD
@@ -702,6 +705,9 @@
 		      , GOODS_STAT
 		      , SELF_MALL_YN
 		      , GOODS_GB
+		      , FOREIGN_BUY_YN
+		      , PARALLEL_IMPORT_YN
+		      , ORDER_MADE_YN
 		      , DISTRIBUTION_GB
 		      , SELF_GOODS_YN
 		      , SUPPLY_COMP_CD
@@ -757,6 +763,9 @@
 		     , GOODS_STAT          
 		     , SELF_MALL_YN             
 		     , GOODS_GB            
+		     , FOREIGN_BUY_YN
+		     , PARALLEL_IMPORT_YN
+		     , ORDER_MADE_YN
 		     , DISTRIBUTION_GB     
 		     , SELF_GOODS_YN       
 		     , SUPPLY_COMP_CD      
@@ -1239,6 +1248,9 @@
 		  , COST_PRICE = #{costPrice}
 		  , GOODS_STAT = #{goodsStat}
 		  , GOODS_GB = #{goodsGb}
+		  , FOREIGN_BUY_YN = #{foreignBuyYn}
+		  , PARALLEL_IMPORT_YN = #{parallelImportYn}
+		  , ORDER_MADE_YN = #{orderMadeYn}
 		  , DELV_FEE_CD = #{delvFeeCd}
 		  , PNT_PRATE = #{pntPrate}
 		  , PNT_MRATE = #{pntMrate}

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

@@ -179,9 +179,16 @@
 										<th>스타일년도</th>
 										<td><span id="styleYearTxt"></span></td>
 									</tr>
-									<tr id="erplinkarea">
+									<tr>
 										<th>원산지</th>
 										<td><span id="makeNmTxt"></span></td>
+										<th>유통구분<em class="required" title="필수"></em></th>
+										<td><select  name="distributionGb" id="distributionGb">
+												<option value="">[선택]</option>
+												<option th:if="${distributionGbList}" th:each="oneData, status : ${distributionGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+											</select>
+											<input type="hidden" id="distributionGbOrg" name="distributionGbOrg"/>
+										</td>
 										<th>상품구분<em class="required" title="필수"></em></th>
 										<td>
 											<select  name="goodsGb" id="goodsGb">
@@ -190,15 +197,26 @@
 											</select>
 											<input type="hidden" id="goodsGbOrg" name="goodsGbOrg"/>
 										</td>
-										<th>유통구분<em class="required" title="필수"></em></th>
-										<td><select  name="distributionGb" id="distributionGb">
-												<option value="">[선택]</option>
-												<option th:if="${distributionGbList}" th:each="oneData, status : ${distributionGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-											</select>
-											<input type="hidden" id="distributionGbOrg" name="distributionGbOrg"/>
+									</tr>
+									<tr>
+										<th>해외구매대행여부</th>
+										<td><label class="rdoBtn"><input type="radio" name="foreignBuyYn" id="foreignBuyYnY" value="Y" />Y</label>
+											<label class="rdoBtn"><input type="radio" name="foreignBuyYn" id="foreignBuyYnN" value="N"/>N</label>
+											<input type="hidden" id="foreignBuyYnOrg" name="foreignBuyYnOrg"/>
+										</td>
+										<th>병행수입여부</th>
+										<td><label class="rdoBtn"><input type="radio" name="parallelImportYn" id="parallelImportYnY" value="Y" />Y</label>
+											<label class="rdoBtn"><input type="radio" name="parallelImportYn" id="parallelImportYnN" value="N"/>N</label>
+											<input type="hidden" id="parallelImportYnOrg" name="parallelImportYnOrg"/>
+										</td>
+										<th>주문제작여부</th>
+										<td>
+											<label class="rdoBtn"><input type="radio" name="orderMadeYn" id="orderMadeYnY" value="Y" />Y</label>
+											<label class="rdoBtn"><input type="radio" name="orderMadeYn" id="orderMadeYnN" value="N"/>N</label>
+											<input type="hidden" id="orderMadeYnOrg" name="orderMadeYnOrg"/>
 										</td>
 									</tr>
-									<tr id="erplinkarea">
+									<tr>
 										<th>상품연령대</th>
 										<td>
 											<select  name="ageGrpCd" id="ageGrpCd">
@@ -748,8 +766,26 @@
 			}else{
 				$("#goodsDetailForm input:radio[name=adultYn]:input[value='N']").trigger('click');
 			}
+			if (result.foreignBuyYn == "Y"){
+				$("#goodsDetailForm input:radio[name=foreignBuyYn]:input[value='Y']").trigger('click');
+			}else{
+				$("#goodsDetailForm input:radio[name=foreignBuyYn]:input[value='N']").trigger('click');
+			}
+			if (result.parallelImportYn == "Y"){
+				$("#goodsDetailForm input:radio[name=parallelImportYn]:input[value='Y']").trigger('click');
+			}else{
+				$("#goodsDetailForm input:radio[name=parallelImportYn]:input[value='N']").trigger('click');
+			}
+			if (result.orderMadeYn == "Y"){
+				$("#goodsDetailForm input:radio[name=orderMadeYn]:input[value='Y']").trigger('click');
+			}else{
+				$("#goodsDetailForm input:radio[name=orderMadeYn]:input[value='N']").trigger('click');
+			}
 			
 			$("#goodsDetailForm input[name=formalGbOrg]").val(result.formalGb);
+			$("#goodsDetailForm input[name=foreignBuyYnOrg]").val(result.foreignBuyYn);
+			$("#goodsDetailForm input[name=parallelImportYnOrg]").val(result.parallelImportYn);
+			$("#goodsDetailForm input[name=orderMadeYnOrg]").val(result.orderMadeYn);
 			$("#goodsDetailForm input[name=erpPriceLinkYnOrg]").val(result.erpPriceLinkYn);
 			$("#goodsDetailForm input[name=selfMallYnOrg]").val(result.selfMallYn);
 			$("#goodsDetailForm input[name=giftPackYnOrg]").val(result.giftPackYn);
@@ -765,7 +801,6 @@
 
 			//입점상품일 경우
 			if (result.selfGoodsYn == "N"){
-				//$('#goodsDetailForm').find('#erplinkarea').hide();
 				$("#goodsDetailForm").find("#selfGoodsDpTitle").html('원코드');
 				$("#goodsDetailForm").find("#selfGoodsDpTxt").html('<div id="supplyGoodsCdTxt"></div>');
 				$('#goodsDetailForm').find('#supplyGoodsCdTxt').html(result.supplyGoodsCd);
@@ -835,13 +870,11 @@
 			//상품 구분에 따른 컬럼 사용여부처리 start
 			//세트
 			if ("G056_S" == result.goodsType){
-				//$('#goodsDetailForm #erplinkarea').addClass('off');
 				if (result.selfGoodsYn == "Y") $('#goodsDetailForm #goodsComposeTab').css('display','block');
 				$('#goodsDetailForm #goodsNotiTab').css('display','none');
 				$('#goodsDetailForm input[name=sellFeeRate]').attr('readonly', true);
 				$('#goodsDetailForm input[name=currPrice]').attr('readonly', true);
 			}else if ("G056_D" == result.goodsType){
-				//$('#goodsDetailForm #erplinkarea').addClass('off');
 				if (result.selfGoodsYn == "Y") $('#goodsDetailForm #goodsComposeTab').css('display','block');
 				$('#goodsDetailForm #goodsNotiTab').css('display','none');
 				$('#goodsDetailForm input[name=sellFeeRate]').attr('readonly', true);
@@ -1143,14 +1176,15 @@
 
 				idx = 0;
 				//고시정보 필수나 전시표시값 입력여부 확인
-				$("#goodsDetailForm #notiArea").find("#infoContents tr").each(function() {
-					if (gagajf.isNull($(this).find("input[name=niContent]").val())){
-						optCheck = true;
-						mcxDialog.alertC("고시정보를 입력해주세요.");
-						return false;
-					}
-					idx++;
-				});
+				$("#goodsDetailForm #notiArea").find("#infoContents tr").each(function() {debugger;
+				if (typeof($(this).find("td input[name=niContent]").val()) != 'undefined' && gagajf.isNull($(this).find("td input[name=niContent]").val())){
+					optCheck = true;
+					mcxDialog.alertC("고시정보를 입력해주세요.");
+					return false;
+				}
+
+				idx++;
+			});
 			}
 			
 			// 자사일 경우 대표색상 선택 여부
@@ -1786,6 +1820,18 @@
 		if ($("#goodsDetailForm input[name=adultYnOrg]").val() != $("input[name=adultYn]:checked").val()){
 			return true;
 		}
+		// 해외구매대행여부
+		if ($("#goodsDetailForm input[name=foreignBuyYnOrg]").val() != $("input[name=foreignBuyYn]:checked").val()){
+			return true;
+		}
+		// 병행수입여부
+		if ($("#goodsDetailForm input[name=parallelImportYnOrg]").val() != $("input[name=parallelImportYn]:checked").val()){
+			return true;
+		}
+		// 주문제작여부
+		if ($("#goodsDetailForm input[name=orderMadeYnOrg]").val() != $("input[name=orderMadeYn]:checked").val()){
+			return true;
+		}
 		
 		return false;
 	}