Browse Source

TB_NOTI_INFO SUPPLY_VENDOR_CD=> SUPPLY_COMP_CD 수정

eskim 5 years ago
parent
commit
189f0aa5e3

+ 1 - 1
src/main/java/com/style24/persistence/domain/NotiInfo.java

@@ -15,7 +15,7 @@ import lombok.Data;
 @Data
 public class NotiInfo extends TscBaseDomain {
 
-	private String supplyVendorCd;
+	private String supplyCompCd;
 	private String niClsfCd;
 	private String niClsfNm;
 	private String niItemCd;

+ 16 - 15
src/main/java/com/style24/persistence/mybatis/shop/TssGoods.xml

@@ -585,10 +585,8 @@
 		     , FN_GET_USER_NM(G.UPD_NO) AS UPD_NM
 		     , E.CERT_NUM
 		     , E.CERT_DT
-		     , C.SUPPLY_VENDOR_CD
 		FROM TB_GOODS G
 		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
-		INNER JOIN TB_SUPPLY_COMPANY C ON G.SUPPLY_COMP_CD = C.SUPPLY_COMP_CD 
 		LEFT OUTER JOIN TB_DELV_FEE_POLICY D ON G.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
 		                                     AND G.DELV_FEE_CD =  D.DELV_FEE_CD
 		LEFT OUTER JOIN TB_GOODS_SAFE_NO E ON G.GOODS_CD = E.GOODS_CD
@@ -639,7 +637,7 @@
 	<!-- 상품의 정보고시 항목 목록 -->
 	<select id="getNotiGoodsInfoList" parameterType="NotiInfo" resultType="NotiInfo">
 		/* TssGoods.getNotiGoodsInfoList */
-		SELECT  N.SUPPLY_VENDOR_CD
+		SELECT  N.SUPPLY_COMP_CD
 		      , N.NI_CLSF_CD
 		      , N.NI_ITEM_CD
 		      , FN_GET_CODE_NM('G005', N.NI_ITEM_CD) AS NI_ITEM_NM
@@ -656,7 +654,7 @@
 		 FROM (
 		     SELECT G.GOODS_CD
 		         , G.ITEMKIND_CD
-		         , (SELECT SUPPLY_VENDOR_CD FROM TB_SUPPLY_COMPANY SC WHERE SC.SUPPLY_COMP_CD = G.SUPPLY_COMP_CD) AS SUPPLY_VENDOR_CD
+		         , G.SUPPLY_COMP_CD
 		         , G.ORIGIN_CD
 		         , G.MAKE_YMD
 		         , (SELECT GROUP_CONCAT(DISTINCT T.OPT_CD1) FROM TB_OPTION T WHERE T.GOODS_CD = G.GOODS_CD)  AS COLOR_NM
@@ -669,9 +667,10 @@
 		  , TB_NOTI_INFO N
 		 WHERE 1 = 1
 		 AND N.NI_CLSF_CD = #{niClsfCd}
-		 AND N.SUPPLY_VENDOR_CD =  CASE G.SUPPLY_VENDOR_CD
-		                                WHEN 'SV0001' THEN 'SV0001'
-		                                WHEN 'SV0002' THEN 'SV0002'
+		 AND N.SUPPLY_COMP_CD =  CASE G.SUPPLY_COMP_CD
+		                                WHEN '1003' THEN '1003'
+		                                WHEN '1004' THEN '1004'
+		                                WHEN '1005' THEN '1005'
 		                                ELSE 'E' 
 		                           END 
 		 ORDER BY  G.GOODS_CD , N.NI_CLSF_CD, N.DISP_ORD
@@ -994,7 +993,7 @@
 		       FROM TB_NOTI_INFO A
 		          , TB_ITEMKIND B
 		       WHERE A.NI_CLSF_CD = B.NI_CLSF_CD
-		       AND A.SUPPLY_VENDOR_CD = #{supplyVendorCd}
+		       AND A.SUPPLY_COMP_CD = #{supplyCompCd}
 		       AND B.ITEMKIND_CD = #{itemkindCd}
 		     ) D
 		    LEFT OUTER JOIN (
@@ -1891,9 +1890,10 @@
 		     , #{goodsCd} AS GOODS_CD
 		FROM TB_ITEMKIND A
 		INNER JOIN TB_NOTI_INFO B ON A.NI_CLSF_CD = B.NI_CLSF_CD
-		                          AND B.SUPPLY_VENDOR_CD = (CASE #{supplyVendorCd} WHEN 'SV0001' THEN 'SV0001' 
-		                                                                           WHEN 'SV0002' THEN 'SV0002'
-		                                                                           ELSE 'E' 
+		                          AND B.SUPPLY_COMP_CD = (CASE #{supplyCompCd} WHEN '1003' THEN '1003' 
+		                                                                       WHEN '1004' THEN '1004'
+		                                                                       WHEN '1005' THEN '1005'
+		                                                                       ELSE 'E' 
 		                                                    END)             
 		WHERE A.ITEMKIND_CD = #{itemkindCd}
 		ORDER BY  B.NI_CLSF_CD, B.DISP_ORD
@@ -2417,16 +2417,17 @@
 	<!-- 정보고시 상세 목록 -->
 	<select id="getNotiInfoItemList" parameterType="NotiInfo" resultType="NotiInfo">
 		/* TssGoods.getNotiInfoItemList */
-		SELECT B.SUPPLY_VENDOR_CD
+		SELECT B.SUPPLY_COMP_CD
 		     , B.NI_CLSF_CD
 		     , B.NI_ITEM_CD
 		     , FN_GET_CODE_NM('G005', B.NI_ITEM_CD) AS NI_ITEM_NM
 		     , B.NI_CONTENT
 		     , B.DISP_ORD
 		FROM TB_NOTI_INFO B
-		WHERE B.SUPPLY_VENDOR_CD = CASE #{supplyVendorCd} 
-		                         WHEN 'SV0001' THEN 'SV0001'
-		                         WHEN 'SV0002' THEN 'SV0002'
+		WHERE B.SUPPLY_COMP_CD = CASE #{supplyCompCd} 
+		                         WHEN '1003' THEN '1003'
+		                         WHEN '1004' THEN '1004'
+		                         WHEN '1005' THEN '1005'
 		                         ELSE 'E' END 
 		<if test="niClsfCd != null and niClsfCd != ''">
 		AND B.NI_CLSF_CD = #{niClsfCd}

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

@@ -3025,7 +3025,7 @@ public class TssGoodsService {
 		Collection<GoodsNotiInfo> goodsNotiList = new ArrayList<>();
 		//고시분류 코드의 고시항목 조회
 		NotiInfo notiInfo = new NotiInfo();
-		notiInfo.setSupplyVendorCd(goodsOrigin.getSupplyVendorCd());
+		notiInfo.setSupplyCompCd(goodsOrigin.getSupplyCompCd());
 		if (!UPDATE_NO_PATTERN.equals(newNiClsfCd)) {
 			notiInfo.setNiClsfCd(newNiClsfCd);
 		} else {

+ 6 - 4
src/main/webapp/WEB-INF/views/goods/GoodsMassRegisterForm.html

@@ -26,8 +26,10 @@
 		<form id="massForm" name="massForm" >
 		<div class="panelStyle">
 			<ul class="notice">
-				<li>상품을 대량으로 등록하는 페이지입니다.</li>
+				<li>상품을 대량으로 등록/수정하는 페이지입니다.</li>
 				<li>상품을 등록 할 경우 [승인대기] 상태이며, STYLE 관리자의 [승인완료] 상태 변경 후 FRONT애 노출이 가능합니다.</li>
+				<li><th:block th:if="${sessionInfo.roleCd == 'G001_B000'}"><em>입점업체 신규 상품등록시 배송비 정책을 선택하셔야 합니다. </em></th:block></li>
+				<li><th:block th:if="${sessionInfo.roleCd == 'G001_B000'}"><em>대량수정시의 옵션정보는 신규 옵션정보만 가능합니다</em></th:block></li>
 				<li><th:block th:if="${sessionInfo.roleCd == 'G001_E000'}"><em>촬영업체의 대량수정은 고시정보만 적용됩니다.</em></th:block></li>
 				<li><th:block th:if="${wmsSyncYn == 'N'}"><em><b>WMS연동여부가 [N]입니다.</b></em></th:block></li>
 			</ul>
@@ -35,7 +37,7 @@
 				<li class="center">
 					<th:block th:if="${sessionInfo.roleCd == 'G001_E000'}">
 						<button type="button" class="btn btn-default btn-lg" onclick="cfnDownloadSampleFile('SF001');">자사상품 등록양식 다운로드</button>
-						<button type="button" class="btn btn-primary btn-lg" id="btnGoodsSelfCreate" >자사상품 등록</button>
+						<button type="button" class="btn btn-primary btn-lg" id="btnGoodsSelfCreate" >대량자사상품 등록</button>
 					</th:block>
 					<th:block th:if="${sessionInfo.roleCd == 'G001_B000'}">
 						<em><b><th:block th:text="${sessionInfo.supplyCompNm}"></th:block></b></em> 업체의 배송비 정책 : &nbsp;&nbsp;
@@ -44,11 +46,11 @@
 							<option th:if="${supplyDeliveryFeePolicyList}" th:each="oneData, status : ${supplyDeliveryFeePolicyList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 						</select>
 						<button type="button" class="btn btn-default btn-lg"  onclick="cfnDownloadSampleFile('SF005');">입점상품 등록양식 다운로드</button>
-						<button type="button" class="btn btn-primary btn-lg" id="btnGoodsCreate" >입점상품 등록</button>
+						<button type="button" class="btn btn-primary btn-lg" id="btnGoodsCreate" >대량입점상품 등록</button>
 					</th:block>
 					<span th:if="${sessionInfo.roleCd == 'G001_B000' or sessionInfo.roleCd == 'G001_E000'}" th:style="'padding-left:80px;'">
 						<button type="button" class="btn btn-default btn-lg"  onclick="cfnDownloadSampleFile('SF014');">상품대량수정 등록양식 다운로드</button>
-						<button type="button" class="btn btn-primary btn-lg" id="btnGoodsUpdate" >수정상품 등록</button>
+						<button type="button" class="btn btn-primary btn-lg" id="btnGoodsUpdate" >대량상품 수정</button>
 					</span>
 				</li>
 			</ul>