Merge branch 'eskim' into develop

style24.admin/src/main/webapp/WEB-INF/views/common/ExcelUploadPopupForm.html

@@ -6,7 +6,7 @@
  * @source  : ExcelUploadPopupForm.html
  * @desc    : 엑셀 업로드 팝업 Page
  *============================================================================
- * Pastelmall
+ * STYLE24
  * Copyright(C) 2019 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsDealForm.html

@@ -6,7 +6,7 @@
  * @source  : goodsDealForm.html
  * @desc    : 딜상상품 구성 관리
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2019 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

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

@@ -6,7 +6,7 @@
  * @source  : GoodsDetailForm.html
  * @desc    : 상품 상세 팝업
  *============================================================================
- * SISUNChDataYn
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsDetailSizeStockForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsSizeStockForm.html
  * @desc    : 상품 옵셥/재고 화면
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsEpSkipForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsEpSkipForm.html
  * @desc    : 네이버EP제외상품관리
  *============================================================================
- * PASTEL
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsEpSkipPopupForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsEpSkipPopupForm.html
  * @desc    : 네이버 EP 제외 상품 예약 화면
  *============================================================================
- * PASTEL
+ * STYLE24
  * Copyright(C) 2019 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsFreeGoodsForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsFreeGoodsForm.html
  * @desc    : 사은품관리 Page
  *============================================================================
- * Pastelmall
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsImageForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsImageMassForm.html
  * @desc    : 상품 이미지 보기 화면(대량등록)
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2019 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsItemkindForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsItemkindForm.html
  * @desc    : 품목변경관리 목록
  *============================================================================
- * Pastelmall
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsListForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsListForm.html
  * @desc    : 상품목록 Page
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsMassRegisterForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsMassRegisterForm.html
  * @desc    : 대량상품등록
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsNaverPriceForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsNaverPriceForm.html
  * @desc    : 네이버최저가 조회
  *============================================================================
- * Pastelmall
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsPopupListForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsPopupListForm.html
  * @desc    : 상품 조회 팝업
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsPriceReserveForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsPriceReserveForm.html
  * @desc    : 상품 가격 예약관리
  *============================================================================
- * PASTEL
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsPriceReservePopupForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsPriceReservePopupForm.html
  * @desc    : 상품 가격 예약등록 화면
  *============================================================================
- * PASTEL
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsReinboundInformForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsReinboundInformForm.html
  * @desc    : 재입고알림관리
  *============================================================================
- * PASTEL
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsReserveSellForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsReserveSellForm.html
  * @desc    : 상품예약판매관리
  *============================================================================
- * PASTEL
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsReserveSellPopupForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsReserveSellPopupForm.html
  * @desc    : 상품예약판매 등록 화면
  *============================================================================
- * PASTEL
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsSetForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsSetForm.html
  * @desc    : 세트상품 구성 관리
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2019 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsSupplyPriceForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsSupplyPriceForm.html
  * @desc    : 입점 상품 가격 승인  관리
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsTitleReserveForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsTitleReserveForm.html
  * @desc    : 상품 타이틀 예약관리
  *============================================================================
- * PASTEL
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsTitleReservePopupForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsTitleReservePopupForm.html
  * @desc    : 상품등록 타이틀 예약등록 화면
  *============================================================================
- * PASTEL
+ * STYLE24
  * Copyright(C) 2019 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsVideoForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsVideoForm.html
  * @desc    : 상품동영상관리 Page
  *============================================================================
- * Pastelmall
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsWmsIncomelotForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsWmsIncomelotForm.html
  * @desc    : WMS입고상품관리 화면
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.admin/src/main/webapp/WEB-INF/views/stock/GoodsSizeStockForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsSizeStockForm.html
  * @desc    : 상품 사이즈별 재고 현황
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

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

@@ -16,6 +16,8 @@ import com.style24.persistence.domain.IfProductSku;
 import com.style24.persistence.domain.IfProvider;
 import com.style24.persistence.domain.Option;
 
