Преглед изворни кода

TB_NOTI_INFO SUPPLY_VENDOR_CD=> SUPPLY_COMP_CD 수정

eskim пре 5 година
родитељ
комит
1ec92c2be3

+ 1 - 1
src/main/java/com/style24/admin/biz/service/TsaGoodsService.java

@@ -3442,7 +3442,7 @@ public class TsaGoodsService {
 		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 {

+ 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;

+ 25 - 24
src/main/java/com/style24/persistence/mybatis/shop/TsaGoods.xml

@@ -127,15 +127,16 @@
 	<!-- 정보고시분류 목록 -->
 	<select id="getNotiInfoList" parameterType="NotiInfo" resultType="NotiInfo">
 		/* TsaGoods.getNotiInfoList */
-		SELECT DISTINCT B.SUPPLY_VENDOR_CD
+		SELECT DISTINCT B.SUPPLY_COMP_CD
 		     , B.NI_CLSF_CD
 		     , C.CD_NM AS NI_CLSF_NM
 		     , C.DISP_ORD
 		FROM TB_NOTI_INFO B
 		INNER JOIN TB_COMMON_CODE C ON B.NI_CLSF_CD = C.CD 
-		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 
 		AND C.CD_GB = 'G004'   /*고시정보*/
 		ORDER BY C.DISP_ORD
@@ -144,16 +145,17 @@
 	<!-- 정보고시 상세 목록 -->
 	<select id="getNotiInfoItemList" parameterType="NotiInfo" resultType="NotiInfo">
 		/* TsaGoods.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}
@@ -165,7 +167,7 @@
 	<insert id="saveNotiInfo" parameterType="NotiInfo">
 		/* TsaGoods.saveNotiInfo */
 		INSERT INTO TB_NOTI_INFO (
-		       SUPPLY_VENDOR_CD
+		       SUPPLY_COMP_CD
 		     , NI_CLSF_CD
 		     , NI_ITEM_CD
 		     , NI_CONTENT
@@ -176,7 +178,7 @@
 		     , UPD_DT
 		)
 		VALUES (
-		       #{supplyVendorCd}
+		       #{supplyCompCd}
 		     , #{niClsfCd}
 		     , #{niItemCd}
 		     , #{niContent}
@@ -929,10 +931,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
@@ -972,14 +972,14 @@
 		     , C.DISP_ORD
 		FROM TB_GOODS_NOTI_INFO C
 		INNER JOIN TB_GOODS B ON C.GOODS_CD = B.GOODS_CD
-		INNER JOIN TB_SUPPLY_COMPANY D ON B.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
 		INNER JOIN TB_NOTI_INFO A ON C.NI_CLSF_CD = A.NI_CLSF_CD
 		                          AND C.NI_ITEM_CD = A.NI_ITEM_CD
-		                          AND A.SUPPLY_VENDOR_CD = CASE D.SUPPLY_VENDOR_CD
-		                                                        WHEN 'SV0001' THEN 'SV0001'
-		                                                        WHEN 'SV0002' THEN 'SV0002'
-		                                                        ELSE 'E' 
-		                                                   END
+		                          AND A.SUPPLY_COMP_CD = CASE B.SUPPLY_COMP_CD
+		                                                      WHEN '1003' THEN '1003'
+		                                                      WHEN '1004' THEN '1004'
+		                                                      WHEN '1005' THEN '1005'
+		                                                      ELSE 'E' 
+		                                                 END
 		WHERE C.GOODS_CD = #{goodsCd}
 		AND C.NI_CLSF_CD = #{niClsfCd}
 		ORDER BY C.DISP_ORD
@@ -988,7 +988,7 @@
 	<!-- 상품의 정보고시 항목 목록 -->
 	<select id="getNotiGoodsInfoList" parameterType="NotiInfo" resultType="NotiInfo">
 		/* TsaGoods.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
@@ -1005,7 +1005,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
@@ -1018,9 +1018,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
@@ -1344,7 +1345,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 (

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

@@ -26,7 +26,7 @@
 		<form id="massForm" name="massForm" >
 		<div class="panelStyle">
 			<ul class="notice">
-				<li>상품을 대량으로 등록하는 페이지입니다.</li>
+				<li>상품을 대량으로 수정하는 페이지입니다.</li>
 				<li>상품을 등록 할 경우 [승인대기] 상태이며, STYLE 관리자의 [승인완료] 상태 변경 후 FRONT애 노출이 가능합니다.</li>
 				<li><th:block th:if="${wmsSyncYn == 'N'}"><em><b>WMS연동여부가 [N]입니다. 관리자에게 문의하세요.</b></em></th:block></li>
 			</ul>
@@ -42,7 +42,7 @@
 								}" 
 							th:style="'padding-left:80px;'">
 						<button type="button" class="btn btn-default btn-lg" onclick="cfnDownloadSampleFile('SF014');">상품대량수정 등록양식 다운로드</button>
-						<button th:if="${wmsSyncYn == 'Y'}" type="button" class="btn btn-primary btn-lg" id="btnGoodsUpdate" >상품 수정</button>
+						<button th:if="${wmsSyncYn == 'Y'}" type="button" class="btn btn-primary btn-lg" id="btnGoodsUpdate" >대량상품 수정</button>
 					</span>
 				</li>
 			</ul>

+ 10 - 9
src/main/webapp/WEB-INF/views/goods/NotiinfoForm.html

@@ -32,9 +32,10 @@
 			<ul class="boxContent">
 				<li class="boxContentBtnT">
 					<span style="padding:5.5px 15px; background:#e9ecfb; border-top:1px solid #dae0fd; border-bottom:0.5px solid #dae0fd;">업체</span>
-					<select name="supplyVendorCd" id="supplyVendorCd">
-						<option value="SV0001" selected="selected">한세엠케이</option>
-						<option value="SV0002">한세드림</option>
+					<select name="supplyCompCd" id="supplyCompCd">
+						<option value="1003" selected="selected">한세드림</option>
+						<option value="1004">(주)에프알제이</option>
+						<option value="1005">(주)엠케이트렌드</option>
 						<option value="E" >입점</option>
 					</select>
 				</li>
@@ -121,7 +122,7 @@
 		{headerName: "등록일자", field: "regDt" , width: 150, cellClass: 'text-center', hide: true},
 		{headerName: "수정일자", field: "udtDt", width: 150, cellClass: 'text-center', hide: true},
 		{headerName: "niClsfCd", field: "niClsfCd", hide: true},
-		{headerName: "supplyVendorCd", field: "supplyVendorCd", hide: true}
+		{headerName: "supplyCompCd", field: "supplyCompCd", hide: true}
 	];
 
 	// Get GridOptions
@@ -150,11 +151,11 @@
 		var formId = '#searchForm';
 		$('#searchForm input[name=niClsfCd]').val('');
 		
-		if (gagajf.isNull($('#searchForm select[name=supplyVendorCd]').val())){
+		if (gagajf.isNull($('#searchForm select[name=supplyCompCd]').val())){
 			mcxDialog.alertC("업체를 선택해 주세요.", {
 				sureBtnText: "확인",
 				sureBtnClick: function() {
-					$('#searchForm select[name=supplyVendorCd]').focus();
+					$('#searchForm select[name=supplyCompCd]').focus();
 				}
 			});
 			return;
@@ -192,9 +193,9 @@
 		});
 		
 		var niClsfCd = $('#searchForm input[name=niClsfCd]').val();
-		var supplyVendorCd = $('#searchForm select[name=supplyVendorCd]').val();
+		var supplyCompCd = $('#searchForm select[name=supplyCompCd]').val();
 		
-		var data = { crud: "C", niItemCd: "", niContent: "", dispOrd: Number(maxDispOrd)+1, niClsfCd: niClsfCd, supplyVendorCd: supplyVendorCd};
+		var data = { crud: "C", niItemCd: "", niContent: "", dispOrd: Number(maxDispOrd)+1, niClsfCd: niClsfCd, supplyCompCd: supplyCompCd};
 		
 		//그리드 마지막에 추가해야함
 		gridNotiItemlOptions.api.updateRowData({add: [data], addIndex: 0});
@@ -299,7 +300,7 @@
 		fnNotiItemlSearch($('#searchForm input[name=niClsfCd]').val());
 	}
 	
-	$("#supplyVendorCd").on("change", function(){
+	$("#supplyCompCd").on("change", function(){
 		fnSearch();
 	});