WMS 입고 상품 관련

style24.admin/src/main/java/com/style24/admin/biz/dao/TsaGoodsDao.java

@@ -1068,6 +1068,15 @@ public interface TsaGoodsDao {
 	 */
 	public void updateFreeGoods(FreeGoods freeGoods);
 
+	/**
+	 * WMS입고상품관리 목록 건수
+	 * @param goodsSearch
+	 * @return Collection<WmsGoods>
+	 * @author eskim
+	 * @since 2021. 01. 04
+	 */
+	int getGoodsWmsIncomelotListCount(WmsGoods wmsGoods);
+
 	/**
 	 * WMS입고상품관리 목록 조회
 	 * @param goodsSearch

style24.admin/src/main/java/com/style24/admin/biz/service/TsaGoodsService.java

@@ -2654,6 +2654,18 @@ public class TsaGoodsService {
 		goodsDao.updateFreeGoods(freeGoods);
 	}
 
+	/**
+	 * WMS입고상품관리 목록 건수
+	 *
+	 * @param goodsSearch
+	 * @return Collection<WmsGoods>
+	 * @author eskim
+	 * @since 2021. 01. 04
+	 */
+	public int getGoodsWmsIncomelotListCount(WmsGoods wmsGoods) {
+		return goodsDao.getGoodsWmsIncomelotListCount(wmsGoods);
+	}
+
 	/**
 	 * WMS입고상품관리 목록 조회
 	 *

style24.admin/src/main/java/com/style24/admin/biz/web/TsaGoodsController.java

@@ -1271,9 +1271,17 @@ public class TsaGoodsController extends TsaBaseController {
 	 */
 	@PostMapping("/wms/incomelot/list")
 	@ResponseBody
-	public Collection<WmsGoods> getGoodsWmsIncomelotList(@RequestBody WmsGoods wmsGoods) {
+	public GagaMap getGoodsWmsIncomelotList(@RequestBody WmsGoods wmsGoods) {
 
-		return goodsService.getGoodsWmsIncomelotList(wmsGoods);
+		GagaMap result = new GagaMap();
+
+		wmsGoods.setPageable(new TsaPageRequest(wmsGoods.getPageNo() - 1, wmsGoods.getPageSize()));
+		wmsGoods.getPageable().setTotalCount(goodsService.getGoodsWmsIncomelotListCount(wmsGoods));
+
+		result.set("pageing", wmsGoods);
+		result.set("goodsList", goodsService.getGoodsWmsIncomelotList(wmsGoods));
+
+		return result;
 	}
 
 	/**

style24.admin/src/main/java/com/style24/persistence/domain/WmsGoods.java

@@ -1,5 +1,6 @@
 package com.style24.persistence.domain;
 
+import com.style24.persistence.TsaPageRequest;
 import com.style24.persistence.TscBaseDomain;
 
 import lombok.Data;
@@ -17,10 +18,6 @@ public class WmsGoods extends TscBaseDomain {
 	private Integer productNo;		//wms상품번호
 	private int productCode;		//wms상품코드
 	private String productName;		//상품명
-	private String skucode;			//옵션번호
-	private int normalQty;			//일반수량
-	private int brokenQty;			//불량수량
-	private int totalQty;			//총수량
 	private String modelNo;			//모델번호
 	private int providerNo;			//공급처번호
 	private String providerName;	//공급처명
@@ -35,4 +32,13 @@ public class WmsGoods extends TscBaseDomain {
 	private String stDate;
 	private String edDate;
 
+	private int startRow;
+	private int endRow;
+	private String goodsPriceYn;
+	// Pagination
+	private TsaPageRequest pageable;
+	private int pageNo = 1;
+	private int pageSize = 50;
+	private int pageUnit = 10;
+
 }

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaGoods.xml

@@ -3650,16 +3650,44 @@
 		WHERE PRODUCT_NO = #{productNo}
 	</update>
 	
+	<!-- WMS입고상품 목록 건수 -->
+	<select id="getGoodsWmsIncomelotListCount" parameterType="WmsGoods" resultType="int">
+		/* TsaGoods.getGoodsWmsIncomelotListCount */
+		SELECT COUNT(*)
+		FROM TB_WMS_GOODS A
+		LEFT OUTER JOIN TB_BRAND B ON A.BRAND_NO = B.BRAND_NO 
+		LEFT OUTER JOIN TB_SUPPLY_COMPANY S ON A.PROVIDER_NO = S.PROVIDER_NO
+		WHERE GOODS_REG_GB IS NULL   /* 온라인 미등록 상품 */
+		<if test="modelNo != null and modelNo != ''">
+		AND UPPER(A.MODEL_NO) LIKE CONCAT('%',UPPER(#{modelNo}),'%') 
+		</if>
+		<if test="stDate != null and stDate != ''">
+		AND A.REG_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+		</if>
+		<if test="edDate != null and edDate != ''">
+		<![CDATA[
+		AND A.REG_DT < DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+		]]>
+		</if>
+		<if test="supplyCompCd != null and supplyCompCd != ''">
+		AND UPPER(S.SUPPLY_COMP_CD) = UPPER(#{supplyCompCd}) 
+		</if>
+		<if test="brandCd != null and brandCd != ''">
+		AND UPPER(B.BRAND_CD) = UPPER(#{brandCd}) 
+		</if>
+		ORDER BY A.UPD_DT DESC
+	</select>
+	
 	<!-- WMS입고상품 목록 -->
 	<select id="getGoodsWmsIncomelotList" parameterType="WmsGoods" resultType="WmsGoods">
 		/* TsaGoods.getGoodsWmsIncomelotList */
+		SELECT Q.* FROM (
+		SELECT Z.* FROM (
+		SELECT A.*, @rownum := @rownum + 1 AS RNUM 
+		    FROM (
 		SELECT A.PRODUCT_NO
 		     , A.PRODUCT_CODE
 		     , A.PRODUCT_NAME
-		     , A.SKUCODE
-		     , A.NORMAL_QTY
-		     , A.BROKEN_QTY
-		     , A.TOTAL_QTY
 		     , A.MODEL_NO
 		     , A.PROVIDER_NO
 		     , A.PROVIDER_NAME
@@ -3676,11 +3704,12 @@
 		     , FN_GET_USER_NM(A.UPD_NO) AS UPD_NM
 		     , DATE_FORMAT(A.UPD_DT,'%Y%m%d%H%i%S') AS UPD_DT
 		FROM TB_WMS_GOODS A
+		JOIN ( SELECT @rownum := 0) R
 		LEFT OUTER JOIN TB_BRAND B ON A.BRAND_NO = B.BRAND_NO 
 		LEFT OUTER JOIN TB_SUPPLY_COMPANY S ON A.PROVIDER_NO = S.PROVIDER_NO
 		WHERE GOODS_REG_GB IS NULL   /* 온라인 미등록 상품 */
 		<if test="modelNo != null and modelNo != ''">
-		AND UPPER(A.MODEL_NO) = CONCAT('%',UPPER(#{modelNo}),'%') 
+		AND UPPER(A.MODEL_NO) LIKE CONCAT('%',UPPER(#{modelNo}),'%') 
 		</if>
 		<if test="stDate != null and stDate != ''">
 		AND A.REG_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
@@ -3697,6 +3726,7 @@
 		AND UPPER(B.BRAND_CD) = UPPER(#{brandCd}) 
 		</if>
 		ORDER BY A.UPD_DT DESC
+		<include refid="getListPagingCondition_sql"/>
 	</select>
 	
 	<!-- 사은품 등록 -->

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

@@ -72,6 +72,15 @@
 			<ul class="panelBar">
 				<li class="right">
 					<button type="button" class="btn btn-primary btn-lg"  id="btnCreateFreeGoods">사은품 등록</button>
+					검색결과 : <strong><span id="gridRowTotalCount">0</span> 건</strong>&nbsp;
+					쪽번호 <span id="pgNo">0</span>/ <strong id="endPgNo">0</strong>&nbsp;&nbsp;
+					<select id="pageSize" name="pageSize">
+						<option value="50" selected="selected">50개씩 보기</option>
+						<option value="100">100개씩 보기</option>
+						<option value="500">500개씩 보기</option>
+						<option value="1000">1000개씩 보기</option>
+					</select>
+					<input type="hidden" name="pageNo" id="pageNo" value ="1"/>
 				</li>
 			</ul>
 			<!-- 검색결과 영역 -->
@@ -151,6 +160,7 @@
 	
 	// 조회클릭시
 	$('#btnSearch').on('click', function() {
+		$("#goodsWmsIncomelotForm input[name=pageNo]").val('1');
 		fnGoodsWmsIncomelotListSearch('BASIC');
 	});
 
@@ -165,9 +175,30 @@
 		
 		if(!fnConditionCheck()) return;
 		
-		gagaAgGrid.fetch($('#goodsWmsIncomelotForm').prop('action'), gridOptions, '#goodsWmsIncomelotForm');
+		//gagaAgGrid.fetch($('#goodsWmsIncomelotForm').prop('action'), gridOptions, '#goodsWmsIncomelotForm');
+		
+		gagaPaging.init('goodsWmsIncomelotForm', fnSearchCallBack, 'goodsListPagination', $('#goodsWmsIncomelotForm').find('#pageSize').val());
+		gagaPaging.load($("#goodsWmsIncomelotForm input[name=pageNo]").val());
 	}
 
+	var fnSearchCallBack = function(result){
+
+		$('#goodsWmsIncomelotForm').find('#gridRowTotalCount').html(result.pageing.pageable.totalCount.addComma());
+		$('#goodsWmsIncomelotForm').find('#pageNo').val(result.pageing.pageable.pageNo.addComma());
+		$('#goodsWmsIncomelotForm').find('#pgNo').html(result.pageing.pageable.pageNo.addComma());
+		$('#goodsWmsIncomelotForm').find('#endPgNo').html(result.pageing.pageable.totalPage.addComma());
+		gridOptions.api.setRowData(result.goodsList);
+		gagaPaging.createPagination(result.pageing.pageable);
+		
+	}
+	
+	//페이징
+	$('#goodsWmsIncomelotForm select[name=pageSize]').on('change', function() {
+		$("#goodsWmsIncomelotForm input[name=pageNo]").val('1');
+		fnGoodsWmsIncomelotListSearch($("#goodsWmsIncomelotForm input[name=searchGb]").val());
+	});
+	
+	
 	//검색 조건 확인
 	var fnConditionCheck = function(){
 		var formId = '#goodsWmsIncomelotForm';

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

@@ -2,7 +2,6 @@ package com.style24.batch.biz.task;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import com.style24.batch.biz.job.delivery.TsbDailyDeliveryZoneJob;
@@ -47,12 +46,12 @@ public class TsbDeliveryTask {
 	 */
 
 	/**
-	 * 총알배송 권역정보   : 일배치  오전 11시  
+	 * 총알배송 권역정보   : 일배치  오전 11시
 	 *
 	 * @throws Exception
 	 */
 	//@Scheduled(cron = "${cron.delivery.tsbDailyDeliveryZoneJob}")
-	@Scheduled(fixedDelay = 3500000)
+	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void tsbDailyDeliveryZoneJob() throws Exception {
 		dailyDeliveryZoneJob.run("cron.delivery.daily.deliveryZone");

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

@@ -185,7 +185,7 @@ public class TsbGoodsTask {
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "${cron.goods.wms.incomelot}")
-	//@Scheduled(fixedDelay = 3500000)
+	@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void tsbGoodsWmsIncomelotJob() throws Exception {
 		goodsWmsIncomelotJob.runById("cron.goods.wms.incomelot");

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

@@ -1208,10 +1208,6 @@
 		       PRODUCT_NO 
 		     , PRODUCT_CODE 
 		     , PRODUCT_NAME 
-		     , SKUCODE 
-		     , NORMAL_QTY 
-		     , BROKEN_QTY 
-		     , TOTAL_QTY 
 		     , MODEL_NO 
 		     , PROVIDER_NO
 		     , PROVIDER_NAME
@@ -1225,11 +1221,7 @@
 		SELECT B.PRODUCTNO 
 		     , B.PRODUCTCODE 
 		     , B.PRODUCTNAME 
-		     , B.SKUCODE 
-		     , B.NORMALQTY 
-		     , B.BROKENQTY 
-		     , B.TOTALQTY 
-		     , B.MODELNO 
+		     , LEFT(B.MODELNO,10) AS MODELNO 
 		     , A.PROVIDERNO
 		     , A.PROVIDERNAME
 		     , A.BRANDNO
@@ -1257,9 +1249,6 @@
 		</choose>
 		ON DUPLICATE KEY UPDATE
 		       PRODUCT_NAME = IF(GOODS_REG_GB IS NULL, B.PRODUCTNAME, TB_WMS_GOODS.PRODUCT_NAME)
-		     , NORMAL_QTY = IF(GOODS_REG_GB IS NULL, B.NORMALQTY, TB_WMS_GOODS.NORMAL_QTY)
-		     , BROKEN_QTY = IF(GOODS_REG_GB IS NULL, B.BROKENQTY, TB_WMS_GOODS.BROKEN_QTY)
-		     , TOTAL_QTY = IF(GOODS_REG_GB IS NULL, B.TOTALQTY, TB_WMS_GOODS.TOTAL_QTY)
 		     , MODEL_NO = IF(GOODS_REG_GB IS NULL, B.MODELNO, TB_WMS_GOODS.MODEL_NO)
 		     , PROVIDER_NO = IF(GOODS_REG_GB IS NULL, A.PROVIDERNO, TB_WMS_GOODS.PROVIDER_NO)
 		     , PROVIDER_NAME = IF(GOODS_REG_GB IS NULL, A.PROVIDERNAME, TB_WMS_GOODS.PROVIDER_NAME)

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

@@ -68,6 +68,7 @@
 		     , NORMALQTY
 		     , BROKENQTY
 		     , TOTALQTY
+		     , MODELNO
 		FROM TB_IF_INCOMELOTITEM
 		WHERE 1 = 1 
 		<choose>

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

@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Tue Jan 05 10:10:08 KST 2021
+#Wed Jan 06 15:15:11 KST 2021
 version=0.0.1-SNAPSHOT
 groupId=com.style24.front
 m2e.projectName=style24.front