+import com.gagaframework.web.parameter.GagaMap;
+
 /**
  * 상품 Dao
  *
@@ -317,7 +319,17 @@ public interface TsbGoodsDao {
 	 * @author eskim
 	 * @since 2021. 01. 06
 	 */
-	void createIfProductSku(IfProductSku ifProductSku);
+	//void createIfProductSku(IfProductSku ifProductSku);
+	void createIfProductSku(GagaMap dataMap);
+
+	/**
+	 * TB_IF_PRODUCTSKU_TEMP 저장
+	 *
+	 * @author eskim
+	 * @since 2021. 01. 06
+	 */
+	void createIfProductSkuByRow(IfProductSku ifProductSku);
+
 
 	/**
 	 * TB_IF_PRODUCTSKU_HST 삭제

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

@@ -1,15 +1,21 @@
 package com.style24.batch.biz.job.goods;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.style24.batch.biz.job.TsbAbstractJob;
 import com.style24.batch.biz.service.TsbCommonService;
 import com.style24.batch.biz.service.TsbGoodsService;
+import com.style24.batch.biz.service.TsbWmsGoodsService;
 import com.style24.persistence.domain.IfProductSku;
 
 import lombok.extern.slf4j.Slf4j;
 
+import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.util.GagaDateUtil;
 
 /**
@@ -25,6 +31,9 @@ public class TsbGoodsWmsProductStockJob extends TsbAbstractJob<IfProductSku, IfP
 	@Autowired
 	private TsbGoodsService goodsService;
 
+	@Autowired
+	private TsbWmsGoodsService wmsGoodsService;
+
 	@Autowired
 	private TsbCommonService commonService;
 
@@ -56,14 +65,52 @@ public class TsbGoodsWmsProductStockJob extends TsbAbstractJob<IfProductSku, IfP
 			log.info("WMS 정보 동기화 미실행 {}, 연동여부 : {}", GagaDateUtil.getToday("yyyy-MM-dd HH:mm:ss"), wmsSyncYn);
 			return null;
 		}else {
+			/**
+			 * 나중에 개발 서버에서 꼭 테스트 해봅시다~~~~
+			 */
 			//wms상품재고이력 생성
-			//goodsService.createWmsProductSkuHst(jobdate);
+//			goodsService.createWmsProductSkuHst(jobdate);
+
+			// TB_IF_PRODUCTSKU_TEMP 작업
+			goodsService.deleteIfProductSku();
+
+			// TB_IF_PRODUCTSKU_TEMP 생성
+			Collection<IfProductSku> wmsIfProductSukList = wmsGoodsService.getWmsIfProductSukList();
+
+			//대용량 : N
+			String byrow = "N";
+			if ("Y".equals(byrow)) {
+				for(IfProductSku ifProductSkuMap : wmsIfProductSukList) {
+					goodsService.createIfProductSkuByRow(ifProductSkuMap);
+				}
+			}else {
+
+				List<IfProductSku> productSukList = new ArrayList<IfProductSku>();
+				GagaMap dataMap = new GagaMap();
+				int index = 0;
+				for(IfProductSku ifProductSkuMap : wmsIfProductSukList) {
+
+					productSukList.add(ifProductSkuMap);
+					index++;
+					if (index % 200 == 0 ||  wmsIfProductSukList.size() == index) {
+						dataMap.set("productSukList", productSukList);
+						goodsService.createIfProductSku(dataMap);
+
+						productSukList.clear();
+					}
+				}
+
+			}
+//
+//			// TB_IF_PRODUCTSKU_HST 생성
+//			//goodsService.createWmsProductSkuHst(jobdate);
+
 			//온라인 상품 재고 적용
-			goodsService.saveGoodsStock();
+			//goodsService.saveGoodsStock();
 		}
 
 		//온라인 전시 재고 작업
-		goodsService.saveGoodsDispStock();
+		//goodsService.saveGoodsDispStock();
 
 		return ifProductSku;
 	}

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

