사이즈별 재고 현황 엑셀다운로드 화면 단위

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

@@ -281,7 +281,7 @@ public class TsaBusinessService {
 		} else { // 수정
 			businessDao.updateBrand(brand);
 		}
-		log.info("brand ={}", brand);
+		//log.info("brand ={}", brand);
 		if (brandSupplyList != null && !brandSupplyList.isEmpty()) {
 			for (Brand brandSupply : brandSupplyList) {
 				brandSupply.setRegNo(TsaSession.getInfo().getUserNo());

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

@@ -61,7 +61,6 @@ public class TsaCardPromotionService {
 	public void saveCardInterest(CardPromotion cardPromotion) {
 
 		Integer userNo = TsaSession.getInfo().getUserNo();
-		log.info("[saveCardInterest] cardPromotion = {}", cardPromotion);
 		// 카드 프로모션 저장
 		cardPromotion.setRegNo(userNo);
 		cardPromotion.setUpdNo(userNo);
@@ -70,7 +69,6 @@ public class TsaCardPromotionService {
 		cardPromotion.setPrmtEdd(cardPromotion.getPrmtEdd().replace("-", ""));
 
 		cardPromotionDao.saveCardPromotion(cardPromotion);
-		log.info("[saveCardInterest] cardPromotion 2  = {}", cardPromotion);
 		// 카드 프로모션 행사조건 저장
 		if ("B".equals(cardPromotion.getPrmtGb())) {
 			if (cardPromotion.getArrMinNoItrt().length > 0) {
@@ -92,7 +90,6 @@ public class TsaCardPromotionService {
 					}
 
 					cardPromotionDao.saveCardPromotionCondition(cardPromotionCondition);
-					log.info("[saveCardInterest] cardPromotionCondition 2  = {}", cardPromotionCondition);
 					// 카드 프로모션 카드 삭제
 					cardPromotionDao.deleteCardPromotionTarget(cardPromotionCondition.getCardPrmtCdtSq());
 
@@ -131,7 +128,6 @@ public class TsaCardPromotionService {
 			}
 
 			cardPromotionDao.saveCardPromotionCondition(cardPromotionCondition);
-			log.info("[saveCardInterest] cardPromotionCondition 2  = {}", cardPromotionCondition);
 			// 카드 프로모션 카드 삭제
 			cardPromotionDao.deleteCardPromotionTarget(cardPromotionCondition.getCardPrmtCdtSq());
 
@@ -207,7 +203,6 @@ public class TsaCardPromotionService {
 
 		cardPromotion.setCardPrmtCdtList(cardPrmtCdtList);
 
-		log.info("[getCardPromotion] cardPromotion = {}", cardPromotion);
 		return cardPromotion;
 	}
 
@@ -317,7 +312,6 @@ public class TsaCardPromotionService {
 
 		cardPromotion.setCardPrmtCdtList(cardPrmtCdtList);
 
-		log.info("[getCardPromotion] cardPromotion = {}", cardPromotion);
 		return cardPromotion;
 	}
 }

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

@@ -496,7 +496,7 @@ public class TsaGoodsController extends TsaBaseController {
 	@ResponseBody
 	public GagaMap getGoodsList(@RequestBody GoodsSearch goodsSearch) {
 
-		log.info("[getGoodsList] goodsSearch = {}", goodsSearch);
+		//log.info("[getGoodsList] goodsSearch = {}", goodsSearch);
 		GagaMap result = new GagaMap();
 
 		// 입점업체담당자는 업체코드 설정
@@ -605,7 +605,7 @@ public class TsaGoodsController extends TsaBaseController {
 		goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
 		goodsSearch.getPageable().setTotalCount(goodsService.getGoodsListCount(goodsSearch));
 		
-		log.info("[downloadGoodsInfoExcelList] goodsSearch = {}", goodsSearch);
+		//log.info("[downloadGoodsInfoExcelList] goodsSearch = {}", goodsSearch);
 
 		// 대용량엑셀파일다운로드는 이런 식으로 ...
 		goodsService.getGoodsInfoExcelList(goodsSearch, excelFilenameWithPath);

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

@@ -130,7 +130,7 @@ public class TsaStockController extends TsaBaseController {
 			goodsSearch.setMdNo(TsaSession.getInfo().getUserNo().toString());
 		}
 		if (!StringUtils.isBlank(goodsSearch.getCondition())) {
-			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").split("\n"));
+			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
 		}
 		// multi row 검색관련 처리
 		if (!StringUtils.isBlank(goodsSearch.getBrandList())) {
@@ -153,7 +153,7 @@ public class TsaStockController extends TsaBaseController {
 			}
 		}
 		
-		log.info("[goodsSearch] goodsSearch =>{}", goodsSearch);
+		//log.info("[goodsSearch] goodsSearch =>{}", goodsSearch);
 		goodsSearch.setRegNo(TsaSession.getInfo().getUserNo());	//엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
 		goodsSearch.getPageable().setTotalCount(stockService.getGoodsSizeStockCount(goodsSearch));
@@ -178,14 +178,14 @@ public class TsaStockController extends TsaBaseController {
 		String excelfileName = "사이즈별재고현황_" + GagaDateUtil.getTodayDateTime() + ".xlsx";
 		String excelFilenameWithPath = GagaFileUtil.getConcatenationPath(env.getProperty("download.path"), "excel", excelfileName);
 
-		log.info("downloadGoodsInfoExcelList goodsSearch= {}", goodsSearch);
+		//log.info("downloadGoodsInfoExcelList goodsSearch= {}", goodsSearch);
 		//입점업체담당자는 업체코드 설정
 		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
 			goodsSearch.setSupplyCompCd(TsaSession.getInfo().getSupplyCompCd());
 			goodsSearch.setMdNo(TsaSession.getInfo().getUserNo().toString());
 		}
 		if (!StringUtils.isBlank(goodsSearch.getCondition())) {
-			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").split("\n"));
+			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
 		}
 		// multi row 검색관련 처리
 		if (!StringUtils.isBlank(goodsSearch.getBrandList())) {
@@ -208,7 +208,9 @@ public class TsaStockController extends TsaBaseController {
 			}
 		}
 		goodsSearch.setRegNo(TsaSession.getInfo().getUserNo());	//엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
-
+		goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
+		goodsSearch.getPageable().setTotalCount(stockService.getGoodsSizeStockCount(goodsSearch));
+		
 		// 대용량엑셀파일다운로드는 이런 식으로 ...
 		stockService.getGoodsSizeStockExcelList(goodsSearch, excelFilenameWithPath);
 
@@ -227,15 +229,15 @@ public class TsaStockController extends TsaBaseController {
 	@PostMapping("/sizeSoldout/excelupload/save")
 	@ResponseBody
 	public GagaResponse saveGoodsSizeSoldoutExcelupload(@RequestBody Goods goods) throws Exception {
-		log.info("[saveGoodsSizeSoldoutExcelupload]Goods = >{}", goods);
+		//log.info("[saveGoodsSizeSoldoutExcelupload]Goods = >{}", goods);
 		ObjectMapper mapper = new ObjectMapper();
 
 		String targetPath = GagaFileUtil.getConcatenationPath(env.getProperty("upload.excel.target.path"), "excel");
 		// DB 처리 시 사용되는 파라미터명(셀명) 설정
 		String[] cellName = { "brandEnm", "goodsNm", "itemkindCd","goodsStat","goodsCd", "optCd", "optCd1", "optCd2",  "soldoutYn",
 								"currStockQty", "baseStockQty","saleStockQty", "ableStockQty"};
-		log.info("[saveGoodsSizeSoldoutExcelupload]targetPath = >{}", targetPath);
-		log.info("[saveGoodsSizeSoldoutExcelupload]getExcelFileNm = >{}", GagaFileUtil.getConcatenationPath(targetPath, goods.getExcelFileNm()));
+		//log.info("[saveGoodsSizeSoldoutExcelupload]targetPath = >{}", targetPath);
+		//log.info("[saveGoodsSizeSoldoutExcelupload]getExcelFileNm = >{}", GagaFileUtil.getConcatenationPath(targetPath, goods.getExcelFileNm()));
 		Collection<GagaMap> ecxelGoodsList = GagaExcelUtil.getList(GagaFileUtil.getConcatenationPath(targetPath, goods.getExcelFileNm()), 0, cellName, 0);
 
 		//건수

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

@@ -11,6 +11,13 @@
 		              <foreach collection="conditionList" item="item" index="index" separator="or">
 		               UPPER(G.GOODS_CD) LIKE CONCAT('%',UPPER(#{item}),'%') 
 		              </foreach>
+		             )
+		              </when>
+		              <when test='search != null and search == "searchGoodsNm"'>
+		        AND (
+		              <foreach collection="conditionList" item="item" index="index" separator="or">
+		               UPPER(G.GOODS_NM) LIKE CONCAT('%',UPPER(#{item}),'%')
+		              </foreach>
 		             )
 		              </when>
 		              <when test='search != null and search == "searchGoodsNum"'>
@@ -233,6 +240,21 @@
 		</choose>
 	</sql>
 	
+	<!-- 목록 페이징 정보 LIMIT 용 -->
+	<sql id="getListLimitPagingCondition_sql">
+		<choose>
+		<when test="pageable != null">
+		    ) A
+		)Z 
+		LIMIT #{pageable.limitStartRow} ,  #{pageable.pageSize}
+		</when>
+		<otherwise>
+		    ) A
+		)Z
+		</otherwise>
+		</choose>
+	</sql>
+	
 	<!-- 상품 사이즈별 재고 현황 목록 건수 -->
 	<select id="getGoodsSizeStockCount" parameterType="GoodsSearch" resultType="int">
 		/* TsaStock.getGoodsSizeStockCount */
@@ -353,7 +375,7 @@
 		    , (SELECT ITEMKIND_NM FROM TB_ITEMKIND WHERE ITEMKIND_CD = Z.ITEMKIND_CD) AS ITEMKIND_NM
 		    , FN_GET_CODE_NM('G008', Z.GOODS_STAT) AS GOODS_STAT_NM
 		FROM (
-		    SELECT A.*, @rownum := @rownum + 1  RNUM 
+		    SELECT A.* -- , @rownum := @rownum + 1  RNUM 
 		    FROM (
 		        SELECT  X.GOODS_CD
 		              , X.BRAND_ENM
@@ -483,7 +505,7 @@
 		            </if>
 		        ORDER BY X.GOODS_CD, X.OPT_CD, X.REG_DT DESC
 		        </if>
-		<include refid="getListPagingCondition_sql"/>
+		<include refid="getListLimitPagingCondition_sql"/>
 	</sql>
 	
 	<!-- 상품 사이즈별 품절여부 변경 -->

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

@@ -239,7 +239,6 @@
 					<button type="button" class="btn btn-base btn-lg" id="btnGoodsExcelUpLoad">엑셀조회</button>
 				</li>
 				<li class="right">
-					<strong class="cRed">* 판매가능재고는 전시재고(배치)입니다.&nbsp;&nbsp;&nbsp;</strong>
 					<button type="button" class="btn btn-primary btn-lg"  id="btnGoodsSetMake">세트상품구성</button>
 					<button type="button" class="btn btn-primary btn-lg" id="btnGoodsSetDeal">딜상품구성</button>
 					검색결과 : <strong><span id="gridRowTotalCount">0</span> 건</strong>&nbsp;

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

@@ -173,15 +173,6 @@
 					<button type="button" class="btn btn-default btn-lg" id="btnExcelSampleDownLoad">다운로드</button>
 					<button type="button" class="btn btn-base btn-lg" id="btnGoodsExcelSearch">엑셀조회</button>
 					<button type="button" class="btn btn-success btn-lg" id="btnGoodsExcelSave" th:if="${sessionInfo.roleCd == 'G001_0000' OR sessionInfo.roleCd == 'G001_A000' OR sessionInfo.roleCd == 'G001_A101' OR sessionInfo.roleCd == 'G001_A100' OR sessionInfo.roleCd == 'G001_A001'}">품절/안전재고 저장</button>
-					<!-- 아이콘 툴팁 -->
-					&nbsp;<div class="iconTooltip">
-						<i class="fa fa-info" aria-hidden="true"></i>
-						<span class="left" style="width:500px;">
-						<!-- class="left" 또는 class="right" -->
-							* 매체별판매가능재고 = WMS가용재고 - 안전재고 - 출고대기
-						</span>
-					</div>
-					<!-- //아이콘 툴팁 -->
 				</li>
 				<li class="right">
 					검색결과 : <strong><span id="gridRowTotalCount">0</span> 건</strong>&nbsp;
@@ -189,6 +180,7 @@
 					<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>
 						<option value="5000">5000개씩 보기</option> -->
 					</select>
@@ -511,6 +503,7 @@
 	}
 	
 	var fnGoodsSizeStockExcelSearchCallBack = function(result){
+		$("#goodsSizeStockForm input[name=pageNo]").val('1');
 		fnGoodsListSearch("EXCEL");
 	}