eskim 5 년 전
부모
커밋
47b1babd42

+ 32 - 37
src/main/java/com/style24/batch/biz/job/goods/TsbGoodsWmsProductStockJob.java

@@ -1,9 +1,5 @@
 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;
 
@@ -15,7 +11,6 @@ import com.style24.persistence.domain.IfProductSku;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.util.GagaDateUtil;
 
 /**
@@ -69,41 +64,41 @@ public class TsbGoodsWmsProductStockJob extends TsbAbstractJob<IfProductSku, IfP
 			 * 나중에 개발 서버에서 꼭 테스트 해봅시다~~~~
 			 */
 			//wms상품재고이력 생성
-//			goodsService.createWmsProductSkuHst(jobdate);
-
-			// TB_IF_PRODUCTSKU_TEMP 작업
-			goodsService.deleteIfProductSku();
-
-			// TB_IF_PRODUCTSKU_TEMP 생성
-			Collection<IfProductSku> wmsIfProductSukList = wmsGoodsService.getWmsIfProductSukList();  //테스트 1000건
-
-			//대용량 : N
-			String byrow = "Y";
-			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();
-					}
-				}
+			goodsService.createWmsProductSkuHst(jobdate);
 
-			}
+//			// TB_IF_PRODUCTSKU_TEMP 작업
+//			goodsService.deleteIfProductSku();
+//
+//			// TB_IF_PRODUCTSKU_TEMP 생성
+//			Collection<IfProductSku> wmsIfProductSukList = wmsGoodsService.getWmsIfProductSukList();  //테스트 1000건
+//
+//			//대용량 : 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.createWmsProductSkuHst(jobdate);
 
 			//온라인 상품 재고 적용
 			goodsService.saveGoodsStock();

+ 35 - 35
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;
@@ -29,7 +31,6 @@ import io.netty.util.internal.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 
 import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.util.GagaDateUtil;
 
 /**
  * 상품 Service
@@ -409,7 +410,6 @@ public class TsbGoodsService {
 		goodsIfIncomelot.setUpdNo(TsbConstants.REG_NO);
 		goodsIfIncomelot.setJobdate(jobdate);
 		goodsDao.saveWmsGoods(goodsIfIncomelot);
-
 	}
 
 	/**
@@ -457,40 +457,40 @@ public class TsbGoodsService {
 	@Transactional("shopTxnManager")
 	public void createWmsProductSkuHst(String jobdate) {
 
-//		// TB_IF_PRODUCTSKU_TEMP 작업
-//		goodsDao.deleteIfProductSku();
-//
-//		// TB_IF_PRODUCTSKU_TEMP 생성
-//		Collection<IfProductSku> wmsIfProductSukList = wmsGoodsService.getWmsIfProductSukList();
-//		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_TEMP 작업
+		goodsDao.deleteIfProductSku();
+
+		// TB_IF_PRODUCTSKU_TEMP 생성
+		Collection<IfProductSku> wmsIfProductSukList = wmsGoodsService.getWmsIfProductSukList();
+		String byrow = "Y";
+		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 생성
-		goodsDao.createWmsProductSkuHst(jobdate);
+//		goodsDao.createWmsProductSkuHst(jobdate);
 
 	}
 

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

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