Merge branch 'develop' of http://112.172.147.34:4936/style24/STYLE24.git into develop

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

@@ -1,12 +1,18 @@
 package com.style24.admin.biz.dao;
 
-import com.style24.core.support.annotation.ShopDs;
-import com.style24.persistence.domain.*;
-import org.springframework.stereotype.Component;
-
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.springframework.stereotype.Component;
+
+import com.style24.core.support.annotation.ShopDs;
+import com.style24.persistence.domain.Coupon;
+import com.style24.persistence.domain.FreeGoodsPromotion;
+import com.style24.persistence.domain.MoreBetter;
+import com.style24.persistence.domain.MoreBetterBurden;
+import com.style24.persistence.domain.MoreBetterGoods;
+import com.style24.persistence.domain.MoreBetterSection;
+
 /**
  * 마케팅 Dao
  *
@@ -122,4 +128,14 @@ public interface TsaMarketingDao {
 	 */
 	void deleteTmtbValList(MoreBetterSection sectionVal);
 	/* // CSB 진행 */
+
+	/**
+	 * 쿠폰조회 목록
+	 * @param coupon - 쿠폰 정보
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 1. 8
+	 */
+	public Collection<Coupon> getCouponRetrieveList(Coupon coupon);
+
 }

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

@@ -1,33 +1,27 @@
 package com.style24.admin.biz.service;
 
-import com.fasterxml.jackson.core.type.TypeReference;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gagaframework.excel.GagaExcelUtil;
-import com.gagaframework.excel.env.GagaExcelConstants;
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.util.GagaDateUtil;
-import com.gagaframework.web.util.GagaFileUtil;
-import com.gagaframework.web.util.GagaStringUtil;
-import com.style24.admin.biz.dao.TsaGoodsDao;
 import com.style24.admin.biz.dao.TsaMarketingDao;
-import com.style24.admin.support.env.TsaConstants;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.biz.thirdparty.NaverLowestPriceApi;
 import com.style24.core.biz.thirdparty.SafetyKoreaApi;
 import com.style24.core.support.message.TscMessageByLocale;
