Merge remote-tracking branch 'origin/develop' into jsh77b

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

@@ -21,6 +21,7 @@ public class DelvFeePolicy extends TscBaseDomain {
 	private int delvFee;			// 배송비
 	private int rtnDelvFee;			// 반품배송비
 	private String useYn;			// 사용여부
+	private String distributionGb;	// 유통구분
 
 	private String delvFeeNm;		// 배송비정책명
 	

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

@@ -86,7 +86,7 @@ public class Goods extends TscBaseDomain {
 	private String sellEddt;		//판매종료일시
 	private String sellEdYMD;		//판매종료일
 	private String sellEdHH;		//판매종료시
-	
+
 	private String brandEnm;		//브랜드영문명
 	private String brandGrpNm;		//브랜드그룹명
 	private int brandNo;			// 브랜드번호
@@ -148,7 +148,6 @@ public class Goods extends TscBaseDomain {
 	private int sellDay15Qty;
 
 	private int goodsSq;
-	private int goodsStat90Cnt; 		// 승인완료이력 수
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] arrGoodsCd;
@@ -174,10 +173,10 @@ public class Goods extends TscBaseDomain {
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] currStockQty; // erp가용재고
-	
+
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] storeStockQty; // 매장가용재고
-	
+
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] storeMaxQty; // wms, 매장 재고중 최대값
 

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

@@ -594,7 +594,6 @@
          , FN_GET_USER_NM(G.UPD_NO) AS UPD_NM
          , DATE_FORMAT(G.SELL_STDT, '%Y%m%d%H%i%S') AS SELL_STDT
          , DATE_FORMAT(G.SELL_EDDT, '%Y%m%d%H%i%S') AS SELL_EDDT
-         , (SELECT COUNT(1) FROM TB_GOODS_HST GH WHERE GH.GOODS_CD = G.GOODS_CD AND GH.GOODS_STAT = 'G008_90') AS GOODS_STAT_90_CNT
     FROM TB_GOODS G
     INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
     LEFT OUTER JOIN TB_DELV_FEE_POLICY D ON G.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
@@ -1318,7 +1317,7 @@
       <if test="goodsStat != null and goodsStat != 'G008_90'">
       , GOODS_STAT = #{goodsStat}
       </if>
-      <if test="goodsStat != null and goodsStat == 'G008_90' and goodsStat90Cnt != null and goodsStat90Cnt != 0">
+      <if test="goodsStat != null and goodsStat == 'G008_90' and frstCfrmDt != null and frstCfrmDt != ''">
       , GOODS_STAT = #{goodsStat}
       </if>
       , GOODS_GB = #{goodsGb}

src/main/java/com/style24/scm/biz/web/TssGoodsController.java

@@ -28,6 +28,13 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.gagaframework.excel.GagaExcelUtil;
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.rest.server.GagaResponse;
+import com.gagaframework.web.rest.server.GagaResponseStatus;
+import com.gagaframework.web.util.GagaDateUtil;
+import com.gagaframework.web.util.GagaFileUtil;
+import com.gagaframework.web.util.GagaStringUtil;
 import com.style24.core.support.env.TscConstants.GoodsType;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.TscPageRequest;
