브랜드 업체 정보 쿼리 수정

src/main/java/com/style24/batch/biz/dao/TsbGoodsDao.java

@@ -297,6 +297,14 @@ public interface TsbGoodsDao {
 	 */
 	Collection<IfBrand> getBrandList();
 
+	/**
+	 * 브랜드 업체 정보 조회
+	 *
+	 * @author eskim
+	 * @since 2021. 01. 05
+	 */
+	Collection<IfBrand> getBrandProviderXrefList();
+
 	/**
 	 * 상품 정보 조회
 	 *

src/main/java/com/style24/batch/biz/service/TsbGoodsService.java

@@ -434,6 +434,17 @@ public class TsbGoodsService {
 		return goodsDao.getBrandList();
 	}
 
+	/**
+	 * 브랜드 업체 정보 조회
+	 *
+	 * @return
+	 * @author eskim
+	 * @since 2021. 01. 26
+	 */
+	public Collection<IfBrand> getBrandProviderXrefList() {
+		return goodsDao.getBrandProviderXrefList();
+	}
+
 	/**
 	 * 상품 정보 조회
 	 *

src/main/java/com/style24/batch/biz/service/TsbWmsGoodsService.java

@@ -67,20 +67,20 @@ public class TsbWmsGoodsService {
 		return wmsGoodsDao.getWmsIncomelotitemList(jobdate);
 	}
 
-	/**
-	 * WMS 업체정보 송신
-	 *
-	 * @return
-	 * @author eskim
-	 * @since 2021. 01. 05
-	 */
-	@Transactional("wmsTxnManager")
-	public void saveWmsBrand(IfBrand ifBrand) {
-		//브랜드 정보 송신
-		wmsGoodsDao.saveWmsBrand(ifBrand);
-		//WMS 브랜드업체관계정보 송신
-		wmsGoodsDao.saveWmsBrandProviderXref(ifBrand);
-	}
+//	/**
+//	 * WMS 업체정보 송신
+//	 *
+//	 * @return
+//	 * @author eskim
+//	 * @since 2021. 01. 05
+//	 */
+//	@Transactional("wmsTxnManager")
+//	public void saveWmsBrand(IfBrand ifBrand) {
+//		//브랜드 정보 송신
+//		wmsGoodsDao.saveWmsBrand(ifBrand);
+//		//WMS 브랜드업체관계정보 송신
+//		wmsGoodsDao.saveWmsBrandProviderXref(ifBrand);
+//	}
 
 
 	/**
@@ -109,18 +109,23 @@ public class TsbWmsGoodsService {
 			wmsGoodsDao.saveWmsProvider(ifProvider);
 		}
 
-		//브랜드, 브랜드/업체 관계정보 송신
+		//브랜드 정보 송신
 		Collection<IfBrand> ifBrandList = goodsService.getBrandList();
 
 		for (IfBrand ifBrand : ifBrandList) {
 			ifBrand.setRegNo(TsbConstants.REG_NO);
 			ifBrand.setUpdNo(TsbConstants.REG_NO);
-			//브랜드 정보 송신
 			wmsGoodsDao.saveWmsBrand(ifBrand);
-			//WMS 브랜드업체관계정보 송신
-			wmsGoodsDao.saveWmsBrandProviderXref(ifBrand);
 		}
 
+		// 브랜드/업체 관계정보 송신
+		Collection<IfBrand> ifBrandProviderXrefList = goodsService.getBrandProviderXrefList();
+
+		for (IfBrand ifBrandProviderXref : ifBrandProviderXrefList) {
+			ifBrandProviderXref.setRegNo(TsbConstants.REG_NO);
+			ifBrandProviderXref.setUpdNo(TsbConstants.REG_NO);
+			wmsGoodsDao.saveWmsBrandProviderXref(ifBrandProviderXref);
+		}
 	}
 
 	/**

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

@@ -22,7 +22,7 @@ public class IfBrand extends TscBaseDomain {
 	private String dateupdateed;        //수정일
 
 	private String supplyCompCd;       //업체코드
-	private int providerNo;            //공급처번호
+	private int providerno;            //공급처번호
 
 
 }

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

@@ -1353,10 +1353,7 @@
 		            ELSE '사용안함' 
 		       END AS STATUSCD
 		     , A.BRAND_CD
-		     , A.SUPPLY_COMP_CD
-		     , B.PROVIDER_NO
 		FROM   TB_BRAND A
-		INNER JOIN TB_SUPPLY_COMPANY B ON A.SUPPLY_COMP_CD = B.SUPPLY_COMP_CD
 		WHERE  A.SELF_YN  = 'Y'  /* 자사 */
 		AND A.UPD_DT >= DATE_FORMAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -7 DAY), '%Y%m%d'), '%Y%m%d%H%i%S') 
 		<![CDATA[
@@ -1364,6 +1361,23 @@
 		]]>
 	</select>
 	
+	<!-- 브랜드 업체 정보 목록 -->
+	<select id="getBrandProviderXrefList" resultType="IfBrand">
+		/* TsbGoods.getBrandProviderXrefList */
+		SELECT A.BRAND_NO AS BRANDNO
+		     , C.PROVIDER_NO  AS PROVIDERNO
+		     , A.BRAND_CD 
+		     , C.SUPPLY_COMP_CD
+		FROM TB_BRAND A
+		INNER JOIN TB_BRAND_SUPPLY B ON A.BRAND_CD = B.BRAND_CD 
+		                             AND B.REG_DT >= DATE_FORMAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -7 DAY), '%Y%m%d'), '%Y%m%d%H%i%S') 
+		                             <![CDATA[
+		                             AND B.REG_DT < DATE_FORMAT(DATE_FORMAT(NOW(), '%Y%m%d'), '%Y%m%d%H%i%S')
+		                             ]]>
+		INNER JOIN TB_SUPPLY_COMPANY  C ON  B.SUPPLY_COMP_CD  = C.SUPPLY_COMP_CD 
+		WHERE A.SELF_YN = 'Y'  /* 자사 */
+	</select>
+	
 	<!-- 상품 목록 -->
 	<select id="getGoodsList" resultType="IfProduct">
 		/* TsbGoods.getGoodsList */

src/main/java/com/style24/persistence/mybatis/wms/TsbWmsGoods.xml

@@ -167,9 +167,9 @@
 	<!--WMS 브랜드업체관계정보 송신-->
 	<insert id="saveWmsBrandProviderXref" parameterType="IfBrand" >
 		/* TsbWmsGoods.saveWmsBrandProviderXref */
-		MERGE TB_IF_BRANDPROVIDERXREF 
+		MERGE INTO TB_IF_BRANDPROVIDERXREF 
 		      USING (SELECT 'AA' AS DUAL) AS B
-		         ON (BRANDNO = #{brandno})
+		         ON (BRANDNO = #{brandno} AND PROVIDERNO = #{providerNo})
 		      WHEN MATCHED THEN
 		           UPDATE SET
 		                   PROVIDERNO = #{providerNo}