-import com.style24.persistence.domain.*;
-import io.netty.util.internal.StringUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
+import com.style24.persistence.domain.Coupon;
+import com.style24.persistence.domain.FreeGoodsPromotion;
+import com.style24.persistence.domain.MoreBetter;
+import com.style24.persistence.domain.MoreBetterBurden;
+import com.style24.persistence.domain.MoreBetterGoods;
+import com.style24.persistence.domain.MoreBetterSection;
 
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  *상품관리 Service
@@ -66,7 +60,6 @@ public class TsaMarketingService {
 	@Autowired
 	private NaverLowestPriceApi naverLowestPriceApi;
 
-
 	@Autowired
 	private ObjectMapper mapper;
 
@@ -144,10 +137,10 @@ public class TsaMarketingService {
 		// 다다익선 적용대상 설정
 		// 공급업체
 		Collection<MoreBetterGoods> supplyCompList = tmtb.getSupplyCompListNew();
-		for(MoreBetterGoods regSupplyComp : supplyCompList){
+		for (MoreBetterGoods regSupplyComp : supplyCompList) {
 			// 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
 			// tmtbGoodsSq 생성
-			Integer tmtbGoodsSq =  commonService.getNextSequence("SEQ_TMTB_GOODS");
+			Integer tmtbGoodsSq = commonService.getNextSequence("SEQ_TMTB_GOODS");
 			regSupplyComp.setTmtbGoodsSq(tmtbGoodsSq);
 			regSupplyComp.setTmtbSq(tmtb.getTmtbSq());
 			regSupplyComp.setGoodsGb("G800_20");
@@ -160,10 +153,10 @@ public class TsaMarketingService {
 
 		// 브랜드
 		Collection<MoreBetterGoods> brandList = tmtb.getBrandListNew();
-		for(MoreBetterGoods regBrand : brandList){
+		for (MoreBetterGoods regBrand : brandList) {
 			// 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
 			// tmtbGoodsSq 생성
-			Integer tmtbGoodsSq =  commonService.getNextSequence("SEQ_TMTB_GOODS");
+			Integer tmtbGoodsSq = commonService.getNextSequence("SEQ_TMTB_GOODS");
 			regBrand.setTmtbGoodsSq(tmtbGoodsSq);
 			regBrand.setTmtbSq(tmtb.getTmtbSq());
 			regBrand.setGoodsGb("G800_20");
@@ -176,10 +169,10 @@ public class TsaMarketingService {
 
 		// 적용상품
 		Collection<MoreBetterGoods> applyGoodsList = tmtb.getApplyGoodsListNew();
-		for(MoreBetterGoods regApplyGoods : applyGoodsList){
+		for (MoreBetterGoods regApplyGoods : applyGoodsList) {
 			// 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
 			// tmtbGoodsSq 생성
-			Integer tmtbGoodsSq =  commonService.getNextSequence("SEQ_TMTB_GOODS");
+			Integer tmtbGoodsSq = commonService.getNextSequence("SEQ_TMTB_GOODS");
 			regApplyGoods.setTmtbGoodsSq(tmtbGoodsSq);
 			regApplyGoods.setTmtbSq(tmtb.getTmtbSq());
 			regApplyGoods.setTargetVal(regApplyGoods.getGoodsCd());
@@ -191,10 +184,10 @@ public class TsaMarketingService {
 
 		// 제외상품
 		Collection<MoreBetterGoods> exceptGoodsList = tmtb.getExceptGoodsListNew();
-		for(MoreBetterGoods regExceptGoods : exceptGoodsList){
+		for (MoreBetterGoods regExceptGoods : exceptGoodsList) {
 			// 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
 			// tmtbGoodsSq 생성
-			Integer tmtbGoodsSq =  commonService.getNextSequence("SEQ_TMTB_GOODS");
+			Integer tmtbGoodsSq = commonService.getNextSequence("SEQ_TMTB_GOODS");
 			regExceptGoods.setTmtbGoodsSq(tmtbGoodsSq);
 			regExceptGoods.setTmtbSq(tmtb.getTmtbSq());
 			regExceptGoods.setTargetVal(regExceptGoods.getGoodsCd());
@@ -206,15 +199,15 @@ public class TsaMarketingService {
 
 		// 다다익선 할인구간 저장
 		Collection<MoreBetterSection> sectionGbList = tmtb.getSectionGbListNew();
-		for(MoreBetterSection regSection : sectionGbList){
+		for (MoreBetterSection regSection : sectionGbList) {
 			// 다다익선 할인구간설정 2차조건(TB_TMTB_SECTION) 저장
 			// tmtbSectionSq 생성
-			Integer tmtbSectionSq =  commonService.getNextSequence("SEQ_TMTB_SECTION");
+			Integer tmtbSectionSq = commonService.getNextSequence("SEQ_TMTB_SECTION");
 			regSection.setTmtbSectionSq(tmtbSectionSq);
 
 			// 다다익선 조건에 따른 할인혜택(금액할인) 설정(TB_TMTB_VAL) 저장
 			// tmtbValSq 생성
-			Integer tmtbValSq =  commonService.getNextSequence("SEQ_TMTB_VAL");
+			Integer tmtbValSq = commonService.getNextSequence("SEQ_TMTB_VAL");
 			regSection.setTmtbValSq(tmtbValSq);
 			regSection.setTmtbSq(tmtb.getTmtbSq());
 			regSection.setRegNo(tmtb.getRegNo());
@@ -228,7 +221,7 @@ public class TsaMarketingService {
 		Collection<MoreBetterBurden> burdenList = tmtb.getBurdenListNew();
 		for (MoreBetterBurden regBurden : burdenList) {
 			// tmtbBurdenSq 생성
-			Integer tmtbBurdenSq =  commonService.getNextSequence("SEQ_TMTB_BURDEN");
+			Integer tmtbBurdenSq = commonService.getNextSequence("SEQ_TMTB_BURDEN");
 			regBurden.setTmtbBurdenSq(tmtbBurdenSq);
 			regBurden.setTmtbSq(tmtb.getTmtbSq());
 			regBurden.setRegNo(tmtb.getRegNo());
@@ -256,4 +249,16 @@ public class TsaMarketingService {
 		}
 	}
 	/* // CSB 진행 */
+
+	/**
+	 * 쿠폰조회 목록
+	 * @param coupon - 쿠폰 정보
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 1. 8
+	 */
+	public Collection<Coupon> getCouponRetrieveList(Coupon coupon) {
+		return marketingDao.getCouponRetrieveList(coupon);
+	}
+
 }

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

@@ -1,27 +1,45 @@
 package com.style24.admin.biz.web;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.rest.server.GagaResponse;
-import com.style24.admin.biz.service.*;
+import com.style24.admin.biz.service.TsaBusinessService;
+import com.style24.admin.biz.service.TsaCommonService;
+import com.style24.admin.biz.service.TsaMarketingService;
+import com.style24.admin.biz.service.TsaRendererService;
+import com.style24.admin.biz.service.TsaSystemService;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.TsaPageRequest;
-import com.style24.persistence.domain.*;
+import com.style24.persistence.domain.CommonCode;
+import com.style24.persistence.domain.Coupon;
+import com.style24.persistence.domain.FreeGoodsPromotion;
+import com.style24.persistence.domain.MoreBetter;
+import com.style24.persistence.domain.MoreBetterBurden;
+import com.style24.persistence.domain.MoreBetterGoods;
+import com.style24.persistence.domain.MoreBetterSection;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
 
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.rest.server.GagaResponse;
+
 /**
  * 마케팅 Controller
  * @author xodud1202
@@ -76,7 +94,7 @@ public class TsaMarketingController extends TsaBaseController {
 	public GagaMap getFreeGoodsPromotionList(@RequestBody FreeGoodsPromotion param) {
 		GagaMap result = new GagaMap();
 
-		List<FreeGoodsPromotion> marketingList = (ArrayList<FreeGoodsPromotion>) marketingService.getFreeGoodsPromotionList(param);
+		List<FreeGoodsPromotion> marketingList = (ArrayList<FreeGoodsPromotion>)marketingService.getFreeGoodsPromotionList(param);
 
 		param.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		param.setPageable(new TsaPageRequest(param.getPageNo() - 1, param.getPageSize()));
@@ -88,7 +106,6 @@ public class TsaMarketingController extends TsaBaseController {
 		return result;
 	}
 
-
 	/**
 	 * 사은품 프로모션 등록 팝업창
 	 * @param param
@@ -111,7 +128,6 @@ public class TsaMarketingController extends TsaBaseController {
 		return mav;
 	}
 
-
 	/* // xodud1202 진행 */
 
 	/* JSM 진행 */
@@ -121,15 +137,15 @@ public class TsaMarketingController extends TsaBaseController {
 	 * @since 2020-12-21
 	 */
 	@GetMapping("/coupon/form")
-	public ModelAndView couponListForm(){
+	public ModelAndView couponListForm() {
 		ModelAndView mav = new ModelAndView();
 
 		// 쿠폰 유형 조회
-		mav.addObject("cpnTypeList" ,  rendererService.getCommonCodeList("G230"));
+		mav.addObject("cpnTypeList", rendererService.getCommonCodeList("G230"));
 		// 할인 유형 조회
-		mav.addObject("dcWayList" , rendererService.getCommonCodeList("G240"));
+		mav.addObject("dcWayList", rendererService.getCommonCodeList("G240"));
 		// 사이트 조회
-		mav.addObject("siteCdList" , rendererService.getCommonCodeList("G000"));
+		mav.addObject("siteCdList", rendererService.getCommonCodeList("G000"));
 
 		mav.setViewName("marketing/CouponListForm");
 
@@ -145,8 +161,8 @@ public class TsaMarketingController extends TsaBaseController {
 	 */
 	@PostMapping("/coupon/list")
 	@ResponseBody
-	public GagaMap getCouponList(@RequestBody Coupon param){
-		GagaMap result =  new GagaMap();
+	public GagaMap getCouponList(@RequestBody Coupon param) {
+		GagaMap result = new GagaMap();
 
 		ArrayList<Coupon> cpnList = marketingService.getCouponList(param);
 		int cpnTotCnt = marketingService.getCouponListCnt(param);
@@ -155,9 +171,9 @@ public class TsaMarketingController extends TsaBaseController {
 		param.setPageable(new TsaPageRequest(param.getPageNo() - 1, param.getPageSize()));
 		param.getPageable().setTotalCount(cpnTotCnt);
 
-		result.set("pageing" , param);
-		result.set("cpnTotCnt" , cpnTotCnt);
-		result.set("cpnList" , cpnList);
+		result.set("pageing", param);
+		result.set("cpnTotCnt", cpnTotCnt);
+		result.set("cpnList", cpnList);
 
 		return result;
 	}
@@ -176,10 +192,10 @@ public class TsaMarketingController extends TsaBaseController {
 
 		// 일시 시 리스트 세팅
 		Collection<CommonCode> hhList = new ArrayList<CommonCode>();
-		for(int i = 0; i < 24; i++) {
+		for (int i = 0; i < 24; i++) {
 			num = "";
 			CommonCode temp = new CommonCode();
-			if(i < 10) {
+			if (i < 10) {
 				num = "0" + i;
 			} else {
 				num = String.valueOf(i);
@@ -190,44 +206,44 @@ public class TsaMarketingController extends TsaBaseController {
 			mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", exceptCds));
 
 			temp.setCd(num);
-			temp.setCdNm(num+"시");
+			temp.setCdNm(num + "시");
 
 			hhList.add(temp);
 		}
 		// 일시 분 리스트 세팅
 		Collection<CommonCode> mmList = new ArrayList<CommonCode>();
-		for(int i = 0 ; i < 60; i++) {
+		for (int i = 0; i < 60; i++) {
 			num = "";
 			CommonCode temp = new CommonCode();
-			if(i < 10) {
+			if (i < 10) {
 				num = "0" + i;
 			} else {
 				num = String.valueOf(i);
 			}
 			temp.setCd(num);
-			temp.setCdNm(num+"분");
+			temp.setCdNm(num + "분");
 
 			mmList.add(temp);
 		}
 
 		// 쿠폰 유형 조회
-		mav.addObject("cpnTypeList" ,  rendererService.getCommonCodeList("G230"));
+		mav.addObject("cpnTypeList", rendererService.getCommonCodeList("G230"));
 		// 사용가능 고객구분 조회
 		mav.addObject("usableCustGbList", rendererService.getCommonCodeList("G100"));
 		// 사용가능 고객등급 조회
 		mav.addObject("usableCustGradeList", rendererService.getCommonCodeList("G110"));
 		// 사이트코드 조회
-		mav.addObject("siteCdList" , rendererService.getCommonCodeList("G000"));
+		mav.addObject("siteCdList", rendererService.getCommonCodeList("G000"));
 		// 재발급 여부 조회
-		mav.addObject("reissuanceList" , rendererService.getCommonCodeList("G231"));
+		mav.addObject("reissuanceList", rendererService.getCommonCodeList("G231"));
 		// 할인방식 조회
-		mav.addObject("dcWayList" , rendererService.getCommonCodeList("G240"));
+		mav.addObject("dcWayList", rendererService.getCommonCodeList("G240"));
 		// 쿠폰다운로드 방식 조회
-		mav.addObject("dnGbList" , rendererService.getCommonCodeList("G058"));
+		mav.addObject("dnGbList", rendererService.getCommonCodeList("G058"));
 		// 시간 분 리스트 세팅
-		mav.addObject("mmList" , mmList);
+		mav.addObject("mmList", mmList);
 		// 시간 시 리스트 세팅
-		mav.addObject("hhList" , hhList);
+		mav.addObject("hhList", hhList);
 
 		mav.setViewName("marketing/CouponCreatePopupForm");
 		return mav;
@@ -258,7 +274,7 @@ public class TsaMarketingController extends TsaBaseController {
 	public GagaMap getMorebetterList(@RequestBody MoreBetter param) {
 		GagaMap result = new GagaMap();
 
-		List<MoreBetter> tmtbList = (ArrayList<MoreBetter>) marketingService.getMorebetterList(param);
+		List<MoreBetter> tmtbList = (ArrayList<MoreBetter>)marketingService.getMorebetterList(param);
 
 		param.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		param.setPageable(new TsaPageRequest(param.getPageNo() - 1, param.getPageSize()));
@@ -286,23 +302,23 @@ public class TsaMarketingController extends TsaBaseController {
 		// 상품상태 : 등록일때는 '대기'
 		String[] exceptCds = {"G008_00"};
 		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", exceptCds));
-		log.info("CHECK param goodsStatList>>"+rendererService.getCommonCodeList("G008", "Y", exceptCds));
+		log.info("CHECK param goodsStatList>>" + rendererService.getCommonCodeList("G008", "Y", exceptCds));
 
 		// 할인구간 목록
 		mav.addObject("sectionGbList", rendererService.getAvailCommonCodeList("G810"));
-		log.info("CHECK param sectionGbList>>"+rendererService.getAvailCommonCodeList("G810"));
+		log.info("CHECK param sectionGbList>>" + rendererService.getAvailCommonCodeList("G810"));
 		// 할인구분 목록
 		mav.addObject("dcWayList", rendererService.getAvailCommonCodeList("G240"));
-		log.info("CHECK param dcWayList>>"+rendererService.getAvailCommonCodeList("G240"));
+		log.info("CHECK param dcWayList>>" + rendererService.getAvailCommonCodeList("G240"));
 
 		// 적용 상품구분 목록
-		String[] exceptGoodsCds = {"G800_30","G800_40"};
+		String[] exceptGoodsCds = {"G800_30", "G800_40"};
 		mav.addObject("applyGoodsGbList", rendererService.getCommonCodeList("G800", "Y", exceptGoodsCds));
-		log.info("CHECK param applyGoodsGbList>>"+rendererService.getCommonCodeList("G800", "Y", exceptGoodsCds));
+		log.info("CHECK param applyGoodsGbList>>" + rendererService.getCommonCodeList("G800", "Y", exceptGoodsCds));
 
 		// 제외 상품구분 목록
 		mav.addObject("exceptGoodsGbList", rendererService.getAvailCommonCodeList("G800"));
-		log.info("CHECK param exceptGoodsGbList>>"+rendererService.getAvailCommonCodeList("G800"));
+		log.info("CHECK param exceptGoodsGbList>>" + rendererService.getAvailCommonCodeList("G800"));
 
 		// 이것도 리스트 받아와서 바꿔야함 ㅠㅠ
 		String tmtbStat = "G232_10";
@@ -310,11 +326,11 @@ public class TsaMarketingController extends TsaBaseController {
 
 		//tmtb sq 자동생성 추가해야함
 		Integer tmtbSq;
-		tmtbSq =  commonService.getNextSequence("SEQ_TMTB");
+		tmtbSq = commonService.getNextSequence("SEQ_TMTB");
 		tmtb.setTmtbSq(tmtbSq);
 
 		mav.addObject("params", tmtb);
-		log.info("CHECK param tmtbSq>>"+tmtb.getTmtbSq());
+		log.info("CHECK param tmtbSq>>" + tmtb.getTmtbSq());
 		mav.setViewName("marketing/MorebetterRegForm");
 		return mav;
 	}
@@ -397,7 +413,7 @@ public class TsaMarketingController extends TsaBaseController {
 			e.printStackTrace();
 		}
 
-		log.info("tmtb::"+tmtb);
+		log.info("tmtb::" + tmtb);
 
 		tmtb.setSupplyCompListNew(tmtbSupplyCompList);
 		tmtb.setBrandListNew(tmtbBrandList);
@@ -410,6 +426,7 @@ public class TsaMarketingController extends TsaBaseController {
 
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
+
 	/**
 	 * 다다익선 할인구간 삭제
 	 *
@@ -428,4 +445,53 @@ public class TsaMarketingController extends TsaBaseController {
 	}
 
 	/* // CSB 진행 */
+
+	/**
+	 * 쿠폰조회 팝업
+	 * @param returnCode - 반환할코드. 필수
+	 * @param returnName - 반환할명칭. 필수
+	 * @param cpnNm - 쿠폰명. 옵션
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 1. 8
+	 */
+	@GetMapping("/coupon/retrieve/form")
+	@ResponseBody
+	public ModelAndView couponRetrieveForm(@RequestParam(value = "returnCode") String returnCode, @RequestParam(value = "returnName") String returnName, @RequestParam(value = "cpnNm", required = false) String cpnNm) {
+		ModelAndView mav = new ModelAndView();
+
+		mav.addObject("returnCode", returnCode);
+		mav.addObject("returnName", returnName);
+		mav.addObject("cpnNm", StringUtils.defaultString(cpnNm, ""));
+
+		// 사이트 목록
+		mav.addObject("siteList", rendererService.getAvailCommonCodeList("G000"));
+
+		// 사용가능고객구분 목록
+		mav.addObject("usableCustGbList", rendererService.getAvailCommonCodeList("G100"));
+
+		// 쿠폰유형 목록
+		mav.addObject("cpnTypeList", rendererService.getAvailCommonCodeList("G230"));
+
+		// 할인방식 목록
+		mav.addObject("dcWayList", rendererService.getAvailCommonCodeList("G240"));
+
+		mav.setViewName("marketing/CouponRetrieveForm");
+
+		return mav;
+	}
+
+	/**
+	 * 쿠폰조회 목록
+	 * @param coupon - 쿠폰 정보
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 1. 8
+	 */
+	@PostMapping("/coupon/retrieve/list")
+	@ResponseBody
+	public Collection<Coupon> getCouponRetrieveList(@RequestBody Coupon coupon) {
+		return marketingService.getCouponRetrieveList(coupon);
+	}
+
 }

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

@@ -309,4 +309,39 @@
 					,UDT_DT = NOW()
 	</insert>
 	<!--// CSB 진행 -->
+	
+	<!-- 쿠폰조회 목록 -->
+	<select id="getCouponRetrieveList" parameterType="Coupon" resultType="Coupon">
+		/* TsaMarketing.getCouponRetrieveList */
+		SELECT A.CPN_ID                                               /*쿠폰ID*/
+		     , A.CPN_NM                                               /*쿠폰명*/
+		     , A.SITE_CD                                              /*사이트코드(공통코드G000)*/
+		     , A.USABLE_CUST_GB                                       /*사용가능고객구분(공통코드G100)*/
+		     , A.CPN_TYPE                                             /*쿠폰유형(공통코드G230)*/
+		     , A.DC_WAY                                               /*할인방식(공통코드G240)*/
+		     , A.DC_PVAL                                              /*할인값(PC). 할인방식이 금액이면 할인금액, 율이면 할인율*/
+		     , A.DC_MVAL                                              /*할인값(모바일). 할인방식이 금액이면 할인금액, 율이면 할인율*/
+		     , A.MAX_DC_AMT                                           /*최고할인값. 할인방식이 금액이면 최고할인금액, 율이면 최고할인율*/
+		     , A.PD_GB                                                /*기간/일수구분(P 기간, D 일수)*/
+		     , DATE_FORMAT(A.AVAIL_STDT,'%Y%m%d%H%i%S') AS AVAIL_STDT /*유효시작일시(기간/일수구분 "P 기간"일 때 사용됨)*/
+		     , DATE_FORMAT(A.AVAIL_EDDT,'%Y%m%d%H%i%S') AS AVAIL_EDDT /*유효종료일시(기간/일수구분 "P 기간"일 때 사용됨)*/
+		     , A.AVAIL_DAYS                                           /*유효일수(기간/일수구분 "D 일수"일 때 사용됨)*/
+		     , A.CUST_PUB_LIMIT_QTY                                   /*고객당발행제한수량(0은 무제한)*/
+		     , A.TOT_PUB_LIMIT_QTY                                    /*총발행제한수량(0은 무제한)*/
+		     , A.ONE_PUB_QTY                                          /*1회발행수량*/
+		     , A.DN_GB                                                /*다운로드구분(A:자동다운로드, D:직접다운로드). 다운로드가능여부가 "Y 다운로드가능"일 때만 사용됨*/
+		     , A.BUY_LIMIT_AMT                                        /*구매제한금액(0은 제한없음)*/
+		FROM   TB_COUPON A
+		WHERE  A.SITE_CD = #{siteCd}
+		<if test="cpnId !=null and cpnId !=''">
+		AND	   A.CPN_ID = #{cpnId}
+		</if>
+		<if test="cpnNm !=null and cpnNm !=''">
+		AND	   A.CPN_NM LIKE '%'||#{cpnNm}||'%'
+		</if>
+		<if test="cpnType !=null and cpnType !=''">
+		AND	   A.CPN_TYPE = #{cpnType}
+		</if>
+	</select>
+	
 </mapper>

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/customer/GoodsQnaDetailForm.html

@@ -57,7 +57,7 @@
 							<td th:text="*{siteNm}"></td>
 							<td>상품문의</td>
 							<td th:text="*{questDt}"></td>
-							<td th:utext="*{custNm + ' / ' + cellPhnno + '<br/>' + email}"></td>
+							<td th:utext="*{maskingCustNm + ' / ' + maskingCellPhnno + '<br/>' + maskingEmail}"></td>
 							<td th:utext="*{ansTransYn == 'Y' ? ansTransDt + '<br/>' + ansCompNm : ''}"></td>
 							<td th:utext="*{ansStat == 'G060_20' ? ansStatNm + ' / ' + ansDt + '<br/>' + ansNm : ansStatNm}"></td>
 						</tr>

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/marketing/CouponRetrieveForm.html

@@ -0,0 +1,211 @@
+<!DOCTYPE html>
+<html lang="ko"
+	xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : CouponRetrieveForm.html
+ * @desc    : 쿠폰조회 팝업 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.01.08   gagamel     최초 작성
+ *******************************************************************************
+ -->
+<div class="modalPopup" data-width="1200" id="popupCoupon">
+	<div class="panelStyle">
+		<!-- TITLE -->
+		<div class="panelTitle">
+			<strong>쿠폰 조회</strong>
+			<button type="button" class="close" onclick="uifnPopupClose('popupCoupon');"><em class="fa fa-times"></em></button>
+		</div>
+		<!-- //TITLE -->
+		
+		<!-- CONTENT -->
+		<div class="panelContent">
+			<form id="searchCouponForm" name="searchCouponForm" action="#" th:action="@{'/marketing/coupon/retrieve/list'}" th:method="post">
+				<table class="frmStyle" aria-describedby="검색조건">
+					<colgroup>
+						<col style="width:10%;"/>
+						<col style="width:40%;"/>
+						<col style="width:10%;"/>
+						<col style="width:40%;"/>
+					</colgroup>
+					<tbody>
+						<tr>
+							<th>사이트<em class="required" title="필수"></em></th>
+							<td>
+								<select name="siteCd" required="required">
+									<option th:if="${siteList}" th:each="oneData, status : ${siteList}" th:value="${oneData.cd}" th:text="|[${oneData.cd}] ${oneData.cdNm}|"></option>
+								</select>
+							</td>
+							<th>쿠폰유형</th>
+							<td>
+								<select name="cpnType">
+									<option value="">[전체]</option>
+									<option th:if="${cpnTypeList}" th:each="oneData, status : ${cpnTypeList}" th:value="${oneData.cd}" th:text="|[${oneData.cd}] ${oneData.cdNm}|"></option>
+								</select>
+							</td>
+						</tr>
+						<tr>
+							<th>쿠폰ID</th>
+							<td>
+								<input type="text" name="cpnId" maxlength="20"/>
+							</td>
+							<th>쿠폰명</th>
+							<td>
+								<input type="text" name="cpnNm" maxlength="50" th:value="${cpnNm}"/>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+				
+				<ul class="panelBar">
+					<li class="center">
+						<button type="button" class="btn btn-base btn-lg" id="btnSearchCouponRetrieve">조회</button>
+					</li>
+				</ul>
+			</form>
+		</div>
+		<!-- //CONTENT -->
+
+		<!-- 리스트 영역 -->
+		<div class="panelContent">
+			<div id="gridCouponList" style="width: 100%; height: 470px" class="ag-theme-balham"></div>
+		</div>
+		<!-- //리스트 영역 -->
+		
+		<!-- 버튼 배치 영역 -->
+		<ul class="panelBar">
+			<li class="right">
+				<button type="button" class="btn btn-info btn-lg" id="btnConfirmCoupon">확인</button>
+			</li>
+		</ul>
+		<!-- //버튼 배치 영역 -->
+	</div>
+</div>
+
+<script th:inline="javascript">
+/*<![CDATA[*/
+	let returnCode = [[${returnCode}]];
+	let returnName = [[${returnName}]];
+
+	let siteList = gagajf.convertToArray([[${siteList}]]);
+	let usableCustGbList = gagajf.convertToArray([[${usableCustGbList}]]);
+	let cpnTypeList = gagajf.convertToArray([[${cpnTypeList}]]);
+	let dcWayList = gagajf.convertToArray([[${dcWayList}]]);
+	
+	let columnDefsCouponList = [
+		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+		{
+			headerName: "사이트", field: "siteCd", width: 80, cellClass: "text-center", pinned: 'left',
+			valueFormatter: function (params) { return gagaAgGrid.lookupValue(siteList, params.value); }
+		},
+		{headerName: "쿠폰ID", field: "cpnId", width: 90, cellClass: 'text-center', pinned: 'left'},
+		{headerName: "쿠폰명", field: "cpnNm", width: 150, pinned: 'left'},
+		{
+			headerName: "사용가능고객", field: "usableCustGb", width: 120, cellClass: "text-center",
+			valueFormatter: function (params) { return gagaAgGrid.lookupValue(usableCustGbList, params.value); }
+		},
+		{
+			headerName: "쿠폰유형", field: "cpnType", width: 100, cellClass: "text-center",
+			valueFormatter: function (params) { return gagaAgGrid.lookupValue(cpnTypeList, params.value); }
+		},
+		{
+			headerName: "할인방식", field: "dcWay", width: 100, cellClass: "text-center",
+			valueFormatter: function (params) { return gagaAgGrid.lookupValue(dcWayList, params.value); }
+		},
+		{
+			headerName: "할인값(PC)", field: "dcPval", width: 100, cellClass: "text-center",
+			cellRenderer: function(params) { return (!gagajf.isNull(params.value) ? gagaAgGrid.toAddComma(params.value) : '') + (params.data.dcWay == '10' ? '원' : '%'); }
+		},
+		{
+			headerName: "할인값(모바일)", field: "dcMval", width: 100, cellClass: "text-center",
+			cellRenderer: function(params) { return (!gagajf.isNull(params.value) ? gagaAgGrid.toAddComma(params.value) : '') + (params.data.dcWay == '10' ? '원' : '%'); }
+		},
+		{
+			headerName: "최고할인값", field: "maxDcAmt", width: 100, cellClass: "text-center",
+			cellRenderer: function(params) { return (!gagajf.isNull(params.value) ? gagaAgGrid.toAddComma(params.value) : '') + (params.data.dcWay == '10' ? '원' : '%'); }
+		},
+// 		{
+// 			headerName: "기간/일수", field: "pdGb", width: 100, cellClass: "text-center", hide: true,
+// 			cellRenderer: function(params) { return (params.value == 'P' ? '기간' : '일수'); }
+// 		},
+// 		{
+// 			headerName: "유효시작일시", field: "availStdt", width: 150, cellClass: "text-center", hide: true,
+// 			cellRenderer: function(params) { return !gagajf.isNull(params.value) ? gagaAgGrid.toDateTimeFormat(params.value) : ''; }
+// 		},
+// 		{
+// 			headerName: "유효종료일시", field: "availEddt", width: 150, cellClass: "text-center", hide: true,
+// 			cellRenderer: function(params) { return !gagajf.isNull(params.value) ? gagaAgGrid.toDateTimeFormat(params.value) : ''; }
+// 		},
+// 		{headerName: "유효일수", field: "availDays", width: 100, cellClass: "text-center", hide: true},
+		{
+			headerName: "유효기간", field: "availPeriod", width: 300, cellClass: "text-center",
+			cellRenderer: function(params) { return params.data.pdGb == 'P' ? gagaAgGrid.toDateTimeFormat(params.data.availStdt) + '~' + gagaAgGrid.toDateTimeFormat(params.data.availStdt) : gagaAgGrid.toAddComma(params.data.availDays) + '일'; }
+		},
+		{headerName: "발행제한여부", field: "pubLimitYn", width: 100, cellClass: "text-center"},
+		{
+			headerName: "고객당발행제한수량", field: "custPubLimitQty", width: 100, cellClass: "text-center",
+			cellRenderer: function(params) { return !gagajf.isNull(params.value) ? gagaAgGrid.toAddComma(params.value) : ''; }
+		},
+		{
+			headerName: "총발행제한수량", field: "totPubLimitQty", width: 100, cellClass: "text-center",
+			cellRenderer: function(params) { return !gagajf.isNull(params.value) ? gagaAgGrid.toAddComma(params.value) : ''; }
+		},
+		{
+			headerName: "1회발행수량", field: "onePubQty", width: 100, cellClass: "text-center",
+			cellRenderer: function(params) { return !gagajf.isNull(params.value) ? gagaAgGrid.toAddComma(params.value) : ''; }
+		},
+		{headerName: "다운로드구분", field: "dnGb", width: 100, cellClass: "text-center"},
+		{
+			headerName: "구매제한금액", field: "buyLimitAmt", width: 100, cellClass: "text-right",
+			cellRenderer: function(params) { return !gagajf.isNull(params.value) ? gagaAgGrid.toAddComma(params.value) : ''; }
+		}
+	];
+
+	let gridOptionsCouponList = gagaAgGrid.getGridOptions(columnDefsCouponList);
+
+	// Row double click
+	gridOptionsCouponList.onRowDoubleClicked = function(event) {
+		$('#btnConfirmCoupon').trigger('click');
+	}
+
+	// 조회
+	$('#btnSearchCouponRetrieve').on('click', function() {
+		// Fetch data
+		gagaAgGrid.fetch($('#searchCouponForm').prop('action'), gridOptionsCouponList, '#searchCouponForm');
+	});
+	
+	// 부모창에 값을 설정
+	let fnSetCouponValueToOpener = function(rowData) {
+		$(returnCode).val(rowData.cpnId);
+		$(returnName).val(rowData.cpnNm);
+
+		uifnPopupClose('popupCoupon');
+	}
+	
+	// 확인
+	$('#btnConfirmCoupon').on('click', function() {
+		var selectedData = gagaAgGrid.selectedRowData(gridOptionsCouponList);
+		
+		if (selectedData.length == 0) {
+			mcxDialog.alert('선택된 쿠폰이 없습니다.');
+			return false;
+		}
+		
+		fnSetCouponValueToOpener(selectedData[0]);
+	});
+	
+	$(document).ready(function() {
+		// Create a agGrid
+		gagaAgGrid.createGrid('gridCouponList', gridOptionsCouponList);
+		
+		$('#btnSearchCouponRetrieve').trigger('click');
+	});
+/*]]>*/
+</script>
+
+</html>

style24.admin/src/main/webapp/WEB-INF/views/settle/DeliveryFeeSettleForm.html

@@ -1,146 +1,146 @@
-<!DOCTYPE html>
-<html lang="ko"
-	xmlns:th="http://www.thymeleaf.org">
-<!--
- *******************************************************************************
- * @source  : DeliveryFeeSettleForm.html
- * @desc    : 배송비정산 Page
- *============================================================================
- * STYLE24
- * Copyright(C) 2020 TSIT, All rights reserved.
- *============================================================================
- * VER  DATE         AUTHOR      DESCRIPTION
- * ===  ===========  ==========  =============================================
- * 1.0  2020.10.26   gagamel     최초 작성
- *******************************************************************************
- -->
-	<div id="main">
-		<!-- 메인타이틀 영역 -->
-		<div class="main-title">
-		</div>
-		<!-- //메인타이틀 영역 -->
-		
-		<!-- 메뉴 설명 -->
-		<div class="infoBox menu-desc">
-		</div>
-		<!-- //메뉴 설명 -->
-		
-		<!-- 검색조건 영역 -->
-		<div class="panelStyle">
-			<form id="searchForm" name="searchForm" action="#" th:action="@{'/settle/delivery/fee/list'}" onsubmit="$('#btnSearch').trigger('click'); return false;">
-				<table class="frmStyle" aria-describedby="검색조건">
-					<colgroup>
-						<col style="width:10%;"/>
-						<col style="width:60%;"/>
-						<col style="width:10%;"/>
-						<col/>
-					</colgroup>
-					<tr>
-						<th>출고기간<i class="required" title="필수" aria-hidden="true"></i></th>
-						<td id="terms">
-						</td>
-						<th>유통구분</th>
-						<td>
-							<select name="distributionGb">
-								<option value="">[전체]</option>
-								<option th:if="${distributionGbList}" th:each="oneData, status : ${distributionGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<th>공급업체/브랜드</th>
-						<td colspan="3">
-							<select name="supplyCompCd">
-								<option value="">[전체]</option>
-								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-							/
-							<select name="brandCd">
-								<option value="">[전체]</option>
-							</select>
-						</td>
-					</tr>
-				</table>
-				
-				<ul class="panelBar">
-					<li class="center">
-						<button type="button" class="btn btn-base btn-lg" id="btnSearch">조회</button>
-						<button type="button" class="btn btn-gray btn-lg" onclick="$('#searchForm')[0].reset();">초기화</button>
-					</li>
-				</ul>
-			</form>
-		</div>
-		<!-- 검색조건 영역 -->
-
-		<!-- 리스트 영역 -->
-		<div class="panelStyle">
-			<!-- 버튼 배치 영역 -->
-			<ul class="panelBar">
-				<li class="right">
-					<button type="button" class="btn btn-default btn-lg" id="btnExcel">엑셀다운로드</button>
-				</li>
-			</ul>
-			<!-- //버튼 배치 영역 -->
-			
-			<div id="gridList" style="width: 100%; height: 470px" class="ag-theme-balham"></div>
-		</div>
-		<!-- //리스트 영역 -->
-	</div>
-
-<script th:inline="javascript">
-/*<![CDATA[*/
-	let supplyCompList = gagajf.convertToArray([[${supplyCompList}]]);
-	let distributionGbList = gagajf.convertToArray([[${distributionGbList}]]);
-
-	let columnDefs = [
-		{
-			headerName: "출고일자", field: "outgoingDt", width: 100, cellClass: 'text-center',
-			valueGetter: function (params) {
-				return gagaAgGrid.toDateFormat(params.data.outgoingDt);
-			}
-		},
-		{
-			headerName: "공급업체", field: "supplyCompCd", width: 100, cellClass: 'text-center',
-			valueGetter: function (params) {
-				return gagaAgGrid.lookupValue(supplyCompList, params.data.supplyCompCd);
-			}
-		},
-		{
-			headerName: "유통구분", field: "distributionGb", width: 100, cellClass: 'text-center',
-			valueGetter: function (params) {
-				return gagaAgGrid.lookupValue(distributionGbList, params.data.distributionGb);
-			}
-		},
-		{
-			headerName: "배송비구분", field: "delvFeeGb", width: 100, cellClass: 'text-center'/* ,
-			valueGetter: function (params) {
-				return gagaAgGrid.lookupValue(delvFeeGbList, params.data.delvFeeGb);
-			} */
-		},
-		{ headerName: "주문번호", field: "ordNo", width: 100, cellClass: 'text-center' },
-		{ headerName: "배송비", field: "delvFee", width: 100, cellClass: 'text-right' }
-	];
-
-	let gridOptions = gagaAgGrid.getGridOptions(columnDefs);
-
-	// 검색
-	$('#btnSearch').on('click', function() {
-		gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptions, '#searchForm');
-	});
-	
-	// 엑셀다운로드
-	$('#btnExcel').on('click', function() {
-		gagaAgGrid.exportToExcel('배송비정산 목록', gridOptions);
-	});
-	
-	$(document).ready(function() {
-		cfnCreateCalendar('#terms', 'startDt', 'endDt', true, '출고');
-		$('.btnToday').trigger('click');
-		
-		// Create a agGrid
-		gagaAgGrid.createGrid('gridList', gridOptions);
-	});
-/*]]>*/
-</script>
-
-</html>
+<!DOCTYPE html>
+<html lang="ko"
+	xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : DeliveryFeeSettleForm.html
+ * @desc    : 배송비정산 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2020.10.26   gagamel     최초 작성
+ *******************************************************************************
+ -->
+	<div id="main">
+		<!-- 메인타이틀 영역 -->
+		<div class="main-title">
+		</div>
+		<!-- //메인타이틀 영역 -->
+		
+		<!-- 메뉴 설명 -->
+		<div class="infoBox menu-desc">
+		</div>
+		<!-- //메뉴 설명 -->
+		
+		<!-- 검색조건 영역 -->
+		<div class="panelStyle">
+			<form id="searchForm" name="searchForm" action="#" th:action="@{'/settle/delivery/fee/list'}" onsubmit="$('#btnSearch').trigger('click'); return false;">
+				<table class="frmStyle" aria-describedby="검색조건">
+					<colgroup>
+						<col style="width:10%;"/>
+						<col style="width:60%;"/>
+						<col style="width:10%;"/>
+						<col/>
+					</colgroup>
+					<tr>
+						<th>매출기간<i class="required" title="필수" aria-hidden="true"></i></th>
+						<td id="terms">
+						</td>
+						<th>유통구분</th>
+						<td>
+							<select name="distributionGb">
+								<option value="">[전체]</option>
+								<option th:if="${distributionGbList}" th:each="oneData, status : ${distributionGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							</select>
+						</td>
+					</tr>
+					<tr>
+						<th>공급업체/브랜드</th>
+						<td colspan="3">
+							<select name="supplyCompCd">
+								<option value="">[전체]</option>
+								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							</select>
+							/
+							<select name="brandCd">
+								<option value="">[전체]</option>
+							</select>
+						</td>
+					</tr>
+				</table>
+				
+				<ul class="panelBar">
+					<li class="center">
+						<button type="button" class="btn btn-base btn-lg" id="btnSearch">조회</button>
+						<button type="button" class="btn btn-gray btn-lg" onclick="$('#searchForm')[0].reset();">초기화</button>
+					</li>
+				</ul>
+			</form>
+		</div>
+		<!-- 검색조건 영역 -->
+
+		<!-- 리스트 영역 -->
+		<div class="panelStyle">
+			<!-- 버튼 배치 영역 -->
+			<ul class="panelBar">
+				<li class="right">
+					<button type="button" class="btn btn-default btn-lg" id="btnExcel">엑셀다운로드</button>
+				</li>
+			</ul>
+			<!-- //버튼 배치 영역 -->
+			
+			<div id="gridList" style="width: 100%; height: 470px" class="ag-theme-balham"></div>
+		</div>
+		<!-- //리스트 영역 -->
+	</div>
+
+<script th:inline="javascript">
+/*<![CDATA[*/
+	let supplyCompList = gagajf.convertToArray([[${supplyCompList}]]);
+	let distributionGbList = gagajf.convertToArray([[${distributionGbList}]]);
+
+	let columnDefs = [
+		{
+			headerName: "출고일자", field: "outgoingDt", width: 100, cellClass: 'text-center',
+			valueGetter: function (params) {
+				return gagaAgGrid.toDateFormat(params.data.outgoingDt);
+			}
+		},
+		{
+			headerName: "공급업체", field: "supplyCompCd", width: 100, cellClass: 'text-center',
+			valueGetter: function (params) {
+				return gagaAgGrid.lookupValue(supplyCompList, params.data.supplyCompCd);
+			}
+		},
+		{
+			headerName: "유통구분", field: "distributionGb", width: 100, cellClass: 'text-center',
+			valueGetter: function (params) {
+				return gagaAgGrid.lookupValue(distributionGbList, params.data.distributionGb);
+			}
+		},
+		{
+			headerName: "배송비구분", field: "delvFeeGb", width: 100, cellClass: 'text-center'/* ,
+			valueGetter: function (params) {
+				return gagaAgGrid.lookupValue(delvFeeGbList, params.data.delvFeeGb);
+			} */
+		},
+		{ headerName: "주문번호", field: "ordNo", width: 100, cellClass: 'text-center' },
+		{ headerName: "배송비", field: "delvFee", width: 100, cellClass: 'text-right' }
+	];
+
+	let gridOptions = gagaAgGrid.getGridOptions(columnDefs);
+
+	// 검색
+	$('#btnSearch').on('click', function() {
+		gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptions, '#searchForm');
+	});
+	
+	// 엑셀다운로드
+	$('#btnExcel').on('click', function() {
+		gagaAgGrid.exportToExcel('배송비정산 목록', gridOptions);
+	});
+	
+	$(document).ready(function() {
+		cfnCreateCalendar('#terms', 'startDt', 'endDt', true, '매출');
+		$('.btnToday').trigger('click');
+		
+		// Create a agGrid
+		gagaAgGrid.createGrid('gridList', gridOptions);
+	});
+/*]]>*/
+</script>
+
+</html>

style24.admin/src/main/webapp/WEB-INF/views/settle/GoodsSettleForm.html

@@ -1,163 +1,181 @@
-<!DOCTYPE html>
-<html lang="ko"
-	xmlns:th="http://www.thymeleaf.org">
-<!--
- *******************************************************************************
- * @source  : GoodsSettleForm.html
- * @desc    : 상품정산 Page
- *============================================================================
- * STYLE24
- * Copyright(C) 2020 TSIT, All rights reserved.
- *============================================================================
- * VER  DATE         AUTHOR      DESCRIPTION
- * ===  ===========  ==========  =============================================
- * 1.0  2020.10.22   gagamel     최초 작성
- *******************************************************************************
- -->
-	<div id="main">
-		<!-- 메인타이틀 영역 -->
-		<div class="main-title">
-		</div>
-		<!-- //메인타이틀 영역 -->
-		
-		<!-- 메뉴 설명 -->
-		<div class="infoBox menu-desc">
-		</div>
-		<!-- //메뉴 설명 -->
-		
-		<!-- 검색조건 영역 -->
-		<div class="panelStyle">
-			<form id="searchForm" name="searchForm" action="#" th:action="@{'/settle/goods/list'}" onsubmit="$('#btnSearch').trigger('click'); return false;">
-				<table class="frmStyle" aria-describedby="검색조건">
-					<colgroup>
-						<col style="width:10%;"/>
-						<col style="width:60%;"/>
-						<col style="width:10%;"/>
-						<col/>
-					</colgroup>
-					<tr>
-						<th>출고기간<i class="required" title="필수" aria-hidden="true"></i></th>
-						<td id="terms">
-						</td>
-						<th>유통구분</th>
-						<td>
-							<select name="distributionGb">
-								<option value="">[전체]</option>
-								<option th:if="${distributionGbList}" th:each="oneData, status : ${distributionGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<th>공급업체/브랜드</th>
-						<td colspan="3">
-							<select name="supplyCompCd">
-								<option value="">[전체]</option>
-								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-							/
-							<select name="brandCd">
-								<option value="">[전체]</option>
-							</select>
-						</td>
-					</tr>
-				</table>
-				
-				<ul class="panelBar">
-					<li class="center">
-						<button type="button" class="btn btn-base btn-lg" id="btnSearch">조회</button>
-						<button type="button" class="btn btn-gray btn-lg" onclick="$('#searchForm')[0].reset();">초기화</button>
-					</li>
-				</ul>
-			</form>
-		</div>
-		<!-- 검색조건 영역 -->
-
-		<!-- 리스트 영역 -->
-		<div class="panelStyle">
-			<!-- 버튼 배치 영역 -->
-			<ul class="panelBar">
-				<li class="right">
-					<button type="button" class="btn btn-default btn-lg" id="btnExcel">엑셀다운로드</button>
-				</li>
-			</ul>
-			<!-- //버튼 배치 영역 -->
-			
-			<div id="gridList" style="width: 100%; height: 470px" class="ag-theme-balham"></div>
-		</div>
-		<!-- //리스트 영역 -->
-	</div>
-
-<script th:inline="javascript">
-/*<![CDATA[*/
-	let supplyCompList = gagajf.convertToArray([[${supplyCompList}]]);
-	let distributionGbList = gagajf.convertToArray([[${distributionGbList}]]);
-
-	let columnDefs = [
-		{ headerName: "주문번호", field: "ordNo", width: 100, cellClass: 'text-center' },
-		{
-			headerName: "공급업체", field: "supplyCompCd", width: 100, cellClass: 'text-center',
-			valueGetter: function (params) {
-				return gagaAgGrid.lookupValue(supplyCompList, params.data.supplyCompCd);
-			}
-		},
-		{
-			headerName: "유통구분", field: "distributionGb", width: 100, cellClass: 'text-center',
-			valueGetter: function (params) {
-				return gagaAgGrid.lookupValue(distributionGbList, params.data.distributionGb);
-			}
-		},
-		{ headerName: "정산주기", field: "usacPeriod", width: 100, cellClass: 'text-center' },
-		{ headerName: "주문일시", field: "ordDt", width: 150, cellClass: 'text-center' },
-		{
-			headerName: "정산구분", field: "usacGb", width: 100, cellClass: 'text-center'/* ,
-			valueGetter: function (params) {
-				return gagaAgGrid.lookupValue(usacGbList, params.data.usacGb);
-			} */
-		},
-		{
-			headerName: "환입구분", field: "prtnGb", width: 100, cellClass: 'text-center'/* ,
-			valueGetter: function (params) {
-				return gagaAgGrid.lookupValue(prtnGbList, params.data.prtnGb);
-			} */
-		},
-		{ headerName: "상품코드", field: "goodsCd", width: 120, cellClass: 'text-center' },
-		{ headerName: "상품명", field: "goodsNm", width: 150, cellClass: 'text-center' },
-		{ headerName: "브랜드", field: "brandEnm", width: 100, cellClass: 'text-center' },
-		{ headerName: "담당MD", field: "mdNm", width: 100, cellClass: 'text-center' },
-		{ headerName: "단품코드", field: "itemCd", width: 120, cellClass: 'text-center' },
-		{ headerName: "사이즈", field: "sizeCd", width: 100, cellClass: 'text-center' },
-		{ headerName: "판매가", field: "currPrice", width: 100, cellClass: 'text-right' },
-		{ headerName: "판매수량", field: "sellQty", width: 100, cellClass: 'text-center' },
-		{ headerName: "판매총액", field: "sellAmt", width: 100, cellClass: 'text-right' },
-		{ headerName: "즉시사용쿠폰금액", field: "duseCpnDcAmt", width: 100, cellClass: 'text-right' },
-		{ headerName: "상품쿠폰사용금액", field: "goodsCpnDcAmt", width: 100, cellClass: 'text-right' },
-		{ headerName: "주문서쿠폰사용금액", field: "cartCpnDcAmt", width: 100, cellClass: 'text-right' },
-		{ headerName: "포인트사용금액", field: "pntDcAmt", width: 100, cellClass: 'text-right' },
-		{ headerName: "다다익선할인금액", field: "multiDcAmt", width: 100, cellClass: 'text-right' },
-		{ headerName: "자사쿠폰분담액", field: "selfCpnDcAmt", width: 100, cellClass: 'text-right' },
-		{ headerName: "입점쿠폰분담액", field: "supplyCompCpnDcAmt", width: 100, cellClass: 'text-right' }
-	];
-
-	let gridOptions = gagaAgGrid.getGridOptions(columnDefs);
-
-	// 검색
-	$('#btnSearch').on('click', function() {
-		gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptions, '#searchForm');
-	});
-	
-	// 엑셀다운로드
-	$('#btnExcel').on('click', function() {
-		gagaAgGrid.exportToExcel('상품정산 목록', gridOptions);
-	});
-	
-	$(document).ready(function() {
-		cfnCreateCalendar('#terms', 'startDt', 'endDt', true, '출고');
-		$('.btnToday').trigger('click');
-		
-		// Create a agGrid
-		gagaAgGrid.createGrid('gridList', gridOptions);
-	});
-/*]]>*/
-</script>
-
-</html>
+<!DOCTYPE html>
+<html lang="ko"
+	xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : GoodsSettleForm.html
+ * @desc    : 상품정산 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2020.10.22   gagamel     최초 작성
+ *******************************************************************************
+ -->
+	<div id="main">
+		<!-- 메인타이틀 영역 -->
+		<div class="main-title">
+		</div>
+		<!-- //메인타이틀 영역 -->
+		
+		<!-- 메뉴 설명 -->
+		<div class="infoBox menu-desc">
+		</div>
+		<!-- //메뉴 설명 -->
+		
+		<!-- 검색조건 영역 -->
+		<div class="panelStyle">
+			<form id="searchForm" name="searchForm" action="#" th:action="@{'/settle/goods/list'}" onsubmit="$('#btnSearch').trigger('click'); return false;">
+				<table class="frmStyle" aria-describedby="검색조건">
+					<colgroup>
+						<col style="width:10%;"/>
+						<col style="width:60%;"/>
+						<col style="width:10%;"/>
+						<col/>
+					</colgroup>
+					<tr>
+						<th>매출기간<i class="required" title="필수" aria-hidden="true"></i></th>
+						<td id="terms">
+						</td>
+						<th>유통구분</th>
+						<td>
+							<select name="distributionGb">
+								<option value="">[전체]</option>
+								<option th:if="${distributionGbList}" th:each="oneData, status : ${distributionGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							</select>
+						</td>
+					</tr>
+					<tr>
+						<th>몰구분</th>
+						<td>
+							<select name="mallGb">
+								<option value="">[전체]</option>
+								<option value="">자사몰</option>
+								<option value="">제휴몰</option>
+							</select>
+							/제휴몰일 때는 벤더+제휴몰 콤보박스 구현
+						</td>
+						<th>공급업체/브랜드</th>
+						<td>
+							<select name="supplyCompCd">
+								<option value="">[전체]</option>
+								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							</select>
+							/
+							<select name="brandCd">
+								<option value="">[전체]</option>
+							</select>
+						</td>
+					</tr>
+				</table>
+				
+				<ul class="panelBar">
+					<li class="center">
+						<button type="button" class="btn btn-base btn-lg" id="btnSearch">조회</button>
+						<button type="button" class="btn btn-gray btn-lg" onclick="$('#searchForm')[0].reset();">초기화</button>
+					</li>
+				</ul>
+			</form>
+		</div>
+		<!-- 검색조건 영역 -->
+
+		<!-- 리스트 영역 -->
+		<div class="panelStyle">
+			<!-- 버튼 배치 영역 -->
+			<ul class="panelBar">
+				<li class="right">
+					<button type="button" class="btn btn-default btn-lg" id="btnExcel">엑셀다운로드</button>
+				</li>
+			</ul>
+			<!-- //버튼 배치 영역 -->
+			
+			<div id="gridList" style="width: 100%; height: 470px" class="ag-theme-balham"></div>
+		</div>
+		<!-- //리스트 영역 -->
+	</div>
+
+<script th:inline="javascript">
+/*<![CDATA[*/
+	let supplyCompList = gagajf.convertToArray([[${supplyCompList}]]);
+	let distributionGbList = gagajf.convertToArray([[${distributionGbList}]]);
+
+	let columnDefs = [
+		{ headerName: "주문번호", field: "ordNo", width: 100, cellClass: 'text-center' },
+		{ headerName: "샵링커주문번호", field: "ordNo", width: 150, cellClass: 'text-center', hide: true },
+		{ headerName: "제휴몰주문번호", field: "extmallOrdNo", width: 150, cellClass: 'text-center' },
+		{ headerName: "제휴몰명", field: "extmallNm", width: 150, cellClass: 'text-center' },
+		{
+			headerName: "공급업체", field: "supplyCompCd", width: 100, cellClass: 'text-center',
+			valueGetter: function (params) {
+				return gagaAgGrid.lookupValue(supplyCompList, params.data.supplyCompCd);
+			}
+		},
+		{
+			headerName: "유통구분", field: "distributionGb", width: 100, cellClass: 'text-center',
+			valueGetter: function (params) {
+				return gagaAgGrid.lookupValue(distributionGbList, params.data.distributionGb);
+			}
+		},
+		{ headerName: "정산주기", field: "usacPeriod", width: 100, cellClass: 'text-center' },
+		{ headerName: "주문일시", field: "ordDt", width: 150, cellClass: 'text-center' },
+		{
+			headerName: "정산구분", field: "usacGb", width: 100, cellClass: 'text-center'/* ,
+			valueGetter: function (params) {
+				return gagaAgGrid.lookupValue(usacGbList, params.data.usacGb);
+			} */
+		},
+		{
+			headerName: "환입구분", field: "prtnGb", width: 100, cellClass: 'text-center'/* ,
+			valueGetter: function (params) {
+				return gagaAgGrid.lookupValue(prtnGbList, params.data.prtnGb);
+			} */
+		},
+		{ headerName: "발생(출고/회수)일시", field: "occurDt", width: 150, cellClass: 'text-center' },
+		{ headerName: "상품코드", field: "goodsCd", width: 120, cellClass: 'text-center' },
+		{ headerName: "상품명", field: "goodsNm", width: 150, cellClass: 'text-center' },
+		{ headerName: "브랜드", field: "brandEnm", width: 100, cellClass: 'text-center' },
+		{ headerName: "담당MD", field: "mdNm", width: 100, cellClass: 'text-center' },
+		{ headerName: "단품코드", field: "itemCd", width: 120, cellClass: 'text-center' },
+		{ headerName: "사이즈", field: "sizeCd", width: 100, cellClass: 'text-center' },
+		{ headerName: "판매가", field: "currPrice", width: 100, cellClass: 'text-right' },
+		{ headerName: "판매수량", field: "sellQty", width: 100, cellClass: 'text-center' },
+		{ headerName: "판매총액", field: "sellAmt", width: 100, cellClass: 'text-right' },
+		{ headerName: "즉시사용쿠폰금액", field: "duseCpnDcAmt", width: 120, cellClass: 'text-right' },
+		{ headerName: "상품쿠폰사용금액", field: "goodsCpnDcAmt", width: 120, cellClass: 'text-right' },
+		{ headerName: "주문서쿠폰사용금액", field: "cartCpnDcAmt", width: 130, cellClass: 'text-right' },
+		{ headerName: "포인트사용금액", field: "pntDcAmt", width: 120, cellClass: 'text-right' },
+		{ headerName: "다다익선할인금액", field: "multiDcAmt", width: 120, cellClass: 'text-right' },
+		{ headerName: "자사쿠폰분담액", field: "selfCpnDcAmt", width: 120, cellClass: 'text-right' },
+		{ headerName: "입점쿠폰분담액", field: "supplyCompCpnDcAmt", width: 120, cellClass: 'text-right' },
+		{ headerName: "실판매금액", field: "realSellAmt", width: 100, cellClass: 'text-right' },
+		{ headerName: "상품총액", field: "goodsTotAmt", width: 100, cellClass: 'text-right' },
+		{ headerName: "판매수수료율", field: "sellFeeRate", width: 100, cellClass: 'text-right' },
+		{ headerName: "수수료", field: "sellFeeAmt", width: 100, cellClass: 'text-right' },
+		{ headerName: "정산대상액", field: "settleAmt", width: 100, cellClass: 'text-right' }
+	];
+
+	let gridOptions = gagaAgGrid.getGridOptions(columnDefs);
+
+	// 검색
+	$('#btnSearch').on('click', function() {
+		gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptions, '#searchForm');
+	});
+	
+	// 엑셀다운로드
+	$('#btnExcel').on('click', function() {
+		gagaAgGrid.exportToExcel('상품정산 목록', gridOptions);
+	});
+	
+	$(document).ready(function() {
+		cfnCreateCalendar('#terms', 'startDt', 'endDt', true, '매출');
+		$('.btnToday').trigger('click');
+		
+		// Create a agGrid
+		gagaAgGrid.createGrid('gridList', gridOptions);
+	});
+/*]]>*/
+</script>
+
+</html>

style24.admin/src/main/webapp/WEB-INF/views/settle/SettleConfirmForm.html

@@ -1,200 +1,200 @@
-<!DOCTYPE html>
-<html lang="ko"
-	xmlns:th="http://www.thymeleaf.org">
-<!--
- *******************************************************************************
- * @source  : SettleConfirmForm.html
- * @desc    : 정산확정관리 Page
- *============================================================================
- * STYLE24
- * Copyright(C) 2020 TSIT, All rights reserved.
- *============================================================================
- * VER  DATE         AUTHOR      DESCRIPTION
- * ===  ===========  ==========  =============================================
- * 1.0  2020.10.26   gagamel     최초 작성
- *******************************************************************************
- -->
-	<div id="main">
-		<!-- 메인타이틀 영역 -->
-		<div class="main-title">
-		</div>
-		<!-- //메인타이틀 영역 -->
-		
-		<!-- 메뉴 설명 -->
-		<div class="infoBox menu-desc">
-		</div>
-		<!-- //메뉴 설명 -->
-		
-		<!-- 검색조건 영역 -->
-		<div class="panelStyle">
-			<form id="searchForm" name="searchForm" action="#" th:action="@{'/settle/confirm/list'}" onsubmit="$('#btnSearch').trigger('click'); return false;">
-				<table class="frmStyle" aria-describedby="검색조건">
-					<colgroup>
-						<col style="width:10%;"/>
-						<col style="width:60%;"/>
-						<col style="width:10%;"/>
-						<col/>
-					</colgroup>
-					<tr>
-						<th>출고기간<i class="required" title="필수" aria-hidden="true"></i></th>
-						<td id="terms">
-						</td>
-						<th>유통구분</th>
-						<td>
-							<select name="distributionGb">
-								<option value="">[전체]</option>
-								<option th:if="${distributionGbList}" th:each="oneData, status : ${distributionGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<th>공급업체/브랜드</th>
-						<td colspan="3">
-							<select name="supplyCompCd">
-								<option value="">[전체]</option>
-								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-							/
-							<select name="brandCd">
-								<option value="">[전체]</option>
-							</select>
-						</td>
-					</tr>
-				</table>
-				
-				<ul class="panelBar">
-					<li class="center">
-						<button type="button" class="btn btn-base btn-lg" id="btnSearch">조회</button>
-						<button type="button" class="btn btn-gray btn-lg" onclick="$('#searchForm')[0].reset();">초기화</button>
-					</li>
-				</ul>
-			</form>
-		</div>
-		<!-- 검색조건 영역 -->
-
-		<!-- 리스트 영역 -->
-		<div class="panelStyle">
-			<!-- 버튼 배치 영역 -->
-			<ul class="panelBar">
-				<li class="right">
-					<button type="button" class="btn btn-warning btn-lg" id="btnUpload">기타차감 엑셀업로드</button>
-					<button type="button" class="btn btn-default btn-lg" id="btnExcel">세금계산서용 엑셀다운로드</button>
-				</li>
-			</ul>
-			<!-- //버튼 배치 영역 -->
-			
-			<div id="gridList" style="width: 100%; height: 570px" class="ag-theme-balham"></div>
-		</div>
-		<!-- //리스트 영역 -->
-	</div>
-
-<script th:inline="javascript">
-/*<![CDATA[*/
-	let supplyCompList = gagajf.convertToArray([[${supplyCompList}]]);
-	let distributionGbList = gagajf.convertToArray([[${distributionGbList}]]);
-	let bankList = gagajf.convertToArray([[${bankList}]]);
-	
-	let columnDefs = [
-		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
-		{
-			headerName: "정산확정", field: "confirmYn", width: 100, cellClass: 'text-center',
-			cellRenderer: function(params) {
-				if (params.value == 'Y') {
-					return '<button type="button" class="btn btn-success btn-sm">확정</button>';
-				} else {
-					return '<button type="button" class="btn btn-danger btn-sm">해제</button>';
-				}
-			}
-		},
-		{
-			headerName: "공급업체", field: "supplyCompCd", width: 100, cellClass: 'text-center',
-			valueGetter: function (params) {
-				return gagaAgGrid.lookupValue(supplyCompList, params.data.supplyCompCd);
-			}
-		},
-		{ headerName: "전자계약여부", field: "econtractYn", width: 100, cellClass: 'text-center' },
-		{ headerName: "사업자등록번호", field: "bizNo", width: 120, cellClass: 'text-center' },
-		{ headerName: "정산주기", field: "settleDay", width: 100, cellClass: 'text-center' },
-		{ headerName: "판매수량", field: "sellQty", width: 100, cellClass: 'text-center' },
-		{ headerName: "판매총액", field: "sellAmt", width: 100, cellClass: 'text-right' },
-		{ headerName: "수수료", field: "sellFeeAmt", width: 100, cellClass: 'text-right' },
-		{ headerName: "쿠폰할인금액", field: "cpnDcAmt", width: 100, cellClass: 'text-right' },
-		{ headerName: "자사쿠폰분담액", field: "selfCpnDcAmt", width: 120, cellClass: 'text-right' },
-		{ headerName: "입점쿠폰분담액", field: "supplyCompCpnDcAmt", width: 120, cellClass: 'text-right' },
-		{ headerName: "계산서발행금액", field: "billAmt", width: 120, cellClass: 'text-right' },
-		{ headerName: "공급가액", field: "supplyAmt", width: 100, cellClass: 'text-right' },
-		{ headerName: "세액", field: "taxAmt", width: 100, cellClass: 'text-right' },
-		{ headerName: "배송비", field: "delvFeeAmt", width: 100, cellClass: 'text-right' },
-		{
-			headerName: "기타차감", field: "etcDeductAmt", width: 100, cellClass: 'text-right',
-			editable: true, cellEditor: 'numericCellEditor', cellEditorParams: { maxlength: 12, validType: 'integer' },
-			cellRenderer: function(params) { return gagajf.isNull(params.value) ? 0 : params.value.addComma(); },
-			cellStyle: { color: '#fffff', 'background-color': '#aaaaff' }
-		},
-		{ headerName: "지급금액", field: "giveAmt", width: 100, cellClass: 'text-right' },
-		{
-			headerName: "미수금", field: "receivableAmt", width: 100, cellClass: 'text-right',
-			editable: true, cellEditor: 'numericCellEditor', cellEditorParams: { maxlength: 12, validType: 'integer' },
-			cellRenderer: function(params) { return gagajf.isNull(params.value) ? 0 : params.value.addComma(); },
-			cellStyle: { color: '#fffff', 'background-color': '#aaaaff' }
-		},
-		{ headerName: "총지급금액", field: "totGiveAmt", width: 100, cellClass: 'text-right' },
-		
-		{
-			headerName: "상태", field: "settleStat", width: 100, cellClass: 'text-center',
-			cellRenderer: function (params) {
-				// 전자계약이 안 되어 있으면 "보류"
-				// 전자계약은 되어 있으나 지급금액 < 0 이면 "미수금" 그 외는 "정상"
-				if (params.data.econtractYn == 'N') {
-					return '보류';
-				}
-				
-				if (params.data.giveAmt < 0) {
-					return '미수금';
-				}
-				
-				return '정상';
-			}
-		},
-		{
-			headerName: "은행", field: "bankCd", width: 100, cellClass: 'text-center',
-			valueGetter: function (params) {
-				return gagaAgGrid.lookupValue(bankList, params.data.bankCd);
-			}
-		},
-		{ headerName: "계좌번호", field: "accountNo", width: 150, cellClass: 'text-center' },
-		{ headerName: "예금주명", field: "depositorNm", width: 100, cellClass: 'text-center' },
-		{ headerName: "계산서이메일", field: "billEmail", width: 100, cellClass: 'text-center' }
-	];
-
-	let gridOptions = gagaAgGrid.getGridOptions(columnDefs);
-
-	// 검색
-	$('#btnSearch').on('click', function() {
-		gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptions, '#searchForm');
-	});
-	
-	// 세금계산서용 엑셀다운로드
-	$('#btnExcel').on('click', function() {
-		// DB 처리로 작업해야 함. 항목은 다음과 같음.
-		// 작성일
-		// 품목: "상품판매수수료"로 고정
-		// 공급가액: ROUND(현금거래액 / 1.1)
-		// 세액: 현금거래액 - 공급가액
-		// 현금거래액: ROUND(수수료 - 자사쿠폰분담액). < 0인 경우 0으로 표기
-		// 공급업체 / 사업자등록번호 / 대표자명 / 업태 / 업종 / 주소
-		// 정산담당자 / 정산담당자연락처 / 계산서이메일
-		// 세금계산서발행금액: ROUND(수수료 - 자사쿠폰분담액). < 0인 경우 0으로 표기
-	});
-	
-	$(document).ready(function() {
-		cfnCreateCalendar('#terms', 'startDt', 'endDt', true, '출고');
-		$('.btnToday').trigger('click');
-		
-		// Create a agGrid
-		gagaAgGrid.createGrid('gridList', gridOptions);
-	});
-/*]]>*/
-</script>
-
-</html>
+<!DOCTYPE html>
+<html lang="ko"
+	xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : SettleConfirmForm.html
+ * @desc    : 정산확정관리 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2020.10.26   gagamel     최초 작성
+ *******************************************************************************
+ -->
+	<div id="main">
+		<!-- 메인타이틀 영역 -->
+		<div class="main-title">
+		</div>
+		<!-- //메인타이틀 영역 -->
+		
+		<!-- 메뉴 설명 -->
+		<div class="infoBox menu-desc">
+		</div>
+		<!-- //메뉴 설명 -->
+		
+		<!-- 검색조건 영역 -->
+		<div class="panelStyle">
+			<form id="searchForm" name="searchForm" action="#" th:action="@{'/settle/confirm/list'}" onsubmit="$('#btnSearch').trigger('click'); return false;">
+				<table class="frmStyle" aria-describedby="검색조건">
+					<colgroup>
+						<col style="width:10%;"/>
+						<col style="width:60%;"/>
+						<col style="width:10%;"/>
+						<col/>
+					</colgroup>
+					<tr>
+						<th>매출기간<i class="required" title="필수" aria-hidden="true"></i></th>
+						<td id="terms">
+						</td>
+						<th>유통구분</th>
+						<td>
+							<select name="distributionGb">
+								<option value="">[전체]</option>
+								<option th:if="${distributionGbList}" th:each="oneData, status : ${distributionGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							</select>
+						</td>
+					</tr>
+					<tr>
+						<th>공급업체/브랜드</th>
+						<td colspan="3">
+							<select name="supplyCompCd">
+								<option value="">[전체]</option>
+								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							</select>
+							/
+							<select name="brandCd">
+								<option value="">[전체]</option>
+							</select>
+						</td>
+					</tr>
+				</table>
+				
+				<ul class="panelBar">
+					<li class="center">
+						<button type="button" class="btn btn-base btn-lg" id="btnSearch">조회</button>
+						<button type="button" class="btn btn-gray btn-lg" onclick="$('#searchForm')[0].reset();">초기화</button>
+					</li>
+				</ul>
+			</form>
+		</div>
+		<!-- 검색조건 영역 -->
+
+		<!-- 리스트 영역 -->
+		<div class="panelStyle">
+			<!-- 버튼 배치 영역 -->
+			<ul class="panelBar">
+				<li class="right">
+					<button type="button" class="btn btn-warning btn-lg" id="btnUpload">기타차감 엑셀업로드</button>
+					<button type="button" class="btn btn-default btn-lg" id="btnExcel">세금계산서용 엑셀다운로드</button>
+				</li>
+			</ul>
+			<!-- //버튼 배치 영역 -->
+			
+			<div id="gridList" style="width: 100%; height: 570px" class="ag-theme-balham"></div>
+		</div>
+		<!-- //리스트 영역 -->
+	</div>
+
+<script th:inline="javascript">
+/*<![CDATA[*/
+	let supplyCompList = gagajf.convertToArray([[${supplyCompList}]]);
+	let distributionGbList = gagajf.convertToArray([[${distributionGbList}]]);
+	let bankList = gagajf.convertToArray([[${bankList}]]);
+	
+	let columnDefs = [
+		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+		{
+			headerName: "정산확정", field: "confirmYn", width: 100, cellClass: 'text-center',
+			cellRenderer: function(params) {
+				if (params.value == 'Y') {
+					return '<button type="button" class="btn btn-success btn-sm">확정</button>';
+				} else {
+					return '<button type="button" class="btn btn-danger btn-sm">해제</button>';
+				}
+			}
+		},
+		{
+			headerName: "공급업체", field: "supplyCompCd", width: 100, cellClass: 'text-center',
+			valueGetter: function (params) {
+				return gagaAgGrid.lookupValue(supplyCompList, params.data.supplyCompCd);
+			}
+		},
+		{ headerName: "전자계약여부", field: "econtractYn", width: 100, cellClass: 'text-center' },
+		{ headerName: "사업자등록번호", field: "bizNo", width: 120, cellClass: 'text-center' },
+		{ headerName: "정산주기", field: "settleDay", width: 100, cellClass: 'text-center' },
+		{ headerName: "판매수량", field: "sellQty", width: 100, cellClass: 'text-center' },
+		{ headerName: "판매총액", field: "sellAmt", width: 100, cellClass: 'text-right' },
+		{ headerName: "수수료", field: "sellFeeAmt", width: 100, cellClass: 'text-right' },
+		{ headerName: "쿠폰할인금액", field: "cpnDcAmt", width: 100, cellClass: 'text-right' },
+		{ headerName: "자사쿠폰분담액", field: "selfCpnDcAmt", width: 120, cellClass: 'text-right' },
+		{ headerName: "입점쿠폰분담액", field: "supplyCompCpnDcAmt", width: 120, cellClass: 'text-right' },
+		{ headerName: "계산서발행금액", field: "billAmt", width: 120, cellClass: 'text-right' },
+		{ headerName: "공급가액", field: "supplyAmt", width: 100, cellClass: 'text-right' },
+		{ headerName: "세액", field: "taxAmt", width: 100, cellClass: 'text-right' },
+		{ headerName: "배송비", field: "delvFeeAmt", width: 100, cellClass: 'text-right' },
+		{
+			headerName: "기타차감", field: "etcDeductAmt", width: 100, cellClass: 'text-right',
+			editable: true, cellEditor: 'numericCellEditor', cellEditorParams: { maxlength: 12, validType: 'integer' },
+			cellRenderer: function(params) { return gagajf.isNull(params.value) ? 0 : params.value.addComma(); },
+			cellStyle: { color: '#fffff', 'background-color': '#aaaaff' }
+		},
+		{ headerName: "지급금액", field: "giveAmt", width: 100, cellClass: 'text-right' },
+		{
+			headerName: "미수금", field: "receivableAmt", width: 100, cellClass: 'text-right',
+			editable: true, cellEditor: 'numericCellEditor', cellEditorParams: { maxlength: 12, validType: 'integer' },
+			cellRenderer: function(params) { return gagajf.isNull(params.value) ? 0 : params.value.addComma(); },
+			cellStyle: { color: '#fffff', 'background-color': '#aaaaff' }
+		},
+		{ headerName: "총지급금액", field: "totGiveAmt", width: 100, cellClass: 'text-right' },
+		
+		{
+			headerName: "상태", field: "settleStat", width: 100, cellClass: 'text-center',
+			cellRenderer: function (params) {
+				// 전자계약이 안 되어 있으면 "보류"
+				// 전자계약은 되어 있으나 지급금액 < 0 이면 "미수금" 그 외는 "정상"
+				if (params.data.econtractYn == 'N') {
+					return '보류';
+				}
+				
+				if (params.data.giveAmt < 0) {
+					return '미수금';
+				}
+				
+				return '정상';
+			}
+		},
+		{
+			headerName: "은행", field: "bankCd", width: 100, cellClass: 'text-center',
+			valueGetter: function (params) {
+				return gagaAgGrid.lookupValue(bankList, params.data.bankCd);
+			}
+		},
+		{ headerName: "계좌번호", field: "accountNo", width: 150, cellClass: 'text-center' },
+		{ headerName: "예금주명", field: "depositorNm", width: 100, cellClass: 'text-center' },
+		{ headerName: "계산서이메일", field: "billEmail", width: 100, cellClass: 'text-center' }
+	];
+
+	let gridOptions = gagaAgGrid.getGridOptions(columnDefs);
+
+	// 검색
+	$('#btnSearch').on('click', function() {
+		gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptions, '#searchForm');
+	});
+	
+	// 세금계산서용 엑셀다운로드
+	$('#btnExcel').on('click', function() {
+		// DB 처리로 작업해야 함. 항목은 다음과 같음.
+		// 작성일
+		// 품목: "상품판매수수료"로 고정
+		// 공급가액: ROUND(현금거래액 / 1.1)
+		// 세액: 현금거래액 - 공급가액
+		// 현금거래액: ROUND(수수료 - 자사쿠폰분담액). < 0인 경우 0으로 표기
+		// 공급업체 / 사업자등록번호 / 대표자명 / 업태 / 업종 / 주소
+		// 정산담당자 / 정산담당자연락처 / 계산서이메일
+		// 세금계산서발행금액: ROUND(수수료 - 자사쿠폰분담액). < 0인 경우 0으로 표기
+	});
+	
+	$(document).ready(function() {
+		cfnCreateCalendar('#terms', 'startDt', 'endDt', true, '매출');
+		$('.btnToday').trigger('click');
+		
+		// Create a agGrid
+		gagaAgGrid.createGrid('gridList', gridOptions);
+	});
+/*]]>*/
+</script>
+
+</html>

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.admin/src/main/webapp/ux/js/admin.popup.js

@@ -537,10 +537,10 @@ var cfnPopPos =function(delvLocCd){
  * @desc   : 쿠폰조회 팝업
  * <pre>
  *     var oParam = new Object();
- *     oParam.returnCode = 'input[name=sellStoreCd]'; // 반환할코드
- *     oParam.returnName = 'input[name=sellStoreNm]'; // 반환할코드명칭
+ *     oParam.returnCode = 'input[name=cpnId]'; // 반환할코드
+ *     oParam.returnName = 'input[name=cpnNm]'; // 반환할코드명칭
  *     oParam.processType = 'DELV'; // 콜백함수처리유형
- *     cfnOpenCouponRetrievePopup($('input[name=sellStoreNm]').val(), oParam);
+ *     cfnOpenCouponRetrievePopup($('input[name=cpnNm]').val(), oParam);
  * </pre>
  * @param sName - 명칭. 필수
  * @param oParam - 파라미터 오브젝트. 필수

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