@@ -57,14 +64,6 @@ import com.style24.scm.support.security.session.TssSession;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.excel.GagaExcelUtil;
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.rest.server.GagaResponse;
-import com.gagaframework.web.rest.server.GagaResponseStatus;
-import com.gagaframework.web.util.GagaDateUtil;
-import com.gagaframework.web.util.GagaFileUtil;
-import com.gagaframework.web.util.GagaStringUtil;
-
 /**
  * 상품관리 Controller
  *
@@ -583,9 +582,8 @@ public class TssGoodsController extends TssBaseController {
 		}
 
 		if ("G008_90".equals(goods.getGoodsStat()) && ("G008_20".equals(goodsOrg.getGoodsStat()) || "G008_40".equals(goodsOrg.getGoodsStat()))) {
-			// 승인완료이력이 있을 경우, 승인완료 상태로 변경가능 21.09.13
-			goods.setGoodsStat90Cnt(goodsOrg.getGoodsStat90Cnt());
-			if( 0 == goodsOrg.getGoodsStat90Cnt()) {
+			// 최초승인일 값이 있을 경우, 승인완료 상태로 변경가능 21.09.14
+			if (StringUtils.isEmpty(goods.getFrstCfrmDt())) {
 				throw new IllegalStateException("상품의 [승인완료]상태는 담당 MD에게 요청하세요.");
 			}
 		}

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

@@ -37,7 +37,8 @@
 				<input type="hidden" id="goodsComposeList" name="goodsComposeList" />
 				<input type="hidden" id="costPrice" name="costPrice" />
 				<input type="hidden" id="repGoodsCd" name="repGoodsCd" /> <!-- 대표상품(딜 가격) -->
-				<input type="hidden" id="goodsStat90Cnt" name="goodsStat90Cnt" /> <!-- 승인완료이력 수(승인완료이력이 있을경우 scm에서도 승인완료로 변경가능) -->
+				<input type="hidden" id="frstCfrmDt" name="frstCfrmDt" /> <!-- 최초승인일 -->
+
 			<div class="panelContent">
 				<table class="frmStyle">
 					<colgroup>
@@ -151,7 +152,7 @@
 											<div class="iconTooltip">
 												<i class="fa fa-info" aria-hidden="true"></i>
 												<span class="left aL" style="width:350px;">
-													상품승인완료 이력이 있을경우만 '승인완료' 상태로 변경가능 
+													'최초승인일'이 존재할 경우 '승인완료' 상태로 변경가능
 												</span>
 											</div>
 											<!-- //아이콘 툴팁 -->
@@ -258,7 +259,7 @@
 										<th>할인율</th>
 										<td class="aR" ><span id="dcRateTxt"></span> ％  <input type="hidden" id="dcRate" name="dcRate"/></td>
 									</tr>
-									<tr class="chk_deal" id="selfGoodsNSellFeeRate">
+									<tr id="selfGoodsNSellFeeRate">
 										<th>최초승인일</th>
 										<td><span id="frstCfrmDtTxt"></span></td>
 										<th>판매수수료율<em class="required" title="필수"></em></th>
@@ -914,7 +915,7 @@
 			$('#goodsDetailForm input[name=goodsNum]').val(result.goodsNum);
 			$('#goodsDetailForm select[name=goodsStat]').val(result.goodsStat);
 			$("#goodsDetailForm input[name=goodsStatOrg]").val(result.goodsStat);
-			$("#goodsDetailForm input[name=goodsStat90Cnt]").val(result.goodsStat90Cnt);
+			$("#goodsDetailForm input[name=frstCfrmDt]").val(result.frstCfrmDt);
 			$('#goodsDetailForm').find('#brandGrpNmTxt').html(result.brandGrpNm);
 
 			$('#goodsDetailForm select[name=itemkindCd]').val(result.itemkindCd);
@@ -1581,10 +1582,10 @@
 
 			// SUPER관리자, 어드민관리자, 계정관리자. 총괄관리자, MD 를 제외하고 승인처리 할수 없음
 			if ($("#goodsDetailForm select[name=goodsStat]").val() == "G008_90" &&  $("#goodsDetailForm input[name=goodsStatOrg]").val() != "G008_90"){
-				// 승인완료이력이 있을 경우, 승인완료 상태로 변경가능 21.09.13 
-				if( $("#goodsDetailForm input[name=goodsStat90Cnt]").val() == "0"){
+				// 최초승인일 값이 있을 경우, 승인완료 상태로 변경가능 21.09.14
+				if( gagajf.isNull($("#goodsDetailForm input[name=frstCfrmDt]").val())){
 					mcxDialog.alert(" '승인완료' 상태로 변경할 권한이 없습니다.");
-					return false;	
+					return false;
 				}
 			}
 			//list가 등록되지 않은 상품은 상태변경 불가