상품상세 - 생산원가, 성인상품여부 추가

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

@@ -69,6 +69,8 @@ public class Goods extends TscBaseDomain {
 	private String erpPriceLinkYn;		//ERP가격연계여부(자사상품만 사용. Y:연계)
 	private String erpStockLinkYn;		//ERP재고연계여부(자사상품만 사용. Y:연계)
 	private String newCustOrdYn;		//신규고객 구매가능여부(Y:신규고객만 구매가능)
+	private String costPrice;		//원가
+	private String adultYn;		//성인용품여부
 
 	private String brandEnm;		//브랜드영문명
 	private String brandGrpNm;		//브랜드그룹명

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

@@ -65,5 +65,8 @@ public class GoodsHst extends TscBaseDomain {
 	private String taxGb;		//과세구분(10:과세, 20:비과세)
 	private String erpPriceLinkYn;		//ERP가격연계여부(자사상품만 사용. Y:연계)
 	private String erpStockLinkYn;		//ERP재고연계여부(자사상품만 사용. Y:연계)
+	private String newCustOrdYn;		//신규고객 구매가능여부(Y:신규고객만 구매가능)
+	private String costPrice;		//원가
+	private String adultYn;		//성인용품여부
 
 }

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaGoods.xml

@@ -864,6 +864,7 @@
 		     , G.CURR_PRICE
 		     , G.CURR_BPRICE
 		     , DATE_FORMAT(G.PRICE_UPD_DT, '%Y%m%d%H%i%S') AS PRICE_UPD_DT
+		     , G.COST_PRICE
 		     , G.DC_RATE
 		     , G.GOODS_STAT
 		     , G.SELF_GOODS_YN
@@ -892,6 +893,7 @@
 		     , G.ERP_STOCK_LINK_YN
 		     , G.ERP_PRICE_LINK_YN
 		     , G.NEW_CUST_ORD_YN
+		     , G.ADULT_YN
 		     , FN_GET_CODE_NM('G076', G.ORIGIN_CD) AS MAKE_NM
 		     , G.ORIGIN_CD
 		     , G.MAKE_YMD
@@ -1037,6 +1039,7 @@
 		      , CURR_PRICE
 		      , CURR_BPRICE
 		      , PRICE_UPD_DT
+		      , COST_PRICE
 		      , DC_RATE
 		      , GOODS_STAT
 		      , SELF_MALL_YN
@@ -1068,6 +1071,7 @@
 		      , ERP_PRICE_LINK_YN
 		      , ERP_STOCK_LINK_YN
 		      , NEW_CUST_ORD_YN
+		      , ADULT_YN
 		      , REG_NO
 		      , REG_DT
 		      , UPD_NO
@@ -1090,6 +1094,7 @@
 		     , CURR_PRICE          
 		     , CURR_BPRICE         
 		     , PRICE_UPD_DT        
+		     , COST_PRICE
 		     , DC_RATE             
 		     , GOODS_STAT          
 		     , SELF_MALL_YN             
@@ -1121,6 +1126,7 @@
 		     , ERP_PRICE_LINK_YN   
 		     , ERP_STOCK_LINK_YN   
 		     , NEW_CUST_ORD_YN
+		     , ADULT_YN
 		     , #{regNo}              
 		     , NOW()              
 		     , UPD_NO              
@@ -1511,6 +1517,7 @@
 		  , GOODS_TYPE
 		  , LIST_PRICE
 		  , CURR_PRICE
+		  , COST_PRICE
 		  , DC_RATE
 		  , GOODS_STAT
 		  , SELF_MALL_YN
@@ -1531,6 +1538,8 @@
 		  , MAKE_YMD
 		  , TAX_GB
 		  , ERP_STOCK_LINK_YN
+		  , NEW_CUST_ORD_YN
+		  , ADULT_YN
 		  , REG_NO
 		  , REG_DT
 		  , UPD_NO
@@ -1552,6 +1561,7 @@
 		  , NVL(#{goodsType},'N')
 		  , #{listPrice}
 		  , #{currPrice}
+		  , #{costPrice}
 		  , #{dcRate}
 		  , #{goodsStat}
 		  , NVL(#{selfMallYn},'Y') 
@@ -1572,6 +1582,8 @@
 		  , #{makeYmd}
 		  , #{taxGb}
 		  , NVL(#{erpStockLinkYn},'N')
+		  , NVL(#{newCustOrdYn},'N')
+		  , NVL(#{adultYn},'N')
 		  , #{regNo}
 		  , NOW()
 		  , #{updNo}
@@ -1611,6 +1623,7 @@
 		  , CURR_BPRICE = #{currBprice}
 		  , PRICE_UPD_DT = NOW()
 		  </if>
+		  , COST_PRICE = #{costPrice}
 		  , DC_RATE = #{dcRate}
 		  , GOODS_STAT = #{goodsStat}
 		  , GOODS_GB = #{goodsGb}
@@ -1637,6 +1650,8 @@
 		  , SELL_FEE_RATE = #{sellFeeRate}
 		  , GIFT_PACK_YN = #{giftPackYn}
 		  , MAIN_COLOR_CD = #{mainColorCd}
+		  , NEW_CUST_ORD_YN = #{newCustOrdYn}
+		  , ADULT_YN = #{adultYn}
 		  , UPD_NO = #{updNo}
 		  , UPD_DT = NOW()
 		WHERE GOODS_CD = #{goodsCd}

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

@@ -244,7 +244,7 @@
 									</tr>
 									<tr>
 										<th>품목코드<em class="required" title="필수"></em></th>
-										<td colspan="5">
+										<td colspan="3">
 											<select  name="itemkindCd" id="itemkindCd" th:disabled="${sessionInfo.roleCd != 'G001_0000' AND sessionInfo.roleCd != 'G001_A000' AND sessionInfo.roleCd != 'G001_A101' AND sessionInfo.roleCd != 'G001_A100' AND sessionInfo.roleCd != 'G001_A001'}">
 												<option th:if="${itemkindList}" th:each="oneData, status : ${itemkindList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 											</select>
@@ -253,7 +253,10 @@
 											<button type="button" class="btn btn-success btn-lg" id="btnGoodsItemkindChange">품목변경</button>
 											</th:block>
 										</td>
-										
+										<th>원가</th>
+										<td><input type="text" class="w80p aR" id="costPrice" name="costPrice" maxlength="10" data-valid-type="numeric"/> 원
+											<input type="hidden" id="costPriceOrg" name="costPriceOrg"/>
+										</td>
 									</tr>
 									<tr>
 										<th>반품여부<em class="required" title="필수"></em></th>
@@ -308,7 +311,11 @@
 											<label class="rdoBtn"><input type="radio" name="preMpntUsableYn" id="preMpntUsableYnN" value="N"/>N</label>
 											<input type="hidden" id="preMpntUsableYnOrg" name="preMpntUsableYnOrg"/>
 										</td>
-										<td colspan="2">
+										<th>성인용품여부<em class="required" title="필수"></em></th>
+										<td>
+											<label class="rdoBtn"><input type="radio" name="adultYn" id="adultYnY" value="Y" />Y</label>
+											<label class="rdoBtn"><input type="radio" name="adultYn" id="adultYnN" value="N"/>N</label>
+											<input type="hidden" id="adultYnOrg" name="adultYnOrg"/>
 										</td>
 									</tr>
 									<tr>
@@ -704,7 +711,6 @@
 			$('#goodsDetailForm input[name=goodsGbOrg]').val(result.goodsGb);
 			$('#goodsDetailForm input[name=mainColorCd]').val(result.mainColorCd);
 			
-
 			$("#goodsDetailForm input[name=goodsNm]").val(result.goodsNm);
 			$('#goodsDetailForm input[name=goodsNmOrg]').val(result.goodsNm);
 			fnDataLengthCheck('goodsNm',200);
@@ -722,6 +728,8 @@
 			$('#goodsDetailForm input[name=currPriceOrg]').val(result.currPrice);
 			$('#goodsDetailForm').find('#dcRateTxt').html(result.dcRate);
 			$('#goodsDetailForm input[name=dcRate]').val(result.dcRate);
+			$('#goodsDetailForm input[name=costPrice]').val(result.costPrice.addComma());
+			$('#goodsDetailForm input[name=costPriceOrg]').val(result.costPrice);
 			$('#goodsDetailForm').find('#priceUpdDtTxt').html(!gagajf.isNull(result.priceUpdDt) ? result.priceUpdDt.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD") : '');
 			$('#goodsDetailForm').find('#frstCfrmDtTxt').html(!gagajf.isNull(result.frstCfrmDt) ? result.frstCfrmDt.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD") : '');
 
@@ -769,6 +777,11 @@
 			}else{
 				$("#goodsDetailForm input:radio[name=newCustOrdYn]:input[value='N']").trigger('click');
 			}
+			if (result.adultYn == "Y"){
+				$("#goodsDetailForm input:radio[name=adultYn]:input[value='Y']").trigger('click');
+			}else{
+				$("#goodsDetailForm input:radio[name=adultYn]:input[value='N']").trigger('click');
+			}
 			
 			$('#goodsDetailForm input[name=sellFeeRate]').val(result.sellFeeRate);
 			$("#goodsDetailForm input[name=sellFeeRateOrg]").val(result.sellFeeRate);
@@ -798,7 +811,8 @@
 			$("#goodsDetailForm input[name=changeableYnOrg]").val(result.changeableYn);
 			$("#goodsDetailForm input[name=returnableYnOrg]").val(result.returnableYn);
 			$("#goodsDetailForm input[name=newCustOrdYnOrg]").val(result.newCustOrdYn);
-
+			$("#goodsDetailForm input[name=adultYnOrg]").val(result.adultYn);
+			
 			$("#goodsDetailForm input[type=radio][checked]").addClass("checked");
 			//$("#goodsDetailForm input[type=radio][checked]").parent("label").addClass("checked");
 
@@ -1351,6 +1365,7 @@
 			});
 			return false;
 		}
+		
 		// 배송비구분
 		if(gagajf.isNull($("#goodsDetailForm select[name=delvFeeCd]").val())){
 			mcxDialog.alertC("배송비정책을 선택해 주세요.", {
@@ -1822,6 +1837,10 @@
 		if ($("#goodsDetailForm input[name=currPriceOrg]").val() != $("#goodsDetailForm input[name=currPrice]").val().removeComma()){
 			return true;
 		}
+		//원가
+		if ($("#goodsDetailForm input[name=costPriceOrg]").val() != $("#goodsDetailForm input[name=costPrice]").val().removeComma()){
+			return true;
+		}
 		
 		//자사 일반상품만 
 		if($("#goodsDetailForm input[name=selfGoodsYn]").val() == 'Y' && $("#goodsDetailForm input[name=goodType]").val() == 'G056_N'){
@@ -1899,6 +1918,11 @@
 		if ($("#goodsDetailForm input[name=newCustOrdYnOrg]").val() != $("input[name=newCustOrdYn]:checked").val()){
 			return true;
 		}
+		// 성인용품여부
+		if ($("#goodsDetailForm input[name=adultYnOrg]").val() != $("input[name=adultYn]:checked").val()){
+			return true;
+		}
+		
 		
 		return false;
 	}

style24.batch/src/main/java/com/style24/persistence/mybatis/shop/TsbGoods.xml

@@ -23,6 +23,7 @@
 		      , CURR_PRICE
 		      , CURR_BPRICE
 		      , PRICE_UPD_DT
+		      , COST_PRICE
 		      , DC_RATE
 		      , GOODS_STAT
 		      , SELF_MALL_YN
@@ -53,6 +54,8 @@
 		      , TAX_GB
 		      , ERP_PRICE_LINK_YN
 		      , ERP_STOCK_LINK_YN
+		      , NEW_CUST_ORD_YN
+		      , ADULT_YN
 		      , REG_NO
 		      , REG_DT
 		      , UPD_NO
@@ -75,6 +78,7 @@
 		     , CURR_PRICE          
 		     , CURR_BPRICE         
 		     , PRICE_UPD_DT        
+		     , COST_PRICE
 		     , DC_RATE             
 		     , GOODS_STAT          
 		     , SELF_MALL_YN             
@@ -105,6 +109,8 @@
 		     , TAX_GB              
 		     , ERP_PRICE_LINK_YN   
 		     , ERP_STOCK_LINK_YN   
+		     , NEW_CUST_ORD_YN
+		     , ADULT_YN
 		     , #{regNo}              
 		     , NOW()              
 		     , UPD_NO              

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

@@ -69,6 +69,8 @@ public class Goods extends TscBaseDomain {
 	private String erpPriceLinkYn;		//ERP가격연계여부(자사상품만 사용. Y:연계)
 	private String erpStockLinkYn;		//ERP재고연계여부(자사상품만 사용. Y:연계)
 	private String newCustOrdYn;		//신규고객 구매가능여부(Y:신규고객만 구매가능)
+	private String costPrice;		//원가
+	private String adultYn;		//성인용품여부
 
 	private String brandEnm;		//브랜드영문명
 	private String brandGrpNm;		//브랜드그룹명

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

@@ -65,5 +65,8 @@ public class GoodsHst extends TscBaseDomain {
 	private String taxGb;		//과세구분(10:과세, 20:비과세)
 	private String erpPriceLinkYn;		//ERP가격연계여부(자사상품만 사용. Y:연계)
 	private String erpStockLinkYn;		//ERP재고연계여부(자사상품만 사용. Y:연계)
+	private String newCustOrdYn;		//신규고객 구매가능여부(Y:신규고객만 구매가능)
+	private String costPrice;		//원가
+	private String adultYn;		//성인용품여부
 
 }

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

@@ -514,6 +514,7 @@
 		     , G.CURR_PRICE
 		     , G.CURR_BPRICE
 		     , DATE_FORMAT(G.PRICE_UPD_DT, '%Y%m%d%H%i%S') AS PRICE_UPD_DT
+		     , G.COST_PRICE
 		     , G.DC_RATE
 		     , G.GOODS_STAT
 		     , G.SELF_GOODS_YN
@@ -539,6 +540,8 @@
 		     , G.GIFT_PACK_YN
 		     , G.ERP_STOCK_LINK_YN
 		     , G.ERP_PRICE_LINK_YN
+		     , G.NEW_CUST_ORD_YN
+		     , G.ADULT_YN
 		     , FN_GET_CODE_NM('G076', G.ORIGIN_CD) AS MAKE_NM
 		     , G.ORIGIN_CD
 		     , G.MAKE_YMD
@@ -681,6 +684,7 @@
 		      , CURR_PRICE
 		      , CURR_BPRICE
 		      , PRICE_UPD_DT
+		      , COST_PRICE
 		      , DC_RATE
 		      , GOODS_STAT
 		      , SELF_MALL_YN
@@ -712,6 +716,7 @@
 		      , ERP_PRICE_LINK_YN
 		      , ERP_STOCK_LINK_YN
 		      , NEW_CUST_ORD_YN
+		      , ADULT_YN
 		      , REG_NO
 		      , REG_DT
 		      , UPD_NO
@@ -734,6 +739,7 @@
 		     , CURR_PRICE          
 		     , CURR_BPRICE         
 		     , PRICE_UPD_DT        
+		     , COST_PRICE
 		     , DC_RATE             
 		     , GOODS_STAT          
 		     , SELF_MALL_YN             
@@ -765,6 +771,7 @@
 		     , ERP_PRICE_LINK_YN   
 		     , ERP_STOCK_LINK_YN   
 		     , NEW_CUST_ORD_YN
+		     , ADULT_YN
 		     , #{regNo}              
 		     , NOW()              
 		     , UPD_NO              
@@ -1217,6 +1224,7 @@
 		  , PRICE_UPD_DT = NOW()
 		  , DC_RATE = #{dcRate}
 		  </if>
+		  , COST_PRICE = #{costPrice}
 		  , GOODS_STAT = #{goodsStat}
 		  , GOODS_GB = #{goodsGb}
 		  , DELV_FEE_CD = #{delvFeeCd}
@@ -1242,7 +1250,8 @@
 		  , SELL_FEE_RATE = #{sellFeeRate}
 		  , GIFT_PACK_YN = #{giftPackYn}
 		  , MAIN_COLOR_CD = #{mainColorCd}
-		  , GIFT_PACK_YN = #{giftPackYn}
+		  , NEW_CUST_ORD_YN = #{newCustOrdYn}
+		  , ADULT_YN = #{adultYn}
 		  , UPD_NO = #{updNo}
 		  , UPD_DT = NOW()
 		WHERE GOODS_CD = #{goodsCd}

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

@@ -36,6 +36,7 @@
 				<input type="hidden" id="mainColorCd" name="mainColorCd" />
 				<input type="hidden" id="goodsType" name="goodsType" />
 				<input type="hidden" id="goodsComposeList" name="goodsComposeList" />
+				<input type="hidden" id="costPrice" name="costPrice" />
 				<table class="frmStyle">
 					<colgroup>
 						<col width="11%"/>
@@ -309,7 +310,11 @@
 											<label class="rdoBtn"><input type="radio" name="preMpntUsableYn" id="preMpntUsableYnN" value="N"/>N</label>
 											<input type="hidden" id="preMpntUsableYnOrg" name="preMpntUsableYnOrg"/>
 										</td>
-										<td colspan="2">
+										<th>성인용품여부<em class="required" title="필수"></em></th>
+										<td>
+											<label class="rdoBtn"><input type="radio" name="adultYn" id="adultYnY" value="Y" />Y</label>
+											<label class="rdoBtn"><input type="radio" name="adultYn" id="adultYnN" value="N"/>N</label>
+											<input type="hidden" id="adultYnOrg" name="adultYnOrg"/>
 										</td>
 									</tr>
 									<tr>
@@ -623,6 +628,7 @@
 			$('#goodsDetailForm input[name=listPrice]').val(result.listPrice);
 			$('#goodsDetailForm input[name=currPrice]').val(result.currPrice.addComma());
 			$('#goodsDetailForm input[name=currPriceOrg]').val(result.currPrice);
+			$('#goodsDetailForm input[name=costPrice]').val(result.costPrice);
 			$('#goodsDetailForm').find('#dcRateTxt').html(result.dcRate);
 			$('#goodsDetailForm input[name=dcRate]').val(result.dcRate);
 			$('#goodsDetailForm').find('#priceUpdDtTxt').html(!gagajf.isNull(result.priceUpdDt) ? result.priceUpdDt.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD") : '');
@@ -685,6 +691,11 @@
 			}else{
 				$("#goodsDetailForm input:radio[name=newCustOrdYn]:input[value='N']").trigger('click');
 			}
+			if (result.adultYn == "Y"){
+				$("#goodsDetailForm input:radio[name=adultYn]:input[value='Y']").trigger('click');
+			}else{
+				$("#goodsDetailForm input:radio[name=adultYn]:input[value='N']").trigger('click');
+			}
 			
 			$("#goodsDetailForm input[name=formalGbOrg]").val(result.formalGb);
 			$("#goodsDetailForm input[name=erpPriceLinkYnOrg]").val(result.erpPriceLinkYn);
@@ -695,6 +706,7 @@
 			$("#goodsDetailForm input[name=changeableYnOrg]").val(result.changeableYn);
 			$("#goodsDetailForm input[name=returnableYnOrg]").val(result.returnableYn);
 			$("#goodsDetailForm input[name=newCustOrdYnOrg]").val(result.newCustOrdYn);
+			$("#goodsDetailForm input[name=adultYnOrg]").val(result.adultYn);
 
 			$("#goodsDetailForm input[type=radio][checked]").addClass("checked");
 			//$("#goodsDetailForm input[type=radio][checked]").parent("label").addClass("checked");
@@ -1692,6 +1704,10 @@
 		if ($("#goodsDetailForm input[name=newCustOrdYnOrg]").val() != $("input[name=newCustOrdYn]:checked").val()){
 			return true;
 		}
+		// 성인용품여부
+		if ($("#goodsDetailForm input[name=adultYnOrg]").val() != $("input[name=adultYn]:checked").val()){
+			return true;
+		}
 		
 		return false;
 	}