입고상품중 온라인 옵션이 없는 상품옵션 추가 쿼리 수정

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

@@ -484,6 +484,6 @@ public interface TsbGoodsDao {
 	 * @author eskim
 	 * @since 2021. 01. 18
 	 */
-	void createGoodsOptionList();
+	void createGoodsOptionList(String jobdate);
 
 }

src/main/java/com/style24/batch/biz/job/goods/TsbGoodsWmsIncomelotJob.java

@@ -62,7 +62,7 @@ public class TsbGoodsWmsIncomelotJob extends TsbAbstractJob<GoodsIfIncomelotitem
 		goodsService.saveWmsGoods(jobdate);
 
 		//입고상품중 온라인 옵션이 없는 상품옵션 추가
-		goodsService.createGoodsOptionList();
+		goodsService.createGoodsOptionList(jobdate);
 
 		return goodsIfIncomelotitem;
 	}

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

@@ -641,7 +641,7 @@ public class TsbGoodsService {
 	 * @since 2021. 01. 18
 	 */
 	@Transactional("shopTxnManager")
-	public void createGoodsOptionList() {
-		goodsDao.createGoodsOptionList();
+	public void createGoodsOptionList(String jobdate) {
+		goodsDao.createGoodsOptionList(jobdate);
 	}
 }

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

@@ -1962,7 +1962,7 @@
 	</insert>
 	
 	<!-- 입고상품중 온라인 옵션이 없는 상품옵션 추가  -->
-	<insert id="createGoodsOptionList"  timeout="300">
+	<insert id="createGoodsOptionList" parameterType="String" timeout="300">
 		/* TsbGoods.createGoodsOptionList */
 		INSERT INTO TB_OPTION(
 		       GOODS_CD
@@ -2004,21 +2004,38 @@
 		           , B.PRODUCTCODE 
 		           , B.OPTION1 
 		           , B.OPTION2 
+		           , G.SUPPLY_VENDOR_CD
 		           , C.SUPPLY_COMP_CD 
 		           , C.BRAND_CD 
 		           , C.GOODS_CD
-		      FROM TB_IF_INCOMELOTITEM A  -- 입고상품
-		      INNER JOIN TB_IF_PRODUCTSKU B ON A.SKUCODE = B.SKUCODE -- wms 상품코드확인
-		      INNER JOIN TB_GOODS C ON A.PRODUCTCODE = C.PRODUCT_CODE -- 온라인 상품등록 확인
-		      LEFT OUTER JOIN TB_OPTION D ON C.GOODS_CD = D.GOODS_CD  -- 온라인 상품 옵션 미등록건 추출
+		      FROM TB_IF_INCOMELOTITEM A                                              -- 입고상품
+		      INNER JOIN TB_IF_PRODUCTSKU B ON A.SKUCODE = B.SKUCODE                  -- wms 상품코드확인
+		      INNER JOIN TB_GOODS C ON A.PRODUCTCODE = C.PRODUCT_CODE                 -- 온라인 상품등록 확인
+		      INNER JOIN TB_SUPPLY_COMPANY G ON A.SUPPLY_COMP_CD = G.SUPPLY_COMP_CD
+		      LEFT OUTER JOIN TB_OPTION D ON C.GOODS_CD = D.GOODS_CD                  -- 온라인 상품 옵션 미등록건 추출
 		                                  AND A.PRODUCTCODE = D.PRODUCT_CODE 
 		                                  AND A.SKUCODE = D.OPT_CD
 		                                  AND D.OPT_CD IS NULL
 		      ) E
 		      INNER JOIN TB_WMS_COLOR_MAPPING F ON (CASE WHEN E.BRAND_CD = 'S006' THEN E.BRAND_CD
-		                                                 ELSE E.SUPPLY_COMP_CD 
-		                                                 END) = F.SUPPLY_COMP_CD
-		                                        AND F.USE_YN ='Y'       
+		                                                 ELSE E.SUPPLY_VENDOR_CD 
+		                                                 END) = F.SUPPLY_VENDOR_CD
+		                                        AND F.USE_YN ='Y'
+		      WHERE 1 = 1
+		      <choose>
+		      <when test='jobdate != null and jobdate != ""'>
+		      AND DATEINCOME >= DATE_FORMAT(#{jobdate}, '%Y-%m-%d %H:%i:%S') 
+		      <![CDATA[
+		      AND DATEINCOME < DATE_FORMAT(DATE_ADD(#{jobdate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+		      ]]>
+		      </when>
+		      <otherwise>
+		      AND DATEINCOME >= DATE_FORMAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -1 DAY),'%Y%m%d' ), '%Y-%m-%d %H:%i:%S')
+		      <![CDATA[
+		      AND DATEINCOME < DATE_FORMAT(DATE_FORMAT(NOW() ,'%Y%m%d'), '%Y-%m-%d %H:%i:%S') 
+		      ]]>
+		      </otherwise>
+		</choose>
 	</insert>
 	
 </mapper>