@@ -1,7 +1,9 @@
 package com.style24.batch.biz.service;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -459,16 +461,37 @@ public class TsbGoodsService {
 
 		// TB_IF_PRODUCTSKU_TEMP 작업
 		goodsDao.deleteIfProductSku();
+
 		// TB_IF_PRODUCTSKU_TEMP 생성
 		Collection<IfProductSku> wmsIfProductSukList = wmsGoodsService.getWmsIfProductSukList();
-		for(IfProductSku ifProductSku : wmsIfProductSukList) {
-			goodsDao.createIfProductSku(ifProductSku);
+		String byrow = "N";
+		if ("Y".equals(byrow)) {
+			for(IfProductSku ifProductSku : wmsIfProductSukList) {
+				goodsDao.createIfProductSkuByRow(ifProductSku);
+			}
+		}else {
+
+			List<IfProductSku> productSukList = new ArrayList<IfProductSku>();
+
+			GagaMap dataMap = new GagaMap();
+			int index = 0;
+			for(IfProductSku ifProductSku : wmsIfProductSukList) {
+
+				productSukList.add(ifProductSku);
+				index++;
+				if (index % 200 == 0 ||  wmsIfProductSukList.size() == index) {
+					dataMap.set("productSukList", productSukList);
+					goodsDao.createIfProductSku(dataMap);
+					productSukList.clear();
+				}
+			}
+
 		}
 
 		// TB_IF_PRODUCTSKU_HST 2달 전 데이터 삭제
 		String delYyyymmdd = GagaDateUtil.getOffsetMonth(-2, "yyyyMMdd") + "000000";  //년월일시분초
 		goodsDao.deleteWmsProductSkuHst(delYyyymmdd);
-		// TB_IF_PRODUCTSKU_HST 생성
+//		// TB_IF_PRODUCTSKU_HST 생성
 		goodsDao.createWmsProductSkuHst(jobdate);
 
 	}
@@ -560,13 +583,59 @@ public class TsbGoodsService {
 	/**
 	 * 상품 전시재고 생성
 	 *
-	 * @throws Exception
 	 * @author eskim
 	 * @since 2020. 01. 06
 	 */
 	@Transactional("shopTxnManager")
-	public void saveGoodsDispStock() throws Exception {
+	public void saveGoodsDispStock()  {
 		goodsDao.deleteGoodsDispStock();
 		goodsDao.createGoodsDispStock();
 	}
+
+	/**
+	 * TB_IF_PRODUCTSKU_TEMP 삭제
+	 *
+	 * @author eskim
+	 * @since 2020. 01. 11
+	 */
+	@Transactional("shopTxnManager")
+	public void deleteIfProductSku() {
+		goodsDao.deleteIfProductSku();
+	}
+
+	/**
+	 * TB_IF_PRODUCTSKU 생성(by row )
+	 *
+	 * @author eskim
+	 * @since 2020. 01. 11
+	 */
+	@Transactional("shopTxnManager")
+	public void createIfProductSkuByRow(IfProductSku ifProductSku) {
+		goodsDao.createIfProductSkuByRow(ifProductSku);
+	}
+
+	/**
+	 * TB_IF_PRODUCTSKU 생성
+	 *
+	 * @author eskim
+	 * @since 2020. 01. 11
+	 */
+	@Transactional("shopTxnManager")
+	public void createIfProductSku(GagaMap dataMap) {
+		goodsDao.createIfProductSku(dataMap);
+	}
+
+	
+	/**
+	 * TB_IF_PRODUCTSKU_HST 저장
+	 *
+	 * @author eskim
+	 * @since 2021. 01. 11
+	 */
+	@Transactional("shopTxnManager")
+	public void createIfProductSku(String jobdate) {
+		goodsDao.createWmsProductSkuHst(jobdate);
+	}
+
+
 }

style24.batch/src/main/java/com/style24/batch/biz/task/TsbGoodsTask.java

@@ -229,7 +229,7 @@ public class TsbGoodsTask {
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "${cron.goods.wms.product.stock}")
-	@Scheduled(fixedDelay = 3500000)
+	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void tsbGoodsWmsProductStockJob() throws Exception {
 		goodsWmsProductStockJob.runById("cron.goods.wms.product.stock");

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

@@ -1338,7 +1338,7 @@
 	</delete>
 	
 	<!-- TB_IF_PRODUCTSKU_TEMP 저장 -->
-	<insert id="createIfProductSku"  parameterType="IfProduct">
+	<insert id="createIfProductSku"  parameterType="java.util.HashMap" >
 		/* TsbGoods.createIfProductSku */
 		INSERT INTO TB_IF_PRODUCTSKU(
 		       SKUCODE
@@ -1358,6 +1358,51 @@
 		     , SKUCODE88
 		     , UPD_DT
 		)
+		VALUES
+		<foreach collection="productSukList" item="item" index="index"  separator=",">
+		(
+		       #{item.skucode}
+		     , #{item.skumodelno}
+		     , #{item.productno}
+		     , #{item.productcode}
+		     , #{item.option1}
+		     , #{item.option2}
+		     , #{item.option3}
+		     , #{item.sellingstockamount}
+		     , #{item.sellingstocktypecd}
+		     , #{item.limitstockamount}
+		     , #{item.vendorskumodelno}
+		     , #{item.vendorskucode}
+		     , #{item.isvirtualstock}
+		     , #{item.datevirtualstock}
+		     , #{item.skucode88}
+		     , NOW()
+		)
+		</foreach>
+		
+	</insert>
+	
+	<!-- TB_IF_PRODUCTSKU_TEMP 저장 -->
+	<insert id="createIfProductSkuByRow"  parameterType="IfProduct">
+		/* TsbGoods.createIfProductSkuByRow */
+		INSERT INTO TB_IF_PRODUCTSKU(
+		       SKUCODE
+		     , SKUMODELNO
+		     , PRODUCTNO
+		     , PRODUCTCODE
+		     , OPTION1
+		     , OPTION2
+		     , OPTION3
+		     , SELLINGSTOCKAMOUNT
+		     , SELLINGSTOCKTYPECD
+		     , LIMITSTOCKAMOUNT
+		     , VENDORSKUMODELNO
+		     , VENDORSKUCODE
+		     , ISVIRTUALSTOCK
+		     , DATEVIRTUALSTOCK
+		     , SKUCODE88
+		     , UPD_DT
+		)
 		VALUES(
 		       #{skucode}
 		     , #{skumodelno}
@@ -1381,7 +1426,7 @@
 	<!-- TB_IF_PRODUCTSKU_HST 삭제 -->
 	<delete id="deleteWmsProductSkuHst"  parameterType="String" timeout="300">
 		/* TsbGoods.deleteWmsProductSkuHst */
-		DELETE TB_IF_PRODUCTSKU_HST
+		DELETE FROM TB_IF_PRODUCTSKU_HST
 		WHERE JOBDATE <![CDATA[<=]]> #{jobdate} 
 	</delete>
 	
@@ -1472,13 +1517,13 @@
 	</insert>
 	
 	<!-- ERP 재고 임시 테이블 삭제 -->
-	<delete id="deleteTbOptionSyncTemp">
+	<delete id="deleteTbOptionSyncTemp"   timeout="300">
 		/* TsbGoods.deleteTbOptionSyncTemp */
 		TRUNCATE TABLE TB_OPTION_SYNC_TEMP
 	</delete>
 
 	<!--ERP 재고 임시 테이블 이관  -->
-	<insert id="createTbOptionSyncTemp">
+	<insert id="createTbOptionSyncTemp"   timeout="300">
 		/* TsbGoods.createTbOptionSyncTemp */
 		INSERT INTO TB_OPTION_SYNC_TEMP
 		(
@@ -1562,7 +1607,7 @@
 	</insert>
 	
 	<!-- 입점상품 SELL_QTY 목록 조회 -->
-	<select id="getGoodsSelfNoStockList" resultType="Option">
+	<select id="getGoodsSelfNoStockList" resultType="Option"   timeout="300">
 		/* TsbGoods.getGoodsSelfNoStockList */
 		SELECT A.GOODS_CD
 		     , A.OPT_CD
@@ -1579,7 +1624,7 @@
 	</select>
 	
 	<!-- 상품 옵션/재고 정보 이력생성 -->
-	<insert id="createStockHst" parameterType="Option">
+	<insert id="createStockHst" parameterType="Option"   timeout="300">
 		/* TsaGoods.createStockHst */
 		INSERT INTO TB_OPTION_HST 
 		(     OPTION_HST_SQ
@@ -1625,7 +1670,7 @@
 	</insert>
 	
 	<!-- 상품 재고 정보 저장 -->
-	<update id="updateStock" parameterType="Option">
+	<update id="updateStock" parameterType="Option"  timeout="300">
 		/* TsbGoods.updateStock */
 		UPDATE TB_STOCK
 		SET CURR_ON_STOCK_QTY = GREATEST(CURR_ON_STOCK_QTY - #{saleStockQty},0)
@@ -1636,13 +1681,13 @@
 	</update>
 	
 	<!-- WMS 재고 임시 테이블 삭제 -->
-	<delete id="deleteGoodsOptionSync">
+	<delete id="deleteGoodsOptionSync"  timeout="300">
 		/* TsbGoods.deleteGoodsOptionSync */
 		TRUNCATE TABLE TB_OPTION_SYNC
 	</delete>
 	
 	<!--TB_OPTION = > TB_OPTION_SYNC 적용 -->
-	<insert id="createGoodsOptionSync">
+	<insert id="createGoodsOptionSync"  timeout="300">
 		/* TsbGoods.createGoodsOptionSync */
 		INSERT INTO TB_OPTION_SYNC
 		(
@@ -1688,7 +1733,7 @@
 	</insert>
 	
 	<!-- TB_OPTION_SYNC_TEMP => TB_OPTION_SYNC 변경적용-->
-	<insert id="saveGoodsOptionSyncSync">
+	<insert id="saveGoodsOptionSyncSync"  timeout="300">
 		/* TsbGoods.saveGoodsOptionSyncSync */
 		UPDATE TB_OPTION_SYNC A, (SELECT GOODS_CD
 		                               , OPT_CD
@@ -1708,7 +1753,7 @@
 	</insert>
 	
 	<!-- WMS 임시 테이블에서 실테이블로 변경 -->
-	<insert id="saveGoodsOptionNew">
+	<insert id="saveGoodsOptionNew"  timeout="300">
 		/* TsbGoods.saveGoodsOptionNew */
 		UPDATE TB_OPTION A, (SELECT GOODS_CD
 		                          , OPT_CD
@@ -1728,13 +1773,13 @@
 	</insert>
 		
 	<!-- TB_SELL_QTY_TEMP 테이블 삭제 -->
-	<delete id="deleteTtbSellQtyTemp">
+	<delete id="deleteTtbSellQtyTemp"  timeout="300">
 		/* TsbGoods.deleteTtbSellQtyTemp */
 		TRUNCATE TABLE TB_SELL_QTY_TEMP
 	</delete>
 	
 	<!-- TB_SELL_QTY_TEMP 테이블 삭제 -->
-	<insert id="createTtbSellQtyTemp">
+	<insert id="createTtbSellQtyTemp"  timeout="300">
 		/* TsbGoods.createTtbSellQtyTemp */
 		INSERT INTO TB_SELL_QTY_TEMP (
 		      GOODS_CD
@@ -1762,13 +1807,13 @@
 	</insert>
 
 	<!-- 주문적재 테이블 삭제 -->
-	<delete id="deleteSellQty">
+	<delete id="deleteSellQty"  timeout="300">
 		/* TsbGoods.deleteSellQty */
 		DELETE FROM TB_SELL_QTY
 	</delete>
 	
 	<!-- TB_SELL_QTY 테이블 생성 -->
-	<insert id="createTtbSellQty">
+	<insert id="createTtbSellQty"  timeout="300">
 		/* TsbGoods.createTtbSellQty */
 		INSERT INTO TB_SELL_QTY (
 		      GOODS_CD
@@ -1806,11 +1851,10 @@
 	</insert>
 	
 	<!-- TB_SELL_QTY 테이블 생성 -->
-	<insert id="createTtbSellQtyByOrderDetail">
+	<insert id="createTtbSellQtyByOrderDetail"  timeout="300">
 		/* TsbGoods.createTtbSellQtyByOrderDetail */
 		INSERT INTO TB_SELL_QTY (
 		      GOODS_CD
-		    , OPT_CD
 		    , SELL_GB
 		    , ORD_DTL_NO
 		    , AGENT_ORDER_ID
@@ -1851,4 +1895,5 @@
 		                  AND Y.ORD_DTL_NO = A.ORD_DTL_NO
 		                  )
 	</insert>
+	
 </mapper>

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

@@ -216,7 +216,7 @@
 	<!-- WMS 재고 테이블 조회   -->
 	<select id="getWmsIfProductSukList"  resultType="IfProductSku">
 		/* TsbWmsGoods.getWmsIfProductSukList */
-		SELECT SKUCODE
+		SELECT  top 1000 SKUCODE
 		     , SKUMODELNO
 		     , PRODUCTNO
 		     , PRODUCTCODE

style24.front/target/m2e-wtp/web-resources/META-INF/maven/com.style24.front/style24.front/pom.properties

@@ -1,7 +1,15 @@
 #Generated by Maven Integration for Eclipse
+<<<<<<< HEAD
+#Wed Jan 06 14:17:20 KST 2021
+=======
 #Fri Jan 08 18:59:52 KST 2021
 version=0.0.1-SNAPSHOT
 groupId=com.style24.front
 m2e.projectName=style24.front
+>>>>>>> refs/heads/develop
 m2e.projectLocation=D\:\\WIDE\\workspace\\webapps\\style24\\STYLE24\\style24.front
 artifactId=style24.front
+<<<<<<< HEAD
+version=0.0.1-SNAPSHOT
+=======
+>>>>>>> refs/heads/develop

style24.scm/src/main/webapp/WEB-INF/views/common/ExcelUploadPopupForm.html

@@ -6,7 +6,7 @@
  * @source  : ExcelUploadPopupForm.html
  * @desc    : 엑셀 업로드 팝업 Page
  *============================================================================
- * Pastelmall
+ * STYLE24
  * Copyright(C) 2019 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

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

@@ -6,7 +6,7 @@
  * @source  : GoodsDetailForm.html
  * @desc    : 상품 상세 팝업
  *============================================================================
- * SISUNChDataYn
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.scm/src/main/webapp/WEB-INF/views/goods/GoodsDetailSizeStockForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsSizeStockForm.html
  * @desc    : 상품 옵셥/재고 화면
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.scm/src/main/webapp/WEB-INF/views/goods/GoodsImageForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsImageMassForm.html
  * @desc    : 상품 이미지 보기 화면(대량등록)
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2019 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.scm/src/main/webapp/WEB-INF/views/goods/GoodsListForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsListForm.html
  * @desc    : 상품목록 Page
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.scm/src/main/webapp/WEB-INF/views/goods/GoodsMassRegisterForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsMassRegisterForm.html
  * @desc    : 대량상품등록
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.scm/src/main/webapp/WEB-INF/views/goods/GoodsPopupListForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsPopupListForm.html
  * @desc    : 상품 조회 팝업
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.scm/src/main/webapp/WEB-INF/views/goods/GoodsSupplyPriceForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsSupplyPriceForm.html
  * @desc    : 입점 상품 가격 승인  관리
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION

style24.scm/src/main/webapp/WEB-INF/views/stock/GoodsSizeStockForm.html

@@ -6,7 +6,7 @@
  * @source  : GoodsSizeStockForm.html
  * @desc    : 상품 사이즈별 재고 현황
  *============================================================================
- * SISUN
+ * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION