# WARNING: head commit changed in the meantime

112233

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

@@ -84,7 +84,7 @@ public interface TsaCouponDao {
 	 * @author xyzp1539
 	 * @since 2021-01-15
 	 */
-    Coupon getCouponDetail(String cpnId);
+    Coupon getCouponDetail(int cpnId);
 
 	/**
 	 * 쿠폰 발급개수 조회
@@ -93,7 +93,7 @@ public interface TsaCouponDao {
 	 * @author xyzp1539
 	 * @since 2021-01-15
 	 */
-	int getCouponIssueCnt(String cpnId);
+	int getCouponIssueCnt(int cpnId);
 
 	/**
 	 * 쿠폰 적용 대상 - 제외상품
@@ -147,7 +147,7 @@ public interface TsaCouponDao {
 	 * @author xyzp1539
 	 * @since 2021-01-18
 	 */
-	ArrayList<Coupon> getCouponBurdenList(String cpnId);
+	ArrayList<Coupon> getCouponBurdenList(int cpnId);
 
 	/**
 	 * 쿠폰 적용대상 삭제
@@ -184,4 +184,28 @@ public interface TsaCouponDao {
 	 * @since 2021-01-21
 	 */
 	void updateCustCouponAvailEddt(CustCoupon issueCust);
+
+	/**
+	 * 난수, 시리얼 쿠폰 등록
+	 * @param param
+	 * @author xodud1202
+	 * @since 2021. 01. 26
+	 */
+	void createRandomCouponInfo(Coupon param);
+
+	/**
+	 * 동일 쿠폰명이 존재하는지 확인
+	 * @param param
+	 * @author xodud1202
+	 * @since 2021. 01. 26
+	 */
+	int getSerialOverlapCheck(Coupon param);
+
+	/**
+	 * 동일 쿠폰명이 존재하는지 확인
+	 * @param param
+	 * @author xodud1202
+	 * @since 2021. 01. 26
+	 */
+	ArrayList<CustCoupon> getRandomCouponInfo(int cpnId);
 }

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

@@ -13,6 +13,7 @@ import com.style24.persistence.domain.GoodsDesc;
 import com.style24.persistence.domain.GoodsEpSkip;
 import com.style24.persistence.domain.GoodsHst;
 import com.style24.persistence.domain.GoodsImg;
+import com.style24.persistence.domain.GoodsMass;
 import com.style24.persistence.domain.GoodsNaverLowestPrice;
 import com.style24.persistence.domain.GoodsNotiInfo;
 import com.style24.persistence.domain.GoodsPriceRes;
@@ -1129,4 +1130,31 @@ public interface TsaGoodsDao {
 	 */
 	void createCategoryGoods(Goods goods);
 
+	/**
+	 * 상품 등록 로그 생성
+	 *
+	 * @param goodsMass
+	 * @author eskim
+	 * @since 2021. 01. 25
+	 */
+	void createGoodsRegLog(GoodsMass goodsMass);
+
+	/**
+	 * 상품 기본 정보 수정 - 대량엑셀
+	 *
+	 * @param goods
+	 * @author eskim
+	 * @since 2021. 1. 25
+	 */
+	void updateGoodsMass(Goods goods);
+
+	/**
+	 * 상품등록로그 목록
+	 *
+	 * @param goodsSearch
+	 * @return
+	 * @author eskim
+	 * @since 2021. 01. 25
+	 */
+	Collection<GoodsMass> getGoodsRegLogList(GoodsSearch goodsSearch);
 }

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

@@ -18,6 +18,15 @@ import java.util.Collection;
 @Component
 public interface TsaMorebetterDao {
     /* CSB 진행 */
+    /**
+     * 다다익선 리스트 건수
+     * @param moreBetter
+     * @return
+     * @author bin2107
+     * @since 2021. 1. 26
+     */
+    int getMorebetterListCount(MoreBetter moreBetter);
+
     /**
      * 다다익선 프로모션 리스트
      * @param moreBetter
@@ -222,5 +231,13 @@ public interface TsaMorebetterDao {
      */
     Collection<MoreBetterGoods> getMorebetterDuplicateList(MoreBetterGoods moreBetterGoods);
 
+    /**
+     * 다다익선 진행 상태 변경
+     * @param
+     * @return
+     * @author bin2107
+     * @since 2021. 1. 26
+     */
+    void updateMorebetterStat(MoreBetter moreBetter);
     /* // CSB 진행 */
 }

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

@@ -44,20 +44,11 @@ public class TsaCouponService {
 	 * @since  2021-01-11
 	 */
 	@Transactional("shopTxnManager")
-	public void saveCoupon(Coupon params) {
-		String cpnId = "";		// 쿠폰ID
+	public String saveCoupon(Coupon params){
+		int cpnId = 0;		// 쿠폰ID
 		params.setRegNo(TsaSession.getInfo().getUserNo());
 		params.setUpdNo(TsaSession.getInfo().getUserNo());
 
-		// 자동생성이면 시퀀스 가져오기
-		if(StringUtils.isBlank(params.getCpnId())) {
-			Integer sequence = commonService.getNextSequence("SEQ_COUPON");
-			cpnId = "CPN"+sequence;
-		} else {
-			cpnId = params.getCpnId();
-		}
-		params.setCpnId(cpnId);
-
 		couponDao.couponInsert(params);
 
 		Gson gson = new Gson();
@@ -162,7 +153,7 @@ public class TsaCouponService {
 		}
 
 		// 수정모드이고 변경된 쿠폰상태가 대기 , 중지 인경우 고객이 발급받은 내용도 변경
-		if(!StringUtils.isBlank(params.getCpnId()) &&
+		if(params.getCpnId() != 0 &&
 				(params.getCpnStat().equals("G232_10") || params.getCpnStat().equals("G232_12")) ) {
 
 			CustCoupon custCoupon = new CustCoupon();
@@ -179,6 +170,23 @@ public class TsaCouponService {
 				}
 			}
 		}
+
+		log.info("CHECK GUBUN >> " + params.getCpnType() + " / " + params.getDcCdGb() + " / " + params.getTotPubLimitQty());
+
+		// 시리얼 쿠폰 생성
+		if("G230_20".equals(params.getCpnType()) && "G233_10".equals(params.getDcCdGb())) {
+			// 시리얼 쿠폰명이 동일한 쿠폰이 일정 겹치는 부분이 있는지 확인
+			int overlapCheck = couponDao.getSerialOverlapCheck(params);
+			if(overlapCheck < 1) {
+				for(int i = 0 ; i < params.getTotPubLimitQty() ; i++) {
+					couponDao.createRandomCouponInfo(params);
+				}
+			} else {
+				throw new IllegalStateException("같은 시리얼명이 사용되는 쿠폰이 중복됩니다. 기간을 확인해주세요.");
+			}
+		}
+
+		return "SUCCESS";
 	}
 
 	/**
@@ -232,7 +240,7 @@ public class TsaCouponService {
 	 * @author xyzp1539
 	 * @since 2021-01-15
 	 */
-    public Coupon getCouponDetail(String cpnId) { return couponDao.getCouponDetail(cpnId);}
+    public Coupon getCouponDetail(int cpnId) { return couponDao.getCouponDetail(cpnId);}
 
 	/**
 	 * 쿠폰 발급 개수 조회
@@ -241,7 +249,7 @@ public class TsaCouponService {
 	 * @author xyzp1539
 	 * @since 2021-01-15
 	 */
-	public int getCouponIssueCnt(String cpnId) {
+	public int getCouponIssueCnt(int cpnId) {
 		return couponDao.getCouponIssueCnt(cpnId);
 	}
 
@@ -252,7 +260,7 @@ public class TsaCouponService {
 	 * @author xyzp1539
 	 * @since 2021-01-18
 	 */
-	public ArrayList<CouponRefval> getCouponRefvalExceptGoodsList(String cpnId ) {
+	public ArrayList<CouponRefval> getCouponRefvalExceptGoodsList(int cpnId ) {
 		CouponRefval cpnRefval = new CouponRefval();
 		cpnRefval.setCpnId(cpnId);
 		cpnRefval.setCpnTarget("G260_14");
@@ -266,7 +274,7 @@ public class TsaCouponService {
 	 * @author xyzp1539
 	 * @since 2021-01-18
 	 */
-	public ArrayList<CouponRefval> getCouponRefvalBrandList(String cpnId ) {
+	public ArrayList<CouponRefval> getCouponRefvalBrandList(int cpnId ) {
 		CouponRefval cpnRefval = new CouponRefval();
 		cpnRefval.setCpnId(cpnId);
 		cpnRefval.setCpnTarget("G260_12");
@@ -280,7 +288,7 @@ public class TsaCouponService {
 	 * @author xyzp1539
 	 * @since 2021-01-18
 	 */
-	public ArrayList<CouponRefval> getCouponRefvalCategoryList(String cpnId) {
+	public ArrayList<CouponRefval> getCouponRefvalCategoryList(int cpnId) {
 		CouponRefval cpnRefval = new CouponRefval();
 		cpnRefval.setCpnId(cpnId);
 		cpnRefval.setCpnTarget("G260_11");
@@ -294,7 +302,7 @@ public class TsaCouponService {
 	 * @author xyzp1539
 	 * @since 2021-01-18
 	 */
-	public ArrayList<CouponRefval> getCouponRefvalGoodsList(String cpnId , String cpnTarget) {
+	public ArrayList<CouponRefval> getCouponRefvalGoodsList(int cpnId , String cpnTarget) {
 		CouponRefval cpnRefval = new CouponRefval();
 		cpnRefval.setCpnId(cpnId);
 		cpnRefval.setCpnTarget(cpnTarget);
@@ -308,7 +316,7 @@ public class TsaCouponService {
 	 * @author xyzp1539
 	 * @since 2021-01-18
 	 */
-	public ArrayList<CouponRefval> getCouponRefvalSupplyCompList(String cpnId) {
+	public ArrayList<CouponRefval> getCouponRefvalSupplyCompList(int cpnId) {
 		CouponRefval cpnRefval = new CouponRefval();
 		cpnRefval.setCpnId(cpnId);
 		cpnRefval.setCpnTarget("G260_13");
@@ -322,7 +330,7 @@ public class TsaCouponService {
 	 * @author xyzp1539
 	 * @since 2021-01-18
 	 */
-	public ArrayList<Coupon> getCouponBurdenList(String cpnId) {
+	public ArrayList<Coupon> getCouponBurdenList(int cpnId) {
 		return couponDao.getCouponBurdenList(cpnId);
 	}
 
@@ -364,4 +372,15 @@ public class TsaCouponService {
 			couponDao.saveCouponCustPub(custPub);
 		}
 	}
+
+	/**
+	 * 랜덤쿠폰 생성 리스트 조회
+	 * @param
+	 * @return
+	 * @author xodud1202
+	 * @since 2021-01-26
+	 */
+	public ArrayList<CustCoupon> getRandomCouponInfo(int cpnId) {
+		return couponDao.getRandomCouponInfo(cpnId);
+	}
 }

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

@@ -2,6 +2,7 @@ package com.style24.admin.biz.service;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.apache.commons.lang3.StringUtils;
@@ -22,6 +23,7 @@ import com.style24.persistence.domain.AdKeyword;
 import com.style24.persistence.domain.AdKeywordGoods;
 import com.style24.persistence.domain.Brand;
 import com.style24.persistence.domain.Color;
+import com.style24.persistence.domain.CommonCode;
 import com.style24.persistence.domain.DelvFeePolicy;
 import com.style24.persistence.domain.FreeGoods;
 import com.style24.persistence.domain.Goods;
@@ -31,6 +33,7 @@ import com.style24.persistence.domain.GoodsDesc;
 import com.style24.persistence.domain.GoodsEpSkip;
 import com.style24.persistence.domain.GoodsHst;
 import com.style24.persistence.domain.GoodsImg;
+import com.style24.persistence.domain.GoodsMass;
 import com.style24.persistence.domain.GoodsNaverLowestPrice;
 import com.style24.persistence.domain.GoodsNotiInfo;
 import com.style24.persistence.domain.GoodsPriceRes;
@@ -96,6 +99,9 @@ public class TsaGoodsService {
 	@Autowired
 	private TsaDisplayService displayService;
 
+	@Autowired
+	private TsaRendererService rendererService;
+
 	@Autowired
 	private SafetyKoreaApi safetyKoreaApi;
 
@@ -107,6 +113,8 @@ public class TsaGoodsService {
 
 	private static final String NUMBER_PATTERN = "^[0-9]+$";
 
+	private static final String UPDATE_NO_PATTERN = "X";
+
 	private static final String SELF_GOOODS_AFTER = "STY";
 
 	/**
@@ -2717,4 +2725,794 @@ public class TsaGoodsService {
 		return goodsDao.getNotiClsfColumnInfo(niClsfCd);
 	}
 
+	/**
+	 * 상품대량수정 엑셀 저장
+	 *
+	 * @param ecxelGoodsList, procJob(updateGoods)
+	 * @return
+	 * @author eskim
+	 * @since 2021. 01. 25
+	 */
+	@Transactional("shopTxnManager")
+	public String updateMassExceluploadGoods(GagaMap gagaMap, String procJob) {
+
+		GoodsMass goodsMass = mapper.convertValue(gagaMap, GoodsMass.class);
+
+		if (StringUtils.isBlank(goodsMass.getGoodsCd())) {
+			throw new IllegalStateException("상품코드가 없습니다.");
+		}
+
+		// 상품기본정보
+		Goods goodsData = new Goods();
+		goodsData.setGoodsCd(goodsMass.getGoodsCd().trim().toUpperCase());
+		Goods goodsOrigin = goodsDao.getGoods(goodsData);
+		if (goodsOrigin == null) {
+			goodsData.setGoodsRegMsg("미등록 상품코드");
+			goodsData.setGoodsStat("10");
+			this.setGoodsRegResult(goodsData, goodsMass, procJob);
+			return goodsData.getGoodsStat();
+		}
+		Goods goods = this.updateMassGoodsInfo(goodsMass, procJob, goodsOrigin);
+
+		if ("10".equals(goods.getGoodsStat())) { // 정보 오류
+			this.setGoodsRegResult(goods, goodsMass, procJob);
+			return goods.getGoodsStat();
+		}
+
+		// 상품 고시
+		Collection<GoodsNotiInfo> newGoodsNotiList = new ArrayList<>(); //적용할 고시 정보
+		goods = this.getUpdateMassGoodsNotiCheck(goods, gagaMap, goodsOrigin, newGoodsNotiList);
+		if ("10".equals(goods.getGoodsStat())) { // 정보 오류
+			this.setGoodsRegResult(goods, goodsMass, procJob);
+			return goods.getGoodsStat();
+		}
+
+		// 상품상세 (html, as-is/입점)
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getGoodsContent().trim())) {
+			if (goodsMass.getGoodsContent().toLowerCase().indexOf("script") >= 0) {
+				goods.setGoodsRegMsg("상품상세 html script 선언 오류");
+				goods.setGoodsStat("10");
+				this.setGoodsRegResult(goods, goodsMass, procJob);
+				return goods.getGoodsStat();
+			}
+			goods.setChkDescKeep("Y");
+		}
+
+		if ("N".equals(goods.getChDataYn()) && "N".equals(goods.getChkDescKeep()) && "N".equals(goods.getChNotiYn())) {
+			goods.setGoodsRegMsg("변경정보 없음");
+			goods.setGoodsStat("10");
+			this.setGoodsRegResult(goods, goodsMass, procJob);
+			return goods.getGoodsStat();
+		}
+
+		//상품 기본정보 변경여부 와 촬영업체가 아닌경우
+		if ("Y".equals(goods.getChDataYn()) && !"G001_E000".equals(TsaSession.getInfo().getRoleCd())) {
+
+			goodsDao.createGoodsHst(goods); // 이력생성
+			goodsDao.updateGoodsMass(goods); // 상품기본 저장
+
+			if (!StringUtils.isBlank(goods.getGoodsSnm1()) && !UPDATE_NO_PATTERN.equals(goods.getGoodsSnm1())) {
+				// 사용자 검색어를 검색어에 적용
+				String goodsSnm = goodsDao.getGoodsSnm(goods.getGoodsCd());
+
+				String[] arrGoodsSnm = goods.getGoodsSnm1().split(";");
+				StringBuilder tempGoodsSnm = new StringBuilder();
+				for (String loopGoodsSnm : arrGoodsSnm) {
+					if (goodsSnm.toUpperCase().indexOf(loopGoodsSnm.toUpperCase()) <= -1) {
+						tempGoodsSnm.append(loopGoodsSnm).append(";");
+					}
+				}
+				goods.setGoodsSnm(tempGoodsSnm.toString() + goodsSnm);
+				goodsDao.updateGoodsSnm(goods);
+			}
+		}
+
+		//상품 상세 변경여부 와 촬영업체가 아닌경우
+		if ("Y".equals(goods.getChkDescKeep()) && !"G001_E000".equals(TsaSession.getInfo().getRoleCd())) {
+			GoodsDesc goodsDesc = new GoodsDesc();
+			goodsDesc.setGoodsCd(goods.getGoodsCd());
+			goodsDesc.setRegNo(goods.getRegNo());
+			goodsDesc.setUpdNo(goods.getUpdNo());
+
+			goodsDesc.setDescGb("80");
+			goodsDesc.setGoodsDesc(goodsMass.getGoodsContent().trim());
+			this.saveGoodsDesc(goodsDesc);
+		}
+
+		// 상품고시정보 적용
+		if ("Y".equals(goods.getChNotiYn()) && newGoodsNotiList != null && !newGoodsNotiList.isEmpty()) {
+
+			int index = 0;
+			for (GoodsNotiInfo goodsNotiInfo : newGoodsNotiList) {
+
+				if (index == 0) {
+					goodsDao.deleteGoodsNotiInfo(goods);
+				}
+				goodsDao.saveGoodsNotiInfo(goodsNotiInfo);
+				index++;
+			}
+		}
+
+		// 품목변경시 카테고리 자동 전시
+		if (!UPDATE_NO_PATTERN.equals(goods.getItemkindCd().trim())) {
+			GoodsCategory goodsCategory = new GoodsCategory();
+			goodsCategory.setRegNo(TsaSession.getInfo().getUserNo());
+			goodsCategory.setUpdNo(TsaSession.getInfo().getUserNo());
+			goodsCategory.setGoodsCd(goods.getGoodsCd());
+			goodsCategory.setCateType("G031_10");	//상품분류카테고리
+			displayService.deleteGoodsCategory(goodsCategory);
+			goodsDao.createCategoryGoods(goods);
+
+		}
+
+		this.setGoodsRegResult(goods, goodsMass, procJob);
+
+		return goods.getGoodsStat();
+	}
+
+	/**
+	 * 상품 대량 등록 결과 정보
+	 *
+	 * @param goods
+	 * @author eskim
+	 * @since 2021. 01. 25
+	 */
+	private void setGoodsRegResult(Goods goods, GoodsMass goodsMass, String procJob) {
+		// 결과 저장
+		goodsMass.setBrandCd(goods.getBrandCd());
+		goodsMass.setGoodsStat(goods.getGoodsStat());
+		goodsMass.setRegSuccYn("Y");
+		goodsMass.setRegFailRsn(goods.getGoodsRegMsg());
+		goodsMass.setRegNo(TsaSession.getInfo().getUserNo());
+		//model은 string 테이블은 number 형이라 ,,,
+//		if (StringUtils.isBlank(goodsMass.getListPrice())) {
+//			goodsMass.setListPrice("0");
+//		}
+//		if (UPDATE_NO_PATTERN.equals(goodsMass.getCurrPrice()) || StringUtils.isBlank(goodsMass.getCurrPrice())) {
+//			goodsMass.setCurrPrice("0");
+//		}
+//		if (StringUtils.isBlank(goodsMass.getCostPrice())) {
+//			goodsMass.setCostPrice("0");
+//		}
+//		if ("10".equals(goods.getGoodsStat())) {
+//			goodsMass.setRegSuccYn("N");
+//		}
+		goodsMass.setProcGb("C");
+		if ("updateGoods".equals(procJob)) {
+			goodsMass.setProcGb("U");
+		}
+		goodsDao.createGoodsRegLog(goodsMass);
+	}
+
+	/**
+	 * 상품대량수정 - 상품기본정보
+	 *
+	 * @param goodsMass
+	 * @param excelFilename
+	 * @author eskim
+	 * @since 2021. 1. 20
+	 */
+	private Goods updateMassGoodsInfo(GoodsMass goodsMass, String procJob, Goods goodsOrigin) {
+
+		Goods goods = new Goods();
+		goods.setChDataYn("N"); // 데이터 변경여부
+		goods.setGoodsRegMsg("상품정보 변경");
+		goods.setRegNo(TsaSession.getInfo().getUserNo());
+		goods.setUpdNo(TsaSession.getInfo().getUserNo());
+
+		goods.setGoodsCd(goodsMass.getGoodsCd().toUpperCase().trim().toUpperCase()); // 상품코드
+
+		if (StringUtils.isBlank(goodsMass.getGoodsNm())) {
+			goods.setGoodsRegMsg("상품명 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setGoodsNm(goodsMass.getGoodsNm().trim()); // 상품명
+		if (!UPDATE_NO_PATTERN.equals(goods.getGoodsNm())) {
+			goods.setGoodsNm(goods.getGoodsNm().replaceAll("(\\r\\n|\\r|\\n|\\n\\r)", "")); // 상품명
+			goods.setChDataYn("Y");
+		}
+		goods.setGoodsTnm(goodsMass.getGoodsTnm().trim()); // 상품 타이틀
+		if (!UPDATE_NO_PATTERN.equals(goods.getGoodsTnm())) {
+			goods.setChDataYn("Y");
+			if (!StringUtils.isBlank(goods.getGoodsTnm())) {
+				goods.setGoodsTnm(goods.getGoodsTnm().replaceAll("(\\r\\n|\\r|\\n|\\n\\r)", "")); // 상품 타이틀
+			}
+		}
+		goods.setGoodsSnm1(goodsMass.getGoodsSnm1().trim()); // 상품 사용자 검색어
+		if (!UPDATE_NO_PATTERN.equals(goods.getGoodsSnm1())) {
+			goods.setChDataYn("Y");
+			if (!StringUtils.isBlank(goods.getGoodsSnm1())) {
+				goods.setGoodsSnm1(goods.getGoodsSnm1().replaceAll("(\\r\\n|\\r|\\n|\\n\\r|\\s)", "")); // 상품 사용자 검색어
+			}
+		}
+		// 품목확인
+		if (StringUtils.isBlank(goodsMass.getItemkindCd())) {
+			goods.setGoodsRegMsg("품목코드 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setItemkindCd(goodsMass.getItemkindCd().trim().toUpperCase()); // 품목
+
+		if (!UPDATE_NO_PATTERN.equals(goods.getItemkindCd())) {
+			Itemkind itemkind = new Itemkind();
+			itemkind.setItemkindCd(goods.getItemkindCd());
+			itemkind.setUseYn("Y");
+			Collection<Itemkind> itemkindList = goodsDao.getItemkindList(itemkind);
+			if (itemkindList == null || itemkindList.isEmpty()) {
+				goods.setGoodsRegMsg("품목 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		CommonCode commonCode = new CommonCode();
+		commonCode.setUseYn("Y");
+		// 시즌코드
+		if (StringUtils.isBlank(goodsMass.getSeasonCd())) {
+			goods.setGoodsRegMsg("시즌코드 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setSeasonCd(goodsMass.getSeasonCd().trim().toUpperCase());
+		if (!UPDATE_NO_PATTERN.equals(goods.getSeasonCd())) {
+			commonCode.setCdGb("G006"); // 시즌
+			commonCode.setCd(goods.getSeasonCd());
+			Collection<CommonCode> seassonList = rendererService.getCommonCodeList(commonCode);
+			if (seassonList == null || seassonList.isEmpty()) {
+				goods.setGoodsRegMsg("시즌 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+		// 성별
+		if (StringUtils.isBlank(goodsMass.getSexGb())) {
+			goods.setGoodsRegMsg("성별코드 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setSexGb(goodsMass.getSexGb().trim().toUpperCase());
+		// 성별
+		if (!UPDATE_NO_PATTERN.equals(goods.getSexGb())) {
+			commonCode.setCdGb("G007"); // 성별
+			commonCode.setCd(goods.getSexGb());
+			Collection<CommonCode> genderList = rendererService.getCommonCodeList(commonCode);
+			if (genderList == null || genderList.isEmpty()) {
+				goods.setGoodsRegMsg("성별 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+		//판매가
+		if (StringUtils.isBlank(goodsMass.getCurrPrice())) {
+			goods.setGoodsRegMsg("판매가 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		if (UPDATE_NO_PATTERN.equals(goodsMass.getCurrPrice().trim())) {
+			goods.setCurrPrice(0);
+		} else {
+
+			if (!GagaStringUtil.replace(goodsMass.getCurrPrice().trim(), ",", "").matches(NUMBER_PATTERN)) {
+				goods.setGoodsRegMsg("판매가 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			if (Integer.parseInt(goodsMass.getCurrPrice().trim()) == 0) {
+				goods.setGoodsRegMsg("판매가 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+		}
+		//판매수수료율
+		if (StringUtils.isBlank(goodsMass.getSellFeeRate())) {
+			goods.setGoodsRegMsg("판매수수료율 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		float sellFeeRate = 0f;
+		if (UPDATE_NO_PATTERN.equals(goodsMass.getSellFeeRate().trim())) {
+			goods.setSellFeeRate(0);
+		} else {
+			try {
+				sellFeeRate = Float.valueOf(goodsMass.getSellFeeRate().trim());
+				//goods.setSellFeeRate(sellFeeRate);
+			} catch (Exception e) {
+				goods.setGoodsRegMsg("판매수수료율 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+
+			//비교값 크면 1, 같으면 0, 작은면 -1 리턴
+			if (Float.compare(sellFeeRate, 0) == 0) {
+				goods.setGoodsRegMsg("판매수수료율 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+
+			if (Float.compare(sellFeeRate, 100) >= 0) {
+				goods.setGoodsRegMsg("판매수수료율 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+		}
+
+		//판매가나 판매수수료율이 변경되었을 때
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getCurrPrice().trim()) || !UPDATE_NO_PATTERN.equals(goodsMass.getSellFeeRate().trim())) {
+			//자사
+			if ("Y".equals(goodsOrigin.getSelfGoodsYn())) {
+				//판매가 변경시
+				if (!UPDATE_NO_PATTERN.equals(goodsMass.getCurrPrice().trim())) {
+					goods.setCurrPrice(Integer.parseInt(GagaStringUtil.replace(goodsMass.getCurrPrice().trim(), ",", ""))); // 판매가
+					goods.setCurrBprice(goodsOrigin.getCurrPrice());
+					goods.setDcRate((int)(this.getDcRate(goodsOrigin.getListPrice(), goods.getCurrPrice())));
+					goods.setChDataYn("Y");
+				}
+				//판매수수료율 변경시
+				if (!UPDATE_NO_PATTERN.equals(goodsMass.getSellFeeRate().trim())) {
+					goods.setSellFeeRate(sellFeeRate); // 판매수수료율
+					goods.setChDataYn("Y");
+				}
+			} else {
+				//입점
+				GoodsPriceRes goodsPriceRes = new GoodsPriceRes();
+				goodsPriceRes.setGoodsCd(goods.getGoodsCd());
+				if (goods.getCurrPrice() != goodsOrigin.getCurrPrice()) {
+					goodsPriceRes.setResGoodsPrice(goods.getCurrPrice());
+					goodsPriceRes.setEndGoodsPrice(goods.getCurrPrice());
+				}
+				if (goods.getSellFeeRate() != goodsOrigin.getSellFeeRate()) {
+					goodsPriceRes.setSellFeeRate(sellFeeRate);
+				}
+				goodsPriceRes.setApplyStdt(GagaDateUtil.getTodayDateTime());	//yyyymmddhhmiss
+				int toYear = Integer.parseInt(GagaDateUtil.getToday("yyyy")) + 4;
+				goodsPriceRes.setApplyEddt(Integer.toString(toYear) + "1231235959");	//yyyymmddhhmiss
+				goodsPriceRes.setCfrmYn("N");
+				goodsPriceRes.setApplyYn("N");
+				goodsPriceRes.setRegNo(goods.getRegNo());
+				goodsPriceRes.setUpdNo(goods.getUpdNo());
+				goodsDao.createGoodPriceRes(goodsPriceRes);
+
+				// 상품테이블에 바로 변경하지 않고 입점상품가격관리에서 승인해야함
+				goods.setCurrPrice(goodsOrigin.getCurrPrice());
+				goods.setSellFeeRate(goodsOrigin.getSellFeeRate());
+			}
+		}
+
+		// 상품구분
+		if (StringUtils.isBlank(goodsMass.getGoodsGb())) {
+			goods.setGoodsRegMsg("상품구분 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setSexGb(goodsMass.getGoodsGb().trim().toUpperCase());
+		// 상품구분
+		if (!UPDATE_NO_PATTERN.equals(goods.getGoodsGb())) {
+			commonCode.setCdGb("G073"); // 상품구분
+			commonCode.setCd(goods.getGoodsGb());
+			Collection<CommonCode> goodsGbList = rendererService.getCommonCodeList(commonCode);
+			if (goodsGbList == null || goodsGbList.isEmpty()) {
+				goods.setGoodsRegMsg("상품구분 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		//정상이월구분
+		if (StringUtils.isBlank(goodsMass.getFormalGb())) {
+			goods.setGoodsRegMsg("정상이월구분 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setFormalGb(goodsMass.getFormalGb().trim().toUpperCase()); // 정상이월
+		if (!UPDATE_NO_PATTERN.equals(goods.getFormalGb())
+			&& !"G009_10".equals(goods.getFormalGb())
+			&& !"G009_20".equals(goods.getFormalGb())) {
+			goods.setGoodsRegMsg("정상이월구분 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+
+		if (!UPDATE_NO_PATTERN.equals(goods.getFormalGb())) {
+			goods.setPntPrate(goodsOrigin.getPntPrate()); // 포인트적립율(PC)
+			goods.setPntMrate(goodsOrigin.getPntMrate()); // 포인트적립율(MOBILE)
+			Brand brand = new Brand();
+			brand.setBrandCd(goodsOrigin.getBrandCd());
+			Collection<Brand> brandList = businessService.getBrandList(brand);
+			if (brandList != null && !brandList.isEmpty()) {
+				// 브랜드 확인
+				float pntPrate = 0f;
+				float pntMrate = 0f;
+				for (Brand tmpBrand : brandList) {
+					if ("G009_10".equals(goods.getFormalGb())) {
+						pntPrate = tmpBrand.getPntPrate10();
+						pntMrate = tmpBrand.getPntMrate10();
+					} else {
+						pntPrate = tmpBrand.getPntPrate20();
+						pntMrate = tmpBrand.getPntMrate20();
+					}
+				}
+				goods.setPntPrate(pntPrate); // 포인트적립율(PC)
+				goods.setPntMrate(pntMrate); // 포인트적립율(MOBILE)
+			}
+			goods.setChDataYn("Y");
+		}
+
+		//최소주문수량
+		if (UPDATE_NO_PATTERN.equals(goodsMass.getMinOrdQty().trim())) {
+			goods.setMinOrdQty(0);
+		} else {
+			if (!goodsMass.getMinOrdQty().trim().matches(NUMBER_PATTERN) || Integer.parseInt(goodsMass.getMinOrdQty().trim()) == 0) {
+				goods.setGoodsRegMsg("최소주문수량 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setMinOrdQty(Integer.parseInt(goodsMass.getMinOrdQty().trim()));
+			goods.setChDataYn("Y");
+		}
+		//최대주문수량
+		if (UPDATE_NO_PATTERN.equals(goodsMass.getMaxOrdQty().trim())) {
+			goods.setMaxOrdQty(0);
+		} else {
+			if (!goodsMass.getMaxOrdQty().trim().matches(NUMBER_PATTERN) || Integer.parseInt(goodsMass.getMaxOrdQty().trim()) == 0) {
+				goods.setGoodsRegMsg("최대주문수량 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setMaxOrdQty(Integer.parseInt(goodsMass.getMaxOrdQty().trim()));
+			goods.setChDataYn("Y");
+		}
+		//ID당1일최대주문수량
+		if (UPDATE_NO_PATTERN.equals(goodsMass.getDayMaxOrdQty().trim())) {
+			goods.setMaxOrdQty(0);
+		} else {
+			if (!goodsMass.getDayMaxOrdQty().trim().matches(NUMBER_PATTERN) || Integer.parseInt(goodsMass.getDayMaxOrdQty().trim()) == 0) {
+				goods.setGoodsRegMsg("ID당1일최대주문수량 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setDayMaxOrdQty(Integer.parseInt(goodsMass.getDayMaxOrdQty().trim()));
+			goods.setChDataYn("Y");
+		}
+
+		if (goods.getMinOrdQty() > goods.getMaxOrdQty()) {
+			goods.setGoodsRegMsg("최소주문수량 오류(최대주문수량보다 클 수 없음)");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+
+		if (goods.getMaxOrdQty() > goods.getDayMaxOrdQty()) {
+			goods.setGoodsRegMsg("최대주문수량 오류(ID당1일최대구매수량보다 클 수 없음)");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+
+		//선물주문가능여부
+		if (StringUtils.isBlank(goodsMass.getGiftPackYn())) {
+			goods.setGoodsRegMsg("선물주문가능여부 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		if ("Y".equals(goodsOrigin.getSelfGoodsYn())) {
+			if (!UPDATE_NO_PATTERN.equals(goodsMass.getGiftPackYn().trim().toUpperCase())) {
+				goods.setGiftPackYn(goodsMass.getGiftPackYn().trim().toUpperCase());
+				if (!"Y".equals(goods.getGiftPackYn()) && !"N".equals(goods.getGiftPackYn())) {
+					goods.setGoodsRegMsg("선물주문가능여부 오류");
+					goods.setGoodsStat("10");
+					return goods;
+				}
+				goods.setChDataYn("Y");
+			}
+		} else {
+			goods.setGiftPackYn(goodsOrigin.getGiftPackYn().trim().toUpperCase());
+		}
+
+		//신규가입구매가능여부
+		if (StringUtils.isBlank(goodsMass.getNewCustOrdYn())) {
+			goods.setGoodsRegMsg("신규가입구매가능여부 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		if ("Y".equals(goodsOrigin.getSelfGoodsYn())) {
+			if (!UPDATE_NO_PATTERN.equals(goodsMass.getNewCustOrdYn().trim().toUpperCase())) {
+				goods.setNewCustOrdYn(goodsMass.getNewCustOrdYn().trim().toUpperCase());
+				if (!"Y".equals(goods.getNewCustOrdYn()) && !"N".equals(goods.getNewCustOrdYn())) {
+					goods.setGoodsRegMsg("신규가입구매가능여부 오류");
+					goods.setGoodsStat("10");
+					return goods;
+				}
+				goods.setChDataYn("Y");
+			}
+		} else {
+			goods.setNewCustOrdYn(goodsOrigin.getNewCustOrdYn().toUpperCase());
+		}
+
+		//반품여부
+		if (StringUtils.isBlank(goodsMass.getReturnableYn())) {
+			goods.setGoodsRegMsg("반품여부 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setReturnableYn(goodsMass.getReturnableYn().trim().toUpperCase());
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getReturnableYn().trim())) {
+			if (!"Y".equals(goods.getReturnableYn()) && !"N".equals(goods.getReturnableYn())) {
+				goods.setGoodsRegMsg("반품여부 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		//교환여부
+		if (StringUtils.isBlank(goodsMass.getChangeableYn())) {
+			goods.setGoodsRegMsg("교환여부 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setChangeableYn(goodsMass.getChangeableYn().trim().toUpperCase());
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getChangeableYn().trim())) {
+			if (!"Y".equals(goods.getChangeableYn()) && !"N".equals(goods.getChangeableYn())) {
+				goods.setGoodsRegMsg("교환여부 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		//과세구분
+		if (StringUtils.isBlank(goodsMass.getTaxGb())) {
+			goods.setGoodsRegMsg("과세구분 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setTaxGb(goodsMass.getTaxGb().trim().toUpperCase());
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getTaxGb().trim())) {
+			if (!"Y".equals(goods.getTaxGb()) && !"N".equals(goods.getTaxGb())) {
+				goods.setGoodsRegMsg("과세구분 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		//상품연령
+		if (StringUtils.isBlank(goodsMass.getAgeGrpCd())) {
+			goods.setGoodsRegMsg("상품연령 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setAgeGrpCd(goodsMass.getAgeGrpCd().trim().toUpperCase());
+		if (!UPDATE_NO_PATTERN.equals(goods.getAgeGrpCd())) {
+			commonCode.setCdGb("G023");
+			commonCode.setCd(goods.getAgeGrpCd());
+			Collection<CommonCode> ageGrpCdList = rendererService.getCommonCodeList(commonCode);
+			if (ageGrpCdList == null || ageGrpCdList.isEmpty()) {
+				goods.setGoodsRegMsg("상품연령 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		//성인용품여부
+		if (StringUtils.isBlank(goodsMass.getAdultYn())) {
+			goods.setGoodsRegMsg("성인용품여부 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setAdultYn(goodsMass.getAdultYn().trim().toUpperCase());
+		if (!UPDATE_NO_PATTERN.equals(goods.getAdultYn())) {
+			if (!"Y".equals(goods.getAdultYn()) && !"N".equals(goods.getAdultYn())) {
+				goods.setGoodsRegMsg("성인용품여부 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		//PC포인트적립율
+		if (StringUtils.isBlank(goodsMass.getPntPrate())) {
+			goods.setGoodsRegMsg("PC포인트적립율 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getPntPrate().trim())) {
+			try {
+				float pntPrate = Float.valueOf(goodsMass.getPntPrate().trim());
+				goods.setPntPrate(pntPrate);
+			} catch (Exception e) {
+				goods.setGoodsRegMsg("PC포인트적립율 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		if (StringUtils.isBlank(goodsMass.getPrePpntUsableYn())) {
+			goods.setGoodsRegMsg("PC선포인트 사용여부 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getPrePpntUsableYn().trim())) {
+			if ("Y".equals(goodsMass.getPrePpntUsableYn().trim()) || "N".equals(goodsMass.getPrePpntUsableYn().trim())) {
+				goods.setPrePpntUsableYn(goodsMass.getPrePpntUsableYn().trim());
+				goods.setChDataYn("Y");
+			} else {
+				goods.setGoodsRegMsg("PC선포인트 사용여부 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+		}
+
+		if (StringUtils.isBlank(goodsMass.getPntMrate())) {
+			goods.setGoodsRegMsg("모바일포인트적립율 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getPntMrate().trim())) {
+			try {
+				int pntMrate = Integer.parseInt(goodsMass.getPntMrate().trim());
+				goods.setPntMrate(pntMrate);
+			} catch (Exception e) {
+				goods.setGoodsRegMsg("모바일포인트적립율 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setChDataYn("Y");
+		}
+
+		if (StringUtils.isBlank(goodsMass.getPreMpntUsableYn())) {
+			goods.setGoodsRegMsg("모바일선포인트 사용여부 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getPreMpntUsableYn().trim())) {
+			if ("Y".equals(goodsMass.getPreMpntUsableYn().trim()) || "N".equals(goodsMass.getPreMpntUsableYn().trim())) {
+				goods.setPreMpntUsableYn(goodsMass.getPreMpntUsableYn().trim());
+				goods.setChDataYn("Y");
+			} else {
+				goods.setGoodsRegMsg("모바일선포인트 사용여부 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+		}
+
+		// 배송비 정책 확인
+		if (StringUtils.isBlank(goodsMass.getDelvFeeCd())) {
+			goods.setGoodsRegMsg("배송비정책코드 오류");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+		goods.setDelvFeeCd(goodsMass.getDelvFeeCd().trim().toUpperCase());
+		if (!UPDATE_NO_PATTERN.equals(goods.getDelvFeeCd())) {
+
+			DelvFeePolicy delvFeePolicy = new DelvFeePolicy();
+			delvFeePolicy.setSupplyCompCd(goods.getSupplyCompCd());
+			delvFeePolicy.setDelvFeeCd(goods.getDelvFeeCd());
+			delvFeePolicy.setUseYn("Y");
+			Collection<DelvFeePolicy> deliveryFeePolicyList =  businessService.getDeliveryFeePolicyList(delvFeePolicy);
+			if (deliveryFeePolicyList != null && !deliveryFeePolicyList.isEmpty()) {
+				goods.setGoodsRegMsg("배송비정책코드 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+		}
+
+		return goods;
+	}
+
+	/**
+	 * 상품대량수정 - 상품고시정보 check
+	 *
+	 * @param goods
+	 * @param excelMap
+	 * @param goodsOrigin
+	 * @param newGoodsNotiList
+	 * @return Goods
+	 * @author eskim
+	 * @since 2021. 01. 25
+	 */
+	private Goods getUpdateMassGoodsNotiCheck(Goods goods, GagaMap excelMap, Goods goodsOrigin, Collection<GoodsNotiInfo> newGoodsNotiList) {
+
+		goods.setChNotiYn("N");
+		String oldNiClsfCd = "";
+		String newNiClsfCd = "";
+
+		newNiClsfCd = excelMap.getString("niClsfCd").trim();
+		for (int i = 0; i < 28; i++) {
+			if (StringUtils.isBlank(excelMap.getString("niContent" + (i + 1)))) {
+				goods.setGoodsRegMsg("고시항목정보 없음 (" + (i + 1) + "번째 항목)");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			if (!UPDATE_NO_PATTERN.equals(excelMap.getString("niContent" + (i + 1)).trim())) {
+				goods.setChNotiYn("Y");
+			}
+		}
+		// 변경사항이 있는지 확인
+		if (UPDATE_NO_PATTERN.equals(newNiClsfCd) && "N".equals(goods.getChNotiYn())) {
+			return goods;
+		}
+
+		Collection<GoodsNotiInfo> goodsNotiList = new ArrayList<>();
+		//고시분류 코드의 고시항목 조회
+		NotiInfo notiInfo = new NotiInfo();
+		notiInfo.setSupplyVendorCd(goodsOrigin.getSupplyVendorCd());
+		if (!UPDATE_NO_PATTERN.equals(newNiClsfCd)) {
+			notiInfo.setNiClsfCd(newNiClsfCd);
+		} else {
+			GoodsNotiInfo goodsNotiInfo = new GoodsNotiInfo();
+			goodsNotiInfo.setGoodsCd(goods.getGoodsCd());
+			goodsNotiList = goodsDao.getGoodsNotiInfoList(goodsNotiInfo);
+			if (goodsNotiList != null && !goodsNotiList.isEmpty()) {
+				oldNiClsfCd = goodsNotiList.iterator().next().getNiClsfCd();
+			}
+			notiInfo.setNiClsfCd(oldNiClsfCd);
+			newNiClsfCd = oldNiClsfCd;
+		}
+		Collection<NotiInfo> notiInfolist = goodsDao.getNotiInfoItemList(notiInfo);  // 항목별 기본값 조회
+		// 상품의 고시 분류코드 조회
+		if (notiInfolist == null || notiInfolist.isEmpty()) {
+			goods.setGoodsRegMsg("고시분류정보 없음");
+			goods.setGoodsStat("10");
+			return goods;
+		}
+
+		int index = 0;
+		// 같은 고시분류 일경우 기존 고시항목 정보 적용
+		if (oldNiClsfCd.equals(newNiClsfCd)) {
+			for (NotiInfo notiInfoData : notiInfolist) {
+				for (GoodsNotiInfo goodsNotiInfoTemp : goodsNotiList) {
+					if (notiInfoData.getNiItemCd().equals(goodsNotiInfoTemp.getNiItemCd())) {
+						notiInfoData.setNiContent(goodsNotiInfoTemp.getNiContent());
+						break;
+					}
+				}
+				index++;
+			}
+		}
+
+		index = 0;
+		for (NotiInfo notiInfoTmp : notiInfolist) {
+			GoodsNotiInfo goodsNotiInfoTmp = new GoodsNotiInfo();
+			goodsNotiInfoTmp.setGoodsCd(goods.getGoodsCd());
+			goodsNotiInfoTmp.setNiClsfCd(notiInfoTmp.getNiClsfCd());
+			goodsNotiInfoTmp.setNiItemCd(notiInfoTmp.getNiItemCd());
+			goodsNotiInfoTmp.setDispOrd(index + 1);
+			goodsNotiInfoTmp.setRegNo(TsaSession.getInfo().getUserNo());
+			goodsNotiInfoTmp.setUpdNo(TsaSession.getInfo().getUserNo());
+			if (UPDATE_NO_PATTERN.equals(excelMap.getString("niContent" + (index + 1)))) {
+				goodsNotiInfoTmp.setNiContent(notiInfoTmp.getNiContent());
+			} else {
+				goodsNotiInfoTmp.setNiContent(excelMap.getString("niContent" + (index + 1)));
+			}
+
+			newGoodsNotiList.add(goodsNotiInfoTmp);
+			index++;
+		}
+
+		return goods;
+	}
+
+	/**
+	 * 상품등록로그 목록
+	 *
+	 * @param goodsSearch
+	 * @return
+	 * @author eskim
+	 * @since 2020. 01. 25
+	 */
+	public Collection<GoodsMass> getGoodsRegLogList(GoodsSearch goodsSearch) {
+
+		// 입점업체담당자는 업체코드 설정
+		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd()) || "G001_E000".equals(TsaSession.getInfo().getRoleCd())) {
+			goodsSearch.setSupplyCompCd(TsaSession.getInfo().getSupplyCompCd());
+			goodsSearch.setRegNo(TsaSession.getInfo().getUserNo());
+		}
+		return goodsDao.getGoodsRegLogList(goodsSearch);
+	}
 }

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

@@ -39,6 +39,17 @@ public class TsaMorebetterService {
     private TsaCommonService commonService;
 
     /* CSB 진행 */
+    /**
+     * 다다익선 리스트 건수
+     * @param moreBetter
+     * @return
+     * @author bin2107
+     * @since 2021. 1. 26
+     */
+    public int getMorebetterListCount(MoreBetter moreBetter) {
+        return morebetterDao.getMorebetterListCount(moreBetter);
+    }
+
     /**
      * 다다익선 리스트
      * @param param
@@ -342,5 +353,18 @@ public class TsaMorebetterService {
         return morebetterDao.getMorebetterDuplicateList(moreBetterGoods);
     }
 
+    /**
+     * 다다익선 진행 상태 변경
+     * @param
+     * @return
+     * @author bin2107
+     * @since 2021. 1. 26
+     */
+    @Transactional("shopTxnManager")
+    public void updateMorebetterStat(MoreBetter moreBetter) {
+        moreBetter.setUpdNo(TsaSession.getInfo().getUserNo());
+        morebetterDao.updateMorebetterStat(moreBetter);
+    }
+
     /* // CSB 진행 */
 }

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

@@ -41,6 +41,7 @@ import com.style24.persistence.domain.GoodsCompose;
 import com.style24.persistence.domain.GoodsEpSkip;
 import com.style24.persistence.domain.GoodsHst;
 import com.style24.persistence.domain.GoodsImg;
+import com.style24.persistence.domain.GoodsMass;
 import com.style24.persistence.domain.GoodsNaverLowestPrice;
 import com.style24.persistence.domain.GoodsNotiInfo;
 import com.style24.persistence.domain.GoodsPriceRes;
@@ -2540,4 +2541,66 @@ public class TsaGoodsController extends TsaBaseController {
 		goodsService.updateFreeGoods(freeGoods);
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
+
+	/**
+	 * 상품대량수정 엑셀 저장
+	 *
+	 * @param goodsMass
+	 * @return
+	 * @throws Exception
+	 * @author eskim
+	 * @since 2021. 1. 25
+	 */
+	@PostMapping("/mass/excelupload/update")
+	@ResponseBody
+	public GagaResponse updateMassExceluploadGoods(@RequestBody GoodsMass goodsMass) throws Exception {
+
+		String targetPath = GagaFileUtil.getConcatenationPath(env.getProperty("upload.excel.target.path"), "excel");
+		Collection<GagaMap> ecxelGoodsList = new ArrayList<>();
+
+		// 상품수장
+		// DB 처리 시 사용되는 파라미터명(셀명) 설정 -
+		String[] goodsNames = {"goodsCd", "goodsNm", "goodsTnm", "goodsSnm1", "itemkindCd", "seasonCd",
+			"sexGb", "currPrice", "sellFeeRate", "goodsGb", "formalGb", "minOrdQty", "maxOrdQty", "dayMaxOrdQty",
+			"giftPackYn", "newCustOrdYn","pntPrate","prePpntUsableYn", "pntMrate","preMpntUsableYn",
+			"returnableYn", "changeableYn","taxGb", "ageGrpCd", "adultYn", "delvFeeCd", "goodsContent",
+			"niClsfCd", "niContent1", "niContent2",
+			"niContent3", "niContent4", "niContent5", "niContent6", "niContent7", "niContent8", "niContent9",
+			"niContent10", "niContent11", "niContent12", "niContent13", "niContent14", "niContent15", "niContent16",
+			"niContent17", "niContent18", "niContent19", "niContent20", "niContent21", "niContent22", "niContent23",
+			"niContent24", "niContent25", "niContent26", "niContent27", "niContent28"};
+
+		ecxelGoodsList = GagaExcelUtil.getList(GagaFileUtil.getConcatenationPath(targetPath, goodsMass.getExcelFileNm()), 0, goodsNames, 0);
+
+		// 입점담당자, 촬영업체
+		if (!"G001_0000".equals(TsaSession.getInfo().getRoleCd()) && !"G001_A000".equals(TsaSession.getInfo().getRoleCd()) &&
+			!"G001_A001".equals(TsaSession.getInfo().getRoleCd()) && !"G001_A100".equals(TsaSession.getInfo().getRoleCd()) &&
+			!"G001_A101".equals(TsaSession.getInfo().getRoleCd()) ) {
+			throw new IllegalStateException("권한이 없습니다.");
+		}
+
+		for (GagaMap gagaMap : ecxelGoodsList) {
+			goodsService.updateMassExceluploadGoods(gagaMap, goodsMass.getProcJob());
+		}
+
+		// 파일 삭제
+		GagaFileUtil.deleteFile(GagaFileUtil.getConcatenationPath(targetPath, goodsMass.getExcelFileNm()));
+
+		return super.ok("");
+	}
+
+	/**
+	 * 상품 대량등록 결과 조회
+	 *
+	 * @param goodsSearch
+	 * @return
+	 * @author eskim
+	 * @since 2020. 01. 25
+	 */
+	@PostMapping("/reg/log/list")
+	@ResponseBody
+	public Collection<GoodsMass> getGoodsRegLogList(@RequestBody GoodsSearch goodsSearch) {
+		return goodsService.getGoodsRegLogList(goodsSearch);
+	}
+
 }

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

@@ -1,8 +1,7 @@
 package com.style24.admin.biz.web;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -322,7 +321,7 @@ public class TsaMarketingController extends TsaBaseController {
 	 */
 	@GetMapping("/coupon/popup/form")
 	@ResponseBody
-	public ModelAndView couponCreatePopup(@RequestParam(value = "cpnId") String cpnId) {
+	public ModelAndView couponCreatePopup(@RequestParam(value = "cpnId") int cpnId) {
 		ModelAndView mav = new ModelAndView();
 		String num = "";
 		String mode = "N";
@@ -369,6 +368,8 @@ public class TsaMarketingController extends TsaBaseController {
 		mav.addObject("hhList", hhList);
 		// 입점업체 조회
 		mav.addObject("ibSupplyCompList", rendererService.getSupplyCompanyList("", "N"));
+		// 할인 쿠폰 코드 조회
+		mav.addObject("dcCdList", rendererService.getCommonCodeList("G233", "Y"));
 		// 정상/이월 조회
 		mav.addObject("formalGbList", rendererService.getCommonCodeList("G009"));
 		// 카테고리 구분 조회
@@ -397,7 +398,7 @@ public class TsaMarketingController extends TsaBaseController {
 		mav.addObject("upperAfLinkCdList", rendererService.getCommonCodeList("G053"));
 
 		// 이미 쿠폰 아이디가 있으면 적용대상 조회
-		if (!StringUtils.isBlank(cpnId)) {
+		if (cpnId != 0) {
 			mode = "U";
 			issueCnt = couponService.getCouponIssueCnt(cpnId);
 			// 쿠폰상세조회
@@ -414,6 +415,8 @@ public class TsaMarketingController extends TsaBaseController {
 			mav.addObject("cpnDtlRefvalExceptGoodsList", couponService.getCouponRefvalGoodsList(cpnId, "G260_14"));
 			// 쿠폰 입점업체분담율 조회
 			mav.addObject("cpnDtlBurdenList", couponService.getCouponBurdenList(cpnId));
+			// 시리얼 및 난수 쿠폰 조회
+			mav.addObject("randomCpnList", couponService.getRandomCouponInfo(cpnId));
 		}
 
 		//issueCnt = 3;
@@ -437,7 +440,10 @@ public class TsaMarketingController extends TsaBaseController {
 	public GagaResponse saveCoupon(@RequestBody Coupon coupon) {
 		log.info("couponSave : {}", coupon);
 
-		couponService.saveCoupon(coupon);
+		String result = couponService.saveCoupon(coupon);
+		if(!"SUCCESS".equals(result)) {
+			return super.error(message.getMessage(result));
+		}
 
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
@@ -565,14 +571,12 @@ public class TsaMarketingController extends TsaBaseController {
 	public GagaMap getMorebetterList(@RequestBody MoreBetter param) {
 		GagaMap result = new GagaMap();
 
-		List<MoreBetter> tmtbList = (ArrayList<MoreBetter>)morebetterService.getMorebetterList(param);
-
 		param.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		param.setPageable(new TscPageRequest(param.getPageNo() - 1, param.getPageSize()));
-		param.getPageable().setTotalCount(tmtbList.size());
+		param.getPageable().setTotalCount(morebetterService.getMorebetterListCount(param));
 
 		result.set("pageing", param);
-		result.set("morebetterList", tmtbList);
+		result.set("morebetterList", morebetterService.getMorebetterList(param));
 
 		return result;
 	}
@@ -610,13 +614,6 @@ public class TsaMarketingController extends TsaBaseController {
 		// 다다익선 상태 목록
 		mav.addObject("tmtbStatList", rendererService.getAvailCommonCodeList("G232"));
 
-		//tmtb sq 자동생성
-		Integer tmtbSq;
-		/*if ("N".equals(mode)) {
-			tmtbSq = commonService.getNextSequence("SEQ_TMTB");
-			moreBetter.setTmtbSq(tmtbSq);
-		}*/
-
 		if ("U".equals(mode)) {
 			// 다다익선 정보
 			mav.addObject("tmtbMstInfo", morebetterService.getMorebetterMstInfo(tmtbSeq));
@@ -634,12 +631,22 @@ public class TsaMarketingController extends TsaBaseController {
 			mav.addObject("tmtbExceptGoodsList", new MoreBetterGoods());
 			mav.addObject("tmtbSectionValList", new MoreBetterSection());
 			mav.addObject("tmtbBurdenList", new MoreBetterBurden());
+			// 날짜형식
+			MoreBetter moreBetter1 = new MoreBetter();
+			Calendar calendar = Calendar.getInstance();
+			calendar.add(Calendar.DAY_OF_MONTH, 1);
+
+			moreBetter1.setEventStdt(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+			moreBetter1.setEventEdHH(new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime()));
+			moreBetter1.setEventEdHH("23");
+			moreBetter1.setEventEdMM("59");
+			mav.addObject("tmtbMstInfo", moreBetter1);
 		}
 
 		mav.addObject("mode", mode);
 		mav.addObject("tmtbSeq", tmtbSeq);
 		mav.addObject("params", moreBetter);
-		log.info("CHECK param tmtbSq::{}", moreBetter.getTmtbSq());
+		log.info("MorebetterPopupForm tmtbSeq::{}", tmtbSeq);
 		mav.setViewName("marketing/MorebetterPopupForm");
 		return mav;
 	}
@@ -754,6 +761,27 @@ public class TsaMarketingController extends TsaBaseController {
 		morebetterService.deleteTmtbBurdenList(moreBetterBurden);
 		return super.ok(message.getMessage("SUCC_0003"));
 	}
+
+	/**
+	 * 다다익선 진행 상태 변경
+	 *
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 1. 26
+	 */
+	@PostMapping("/morebetter/changeStat")
+	@ResponseBody
+	public GagaResponse updateMorebetterStat(@RequestBody MoreBetter moreBetter) {
+		try {
+			morebetterService.updateMorebetterStat(moreBetter);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return super.error(message.getMessage("FAIL_0001"));
+		}
+
+		return super.ok(message.getMessage("SUCC_0003"));
+	}
 	/* // CSB 진행 */
 
 	/**

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

@@ -474,15 +474,27 @@ public class TsaOrderChangeController extends TsaBaseController {
 		GagaMap result = new GagaMap();
 		result.set("status", GagaResponseStatus.FAIL.getCode());
 
+		// 교환요청 데이터 확인
 		if (excReq == null) {
 			result.set("message", message.getMessage("FAIL_1001"));
 			return result;
 		}
 
-		log.info("excReq >>> {}", excReq);
-		// orderChangeService.changeRequest()
-		// result.set("status", GagaResponseStatus.SUCCESS.getCode());
+		// 세션 회원번호 설정
+		int userNo = TsaSession.getInfo().getUserNo();
+		excReq.setUpdNo(userNo);
+		excReq.setRegNo(userNo);
+
+		// 교환처리
+		result = coreOrderChangeService.exchReq(excReq);
 
+		// 처리 결과 코드에 따른 메세지 설정
+		if (result.get("status").equals(GagaResponseStatus.SUCCESS.getCode())) {
+			result.set("message", message.getMessage("SUCC_0004"));
+		} else {
+			result.set("message", message.getMessage("FAIL_0004"));
+		}
+		
 		return result;
 	}
 	

src/main/java/com/style24/persistence/domain/Coupon.java

@@ -17,7 +17,7 @@ import java.util.Collection;
 @Data
 public class Coupon extends TscBaseDomain {
     // TB_COUPON
-    private String  cpnId;					// 쿠폰ID
+    private int     cpnId;					// 쿠폰ID
     private String  cpnNm;					// 쿠폰명
     private String  siteCd;					// 사이트코드(공통코드G000)
     private String  afLinkCd;				// 제휴링크코드
@@ -56,6 +56,8 @@ public class Coupon extends TscBaseDomain {
     private String  payType;                // 결제수단
     private String  custJoinYn;             // 신규회원여부
     private String  afChannel;              // 제휴링크
+    private String  dcCdGb;                 // 할인코드유형 (공통코드G233)
+    private String  rdCpnNm;                // 랜덤쿠폰 사용키 (시리얼명 or 난수)
 
     // 그리드 파라미터
     private String  supplyCompList;         // 공급업체 리스트

src/main/java/com/style24/persistence/domain/CouponBurden.java

@@ -13,7 +13,7 @@ import lombok.Data;
 @Data
 public class CouponBurden extends TscBaseDomain {
     // TB_COUPON_REFVAL
-    private String  cpnId;					// 쿠폰ID
+    private int  cpnId;					// 쿠폰ID
     private String  supplyCompCd;           // 공급업체코드
     private Integer burdenRate;             // 업체분담율
     private String  delYn;                  // 삭제여부

src/main/java/com/style24/persistence/domain/CouponRefval.java

@@ -14,7 +14,7 @@ import lombok.Data;
 @Data
 public class CouponRefval extends TscBaseDomain {
     // TB_COUPON_REFVAL
-    private String  cpnId;					// 쿠폰ID
+    private int  cpnId;					    // 쿠폰ID
     private String  cpnTarget;              // 쿠폰대상구분(공통코드G260)
     private String  refVal;                 // 관련값(쿠폰대상이 "10:상품"일 때는 상품코드, "20:브랜드"일 때는 브랜드코드, "30:카테고리"일 때는 카테고리코드, "40:제외상품"일 때는 상품코드)
     private Integer cpnRefvalSq;            // 쿠폰대상일련번호

src/main/java/com/style24/persistence/domain/CustCoupon.java

@@ -15,7 +15,7 @@ import org.codehaus.groovy.runtime.dgmimpl.arrays.IntegerArrayGetAtMetaMethod;
 public class CustCoupon extends TscBaseDomain {
     private Integer custCpnSq;              // 고객쿠폰일련번호
     private Integer custNo;                 // 고객번호
-    private String  cpnId;                  // 쿠폰아이디
+    private int     cpnId;                  // 쿠폰아이디
     private String  availStdt;              // 유효시작일시
     private String  availEddt;              // 유효종료일시
     private String  pubReason;              // 발행사유(공통코드G250)
@@ -23,6 +23,9 @@ public class CustCoupon extends TscBaseDomain {
     private String  usedDt;                 // 사용된일시
     private String  endAlimSendYn;          // 만료알림발송여부
     private String  useYn;                  // 사용여부
+    private String  rdCpnNm;                // 랜덤쿠폰 및 시리얼쿠폰 키
+    private String  custId;                 // 고객 아이디
+    private String  custNm;                 // 고객명
 
     // 그리드 컬럼
     private String  custList;

src/main/java/com/style24/persistence/domain/GoodsMass.java

@@ -0,0 +1,102 @@
+package com.style24.persistence.domain;
+
+import com.style24.persistence.TscBaseDomain;
+
+import lombok.Data;
+
+/**
+ * 상품 대량등록 Domain
+ *
+ * @author eskim
+ * @since 2021. 01. 12
+ */
+@SuppressWarnings("serial")
+@Data
+public class GoodsMass extends TscBaseDomain {
+
+	private String goodsCd;
+	private String goodsNum;
+	private String brandCd;		//브랜드코드
+	private String itemkindCd;	//품목코드
+	private String goodsNm;		//상품명
+	private String styleYear;	//스타일연도
+	private String seasonCd;	//시즌코드(공통코드G006)
+	private String sexGb;		//성별구분(공통코드G007)
+	private String listPrice;	//정상가(최초판매가)
+	private String currPrice;	//현재판매가
+	private String costPrice;	//원가
+	private String delvFeeCd;	//배송비정책코드
+	private String originCd;	//제조국(원산지)
+	private String makeYmd;		//제조연월일
+
+	private String supplyCompCd;	//공급업체코드
+	private String supplyGoodsCd;	//공급업체상품코드(원코드)
+	private String goodsTnm;		//상품타이틀명
+	private String goodsSnm1;		//상품검색명1(사용자등록용)
+	private String goodsGb;			//상품구분(공콩코드 G073)
+	private String formalGb; 		//정상이월구분(공통코드G009)
+//	private String distributionGb;	//유통구분(공콩코드 G065)
+	private String taxGb;			//과세구분(10:과세, 20:비과세)
+	private String ageGrpCd;		//상품연령코드(공통코드G023)
+	private String adultYn;			//성인용품여부 'Y', 'N'
+
+	private String pntPrate;		//포인트적립율(PC)
+	private String pntMrate;		//포인트적립율(모바일)
+	private String prePpntUsableYn;	//선포인트사용가능여부(PC)
+	private String preMpntUsableYn;	//선포인트사용가능여부(모바일)
+	private String sellFeeRate;		//판매수수료율
+	private String changeableYn;	//교환가능여부
+	private String returnableYn;	//반품가능여부
+	private String minOrdQty;		//최소주문수량
+	private String maxOrdQty;		//최대주문수량
+	private String dayMaxOrdQty;	//ID당1일최대구매수량
+	private String giftPackYn;		//선물포장여부
+	private String newCustOrdYn;	//신규고객 구매가능여부(Y:신규고객만 구매가능)
+
+	private String optStr;			//옵션(입점용)
+	private String opt1Str;			//옵션1
+	private String opt2Str;			//옵션2
+	private String goodsContent;	//상품상세 html(입점용)
+
+	private String niClsfCd;
+	private String niContent1;
+	private String niContent2;
+	private String niContent3;
+	private String niContent4;
+	private String niContent5;
+	private String niContent6;
+	private String niContent7;
+	private String niContent8;
+	private String niContent9;
+	private String niContent10;
+	private String niContent11;
+	private String niContent12;
+	private String niContent13;
+	private String niContent14;
+	private String niContent15;
+	private String niContent16;
+	private String niContent17;
+	private String niContent18;
+	private String niContent19;
+	private String niContent20;
+	private String niContent21;
+	private String niContent22;
+	private String niContent23;
+	private String niContent24;
+	private String niContent25;
+	private String niContent26;
+	private String niContent27;
+	private String niContent28;
+
+	private String excelFileNm;
+	private String procJob;
+	private String procGb;
+
+	private int goodsRegSq;
+	private String regSuccYn;
+	private String regFailRsn;
+	private String goodsStat;		//상품상태(공통코드G008)
+
+	private String mainColorCd;
+
+}

src/main/java/com/style24/persistence/domain/MoreBetter.java

@@ -65,6 +65,14 @@ public class MoreBetter extends TscBaseDomain {
 	List<MoreBetterBurden> burdenList;
 	List<MoreBetterSection> sectionGbList;
 
+	// 날짜+시간
+	private String eventStdt;				// 다다익선시작일시
+	private String eventStHH;				// 다다익선시작일시
+	private String eventStMM;				// 다다익선시작일시
+	private String eventEddt;				// 다다익선종료일시
+	private String eventEdHH;				// 다다익선종료일시
+	private String eventEdMM;				// 다다익선종료일시
+
 	// Pagination
 	private TscPageRequest pageable;
 	private int pageNo = 1;

src/main/java/com/style24/persistence/domain/Order.java

@@ -0,0 +1,405 @@
+package com.style24.persistence.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.style24.persistence.TscBaseDomain;
+
+import com.style24.persistence.TscPageRequest;
+import lombok.Data;
+
+/**
+ * 주문 Domain
+ *
+ * @author jsh77b
+ * @since 2020. 11. 16
+ */
+@SuppressWarnings("serial")
+@Data
+public class Order extends TscBaseDomain {
+	
+	// 주문마스터
+	private int ordNo;
+	private String mallGb;
+	private String mallGbNm;
+	private String ordDt;
+	private String payDt;
+	private int custNo;
+	private String ordNm;
+	private String ordTelno;
+	private String siteCd;
+	private String siteCdNm;
+	private int npayOrdNo;
+	private String frontGb;
+	private String frontGbNm;
+	private String extmallNm;
+
+	// 주문상세
+	private int ordDtlNo;
+	private String ordExchGb;
+	private String ordDtlStat;
+	private int orgOrdDtlNo;
+	private String supplyCompCd;
+	private String goodsCd;
+	private String formalGb;
+	private String formalGbNm;
+	private String goodsType;
+	private int listPrice;
+	private int currPrice;
+	private double dcRate;
+	private int optAddPrice;
+	private int ordQty;
+	private int ordAmt;
+	private int cnclRtnQty;
+	private int cnclRtnAmt;
+	private int cpn1CpnSq;
+	private int cpn1DcAmt;
+	private int tmtb1Sq;
+	private int tmtb1DcAmt;
+	private int tmtb2Sq;
+	private int tmtb2DcAmt;
+	private int goodsCpnSq;
+	private int goodsCpnDcAmt;
+	private int cartCpnSq;
+	private int cartCpnDcAmt;
+	
+	private int pntDcAmt;
+	private int prePntDcAmt;
+	private int savePntAmt;
+	
+	private int realOrdAmt;
+	private String venderId;
+	private String extmallId;
+	private String agentOrderId;
+	private String extmallOrderId;
+	private String changeableYn;
+	private String changeFeeFreeYn;
+	private String returnableYn;
+	private String returnFeeFreeYn;
+	
+	private String soldoutYn;
+	private String soldoutMemo;
+	private String soldoutRegNo;
+	private String soldoutRegDt;
+	private int delvAddrSq;
+	private String shotDelvYn;
+	private String giftPackYn;
+	
+	private String delvLocCd;
+	private String delvAssigngDt;
+	private String delvAddignStat;
+	private String dstrbtMemo;
+	private String delvStdt;
+	private String delvEddt;
+	
+	private String shipCompCd;
+	private String invoiceNo;
+	private String invoiceSendYn;
+	private String sellStoreCd;
+	private double sellFeeRate;
+	
+	private String afLinkCd;
+	private String ithrCd;
+	private String contentsLoc;
+	
+	private int planDtlsq;
+	private int socialSq;
+	
+	private String condition;
+	private String[] conditions = null;
+	
+	private String stDate;
+	private String edDate;
+	private String searchDateGb;
+	private String orderNm;
+	private int custId;
+	private String orderPhnno;
+	private String vendorId;
+	private String sizeCd;
+	private String goodsNm;
+	private String payMeans;
+	private String chgStat;
+	private String recipNm;
+	private String chgGb;
+	private String wdInvoiceSendYn;
+	
+	// 상품정보
+	private String imgPath1;
+	private String sysImgNm;
+	private String brandCd;
+	private String optCd1;
+	private String optCd2;
+	private String goodsTypeNm;
+	private String brandEnm;
+	private String itemCd;
+	private String goodsNum;
+	private String supplyGoodsCd;
+	private String optCd2s;
+	private int currStockQty;
+	private String currStockQtys;
+	
+	private int totDcAmt;
+	private String dateGbn;
+	private String mallCd;
+	private String search;
+	
+	/* Multi CheckBox 항목*/
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] multiBrand;
+
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] multiOrdStat;
+
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] multiOrdDtlStat;
+	
+	private int sumOrdAmt;
+	private int sumOrdCnclAmt;
+	private int sumRealPayAmt;
+	private int ordNoCnt;
+	private int sumOrdQty;
+	private int sumOrdCnclQty;
+	
+	private String excelFileNm;
+	
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private int[] ordNoList;
+	
+	private String delYn;
+	private String recipPhnno;
+	private String recipTelno;
+	private String recipZipcode;
+	private String recipBaseAddr;
+	private String recipDtlAddr;
+	private String ordEmail;
+	private String delvMemo;
+	private String delvAddrEditYn;
+	private String exchGbNm;
+	
+	private String escrowYn;
+	private String payMeansNm;
+	private String cardNm;
+	private String vaBank;
+	private String pgTradeNo;
+	private String payStat;
+	private String payStatNm;
+	private int payAmt;
+	private String vaDeadLine;
+	
+	private String delvFeeGb;
+	private String delvFeeGbNm;
+	private int delvFee;
+	private String delvUsacYn;
+	private String delvUsacDt;
+	private int delvFeeSq;
+	
+	private String coundelClsf;
+	private String relGoodsCd;
+	private String questTitle;
+	private String questDt;
+	private String ansDt;
+	private int andNo;
+	
+	private int ordChgSq;
+	private String chgGbNm;
+	private String chgStatNm;
+	private String chgReason;
+	private String chgReasonNm;
+	private String chgMemo;
+	private String chgerNm;
+	private String chgerPhnno;
+	private String chgerZipcode;
+	private String chgerBaseAddr;
+	private String chgerDtlAddr;
+	private String wdInvoiceNo;
+	
+	private String supplyCompNm;
+	private String brandKnm;
+	private String ordDtlStatNm;	
+	private String ordPhnno;
+	
+	private String custGrade;
+	private String custGradeNm;
+	private String custGb;
+	private String custGbNm;
+	private String managedRsn;
+	private String managedRsnNm;
+	
+	private int itemQty;
+	private int itemPrice;
+	private String itemNm;
+	private int gfcdUseAmt;
+	
+	// Pagination
+	private TscPageRequest pageable;
+	private int pageNo = 1;
+	private int pageSize = 50;
+	private int pageUnit = 10;
+	
+	// 주문문의 1:1 응답 칼럼
+	private String counselClsfNm;
+	private String ansNo;
+	private String ansNm;
+	private String regNm;
+	private String updNm;
+	
+	// 주문메모칼럼
+	private int orderMemoSq;
+	private String memo;
+	private String orgFileNm;
+	private String sysFileNm;
+	
+	// 사은품칼럼
+	private int ordFreegiftSq;
+	private int freegiftSq;
+	private String freegiftNm;
+	private int freegiftValSq;
+	private int usePoint;
+	private int seq;
+	private String userNm;
+	
+	// 환불계좌칼럼
+	private String raBank;
+	private String raBankNm;
+	private String raNo;
+	private String raNm;
+	private String defaultYn;
+	
+	// 주문상세변경내역칼럼
+	private String userId;
+	private String updId;
+	private String shipCompNm;
+	private String shipCompId;
+	
+	// 주문쿠폰
+	private int cpnSq;
+	private int cpnId;
+	private int cpnDcAmt;
+	private String cpnType;
+	private String targetCd1;
+	private String targetCd2;
+	private String cpnNm;
+	private String dcWay;
+	private int dcPval;
+	private int dcMval;
+	private int dcAval;
+	
+	// 주문포인트
+	private int pntPrate;
+	private int pntMrate;
+	private int pntAmt;
+	private String occurGb;
+	private String occurGbNm;
+	private String occurDtlDesc;
+	
+	// 주문상품권
+	private String gfcdNm;
+	private String gfcdNo;
+	private int gfcdAmt;
+	private int chgGfcdAmt;
+	private int usGfcdAmt;
+	private int rmGfcdAmt;
+	
+	// 다다익선
+	private int tmtbSq;
+	private String tmtbNm;
+	private int tmtbDcAmt;
+	
+	// 상태변경
+	private String g20;
+	private String g30;
+	private String g40;
+	private String g50;
+	private String g55;
+	private String g60;
+	
+	// 취소요청
+	private String cncWait;
+	private int ordReqChgQty;
+	private int itemReqChgQty;
+	private int itemOrdPrice;
+	private int minOrdAmt;
+	private int orgDelvFee;
+	private String delvFeeCd;
+	private int ordCanChgQty;
+	private String allCanYn;
+	
+	private String addDelvFeeYn;
+	private int addDelvFee;
+	private int ordDtlItemSq;
+	
+	private int paySq;
+	private int refundAmt;
+	private int rfCpn1Amt;
+	private int rfTmtb1Amt;
+	private int rfTmtb2Amt;
+	private int rfGoodsCpnAmt;
+	private int rfCartCpnAmt;
+	private int rfPntAmt;
+	private int rfPrePntAmt;
+	private int rfGfcdUseAmt;
+
+	private int pgCpnAmt;
+	private int npayPntAmt;
+	private String payGb;
+	private String pgGb;
+	private String pgTid;
+	private String cardType;
+	private String cardKind;
+	private String cardBank;
+	private String cardMips;
+	private String cardPcableYn;
+	private String vaNo;
+	private String vaNm;
+	private String vaDeadline;
+	private String telecom;
+
+	private String accountNo;
+	private String accountNm;
+	private String bankCd;
+	private String bankNm;
+
+	private int realDelvAmt;
+	private int delvCpnSq;
+	private int delvCpnDcAmt;
+
+	private int chgQty;
+	private int rtnDelvFee;
+	private int excDelvFee;
+
+	private String[] ordDtlStatArr;
+	
+	// 교환요청
+	private String ordChgOpt;
+	private String rtnLocZipcode;
+	private String rtnLocBaseAddr;
+	private String rtnLocDtlAddr;
+	private String rtnLocTelno;
+	private String rtnLocNm;
+	private int exchangeOrdDtlNo;
+	private int exchangeOrdDtlItemSq;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -106,9 +106,11 @@
 	<!-- 쿠폰 등록 -->
 	<insert id="couponInsert" parameterType="Coupon">
 		/* TsaCoupon.couponInsert*/
+		<selectKey keyProperty="cpnId" resultType="int" order="AFTER">
+			SELECT LAST_INSERT_ID()
+		</selectKey>
 		INSERT INTO TB_COUPON (
-			CPN_ID
-		  , CPN_NM
+		    CPN_NM
 		  , SITE_CD
 		  , AF_LINK_CD
 		  , USABLE_CUST_GB
@@ -128,6 +130,7 @@
 		  , TOT_PUB_LIMIT_QTY
 		  , ONE_PUB_QTY
 		  , DN_GB
+		  , DC_CD_GB
 		  , DOWN_STDT
 		  , DOWN_EDDT
 		  , BUY_LIMIT_AMT
@@ -150,8 +153,7 @@
 		  </if>
 		  , CUST_JOIN_YN
 		) VALUES (
-		    #{cpnId}
-		  , #{cpnNm}
+		    #{cpnNm}
 		  , #{siteCd}
 		  , #{afLinkCd}
 		  , #{usableCustGb}
@@ -180,6 +182,7 @@
 		  , #{totPubLimitQty}
 		  , #{onePubQty}
 		  , #{dnGb}
+		  , #{dcCdGb}
 		  , DATE_FORMAT(#{downStdt} , '%Y-%m-%d %H:%i:%s')
 		  , DATE_FORMAT(#{downEddt} , '%Y-%m-%d %H:%i:%s')
 		  , #{buyLimitAmt}
@@ -218,8 +221,7 @@
 		  </if>
 		  , #{custJoinYn}
 		) ON DUPLICATE KEY UPDATE
-		    CPN_ID = #{cpnId}
-		  ,	CPN_NM = #{cpnNm}
+		    CPN_NM = #{cpnNm}
 		  , SITE_CD = #{siteCd}
 		  , AF_LINK_CD = #{afLinkCd}
 		  , USABLE_CUST_GB = #{usableCustGb}
@@ -407,53 +409,61 @@
 	</select>
 
 	<!-- 쿠폰 상세 조회-->
-	<select id="getCouponDetail" parameterType="String" resultType="Coupon">
+	<select id="getCouponDetail" parameterType="int" resultType="Coupon">
 		/* TsaCoupon.getCouponDetail */
-		SELECT CPN_ID
-			 , CPN_NM
-			 , SITE_CD
-			 , AF_LINK_CD
-			 , USABLE_CUST_GB
-			 , USABLE_CUST_GRADE
-			 , CPN_TYPE
-			 , APPLY_SCOPE
-			 , DC_WAY
-			 , DC_PVAL
-			 , DC_MVAL
-			 , DC_AVAL
-			 , MAX_DC_AMT
-			 , PD_GB
-			 , AVAIL_STDT
-			 , AVAIL_EDDT
-			 , AVAIL_DAYS
-			 , CUST_PUB_LIMIT_QTY
-			 , TOT_PUB_LIMIT_QTY
-			 , ONE_PUB_QTY
-			 , DN_GB
-			 , DOWN_STDT
-			 , DOWN_EDDT
-			 , BUY_LIMIT_AMT
-			 , PLAN_SQ
-			 , REISSUANCE
-			 , CPN_STAT
-			 , END_ALIM_YN
-			 , FIRST_YN
-			 , DOWN_YN
-			 , CUST_JOIN_STDT
-			 , CUST_JOIN_EDDT
-			 , BUY_STDT
-			 , BUY_EDDT
-			 , PAY_TYPE
-			 , CUST_JOIN_YN
+		SELECT B.CPN_ID
+			 , B.CPN_NM
+			 , B.SITE_CD
+			 , B.AF_LINK_CD
+			 , B.USABLE_CUST_GB
+			 , B.USABLE_CUST_GRADE
+			 , B.CPN_TYPE
+			 , B.APPLY_SCOPE
+			 , B.DC_WAY
+			 , B.DC_PVAL
+			 , B.DC_MVAL
+			 , B.DC_AVAL
+			 , B.MAX_DC_AMT
+			 , B.PD_GB
+			 , B.AVAIL_STDT
+			 , B.AVAIL_EDDT
+			 , B.AVAIL_DAYS
+			 , B.CUST_PUB_LIMIT_QTY
+			 , B.TOT_PUB_LIMIT_QTY
+			 , B.ONE_PUB_QTY
+			 , B.DN_GB
+			 , B.DOWN_STDT
+			 , B.DOWN_EDDT
+			 , B.BUY_LIMIT_AMT
+			 , B.PLAN_SQ
+			 , B.REISSUANCE
+			 , B.CPN_STAT
+			 , B.END_ALIM_YN
+			 , B.FIRST_YN
+			 , B.DOWN_YN
+		     , B.DC_CD_GB
+			 , B.CUST_JOIN_STDT
+			 , B.CUST_JOIN_EDDT
+			 , B.BUY_STDT
+			 , B.BUY_EDDT
+			 , B.PAY_TYPE
+			 , B.CUST_JOIN_YN
 			 , (SELECT AF_CHANNEL
 			      FROM TB_AF_LINK A
 			     WHERE A.AF_LINK_CD = B.AF_LINK_CD) AS AF_CHANNEL
+			 , RC.RD_CPN_NM AS RD_CPN_NM
   		  FROM TB_COUPON B
-    	 WHERE CPN_ID = #{value}
+		  LEFT OUTER JOIN (SELECT CPN_ID
+		  						, RD_CPN_NM
+							 FROM TB_RANDOM_COUPON
+		    				GROUP BY CPN_ID, RD_CPN_NM) RC
+		    ON B.CPN_ID = RC.CPN_ID
+		   AND B.DC_CD_GB = 'G233_10'		<!-- 시리얼 유형일 경우에만 랜덤쿠폰 검색 검색 -->
+    	 WHERE B.CPN_ID = #{value}
 	</select>
 
 	<!-- 쿠폰 발급 개수 조회 -->
-	<select id="getCouponIssueCnt" parameterType="String" resultType="int">
+	<select id="getCouponIssueCnt" parameterType="int" resultType="int">
 		/* TsaCoupon.getCouponIssueCnt*/
 		SELECT COUNT(1)
 		  FROM TB_CUST_COUPON
@@ -526,7 +536,7 @@
 	</select>
 
 	<!-- 쿠폰 입점업체 분담율 조회-->
-	<select id="getCouponBurdenList" parameterType="String" resultType="CouponBurden">
+	<select id="getCouponBurdenList" parameterType="int" resultType="CouponBurden">
 		/* TsaCoupon.getCouponBurdenList */
 		SELECT SUPPLY_COMP_CD
 			 , BURDEN_RATE
@@ -606,4 +616,98 @@
 		   AND CUST_CPN_SQ = #{custCpnSq}
 	</update>
 
+	<!-- 특정 쿠폰 발급받은 회원 조회-->
+	<select id="getSerialOverlapCheck" parameterType="Coupon" resultType="int">
+		/* TsaCoupon.getSerialOverlapCheck : 중복 시리얼넘버 체크 */
+		WITH CHECK_DATA AS (
+		    SELECT C.CPN_ID
+				 , C.DOWN_STDT
+		    	 , C.DOWN_EDDT
+		    	 , C.AVAIL_STDT
+		    	 , C.AVAIL_EDDT
+		    	 , C.AVAIL_DAYS
+		    FROM TB_COUPON C
+			INNER JOIN (SELECT CPN_ID
+							 , RD_CPN_NM
+						FROM TB_RANDOM_COUPON
+						WHERE RD_CPN_NM = #{rdCpnNm}
+						GROUP BY CPN_ID, RD_CPN_NM ) RC
+		    ON C.CPN_ID = RC.CPN_ID
+		)
+		SELECT SUM(A.CNT) AS CNT
+		FROM ( SELECT COUNT(1) AS CNT		<!-- 다운 시작일이 겹치는 쿠폰번호 찾기 -->
+				FROM CHECK_DATA C
+				WHERE 1=1
+				AND C.DOWN_STDT >= STR_TO_DATE(#{downStdt}, '%Y-%m-%d %H:%i:%s')
+				AND C.DOWN_STDT <![CDATA[ <= ]]> STR_TO_DATE(#{downEddt}, '%Y-%m-%d %H:%i:%s')
+				UNION
+				SELECT COUNT(1) AS CNT		<!-- 다운 종료일이 겹치는 쿠폰번호 찾기 -->
+				FROM CHECK_DATA C
+				WHERE 1=1
+				AND C.DOWN_EDDT >= STR_TO_DATE(#{downStdt}, '%Y-%m-%d %H:%i:%s')
+				AND C.DOWN_EDDT <![CDATA[ <= ]]> STR_TO_DATE(#{downEddt}, '%Y-%m-%d %H:%i:%s')
+				UNION
+				SELECT COUNT(1) AS CNT		<!-- 유효 시작일이 겹치는 쿠폰번호 찾기 -->
+				FROM CHECK_DATA C
+				WHERE 1=1
+				AND C.AVAIL_STDT >= STR_TO_DATE(#{downStdt}, '%Y-%m-%d %H:%i:%s')
+				AND C.AVAIL_STDT <![CDATA[ <= ]]> STR_TO_DATE(#{downEddt}, '%Y-%m-%d %H:%i:%s')
+				UNION
+				SELECT COUNT(1) AS CNT		<!-- 유효 종료일이 겹치는 쿠폰번호 찾기 -->
+				FROM CHECK_DATA C
+				WHERE 1=1
+				AND C.AVAIL_EDDT >= STR_TO_DATE(#{downStdt}, '%Y-%m-%d %H:%i:%s')
+				AND C.AVAIL_EDDT <![CDATA[ <= ]]> STR_TO_DATE(#{downEddt}, '%Y-%m-%d %H:%i:%s')
+				UNION
+				SELECT COUNT(1) AS CNT		<!-- 쿠폰 사용 기한이 일수일경우 다운시작일 + 일수가 사용가능일. 해당 기준으로 겹치는 쿠폰번호 찾기 -->
+				FROM CHECK_DATA C
+				WHERE 1=1
+				AND DATE_ADD(C.DOWN_STDT, INTERVAL C.AVAIL_DAYS DAY) >= STR_TO_DATE(#{downStdt}, '%Y-%m-%d %H:%i:%s')
+				AND DATE_ADD(C.DOWN_STDT, INTERVAL C.AVAIL_DAYS DAY) <![CDATA[ <= ]]> STR_TO_DATE(#{downEddt}, '%Y-%m-%d %H:%i:%s')
+				UNION
+				SELECT COUNT(1) AS CNT		<!-- 쿠폰 사용 기한이 일수일경우 다운종료일 + 일수가 사용종료일. 해당 기준으로 겹치는 쿠폰번호 찾기 -->
+				FROM CHECK_DATA C
+				WHERE 1=1
+				AND DATE_ADD(C.DOWN_EDDT, INTERVAL C.AVAIL_DAYS DAY) >= STR_TO_DATE(#{downStdt}, '%Y-%m-%d %H:%i:%s')
+				AND DATE_ADD(C.DOWN_EDDT, INTERVAL C.AVAIL_DAYS DAY) <![CDATA[ <= ]]> STR_TO_DATE(#{downEddt}, '%Y-%m-%d %H:%i:%s') ) A
+	</select>
+
+	<!-- 고객 쿠폰 발행 -->
+	<insert id="createRandomCouponInfo" parameterType="Coupon">
+		/* TsaCoupon.createRandomCouponInfo */
+		INSERT INTO TB_RANDOM_COUPON (
+			  RD_CPN_NM
+			, CPN_ID
+			, REG_NO
+			, REG_DT
+			, UPD_NO
+			, UPD_DT
+		) VALUES (
+			  #{rdCpnNm}
+			, #{cpnId}
+			, #{regNo}
+			, CURRENT_TIMESTAMP()
+			, #{updNo}
+			, CURRENT_TIMESTAMP()
+		)
+	</insert>
+
+	<!-- 특정 쿠폰 발급받은 회원 조회-->
+	<select id="getRandomCouponInfo" parameterType="int" resultType="CustCoupon">
+		/* TsaCoupon.getRandomCouponInfo */
+		SELECT RC.CPN_ID
+			 , RC.RD_CPN_NM
+		     , C.CUST_NO
+			 , C.CUST_ID
+			 , C.CUST_NM
+			 , DATE_FORMAT(CC.REG_DT, '%Y-%m-%d %H:%i:%s') AS REG_DT
+			 , DATE_FORMAT(CC.USED_DT, '%Y-%m-%d %H:%i:%s') AS USED_DT
+		FROM TB_RANDOM_COUPON RC
+		LEFT OUTER JOIN TB_CUSTOMER C
+		ON RC.CUST_NO = C.CUST_NO
+		LEFT OUTER JOIN TB_CUST_COUPON CC
+		ON RC.CPN_ID = CC.CPN_ID
+		AND C.CUST_NO = CC.CUST_NO
+		WHERE RC.CPN_ID = #{cpnId}
+	</select>
 </mapper>

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

@@ -162,6 +162,7 @@
 		     , FV.USE_POINT
 		     , FV.ITEM_QTY
 		     , FV.LIMIT_QTY
+			 , FV.LEFT_QTY
 		     , FV.ITEM_CD
 			 , FG.PRODUCT_NO
 			 , FG.GOODS_NM

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

@@ -3947,4 +3947,339 @@
 		                AND GOODS_CD = A.GOODS_CD
 		                )
 	</insert>
+	
+	<!-- 상품  등록 로그 생성 -->
+	<insert id="createGoodsRegLog" parameterType="GoodsMass">
+		/* TsaGoods.createGoodsRegLog */
+		INSERT INTO TB_GOODS_REG_LOG (
+		    PROC_GB
+		  , GOODS_CD
+		  , SUPPLY_COMP_CD
+		  , GOODS_NM
+		  , GOODS_TNM
+		  , GOODS_SNM1
+		  , ORIGIN_CD
+		  , MAKE_YMD
+		  , BRAND_CD
+		  , ITEMKIND_CD
+		  , STYLE_YEAR
+		  , SEASON_CD
+		  , SEX_GB
+		  , GOODS_NUM
+		  , LIST_PRICE
+		  , CURR_PRICE
+		  , COST_PRICE
+		  , SUPPLY_GOODS_CD
+		  , FORMAL_GB
+		  , SELL_FEE_RATE
+		  , GOODS_GB
+		  , TAX_GB
+		  , ADULT_YN
+		  , MIN_ORD_QTY
+		  , MAX_ORD_QTY
+		  , DAY_MAX_ORD_QTY
+		  , PNT_PRATE
+		  , PNT_MRATE
+		  , PRE_PPNT_USABLE_YN
+		  , PRE_MPNT_USABLE_YN
+		  , CHANGEABLE_YN
+		  , RETURNABLE_YN
+		  , GIFT_PACK_YN
+		  , NEW_CUST_ORD_YN
+		  , OPT_STR
+		  , GOODS_CONTENT
+		  , NI_CLSF_CD
+		  , NI_CONTENT1
+		  , NI_CONTENT2
+		  , NI_CONTENT3
+		  , NI_CONTENT4
+		  , NI_CONTENT5
+		  , NI_CONTENT6
+		  , NI_CONTENT7
+		  , NI_CONTENT8
+		  , NI_CONTENT9
+		  , NI_CONTENT10
+		  , NI_CONTENT11
+		  , NI_CONTENT12
+		  , NI_CONTENT13
+		  , NI_CONTENT14
+		  , NI_CONTENT15
+		  , NI_CONTENT16
+		  , NI_CONTENT17
+		  , NI_CONTENT18
+		  , NI_CONTENT19
+		  , NI_CONTENT20
+		  , NI_CONTENT21
+		  , NI_CONTENT22
+		  , NI_CONTENT23
+		  , NI_CONTENT24
+		  , NI_CONTENT25
+		  , NI_CONTENT26
+		  , NI_CONTENT27
+		  , NI_CONTENT28
+		  , REG_SUCC_YN
+		  , REG_FAIL_RSN
+		  , REG_NO
+		  , REG_DT
+		)
+		VALUES(
+		    #{procGb}
+		  , #{goodsCd}
+		  , #{supplyCompCd}
+		  , #{goodsNm}
+		  , #{goodsTnm}
+		  , #{goodsSnm1}
+		  , #{originCd}
+		  , #{makeYmd}
+		  , #{brandCd}
+		  , #{itemkindCd}
+		  , #{styleYear}
+		  , #{seasonCd}
+		  , #{sexGb}
+		  , #{goodsNum}
+		  , #{listPrice}
+		  , #{currPrice}
+		  , #{costPrice}
+		  , #{supplyGoodsCd}
+		  , #{formalGb}
+		  , #{sellFeeRate}
+		  , #{goodsGb}
+		  , #{taxGb}
+		  , #{adultYn}
+		  , #{minOrdQty}
+		  , #{maxOrdQty}
+		  , #{dayMaxOrdQty}
+		  , #{pntPrate}
+		  , #{pntMrate}
+		  , #{prePpntUsableYn}
+		  , #{preMpntUsableYn}
+		  , #{changeableYn}
+		  , #{returnableYn}
+		  , #{giftPackYn}
+		  , #{newCustOrdYn}
+		  , #{optStr}
+		  , #{goodsContent}
+		  , #{niClsfCd}
+		  , #{niContent1}
+		  , #{niContent2}
+		  , #{niContent3}
+		  , #{niContent4}
+		  , #{niContent5}
+		  , #{niContent6}
+		  , #{niContent7}
+		  , #{niContent8}
+		  , #{niContent9}
+		  , #{niContent10}
+		  , #{niContent11}
+		  , #{niContent12}
+		  , #{niContent13}
+		  , #{niContent14}
+		  , #{niContent15}
+		  , #{niContent16}
+		  , #{niContent17}
+		  , #{niContent18}
+		  , #{niContent19}
+		  , #{niContent20}
+		  , #{niContent21}
+		  , #{niContent22}
+		  , #{niContent23}
+		  , #{niContent24}
+		  , #{niContent25}
+		  , #{niContent26}
+		  , #{niContent27}
+		  , #{niContent28}
+		  , #{regSuccYn}
+		  , #{regFailRsn}
+		  , #{regNo}
+		  , NOW()
+		)
+	</insert>
+	
+	<!-- 상품 기본 정보 수정  - 대량엑셀 -->
+	<update id="updateGoodsMass" parameterType="Goods">
+		/* TsaGoods.updateGoodsMass */
+		UPDATE TB_GOODS
+		SET UPD_NO = #{updNo}
+		  , UPD_DT = NOW()
+		<if test='goodsNm != null and goodsNm != "X"'>
+		  , GOODS_NM = #{goodsNm} 
+		</if>
+		<if test='goodsTnm != null and goodsTnm != "X"'>
+		  , GOODS_TNM = #{goodsTnm}
+		</if>
+		<if test='goodsSnm1 != null and goodsSnm1 != "X"'>
+		  , GOODS_SNM1 = #{goodsSnm1}
+		</if>
+		<if test='itemkindCd != null and itemkindCd != "X"'>
+		  , ITEMKIND_CD = #{itemkindCd}
+		</if>
+		<if test='seasonCd != null and seasonCd != "X"'>
+		  , SEASON_CD = #{seasonCd}
+		</if>
+		<if test='sexGb != null and sexGb != "X"'>
+		  , SEX_GB = #{sexGb}
+		</if>
+		<if test="currPrice != null and currPrice > 0">
+		  , CURR_PRICE = #{currPrice}
+		  , CURR_BPRICE = #{currBprice}
+		  , PRICE_UPD_DT = NOW()
+		  , DC_RATE = #{dcRate}
+		</if>
+		<if test="sellFeeRate != null and sellFeeRate > 0">
+		  , SELL_FEE_RATE = #{sellFeeRate}
+		</if>
+		<if test='goodsGb != null and goodsGb != "X"'>
+		  , GOODS_GB = #{goodsGb}
+		</if>
+		<if test='formalGb != null and formalGb != "X"'>
+		  , FORMAL_GB = #{formalGb}
+		  , PNT_PRATE = NVL(#{pntPrate}, PNT_PRATE)
+		  , PNT_MRATE = NVL(#{pntMrate}, PNT_MRATE)
+		</if>
+		<if test="minOrdQty != null and minOrdQty > 0">
+		  , MIN_ORD_QTY = #{minOrdQty}
+		</if>
+		<if test="maxOrdQty != null and maxOrdQty > 0">
+		  , MAX_ORD_QTY = #{maxOrdQty}
+		</if>
+		<if test="dayMaxOrdQty != null and dayMaxOrdQty > 0">
+		  , DAY_MAX_ORD_QTY = #{dayMaxOrdQty}
+		</if>
+		<if test='giftPackYn != null and giftPackYn != "X"'>
+		  , GIFT_PACK_YN = #{giftPackYn}
+		</if>
+		<if test='newCustOrdYn != null and newCustOrdYn != "X"'>
+		  , NEW_CUST_ORD_YN = #{newCustOrdYn}
+		</if>
+		<if test='returnableYn != null and returnableYn != "X"'>
+		  , RETURNABLE_YN = #{returnableYn}
+		</if>
+		<if test='changeableYn != null and changeableYn != "X"'>
+		  , CHANGEABLE_YN = #{changeableYn}
+		</if>
+		<if test='taxGb != null and taxGb != "X"'>
+		  , TAX_GB = #{taxGb}
+		</if>
+		<if test='ageGrpCd != null and ageGrpCd != "X"'>
+		  , AGE_GRP_CD = #{ageGrpCd}
+		</if>
+		<if test='adultYn != null and adultYn != "X"'>
+		  , ADULT_YN = #{adultYn}
+		</if>
+		<if test='pntPrate != null and pntPrate >= 0'>
+		  , PNT_PRATE = #{pntPrate}
+		</if>
+		<if test='prePpntUsableYn != null and prePpntUsableYn != "X"'>
+		  , PRE_PPNT_USABLE_YN = DECODE(#{prePpntUsableYn}, 'Y', 'Y', 'N', 'N', PRE_PPNT_USABLE_YN)
+		</if>
+		<if test='pntMrate != null and pntMrate >= 0'>
+		  , PNT_MRATE = #{pntMrate}
+		</if>
+		<if test='makeYmd != preMpntUsableYn and preMpntUsableYn != "X"'>
+		  , PRE_MPNT_USABLE_YN = DECODE(#{preMpntUsableYn}, 'Y', 'Y', 'N', 'N', PRE_MPNT_USABLE_YN)
+		</if>
+		WHERE GOODS_CD = #{goodsCd}
+	</update>
+	
+	<!-- 상품등록로그 목록 조회 -->
+	<select id="getGoodsRegLogList" parameterType="GoodsSearch" resultType="GoodsMass">
+		/* TsaGoods.getGoodsRegLogList */
+		SELECT A.GOODS_REG_SQ
+		     , A.PROC_GB
+		     , A.GOODS_CD
+		     , A.SUPPLY_COMP_CD
+		     , A.GOODS_NM
+		     , A.GOODS_TNM
+		     , A.GOODS_SNM1
+		     , A.ORIGIN_CD
+		     , A.MAKE_YMD
+		     , A.BRAND_CD
+		     , A.ITEMKIND_CD
+		     , A.STYLE_YEAR
+		     , A.SEASON_CD
+		     , A.SEX_GB
+		     , A.GOODS_NUM
+		     , A.LIST_PRICE
+		     , A.CURR_PRICE
+		     , A.COST_PRICE
+		     , A.SUPPLY_GOODS_CD
+		     , A.FORMAL_GB
+		     , A.GOODS_GB
+		     , A.TAX_GB
+		     , A.ADULT_YN
+		     , A.SELL_FEE_RATE
+		     , A.MIN_ORD_QTY
+		     , A.MAX_ORD_QTY
+		     , A.DAY_MAX_ORD_QTY
+		     , A.PNT_PRATE
+		     , A.PNT_MRATE
+		     , A.PRE_PPNT_USABLE_YN
+		     , A.PRE_MPNT_USABLE_YN
+		     , A.CHANGEABLE_YN
+		     , A.RETURNABLE_YN
+		     , A.GIFT_PACK_YN
+		     , A.NEW_CUST_ORD_YN
+		     , A.OPT_STR
+		     , A.GOODS_CONTENT
+		     , A.NI_CLSF_CD
+		     , A.NI_CONTENT1
+		     , A.NI_CONTENT2
+		     , A.NI_CONTENT3
+		     , A.NI_CONTENT4
+		     , A.NI_CONTENT5
+		     , A.NI_CONTENT6
+		     , A.NI_CONTENT7
+		     , A.NI_CONTENT8
+		     , A.NI_CONTENT9
+		     , A.NI_CONTENT10
+		     , A.NI_CONTENT11
+		     , A.NI_CONTENT12
+		     , A.NI_CONTENT13
+		     , A.NI_CONTENT14
+		     , A.NI_CONTENT15
+		     , A.NI_CONTENT16
+		     , A.NI_CONTENT17
+		     , A.NI_CONTENT18
+		     , A.NI_CONTENT19
+		     , A.NI_CONTENT20
+		     , A.NI_CONTENT21
+		     , A.NI_CONTENT22
+		     , A.NI_CONTENT23
+		     , A.NI_CONTENT24
+		     , A.NI_CONTENT25
+		     , A.NI_CONTENT26
+		     , A.NI_CONTENT27
+		     , A.NI_CONTENT28
+		     , A.REG_SUCC_YN
+		     , A.REG_FAIL_RSN
+		     , A.REG_NO
+		     , FN_GET_USER_NM(A.REG_NO) AS REG_NM 
+		     , DATE_FORMAT(A.REG_DT, '%Y%m%d%H%i%S') AS REG_DT
+		FROM TB_GOODS_REG_LOG A
+		-- LEFT OUTER JOIN TB_GOODS B ON A.GOODS_CD = B.GOODS_CD
+		WHERE 1 = 1 
+		<if test='condition != null and condition != "" '>
+		AND (UPPER(A.GOODS_NUM) LIKE CONCAT('%',UPPER(#{condition}),'%')
+		     OR 
+		     UPPER(A.GOODS_CD) LIKE CONCAT('%',UPPER(#{condition}),'%')
+		     OR 
+		     UPPER(A.SUPPLY_GOODS_CD) LIKE CONCAT('%',UPPER(#{condition}),'%')
+		    )
+		</if>
+		<if test='regSuccYn != null and regSuccYn != "" '>
+		AND A.REG_SUCC_YN  = #{regSuccYn}
+		</if>
+		<if test='regNo != null and regNo != "" '>
+		AND A.REG_No = #{regNo}
+		</if>
+		<if test="stDate != null and stDate != ''">
+		AND A.REG_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+		</if>
+		<if test="edDate != null and edDate != ''">
+		<![CDATA[
+		AND A.REG_DT < DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S') 
+		]]>
+		</if>
+		ORDER BY A.REG_DT DESC, A.GOODS_CD
+	</select>
 </mapper>

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

@@ -2,52 +2,98 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.style24.admin.biz.dao.TsaMorebetterDao">
 	<!-- // CSB 진행 -->
-	<select id="getMorebetterList" parameterType="MoreBetter" resultType="MoreBetter">
-		/* TsaMarketing.getMorebetterList */
-		SELECT TMTB_SQ
-			 , TMTB_NM
-			 , FN_GET_CODE_NM('G232',TMTB_STAT) as TMTB_STAT
-			 , DATE_FORMAT(TMTB_ST_DT, '%Y.%m.%d') AS TMTB_STDT
-			 , DATE_FORMAT(TMTB_ED_DT, '%Y.%m.%d') AS TMTB_EDDT
-			 , DEL_YN
-			 , FN_GET_USER_NM(REG_NO) AS REG_NM
-			 , DATE_FORMAT(REG_DT, '%Y.%m.%d %H:%i:%S') AS REG_DT
-			 , FN_GET_USER_NM(UPD_NO) AS UPD_NM
-			 , DATE_FORMAT(UPD_DT, '%Y.%m.%d %H:%i:%S') AS UPD_DT
-		FROM TB_TMTB
-		WHERE 1=1
+	<select id="getMorebetterListCount" parameterType="MoreBetter" resultType="int">
+		/* TsaMarketing.getMorebetterListCount */
+		SELECT  COUNT(*) AS TOTCNT
+		FROM	TB_TMTB T
+		WHERE	1=1
 		<if test="tmtbStdt != null and tmtbStdt != '' and tmtbEddt != null and tmtbEddt != ''">
-			AND DATE_FORMAT(TMTB_ST_DT,'%Y%m%d%H%i%S') >= DATE_FORMAT(#{tmtbStdt} , '%Y%m%d%H%i%S')
-			AND DATE_FORMAT(TMTB_ED_DT,'%Y%m%d%H%i%S') <![CDATA[ <= ]]> DATE_FORMAT(#{tmtbEddt} , '%Y%m%d%H%i%S')
+			AND T.TMTB_ST_DT BETWEEN STR_TO_DATE(#{tmtbStdt}, '%Y-%m-%d%H%i%S') AND STR_TO_DATE(CONCAT(#{tmtbEddt}, '235959'),'%Y-%m-%d%H%i%S')
 		</if>
 		<if test="searchTxt != null and searchTxt != ''">
 			<if test="searchGubun != null and searchGubun == 'tmtbSq'">
-				AND TMTB_SQ = #{searchTxt}
+				AND T.TMTB_SQ = #{searchTxt}
 			</if>
 			<if test="searchGubun != null and searchGubun == 'tmtbNm'">
-				AND TMTB_NM = #{searchTxt}
+				AND T.TMTB_NM = #{searchTxt}
 			</if>
 		</if>
-		ORDER BY REG_DT DESC
 	</select>
 
+	<select id="getMorebetterList" parameterType="MoreBetter" resultType="MoreBetter">
+		/* TsaMarketing.getMorebetterList */
+		SELECT Z.*
+		FROM(
+			SELECT @rownum := @rownum + 1 AS RNUM
+					,A.*
+			FROM (
+				SELECT T.TMTB_SQ
+					 , T.TMTB_NM
+					 , FN_GET_CODE_NM('G232',T.TMTB_STAT) as TMTB_STAT
+					 , DATE_FORMAT(T.TMTB_ST_DT, '%Y.%m.%d') AS TMTB_STDT
+					 , DATE_FORMAT(T.TMTB_ED_DT, '%Y.%m.%d') AS TMTB_EDDT
+					 , T.DEL_YN
+					 , FN_GET_USER_NM(T.REG_NO) AS REG_NM
+					 , DATE_FORMAT(T.REG_DT, '%Y.%m.%d %H:%i:%S') AS REG_DT
+					 , FN_GET_USER_NM(T.UPD_NO) AS UPD_NM
+					 , DATE_FORMAT(T.UPD_DT, '%Y.%m.%d %H:%i:%S') AS UPD_DT
+				FROM TB_TMTB T
+				JOIN ( SELECT @rownum := 0) R
+				WHERE 1=1
+				<if test="tmtbStdt != null and tmtbStdt != '' and tmtbEddt != null and tmtbEddt != ''">
+					AND T.TMTB_ST_DT BETWEEN STR_TO_DATE(#{tmtbStdt}, '%Y-%m-%d%H%i%S') AND STR_TO_DATE(CONCAT(#{tmtbEddt}, '235959'),'%Y-%m-%d%H%i%S')
+				</if>
+				<if test="searchTxt != null and searchTxt != ''">
+					<if test="searchGubun != null and searchGubun == 'tmtbSq'">
+						AND T.TMTB_SQ = #{searchTxt}
+					</if>
+					<if test="searchGubun != null and searchGubun == 'tmtbNm'">
+						AND T.TMTB_NM = #{searchTxt}
+					</if>
+				</if>
+				ORDER BY T.REG_DT DESC
+			<include refid="getListPagingCondition_sql"/>
+	</select>
+
+	<sql id="getListPagingCondition_sql">
+		<choose>
+			<when test="pageable != null">
+				) A
+				)Z
+				WHERE RNUM BETWEEN  #{pageable.startRow} AND #{pageable.endRow}
+			</when>
+			<otherwise>
+				) A
+				)Z
+			</otherwise>
+		</choose>
+	</sql>
+
 	<select id="getMorebetterMstInfo" parameterType="Integer" resultType="MoreBetter">
 		/* TsaMarketing.getMorebetterMstInfo */
 		SELECT	   	   TT.TMTB_SQ
 					 , TT.TMTB_NM
 					 , TT.TMTB_STAT
-					 , DATE_FORMAT(TT.TMTB_ST_DT , '%Y-%m-%d') AS TMTB_ST_DT
-					 , DATE_FORMAT(TT.TMTB_ED_DT , '%Y-%m-%d') AS TMTB_ED_DT
+					 , TT.TMTB_ST_DT
+					 , TT.TMTB_ED_DT
 					 , TT.MULTI_YN
 					 , TT.DEL_YN
 					 , TT.REG_NO
+					 , FN_GET_USER_NM(TT.REG_NO) AS REG_NM
 					 , TT.REG_DT
 					 , TT.UPD_NO
+					 , FN_GET_USER_NM(TT.UPD_NO) AS UPD_NM
 					 , TT.UPD_DT
 					 , TS.SECTION_GB
 					 , TS.SECTION_VAL
 					 , TV.DC_WAY
 					 , TV.DC_VAL
+					 , DATE_FORMAT(TT.TMTB_ST_DT , '%Y-%m-%d') AS EVENT_STDT
+					 , DATE_FORMAT(TT.TMTB_ST_DT , '%H') AS EVENT_STHH
+					 , DATE_FORMAT(TT.TMTB_ST_DT , '%i') AS EVENT_STMM
+					 , DATE_FORMAT(TT.TMTB_ED_DT , '%Y-%m-%d') AS EVENT_EDDT
+					 , DATE_FORMAT(TT.TMTB_ED_DT , '%H') AS EVENT_EDHH
+					 , DATE_FORMAT(TT.TMTB_ED_DT , '%i') AS EVENT_EDMM
 		FROM 	TB_TMTB TT
 		INNER 	JOIN TB_TMTB_SECTION TS
 		ON 		TT.TMTB_SQ = TS.TMTB_SQ
@@ -218,8 +264,8 @@
 			#{tmtbSq}
 		    ,#{tmtbNm}
 			,#{tmtbStat}
-			,#{tmtbStdt}
-			,#{tmtbEddt}
+			,DATE_FORMAT(#{tmtbStdt},'%Y-%m-%d %H:%i:%s')
+			,DATE_FORMAT(#{tmtbEddt},'%Y-%m-%d %H:%i:%s')
 			,#{applyGb}
 			,#{multiYn}
 			,'N'
@@ -544,5 +590,17 @@
 						</if>
 				)
 	</select>
+
+	<update id="updateMorebetterStat" parameterType="MoreBetter">
+		/* TsaMarketing.updateMorebetterStat */
+		UPDATE TB_TMTB SET
+			TMTB_STAT = #{tmtbStat}
+		<if test="tmtbStat == 'G232_14'">
+			, DEL_YN = 'Y'
+		</if>
+			, UPD_NO = #{updNo}
+			, UPD_DT = NOW()
+		WHERE TMTB_SQ = #{tmtbSq}
+	</update>
 	<!--// CSB 진행 -->
 </mapper>

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

@@ -152,7 +152,7 @@
 			, CHGER_PHNNO
 			, CHGER_TELNO
 			, CHGER_EMAIL
-			, CHGER_ZIP_NO
+			, CHGER_ZIPCODE
 			, CHGER_BASE_ADDR
 			, CHGER_DTL_ADDR
 			, CHGER_RTN_MEMO

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

@@ -67,7 +67,7 @@
 			<col width="7%"/>
 		</colgroup>
 		<tr th:if="${goods.selfGoodsYn == 'Y' and goods.goodsType == 'G056_N'}">
-			<th colspan="2">WMS재고연동여부<i class="star"></i></th>
+			<th colspan="2">WMS재고연동여부<em class="required" title="필수"></em></th>
 			<td colspan="2">
 				<label class="rdoBtn"><input type="radio" name="erpStockLinkYn" id="erpStockLinkYnY" value="Y" th:checked="${goods.erpStockLinkYn == 'Y'}"/>Y</label>
 				<label class="rdoBtn"><input type="radio" name="erpStockLinkYn" id="erpStockLinkYnN" value="N" th:checked="${goods.erpStockLinkYn == 'N'}"/>N</label>

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

@@ -32,24 +32,6 @@
 			</ul>
 			<ul class="panelBar">
 				<li class="center">
-					<!-- <th:block th:if="${sessionInfo.roleCd == 'G001_0000' 
-									or sessionInfo.roleCd == 'G001_A000' 
-									or sessionInfo.roleCd == 'G001_A001' 
-									or sessionInfo.roleCd == 'G001_A100' 
-									or sessionInfo.roleCd == 'G001_A101'
-									}">
-						<button type="button" class="btn btn-default btn-lg" id="btnInit" onclick="cfnDownloadSampleFile('SF001');">자사상품 등록양식 다운로드</button>
-						<button th:if="${wmsSyncYn == 'Y'}" type="button" class="btn btn-primary btn-lg" id="btnGoodsSelfCreate" >자사상품 등록</button>
-					</th:block>
-					<th:block th:if="${sessionInfo.roleCd == 'G001_0000' 
-									or sessionInfo.roleCd == 'G001_A000' 
-									or sessionInfo.roleCd == 'G001_A001' 
-									or sessionInfo.roleCd == 'G001_A100' 
-									or sessionInfo.roleCd == 'G001_A101'
-									}">
-						<button type="button" class="btn btn-default btn-lg" id="btnInit" onclick="cfnDownloadSampleFile('SF005');">입점상품 등록양식 다운로드</button>
-						<button th:if="${wmsSyncYn == 'Y'}" type="button" class="btn btn-primary btn-lg" id="btnGoodsCreate" >입점상품 등록</button> -->
-					</th:block>
 					<label class="off"><a href="javascript:void(0);" id="excelList" style="display: none;">엑셀다운로드</a></label>
 					<!--  추후 대량 수정 권한-->
 					<span th:if="${sessionInfo.roleCd == 'G001_0000' 
@@ -59,7 +41,7 @@
 									or sessionInfo.roleCd == 'G001_A101'
 								}" 
 							th:style="'padding-left:80px;'">
-						<button type="button" class="btn btn-default btn-lg" id="btnInit" onclick="cfnDownloadSampleFile('SF014');">상품대량수정 등록양식 다운로드</button>
+						<button type="button" class="btn btn-default btn-lg" onclick="cfnDownloadSampleFile('SF014');">상품대량수정 등록양식 다운로드</button>
 						<button th:if="${wmsSyncYn == 'Y'}" type="button" class="btn btn-primary btn-lg" id="btnGoodsUpdate" >상품 수정</button>
 					</span>
 				</li>
@@ -68,7 +50,7 @@
 		<div class="panelStyle" >
 			<!-- 검색조건 영역 -->
 			<div class="panelTitle">
-				<h3><i class="fa fa-info-circle"></i>아래 검색조건 중 하나를 꼭 입력해 주세요.</h3>
+				<h3><i class="fa fa-info-circle"></i>아래 검색조건 중 상품코드나 등록일을 꼭 입력해 주세요.</h3>
 			</div>
 			<div class="panelContent">
 				<table class="frmStyle">
@@ -79,7 +61,7 @@
 						<col/>
 					</colgroup>
 					<tr>
-						<th>상품코드<i class="star"></i></th>
+						<th>상품코드<em class="required" title="필수"></em></th>
 						<td><input type="text" class="w130" name="condition" id="condition" maxlength="50"/></td>
 						<th>등록여부</th>
 						<td>
@@ -90,7 +72,7 @@
 						</td>
 					</tr>
 					<tr>
-						<th>등록일<i class="star"></i></th>
+						<th>등록일<em class="required" title="필수"></em></th>
 						<td colspan="3" id="sellTerms"></td>
 					</tr>
 				</table>
@@ -113,22 +95,22 @@
 						<i class="fa fa-info" aria-hidden="true"></i>
 						<span class="left aL" style="width:580px;">
 						<!-- class="left" 또는 class="right" -->
-							<em>상품미등록</em><br/>
-							- 상품코드 오류 : 빈값, 온라인상품코드 미존재<br/>
-							- 업체 오류 : 빈값, 'S0001'나 'S0002' 가 아닌경우<br/>
-							- 상품명 오류 : 빈값<br/>
-							- 스타일 연도 오류 : 온라인에서 관리되지 않는 스타일 연도<br/>
-							- 성별 오류 : 온라인에서 관리되지 않는 성별<br/>
-							- 컬러 오류 : 온라인에서 관리되지 않는 컬러<br/>
-							- 품목 오류 : 온라인에서 관리되지 않는 품목<br/>
+							<em>* 상품미등록 *</em><br/>
+							- 품번 오류(자사) : 빈값, 길이 10이 아닐경우, FRJ는 '-'제외한 길이<br/>
+							- 제조년월일 오류 : 빈값, 날짜형식이 맞는지<br/>
+							- WMS 미존재 품번코드(자사) : 온라인 입고테이블에 품번이 없는 경우<br/>
+							- 상품코드 중복등록요청 : 등록된 상품코드 등록요청<br/>
+							- 항목별 오류 : 온라인에서 관리되지 않는 공통코드<br/>
 							- 품목의 고시정보 없음 : 품목의 고시분류 매핑이 안되어 있는 경우<br/>
+							- 고시분류 오류 : 등록요청 고시분류 와 온라인에서 품목과 매핑된 고시분류가 다른 경우<br/>
+							<br/>
+							<em>* 상품등록 *</em><br/>
+							- WMS 상품 사이즈 정보 없음 : WMS에 상품코드의 사이즈가 없을 경우<br/>
+							- 고시항목 필수 항목 오류 : 필수 고시항목의 값이 없을 경우<br/>
 						</span>
 					</div>
 					<!-- //아이콘 툴팁 -->
 				</li>
-				<li class="right">
-					<button type="button" class="btn btn-default btn-lg" id="btnGoodsRegExcelDownLoad">엑셀다운로드</button>
-				</li>
 			</ul>
 			<!-- //상단버튼 영역  -->
 			<div id="gridList" style="width: 100%; height: 500px;" class="ag-theme-balham"></div>
@@ -144,42 +126,33 @@
 	var columnDefs = [
 		{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
 		{headerName: "작업일시", field: "regDt", width: 150, cellClass: 'text-center'},
+		{headerName: "작업자", field: "regNm", width: 120, cellClass: 'text-center'},
 		{headerName: "상품등록여부", field: "regSuccYn", width: 100, cellClass: 'text-center'},
 		{headerName: "등록결과메세지", field: "regFailRsn", width: 200, cellClass: 'text-left'},
-		{headerName: "등록브랜드코드", field: "brandCd", width: 120, cellClass: 'text-center'},
-		{headerName: "업체코드", field: "supplyCompCd", width: 130, cellClass: 'text-center'},
+		{headerName: "품번", field: "goodsNum", width: 100, cellClass: 'text-center'},
+		{headerName: "브랜드코드", field: "brandCd", width: 100, cellClass: 'text-center'},
+		{headerName: "공급업체상품코드", field: "supplyGoodsCd", width: 130, cellClass: 'text-center'},
+		{headerName: "공급업체코드", field: "supplyCompCd", width: 100, cellClass: 'text-center'},
 		{headerName: "상품코드", field: "goodsCd", width: 130, cellClass: 'text-center'},
 		{headerName: "상품명", field: "goodsNm", width: 150, cellClass: 'text-left'},
 		{headerName: "상품타이틀", field: "goodsTnm", width: 150, cellClass: 'text-left'},
 		{headerName: "검색어", field: "goodsSnm1", width: 150, cellClass: 'text-left'},
-		{headerName: "제조국", field: "makeNm", width: 100, cellClass: 'text-center'},
+		{headerName: "원산지", field: "originCd", width: 100, cellClass: 'text-center'},
 		{headerName: "제조일", field: "makeYmd", width: 100, cellClass: 'text-center'},
-		{headerName: "이지미타입", field: "imgType", width: 100, cellClass: 'text-center'},
-		{headerName: "이미지경로1", field: "imgPath1", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로2", field: "imgPath2", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로3", field: "imgPath3", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로4", field: "imgPath4", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로5", field: "imgPath5", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로6", field: "imgPath6", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로7", field: "imgPath7", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로8", field: "imgPath8", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로9", field: "imgPath9", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로10", field: "imgPath10", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로11", field: "imgPath11", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로12", field: "imgPath12", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로13", field: "imgPath13", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로14", field: "imgPath14", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로15", field: "imgPath15", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로16", field: "imgPath16", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로17", field: "imgPath17", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로18", field: "imgPath18", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로19", field: "imgPath19", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로20", field: "imgPath20", width: 200, cellClass: 'text-left'},
-		{headerName: "고시분류코드", field: "niClsfCd", width: 200, cellClass: 'text-center',
-			cellEditorParams: { values: gagaAgGrid.extractValues(niClsfCdList) },
-			valueFormatter: function (params) { return gagaAgGrid.lookupValue(niClsfCdList, params.value); },
-			valueParser: function (params) { return gagaAgGrid.lookupKey(niClsfCdList, params.newValue); }
-		},
+		{headerName: "품목", field: "itemkindCd", width: 100, cellClass: 'text-center'},
+		{headerName: "스타일연도", field: "styleYear", width: 100, cellClass: 'text-center'},
+		{headerName: "시즌", field: "seasonCd", width: 100, cellClass: 'text-center'},
+		{headerName: "성별", field: "sexGb", width: 100, cellClass: 'text-center'},
+		{headerName: "정상가", field: "listPrice", width: 100, cellClass: 'text-center'},
+		{headerName: "판매가", field: "currPrice", width: 100, cellClass: 'text-center'},
+		{headerName: "원가", field: "costPrice", width: 100, cellClass: 'text-center'},
+		{headerName: "정상이월", field: "formalGb", width: 100, cellClass: 'text-center'},
+		{headerName: "상품구분", field: "goodsGb", width: 100, cellClass: 'text-center'},
+		{headerName: "과세구분", field: "taxGb", width: 100, cellClass: 'text-center'},
+		{headerName: "성인용품여부", field: "adultYn", width: 100, cellClass: 'text-center'},
+		{headerName: "옵션정보", field: "optStr", width: 150, cellClass: 'text-center'},
+		{headerName: "상품상세 html", field: "goodsContent", width: 150, cellClass: 'text-center'},
+		{headerName: "고시분류코드", field: "niClsfCd", width: 100, cellClass: 'text-center'},
 		{headerName: "고시내용1", field: "niContent1", width: 200, cellClass: 'text-left'},
 		{headerName: "고시내용2", field: "niContent2", width: 200, cellClass: 'text-left'},
 		{headerName: "고시내용3", field: "niContent3", width: 200, cellClass: 'text-left'},
@@ -207,21 +180,7 @@
 		{headerName: "고시내용25", field: "niContent25", width: 200, cellClass: 'text-left'},
 		{headerName: "고시내용26", field: "niContent26", width: 200, cellClass: 'text-left'},
 		{headerName: "고시내용27", field: "niContent27", width: 200, cellClass: 'text-left'},
-		{headerName: "고시내용28", field: "niContent28", width: 200, cellClass: 'text-left'},
-		{headerName: "브랜드", field: "brandCd", width: 100, cellClass: 'text-center'},
-		{headerName: "품목", field: "itemkindCd", width: 100, cellClass: 'text-center'},
-		{headerName: "스타일연도", field: "styleYear", width: 100, cellClass: 'text-center'},
-		{headerName: "시즌", field: "seasonCd", width: 80, cellClass: 'text-center'},
-		{headerName: "성별", field: "sexGb", width: 80, cellClass: 'text-center'},
-		{headerName: "품번", field: "goodsNum", width: 100, cellClass: 'text-center'},
-		{headerName: "정상가", field: "listPrice", width: 100, cellClass: 'text-center'},
-		{headerName: "판매가", field: "currPrice", width: 100, cellClass: 'text-center'},
-		{headerName: "공급업체상품코드", field: "supplyGoodsCd", width: 130, cellClass: 'text-center'},
-		{headerName: "정상이월", field: "formalGb", width: 100, cellClass: 'text-center'},
-		/* {headerName: "옵션문자열", field: "optStr", width: 200, cellClass: 'text-center'},
-		{headerName: "안전재고문자열", field: "baseStockStr", width: 200, cellClass: 'text-center'},
-		{headerName: "현재고문자열", field: "currStockStr", width: 200, cellClass: 'text-center'}, */
-		{headerName: "매입유형", field: "buyingType", width: 80, cellClass: 'text-center'}
+		{headerName: "고시내용28", field: "niContent28", width: 200, cellClass: 'text-left'}
 	];
 
 	// Get GridOptions
@@ -297,31 +256,6 @@
 		fnGoodsListSearch();
 	}
 	
-	$('#btnGoodsRegExcelDownLoad').on('click', function() {
-		
-		var date = new Date().format("YYYYMMDDHHmmss");
-		var params = {
-			
-			fileName : "상품대량등록결과_"+ date,
-			sheetName: "DATA"
-		}
-		gridOptions.excelStyles = [
-			{
-				id: 'text-center',
-				dataType: 'string',
-				font: {size : 10, bold: false}
-			},
-			{
-				id: 'text-left',
-				dataType: 'string',
-				font: {size : 10, bold: false}
-			}
-		]
-		
-		gridOptions.api.exportDataAsExcel(params);
-		
-	});
-	
 	// 초기화 클릭시
 	$('#btnInit').on('click', function() {
 		$('#massForm')[0].reset();

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

@@ -38,7 +38,7 @@
 						<col/>
 					</colgroup>
 					<tr>
-						<th>업체/브랜드<i class="star"></i></th>
+						<th>업체/브랜드<em class="required" title="필수"></em></th>
 						<td>
 							<select name="supplyCompCd" id="supplyCompCd">
 								<option value="" th:if="${sessionInfo.roleCd} != 'B000'">[전체]</option>
@@ -48,13 +48,13 @@
 								<option value="">[전체]</option>
 							</select>
 						</td>
-						<th>모델번호<i class="star"></i></th>
+						<th>모델번호<em class="required" title="필수"></em></th>
 						<td>
 							<input id="modelNo" name=modelNo type="text" class="w150"  maxlength="20"/>
 						</td>
 					</tr>
 					<tr>
-						<th>등록일<i class="star"></i></th>
+						<th>등록일<em class="required" title="필수"></em></th>
 						<td colspan="3" id="sellTerms"></td>
 					</tr>
 				</table>

src/main/webapp/WEB-INF/views/marketing/CouponPopupForm.html

@@ -28,7 +28,8 @@
 				<input type="hidden" name="exceptGoodsList" id="excepGoodsList">
 				<input type="hidden" name="burdenList" id="burdenList">
 				<input type="hidden" name="cateList" id="cateList">
-				<input type="hidden" name="cpnId2" id="cpnId2" th:if="${cpnDetail}" th:value="${cpnDetail.cpnId}">
+				<input type="hidden" name="rdCpnNm" id="rdCpnNm">
+				<input type="hidden" name="cpnId" id="cpnId" th:if="${cpnDetail}" th:value="${cpnDetail.cpnId}">
 
 				<div class="tabs">
 					<div class="tabsNav">
@@ -36,6 +37,7 @@
 							<li class="on"><a href="#coupontab1">기본정보</a></li>
 							<li><a href="#coupontab2">적용대상</a></li>
 							<li><a href="#coupontab3">입점업체분담율</a></li>
+							<li class="randomCpnTab" style="display:none;"><a href="#coupontab4">시리얼및난수</a></li>
 						</ul>
 					</div>
 					<ul class="tabsCont">
@@ -49,14 +51,10 @@
 										<col style="width:40%;">
 									</colgroup>
 									<tbody>
-										<tr>
-											<th>쿠폰번호<em class="required" title="필수"></em></th>
+										<tr th:if="${cpnDetail}">
+											<th>쿠폰번호</th>
 											<td colspan="5">
-												<input type="hidden" name="copyCpnId" maxlength="50" value="">
-												<input type="text" name="cpnId" id="cpnId" maxlength="50"  style="width:70%;" disabled="true" readonly="readonly" placeholder="자동생성" data-valid-name="쿠폰번호">
-												<label class="chkBox checked" onclick="clickCreateChk(this);">
-													<input type="checkbox" name="cpnCreateType" value="true" class="type-check" checked />쿠폰번호 자동생성
-												</label>
+												<span th:if="${cpnDetail}" th:text="${cpnDetail.cpnId}"></span>
 											</td>
 										</tr>
 										<tr>
@@ -72,6 +70,27 @@
 												<label class="rdoBtn" th:if="${cpnTypeList}" th:each="oneData, status : ${cpnTypeList}"> <input type="radio" name="rdoCpnType"  th:text="${oneData.cdNm}" th:value="${oneData.cd}"/></label>
 											</td>
 										</tr>
+										<tr class="dcCdGb" style="display:none;">
+											<th>할인쿠폰유형<em class="required" title="필수"></em></th>
+											<td class="normalCol">
+												<input type="hidden" id="dcCd" required="required"  data-valid-name="할인쿠폰유형">
+												<label class="rdoBtn" th:if="${dcCdList}" th:each="oneData, status : ${dcCdList}"> <input type="radio" name="dcCdGb"  th:text="${oneData.cdNm}" th:value="${oneData.cd}"/></label>
+											</td>
+											<th class="randomCpnArea">난수생성수량<em class="required" title="필수"></em></th>
+											<td class="randomCpnArea">
+												<input type="text" name="randomCpnQty" class="w300" required="required" data-valid-name="랜덤쿠폰발급수량" data-valid-type="numeric">
+											</td>
+										</tr>
+										<tr class="serialCpnArea" style="display:none;">
+											<th>시리얼명<em class="required" title="필수"></em></th>
+											<td>
+												<input type="text" name="serialCpnNm" class="w300" required="required" data-valid-name="시리얼쿠폰키워드">
+											</td>
+											<th>쿠폰발급수량<em class="required" title="필수"></em></th>
+											<td>
+												<input type="text" name="serialCpnQty" class="w300" required="required" data-valid-name="시리얼쿠폰발급수량" data-valid-type="numeric">
+											</td>
+										</tr>
 										<tr>
 											<th>사용가능고객구분<em class="required" title="필수"></em></th>
 											<td>
@@ -247,8 +266,8 @@
 													<option value="N" selected="selected">N</option>
 												</select>
 											</td>
-											<th>총발행제한수량<em class="required" title="필수"></em></th>
-											<td>
+											<th class="dcCdCheck">총발행제한수량<em class="required" title="필수"></em></th>
+											<td class="dcCdCheck">
 												<input type="text" class="w200" name="totPubLimitQty" id="totPubLimitQty" value="0" required="required" data-valid-name="총발행제한수량" data-valid-type="numeric" style="text-align: right;">개<span class="cRed" id="totPubLimitQtySpan"> *제한없음</span>
 											</td>
 										</tr>
@@ -275,7 +294,7 @@
 												</select>
 											</td>
 										</tr>
-										<tr>
+										<tr class="dcCdCheck">
 											<th>1인당발행제한수량<em class="required" title="필수"></em></th>
 											<td>
 												<input type="text" class="w200" name="custPubLimitQty" id="custPubLimitQty" value="0" required="required" data-valid-name="1인당발행제한수량" data-valid-type="numeric" style="text-align: right;">개<span class="cRed" id="custPubLimitQtySpan"> *제한없음</span>
@@ -325,7 +344,7 @@
 									</tbody>
 								</table>
 								<div class="mdPopBtnB aR">
-									<button type="button" class="btn btn-info btn-lg" onclick="fnCustomerIssuePopUp();" th:if="${mode == 'U'}">쿠폰발행</button>
+									<button type="button" class="btn btn-info btn-lg" onclick="fnCustomerIssuePopUp();" th:if="${mode == 'U' && cpnDetail.dcCdGb == 'G233_00'}">쿠폰발행</button>  <!-- 난수유형과 시리얼 유형에서는 쿠폰발행기능 X -->
 									<button type="button" class="btn btn-info btn-lg" onclick="fnCouponCreate();" th:if="${mode == 'N'}">등록</button>
 									<button type="button" class="btn btn-info btn-lg" onclick="fnCouponUpdate();" th:if="${mode == 'U'}">수정</button>
 								</div>
@@ -431,12 +450,19 @@
 										<button type="button" class="btn btn-danger btn-lg" id="btnDelRow">행삭제</button>
 									</li>
 								</ul>
-
 								<div id="inComGridList" style="width: 100%; height: 570px" class="ag-theme-balham"></div>
-
 							</div>
 						</li>
 						<!-- 입점업체분담끝-->
+						<!-- 난수 및 네임쿠폰 설정 -->
+						<li class="tab" id="coupontab4">
+							<div class="panelStyle">
+								<span>
+									<div id="randomCpnList" style="width: 100%; height: 500px" class="ag-theme-balham"></div>
+								</span>
+							</div>
+						</li>
+						<!-- 난수 및 네임쿠폰 설정-->
 					</ul>
 				</div>
 			</form>
@@ -454,6 +480,7 @@
 	var cpnDtlRefvalBrandList = [[${cpnDtlRefvalBrandList}]];
 	var cpnDtlRefvalExceptGoodsList = [[${cpnDtlRefvalExceptGoodsList}]];
 	var cpnDtlBurdenList = [[${cpnDtlBurdenList}]];
+	var randomCpnList = [[${randomCpnList}]];
 	var issueCnt = [[${issueCnt}]];
 
 	// 공통코드 리스트
@@ -551,12 +578,23 @@
 		{ headerName: "쿠폰대상일련번호"  , field: "cpnRefvalSq" , width: 120 , cellClass: 'text-center' , hide:true}
 	];
 
+	// ag-grid 시리얼 및 난수 리스트
+	var randomCouponDefs = [
+		{ headerName : "생성쿠폰키워드" , field: "rdCpnNm" , width:150, cellClass: 'text-center'} ,
+		{ headerName: "지급고객번호" , field: "custNm" , width:150, cellClass: 'text-center'},
+		{ headerName: "고객아이디" , field: "custId" , width:150, cellClass: 'text-center'},
+		{ headerName: "고객명" , field: "custNm" , width:150, cellClass: 'text-center'},
+		{ headerName: "지급일" , field: "regDt" , width:150, cellClass: 'text-center'},
+		{ headerName: "쿠폰사용일" , field: "usedDt" , width:150, cellClass: 'text-center'}
+	];
+
 	var inComGridOptions = gagaAgGrid.getGridOptions(columnDefs);
 	var cateGridOptions = gagaAgGrid.getGridOptions(cateSelColumnDefs);
 	var goodsGridOptions = gagaAgGrid.getGridOptions(goodsSelColumnDefs);
 	var brandGridOptions = gagaAgGrid.getGridOptions(brandSelColumnDefs);
 	var supplyGridOptions = gagaAgGrid.getGridOptions(supplyColumnDefs);
 	var excepGoodsGridOptions = gagaAgGrid.getGridOptions(excepGoodsColumnDefs);
+	var randomCouponGridOptions = gagaAgGrid.getGridOptions(randomCouponDefs);
 
 	inComGridOptions.defaultColDef.editable = true;
 	inComGridOptions.rowSelection = "multiple";
@@ -727,16 +765,42 @@
 
 		// 주문서 쿠폰 선택시 결제수단 노출
 		if(radioValue == 'G230_20') {
-			$('.payTypeTr').css('display' , '');
+			$('#CouponForm .payTypeTr').show();
 			$('#CouponForm #payType').attr('required' , true);
+			$("#CouponForm .dcCdGb").show();		// 할인쿠폰유형 노출
 		} else {
-			$('.payTypeTr').css('display' , 'none');
+			$('#CouponForm .payTypeTr').hide();
 			$('#CouponForm #payType').attr('required' , false );
+			$("#CouponForm .dcCdGb").hide();		// 할인쿠폰유형 숨김
+			$("#CouponForm input:radio[name='dcCdGb']:radio[value='G233_00']").prop('checked', true);		// 주문서 쿠폰이 아닐 경우 일반 쿠폰으로 설정
 		}
 
 		$('#CouponForm #cpnType').val(radioValue);
 	});
 
+	// 할인 쿠폰 유형 변경
+	$("#CouponForm input[name=dcCdGb]").bind('click change', function () {
+		if(this.value == "G233_00") {			// 일반 유형
+			$("#CouponForm .dcCdCheck").show();
+			$("#CouponForm .serialCpnArea").hide();
+			$("#CouponForm .randomCpnArea").hide();
+			$("#CouponForm #custJoinYn").parent().attr("colspan", "");
+			$("#CouponForm .normalCol").attr("colspan", "5");
+		} else {
+			if(this.value == "G233_10") {		// 시리얼 유형
+				$("#CouponForm .serialCpnArea").show();
+				$("#CouponForm .randomCpnArea").hide();
+				$("#CouponForm .normalCol").attr("colspan", "5");
+			} else {							// 난수 유형
+				$("#CouponForm .serialCpnArea").hide();
+				$("#CouponForm .randomCpnArea").show();
+				$("#CouponForm .normalCol").attr("colspan", "");
+			}
+			$("#CouponForm .dcCdCheck").hide();								// 총발행제한수량, 1회발행수량, 1인당발행제한수량 숨김
+			$("#CouponForm #custJoinYn").parent().attr("colspan", "5");		// 총발행제한 수량을 없애면서 신규회원여부 colspan 수정
+		}
+	});
+
 	// 적용대상 - 브랜드 추가 버튼시
 	$('#btnBrandAdd').on('click' , function(){
 		cfnOpenBrandListPopup("fnSetPopupBrandInfo", "M");
@@ -1105,31 +1169,6 @@
 		inComGridOptions.api.updateRowData({remove:gagaAgGrid.selectedRowData(inComGridOptions)});
 	});
 
-
-
-	// 쿠폰번호 자동생성 클릭시
-	function clickCreateChk(){
-		var flag = $('#CouponForm input[name=cpnCreateType]').prop("checked");
-		// 발급받은 이력이 있으면 수정 안됨
-		if(issueCnt > 0 ) {
-			return false;
-		}
-
-		if(!flag) {
-			$("#CouponForm input[name=cpnId]").prop("disabled", true);
-			$("#CouponForm input[name=cpnId]").attr("required", false);
-			$("#CouponForm input[name=cpnId]").attr("readonly", true);
-			$("#CouponForm input[name=cpnId]").attr("placeholder", "자동생성");
-			$('#CouponForm input[name=cpnCreateType]').prop("checked" , false);
-		} else{
-			$("#CouponForm input[name=cpnId]").prop("disabled", false);
-			$("#CouponForm input[name=cpnId]").attr("required", true);
-			$("#CouponForm input[name=cpnId]").attr("placeholder", "");
-			$("#CouponForm input[name=cpnId]").attr("readonly", false);
-			$('#CouponForm input[name=cpnCreateType]').prop("checked" , true);
-		}
-	}
-
 	// 제휴링크채널 수정 (제휴링크가 꼭필요한지 확인필요)
 	function fnChangeAfLinkCdList(){
 		var actionUrl = "/business/aflink/list" + '?' + $('#afChannel').serialize();
@@ -1180,6 +1219,19 @@
 		// 신규회원기간 세팅
 		$('#CouponForm #custJoinStdt').val($('#CouponForm #custJoinStDay').val() + " " + $('#CouponForm #custJoinStHH').val() + ":" + $('#CouponForm #custJoinStMM').val() + ":00");
 		$('#CouponForm #custJoinEddt').val($('#CouponForm #custJoinEdDay').val() + " " + $('#CouponForm #custJoinEdHH').val() + ":" + $('#CouponForm #custJoinEdMM').val() + ":59");
+
+		// 할인쿠폰 유형에 따른 총 발행수량 수정 (주문서 쿠폰이고 난수쿠폰일 경우)
+		if($('#CouponForm #cpnType').val() == "G230_20" && $('#CouponForm input:radio[name="dcCdGb"]:checked').val() == "G233_20") {
+			$('#CouponForm input[name="totPubLimitQty"]').val($('#CouponForm input[name="randomCpnQty"]').val());	// 총 발행수량 난수 생성수량으로 변경
+			$('#CouponForm input[name="custPubLimitQty"]').val(1);		// 1인당 발행제한수량 1개 고정
+			$('#CouponForm input[name="onePubQty"]').val(1);			// 1회발행수량 1개 고정
+		} else if ($('#CouponForm #cpnType').val() == "G230_20" && $('#CouponForm input:radio[name="dcCdGb"]:checked').val() == "G233_10") {		// 주문서 쿠폰이고 시리얼 유형일 경우
+			$('#CouponForm input[name="rdCpnNm"]').val($('#CouponForm input[name="serialCpnNm"]').val());			// 시리얼유형쿠폰명 저장
+			$('#CouponForm input[name="totPubLimitQty"]').val($('#CouponForm input[name="serialCpnQty"]').val());	// 총 발행수량 랜덤쿠폰발급수량으로 변경
+			$('#CouponForm input[name="custPubLimitQty"]').val(1);		// 1인당 발행제한수량 1개 고정
+			$('#CouponForm input[name="onePubQty"]').val(1);			// 1회발행수량 1개 고정
+		}
+
 		// 적용대상 - 공급처 그리드 전체값 세팅
 		var supplyAllData = gagaAgGrid.getAllRowData(supplyGridOptions);
 		var jsonSupplyCompData = JSON.stringify(supplyAllData);
@@ -1214,10 +1266,12 @@
 		gagaAgGrid.createGrid('supplyGridList', supplyGridOptions);
 		gagaAgGrid.createGrid('goodsGridList', goodsGridOptions);
 		gagaAgGrid.createGrid('excepGoodsGridList', excepGoodsGridOptions);
+		gagaAgGrid.createGrid('randomCpnList', randomCouponGridOptions);
 
 		// 초기화시 데이터 세팅
 		if (mode == "N") {
 			$('input[name=rdoCpnType]').eq(0).attr("checked", true);
+			$('input[name=dcCdGb]').eq(0).attr("checked", true);
 			$('input[name=rdoDcWay]').eq(0).attr("checked", true);
 			$('input[name=rdoApplyScope]').eq(0).attr("checked", true)
 			$('#CouponForm #availEdHH option:last').attr("selected", "selected");
@@ -1229,6 +1283,8 @@
 			$('#buyEdHH option:last').attr("selected", "selected");
 			$('#buyEdMM option:last').attr("selected", "selected");
 			$("#CouponForm #afChannel option:first").attr("selected" , "selected");
+			$("#CouponForm .normalCol").attr("colspan", "5");
+			$("#CouponForm .randomCpnArea").hide();
 		} else {
 			// 수정모드시 그리드 세팅
 			inComGridOptions.api.setRowData(cpnDtlBurdenList);
@@ -1237,6 +1293,7 @@
 			excepGoodsGridOptions.api.setRowData(cpnDtlRefvalExceptGoodsList);
 			brandGridOptions.api.setRowData(cpnDtlRefvalBrandList);
 			cateGridOptions.api.setRowData(cpnDtlRefvalCateList);
+			randomCouponGridOptions.api.setRowData(randomCpnList);
 			// 기본정보 세팅
 			$("#CouponForm input:radio[name='rdoDcWay']:radio[value=" + cpnDetail.dcWay + "]").prop('checked', true);
 			$("#CouponForm input:radio[name='rdoCpnType']:radio[value=" + cpnDetail.cpnType + "]").prop('checked', true);
@@ -1264,6 +1321,40 @@
 			$("#CouponForm #buyLimitAmt").val(cpnDetail.buyLimitAmt);
 			$("#CouponForm #cpnId").val(cpnDetail.cpnId);
 
+			// 한번 저장되면 쿠폰유형, 할인쿠폰유형, 난수 생성수량, 시리얼명, 시리얼쿠폰발급수량 수정 불가 처리
+			$("#CouponForm input:radio[name='rdoCpnType']").attr('readonly', true);
+			$("#CouponForm input:radio[name='rdoCpnType']").prop('disabled', true);
+			$("#CouponForm input:radio[name='rdoCpnType']").parent().prop('disabled', true);
+			$("#CouponForm input:radio[name='dcCdGb']").attr('readonly', true);
+			$("#CouponForm input:radio[name='dcCdGb']").prop('disabled', true);
+			$("#CouponForm input:radio[name='dcCdGb']").parent().prop('disabled', true);
+			$("#CouponForm input:radio[name='dcCdGb']:radio[value=" + cpnDetail.dcCdGb + "]").prop('checked', true);
+			$("#CouponForm input[name='serialCpnNm']").prop("disabled", true);
+			$("#CouponForm input[name='serialCpnQty']").prop("disabled", true);
+			$("#CouponForm input[name='randomCpnQty']").prop("disabled", true);
+
+			// 주문서 쿠폰이면 할인쿠폰유형 노출
+			if(cpnDetail.cpnType == "G230_20") {
+				$("#CouponForm .dcCdGb").show();
+			}
+			// 할인코드유형이 일반유형이 아니면
+			if(cpnDetail.dcCdGb != "G233_00" ) {
+				$("#CouponForm .randomCpnTab").show();							// 시리얼 및 난수 TAB 노출
+				$("#CouponForm .dcCdCheck").hide();								// 총발행제한수량, 1회발행수량, 1인당발행제한수량 숨김
+				if(cpnDetail.dcCdGb == "G233_10") {		// 시리얼 유형
+					$("#CouponForm input[name='serialCpnQty']").val(cpnDetail.totPubLimitQty);
+					$("#CouponForm input[name='serialCpnNm']").val(cpnDetail.rdCpnNm);
+					$("#CouponForm .normalCol").attr("colspan", "5");
+					$("#CouponForm .serialCpnArea").show();
+					$("#CouponForm .randomCpnArea").hide();
+				} else if (cpnDetail.dcCdGb == "G233_20") {
+					$("#CouponForm input[name='randomCpnQty']").val(cpnDetail.totPubLimitQty);
+					$("#CouponForm .normalCol").attr("colspan", "");
+					$("#CouponForm .randomCpnArea").show();
+					$("#CouponForm .serialCpnArea").hide();
+				}
+			}
+
 			/*
 			$("#CouponForm input:checkbox[name='cpnCreateType']").parent("label").addClass("formControl");
 			$("#CouponForm input:checkbox[name='cpnCreateType']").parent("label").prop('disabled', true);
@@ -1318,7 +1409,6 @@
 				$("#CouponForm #downStMM").attr('disabled', true);
 				$("#CouponForm #buyLimitAmt").attr('readonly', true);
 				$("#CouponForm input:radio[name='rdoDcWay']").attr('readonly', true);
-				$("#CouponForm input:radio[name='rdoCpnType']").attr('readonly', true);
 				$("#CouponForm input:radio[name='rdoApplyScope']").attr('readonly', true);
 				$("#CouponForm .rdoBtn").css('cursor', 'auto');
 				$("#CouponForm #cpnId").attr('readonly', true);

src/main/webapp/WEB-INF/views/marketing/CouponPubForCustPopupForm.html

@@ -227,7 +227,7 @@
 		var custAllData = gagaAgGrid.getAllRowData(pubCustGridOptions);
 		var jsonCustPubData = JSON.stringify(custAllData);
 		$("#pubRegForm #custList").val(jsonCustPubData);
-		$("#pubRegForm #cpnId").val($("#CouponForm #cpnId2").val());
+		$("#pubRegForm #cpnId").val($("#CouponForm #cpnId").val());
 	}
 
 	$(document).ready(function(){

src/main/webapp/WEB-INF/views/marketing/MorebetterListForm.html

@@ -97,6 +97,11 @@
 				<!-- 검색결과 영역 -->
 				<!--<div id="gridList" style="width: 100%; height: 700px;" class="ag-theme-balham lh60"></div>-->
 				<div id="gridList" style="width: 100%; height: 570px" class="ag-theme-balham"></div>
+				<ul class="panelBar">
+					<li class="center">
+						<div class="tablePaging" id="morebetterListPagination"></div>
+					</li>
+				</ul>
 			</div>
 		</form>
 <script type="text/javascript" src="/ux/plugins/gaga/gaga.paging.js?v=2019072202"></script>
@@ -104,6 +109,9 @@
 /*<![CDATA[*/
 	var columnDefs = [];
 	columnDefs = [
+		{headerName: 'No', width: 60, cellClass: 'text-center',
+			valueGetter: function(params) { return cfnGridNumner('searchForm',params.node.rowIndex, 'A');}
+		},
 		{headerName: "프로모션ID", field: "tmtbSq", width: 80, cellClass: 'text-center',
 			cellRenderer: function(params) {
 				return "<a href=\"javascript:void(0);\" onclick=\"cfnOpenMorebetterSetPopup('U','" + params.value + "');\">" + params.value + "</a>";
@@ -157,16 +165,14 @@
 
 	// 조회클릭시
 	$('#btnSearch').on('click', function() {
-		$("#searchForm input[name=pageNo]").val('1');
+		if(!fnConditionCheck()) return;
 		fnMorebetterListSearch();
 	});
 
 	// 조회
 	var fnMorebetterListSearch = function() {
-		if(!fnConditionCheck()) return;
-
 		gagaPaging.init('searchForm', fnSearchCallBack, 'morebetterListPagination', $('#searchForm').find('#pageSize').val());
-		gagaPaging.load($("#searchForm input[name=pageNo]").val());
+		gagaPaging.load(1);
 	}
 
 	//검색 조건 확인

src/main/webapp/WEB-INF/views/marketing/MorebetterPopupForm.html

@@ -48,7 +48,7 @@
 						<td>
 							<!-- 프로모션 ID 입력 : before -->
 							<label th:if="${mode == 'N'}">
-								<input class="w50p" type="text" id="disTmtbSq1" name="disTmtbSq" maxlength="30" th:value="${params.tmtbSq}" disabled=""/>
+								<input class="w50p" type="text" id="disTmtbSq1" name="disTmtbSq" maxlength="30" th:value="${params.tmtbSq}" disabled=""/> *자동생성
 							</label>
 							<label th:if="${mode == 'U'}">
 								<input class="w50p" type="text" id="disTmtbSq2" name="disTmtbSq" maxlength="30" th:value="${tmtbSeq}" disabled=""/>
@@ -57,18 +57,35 @@
 						</td>
 					</tr>
 					<tr>
-						<th>행사 기간<em class="required" title="필수"></em></th>
+						<th>시작일<em class="required" title="필수"></em></th>
 						<td>
-							<input type="text" class="schDate w100" name="tmtbStdt" maxlength="10" required="required" data-valid-name="시작일자"/>
-							~
-							<input type="text" class="schDate w100" name="tmtbEddt" maxlength="10" required="required" data-valid-name="종료일자"/>
+							<input type="hidden" name="tmtbStdt" id="tmtbStdt" required="required" data-valid-name="다다익선시작일시">
+							<input type="text" class="schDate w100" name="eventStdt" id="eventStdt" maxlength="10" th:value="${#calendars.format(#calendars.createNow(), 'yyyy-MM-dd')}"/>
+							<select name="eventStHH" data-valid-name="다다익선시작(시)" style="width: 65px;"> <!--th:disabled="${mode == 'U'}"-->
+								<th:block th:each="num, index : ${#numbers.sequence(0,23)}">
+									<option  th:value="${#numbers.formatInteger(num,2)}" th:text="|${#numbers.formatInteger(num,2)}시|" th:selected="${tmtbMstInfo.eventStHH == #numbers.formatInteger(num,2)}">시간</option>
+								</th:block>
+							</select>
+							<select name="eventStMM" data-valid-name="다다익선시작(분)" style="width: 65px;">
+								<th:block th:each="num, index : ${#numbers.sequence(0,59)}">
+									<option  th:value="${#numbers.formatInteger(num,2)}"  th:text="|${#numbers.formatInteger(num,2)}분|" th:selected="${tmtbMstInfo.eventStMM == #numbers.formatInteger(num,2)}">분</option>
+								</th:block>
+							</select>
 						</td>
-						<th>상태<em class="required" title="필수"></em></th>
+						<th>종료일<em class="required" title="필수"></em></th>
 						<td>
-							<!-- 상태 입력 : before
-                            <input class="w50p" type="text" id="disTmtbStat" name="disTmtbStat" maxlength="30" th:value="${params.tmtbStat}" disabled=""/>-->
-							<label class="rdoBtn" th:if="${tmtbStatList}" th:each="oneData, status : ${tmtbStatList}" ><input type="radio" id="disTmtbStat" name="disTmtbStat" th:value="${oneData.cd}" th:text="${oneData.cdNm}" data-valid-name="상태"/></label>
-							<input type="hidden" id="tmtbStat" name="tmtbStat"/>
+							<input type="hidden" name="tmtbEddt" id="tmtbEddt" required="required" data-valid-name="다다익선종료일시">
+							<input type="text" class="schDate w100" name="eventEddt" id="eventEddt" maxlength="10" th:value="${#calendars.format(#calendars.createNow(), 'yyyy-MM-dd')}"/>
+							<select name="eventEdHH" data-valid-name="다다익선종료(시)" style="width: 65px;">
+								<th:block th:each="num, index : ${#numbers.sequence(0,23)}">
+									<option  th:value="${#numbers.formatInteger(num,2)}" th:text="|${#numbers.formatInteger(num,2)}시|" th:selected="${tmtbMstInfo.eventEdHH == #numbers.formatInteger(num,2)}">시간</option>
+								</th:block>
+							</select>
+							<select name="eventEdMM" data-valid-name="다다익선종료(분)" style="width: 65px;">
+								<th:block th:each="num, index : ${#numbers.sequence(0,59)}">
+									<option  th:value="${#numbers.formatInteger(num,2)}"  th:text="|${#numbers.formatInteger(num,2)}분|" th:selected="${tmtbMstInfo.eventEdMM == #numbers.formatInteger(num,2)}">분</option>
+								</th:block>
+							</select>
 						</td>
 					</tr>
 					<tr>
@@ -90,12 +107,48 @@
 							<label class="rdoBtn"><input type="radio" name="multiYn" id="multiYnY" value="Y" checked="checked"/>복합상품</label>
 							<label class="rdoBtn"><input type="radio" name="multiYn" id="multiYnN" value="N"/>단일상품</label>
 						</td>
-
+						<th>상태<em class="required" title="필수"></em></th>
+						<td>
+							<!-- 상태 입력 : before
+                            <input class="w50p" type="text" id="disTmtbStat" name="disTmtbStat" maxlength="30" th:value="${params.tmtbStat}" disabled=""/>-->
+							<label class="rdoBtn" th:if="${tmtbStatList}" th:each="oneData, status : ${tmtbStatList}" ><input type="radio" id="disTmtbStat" name="disTmtbStat" th:value="${oneData.cd}" th:text="${oneData.cdNm}" data-valid-name="상태" disabled="disabled"/></label>
+							<input type="hidden" id="tmtbStat" name="tmtbStat"/>
+						</td>
 					</tr>
 
 				</table>
 			</div>
-
+			<div class="panelStyle" style="margin:unset;">
+				<!-- TITLE -->
+				<div class="panelTitle">
+					<h2>할인 구간</h2>
+					<span class="panelControl">
+						<i class="fa inner-fa-chevron-up"></i>    <!-- 열림/닫힘 화살표 -->
+					</span>
+				</div>
+				<!-- //TITLE -->
+				<div class="inner-panelContent">
+					<div class="panelContent">
+						<table class="frmStyle">
+							<colgroup>
+								<col width="10%"/>
+								<col width="90%"/>
+							</colgroup>
+							<tr>
+								<th>할인 구간</th>
+								<td>
+									<div class="padding10">
+										<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddSectionRow">행추가</button>
+										<button type="button" class="btn btnRight btn-success btn-lg" id="btnDelSectionRow">행삭제</button>
+										<br/>
+										<div id="gridSectionGbList" style="width:100%; height:200px;" class="ag-theme-balham"></div>
+									</div>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</div>
+			</div>
 			<div class="panelStyle" style="margin:unset;">
 				<!-- TITLE -->
 				<div class="panelTitle">
@@ -152,10 +205,10 @@
 									</div>
 								</td>
 							</tr>
-							<tr > <!--class="off"-->
+							<tr class="off"> <!---->
 								<th>업체&브랜드상품</th>
 								<td>
-									<div class="padding10" > <!--style="display: none;"-->
+									<div class="padding10" style="display: none;"> <!---->
 										<div id="gridDuplicateGoodsList" style="width:100%; height:200px;" class="ag-theme-balham"></div>
 									</div>
 								</td>
@@ -200,7 +253,7 @@
 			<div class="panelStyle" style="margin:unset;">
 				<!-- TITLE -->
 				<div class="panelTitle">
-					<h2>할인 구간</h2>
+					<h2>업체 분담율</h2>
 					<span class="panelControl">
 						<i class="fa inner-fa-chevron-up"></i>    <!-- 열림/닫힘 화살표 -->
 					</span>
@@ -214,13 +267,13 @@
 								<col width="90%"/>
 							</colgroup>
 							<tr>
-								<th>할인 구간</th>
+								<th>업체 분담율</th>
 								<td>
 									<div class="padding10">
-										<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddSectionRow">행추가</button>
-										<button type="button" class="btn btnRight btn-success btn-lg" id="btnDelSectionRow">행삭제</button>
+										<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddApplyBurden">업체추가</button>
+										<button type="button" class="btn btnRight btn-success btn-lg" id="btnDelApplyBurden">선택삭제</button>
 										<br/>
-										<div id="gridSectionGbList" style="width:100%; height:200px;" class="ag-theme-balham"></div>
+										<div id="gridApplyBurdenList" style="width:100%; height:200px;" class="ag-theme-balham"></div>
 									</div>
 								</td>
 							</tr>
@@ -229,31 +282,24 @@
 				</div>
 			</div>
 
-			<div class="panelStyle" style="margin:unset;">
-				<!-- TITLE -->
-				<div class="panelTitle">
-					<h2>업체 분담율</h2>
-					<span class="panelControl">
-						<i class="fa inner-fa-chevron-up"></i>    <!-- 열림/닫힘 화살표 -->
-					</span>
-				</div>
-				<!-- //TITLE -->
+			<div class="panelStyle" style="margin:unset;" th:if="${mode == 'U'}">
 				<div class="inner-panelContent">
 					<div class="panelContent">
 						<table class="frmStyle">
 							<colgroup>
 								<col width="10%"/>
-								<col width="90%"/>
+								<col width="40%"/>
+								<col width="10%"/>
+								<col width="40%"/>
 							</colgroup>
 							<tr>
-								<th>업체 분담율</th>
+								<th>등록자</th>
 								<td>
-									<div class="padding10">
-										<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddApplyBurden">업체추가</button>
-										<button type="button" class="btn btnRight btn-success btn-lg" id="btnDelApplyBurden">선택삭제</button>
-										<br/>
-										<div id="gridApplyBurdenList" style="width:100%; height:200px;" class="ag-theme-balham"></div>
-									</div>
+									<span id="regInfo">등록자이름(연.월.일 시간:분:초)</span>
+								</td>
+								<th>최종수정자</th>
+								<td>
+									<span id="updInfo">수정자이름(연.월.일 시간:분:초)</span>
 								</td>
 							</tr>
 						</table>
@@ -264,15 +310,13 @@
 
 		<ul class="panelBar">
 			<li  class="right">
-				<!-- <th:block th:if="${sessionInfo.roleCd == 'G001_0000' OR sessionInfo.roleCd == 'G001_A000' OR sessionInfo.roleCd == 'G001_A101' OR sessionInfo.roleCd == 'G001_A100' OR sessionInfo.roleCd == 'G001_A001'}"> -->
-				<!--<button type="button" class="btn btnRight btn-success btn-lg" id="btnSearchList">목록</button>-->
-				<button type="button" class="btn btnRight btn-success btn-lg" id="btnMorebetterSave">저장</button>
+				<button type="button" class="btn btnRight btn-success btn-lg" id="btnSearchList">목록</button>
+				<button type="button" class="btn btnRight btn-success btn-lg tmtbButton" id="btnMorebetterSave">저장</button>
 				<!--<button type="button" th:if="${mode == 'N'}" class="btn btnRight btn-success btn-lg" id="btnMorebetterSave">저장</button>
 				<button type="button" th:if="${mode == 'U'}" class="btn btnRight btn-success btn-lg" id="btnMorebetterUpdate">수정</button>-->
-				<!--<button type="button" class="btn btnRight btn-success btn-lg" id="btnChangeStatIng">진행</button>
-                    <button type="button" class="btn btnRight btn-success btn-lg" id="btnPromotionDelete">삭제</button>
-                    <button type="button" class="btn btnRight btn-success btn-lg" id="btnPromotionStop">중지</button>-->
-				<!-- </th:block> -->
+				<button type="button" class="btn btnRight btn-success btn-lg tmtbButton" id="btnChangeStatIng">진행</button>
+				<button type="button" class="btn btnRight btn-success btn-lg tmtbButton" id="btnMorebetterDelete">삭제</button>
+				<button type="button" class="btn btnRight btn-success btn-lg tmtbButton" id="btnMorebetterStop">중지</button>
 			</li>
 		</ul>
 	</div>
@@ -280,6 +324,7 @@
 
 <script th:inline="javascript">
 	// 상세 조회시 데이터 리스트
+	let confirmBtnText = ["확인", "취소"];
 	var mode = [[${mode}]];
 	var tmtbMstInfo = [[${tmtbMstInfo}]];
 	var tmtbSectionValList = [[${tmtbSectionValList}]];
@@ -349,6 +394,7 @@
 		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
 		{headerName: "업체ID", field: "tmtbSupplyCd" , width: 120, cellClass: 'text-center'},
 		{headerName: "분담율(%)", field: "tmtbBurdenRate" , width: 120, cellClass: 'text-center',required: true
+			,editable: true
 			,valueFormatter: function(params) {
 				if(params.value && params.value > 0) {
 					return params.value.addComma();
@@ -356,7 +402,7 @@
 					return '0';
 				}
 			},
-			cellEditor: 'textCellEditor',
+			//cellEditor: 'textCellEditor',
 			cellEditorParams: { maxlength: 3, validType: 'numeric'}
 		},
 		{headerName: "사용여부", field: "useYn" , width: 120, cellClass: 'text-center'},
@@ -368,7 +414,7 @@
 		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
 		{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
 		{headerName: "시퀀스", field: "tmtbSq", width: 100, cellClass: 'text-center', hide: true},
-		{headerName: "할인구간", field: "sectionGb", width: 100, cellClass: 'text-center',
+		{headerName: "할인구간", field: "sectionGb", width: 100, cellClass: 'text-center', editable: false,
 			cellEditor: 'agRichSelectCellEditor',
 			cellEditorParams: { values: gagaAgGrid.extractValues(sectionGbList), required: true },
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(sectionGbList, params.value); },
@@ -382,10 +428,9 @@
 					return '0';
 				}
 			},
-			cellEditor: 'textCellEditor',
 			cellEditorParams: { maxlength: 14, validType: 'numeric'}
 		},
-		{headerName: "할인구분", field: "dcWay", width: 100, cellClass: 'text-center',
+		{headerName: "할인구분", field: "dcWay", width: 100, cellClass: 'text-center', editable: false,
 			cellEditor: 'agRichSelectCellEditor',
 			cellEditorParams: { values: gagaAgGrid.extractValues(dcWayList), required: true },
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(dcWayList, params.value); },
@@ -394,12 +439,18 @@
 		{headerName: "할인값", field: "dcVal", width: 100, cellClass: 'text-right', required: true
 			,valueFormatter: function(params) {
 				if(params.value && params.value > 0) {
+					if(params.data.dcWay == "G240_11"){
+						if(params.value.length > 2){
+							mcxDialog.alert('할인율은 100이하로 설정해주세요.');
+							params.data.dcVal = '0';
+							return '0';
+						}
+					}
 					return params.value.addComma();
 				} else {
 					return '0';
 				}
 			},
-			cellEditor: 'textCellEditor',
 			cellEditorParams: { maxlength: 14, validType: 'numeric'}
 		},
 		{headerName: "구간시퀀스", field: "tmtbSectionSq", width: 150, cellClass: 'text-center', hide: true},
@@ -435,9 +486,9 @@
 	// Grid editable
 	gridOptionsSectionGbList.defaultColDef.editable = true;
 	// Add on options
-	gridOptionsSectionGbList.suppressRowClickSelection = true;
+	//gridOptionsSectionGbList.suppressRowClickSelection = true;
 	gridOptionsSectionGbList.rowSelection = "multiple";
-	gridOptionsSectionGbList.stopEditingWhenGridLosesFocus = true;
+	//gridOptionsSectionGbList.stopEditingWhenGridLosesFocus = true;
 
 	// 다른 다다익선 사용중인 중복상품 엑셀 리스트 설정
 	var gridOptionsDuplicateGoodsList = gagaAgGrid.getGridOptions(columnDuplicateGoodsList);
@@ -453,6 +504,9 @@
 		gagaAgGrid.createGrid("gridSectionGbList", gridOptionsSectionGbList);
 		gagaAgGrid.createGrid("gridDuplicateGoodsList", gridOptionsDuplicateGoodsList);
 
+		// 일단 버튼 숨김
+		$(".tmtbButton").hide();
+
 		// 2. 그리드 데이터 바인딩
 		if(mode == "U"){
 			gridOptionsFGCompanyList.api.setRowData(tmtbSupplyCompList);
@@ -465,78 +519,30 @@
 			$('#moreBetterForm input[name=tmtbNm]').val(tmtbMstInfo.tmtbNm);
 			$('#moreBetterForm input[name=tmtbStdt]').val(tmtbMstInfo.tmtbStdt);
 			$('#moreBetterForm input[name=tmtbEddt]').val(tmtbMstInfo.tmtbEddt);
+			$('#moreBetterForm #regInfo').text(tmtbMstInfo.regNm + "(" + tmtbMstInfo.regDt + ")");
+			$('#moreBetterForm #updInfo').text(tmtbMstInfo.updNm + "(" + tmtbMstInfo.updDt + ")");
 			$("input:radio[name='disTmtbStat']:radio[value="+tmtbMstInfo.tmtbStat+"]").prop('checked', true); // 선택하기
 			$("input:radio[name='sectionGb']:radio[value="+tmtbMstInfo.sectionGb+"]").prop('checked', true); // 선택하기
 			$("input:radio[name='dcWay']:radio[value="+tmtbMstInfo.dcWay+"]").prop('checked', true); // 선택하기
 			$("input:radio[name='multiYn']:radio[value="+tmtbMstInfo.multiYn+"]").prop('checked', true); // 선택하기
 
+			if(tmtbMstInfo.tmtbStat == "G232_10"){
+				$("#btnMorebetterSave").show();		// 저장버튼
+				$("#btnChangeStatIng").show();		// 진행버튼
+				$("#btnMorebetterDelete").show();	// 삭제버튼
+			}else if(tmtbMstInfo.tmtbStat == "G232_11"){
+				$("#btnMorebetterSave").show();		// 저장버튼
+				$("#btnMorebetterStop").show();		// 중지버튼
+			}
 		}
 
 		// 구분 -> 대기로 체크
 		if(mode=="N"){
 			$("input:radio[name='disTmtbStat']:radio[value='G232_10']").prop('checked', true); // 선택하기
+			$("#btnMorebetterSave").show();	// 저장버튼
 		}
-		cfnCreateCalendar('#tmtbTerms', 'tmtbStdt', 'tmtbEddt', true, '행사기간', 'X');
-	});
-
-	// 수정 버튼 클릭시
-	$('#btnMorebetterUpdate').on('click', function() {
-		// validation
-		if (!gagajf.validation('#moreBetterForm'))
-			return false;
-
-		// 행사기간 확인
-		let fromDate = $('#moreBetterForm input[name=tmtbStdt]').val();
-		let toDate = $('#moreBetterForm input[name=tmtbEddt]').val();
-
-		if (gagajf.isNull(fromDate) || gagajf.isNull(toDate)) {
-			mcxDialog.alert("행사 기간 시작일자와 종료일자를 입력하세요.");
-			$('#moreBetterForm input[name=tmtbStdt]').focus();
-			return false;
-		}
-
-		if (fromDate > toDate) {
-			mcxDialog.alert("시작일자는 종료일자 보다 클 수 없습니다.");
-			$('#moreBetterForm input[name=tmtbStdt]').focus();
-			return false;
-		}
-
-		// disabled 값 넘겨주기
-		$('#moreBetterForm input[name=tmtbSq]').val($('#moreBetterForm input[name=disTmtbSq]').val());
-		$('#moreBetterForm input[name=tmtbStat]').val($('input:radio[name="disTmtbStat"]:checked').val());
-
-		mcxDialog.confirm('수정하시겠습니까?', {
-			cancelBtnText: "취소",
-			sureBtnText: "확인",
-			sureBtnClick: function(){
-				var compAllData = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);	//selectedRowData
-				var brandAllData = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);
-				var applyAllData = gagaAgGrid.getAllRowData(gridOptionsFGApplyGoodsList);
-				var exceptAllData = gagaAgGrid.getAllRowData(gridOptionsFGExceptGoodsList);
-				var burdenAllData = gagaAgGrid.getAllRowData(gridOptionsApplyBurdenList);
-				var sectionGbAllData = gagaAgGrid.getAllRowData(gridOptionsSectionGbList);
-
-				var jsonSupplyCompData = JSON.stringify(compAllData);
-				$('#moreBetterForm input[name=supplyCompList]').val(jsonSupplyCompData);
-				var jsonBrandData = JSON.stringify(brandAllData);
-				$('#moreBetterForm input[name=brandList]').val(jsonBrandData);
-				var jsonApplyData = JSON.stringify(applyAllData);
-				$('#moreBetterForm input[name=applyGoodsList]').val(jsonApplyData);
-				var jsonExceptData = JSON.stringify(exceptAllData);
-				$('#moreBetterForm input[name=exceptGoodsList]').val(jsonExceptData);
-				var jsonSectionGbData = JSON.stringify(sectionGbAllData);
-				$('#moreBetterForm input[name=sectionGbList]').val(jsonSectionGbData);
-				var jsonBurdenData = JSON.stringify(burdenAllData);
-				$('#moreBetterForm input[name=burdenList]').val(jsonBurdenData);
-
-				var jsonData = JSON.stringify($('#moreBetterForm').serializeObject());
-				gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, function() {
-					fnMorebetterFormClose();
-					$('#btnInit').trigger('click');
-					$('#btnSearch').trigger('click');
-				});
-			}
-		});
+		//cfnCreateCalendar('#tmtbTerms', 'tmtbStdt', 'tmtbEddt', true, '행사기간', 'X');
+		cfnCreateCalendar('#tmtbTerms', 'eventStdt', 'eventEddt', true, '행사기간', 'X');
 	});
 
 	var fnGoodsGbCheck = function (){
@@ -547,12 +553,23 @@
 				checkCnt++;
 			}
 		});
-		console.log('checkCnt>>'+checkCnt);
+
 		if(checkCnt < 1){
 			mcxDialog.alert("기본상품을 1개 이상 지정해주세요.");
 			return false;
-		}else{
-			console.log('통과');
+		}
+	};
+
+	var fnBurdenValueCheck = function (){
+		let burdenData = gagaAgGrid.getAllRowData(gridOptionsApplyBurdenList);
+		let totalValue = 0;
+		$.each(burdenData, function(idx, item) {
+			totalValue += parseInt(item.tmtbBurdenRate);
+		});
+
+		if(totalValue > 100) {
+			mcxDialog.alert("업체분담율의 합이 100을 넘을수 없습니다.");
+			return false;
 		}
 	};
 
@@ -563,15 +580,23 @@
 			return false;
 
 		// 행사기간 확인
-		let fromDate = $('#moreBetterForm input[name=tmtbStdt]').val();
-		let toDate = $('#moreBetterForm input[name=tmtbEddt]').val();
-
-		if (gagajf.isNull(fromDate) || gagajf.isNull(toDate)) {
+		if (gagajf.isNull($('#moreBetterForm input[name=eventStdt]').val()) || gagajf.isNull($('#moreBetterForm input[name=eventEddt]').val())) {
 			mcxDialog.alert("행사 기간 시작일자와 종료일자를 입력하세요.");
 			$('#moreBetterForm input[name=tmtbStdt]').focus();
 			return false;
 		}
 
+		var eventStDt = $('#moreBetterForm input[name=eventStdt]').val()+$('#moreBetterForm select[name=eventStHH]').val()+$('#moreBetterForm select[name=eventStMM]').val()+'00';
+		var eventEdDt = $('#moreBetterForm input[name=eventEddt]').val()+$('#moreBetterForm select[name=eventEdHH]').val()+$('#moreBetterForm select[name=eventEdMM]').val()+'59';
+
+		eventStDt = eventStDt.replace(/[^0-9]/g, '');
+		eventEdDt = eventEdDt.replace(/[^0-9]/g, '');
+		console.log('2.eventStDt>>'+eventStDt);
+		console.log('3.eventEdDt>>'+eventEdDt);
+
+		let fromDate = $('#moreBetterForm input[name=tmtbStdt]').val(eventStDt);
+		let toDate = $('#moreBetterForm input[name=tmtbEddt]').val(eventEdDt);
+
 		if (fromDate > toDate) {
 			mcxDialog.alert("시작일자는 종료일자 보다 클 수 없습니다.");
 			$('#moreBetterForm input[name=tmtbStdt]').focus();
@@ -607,6 +632,9 @@
 		// 적용상품 그리드에 기본상품 1개이상 있는지 체크
 		fnGoodsGbCheck();
 
+		// 업체분담율 토탈 100% 넘는지 체크
+		fnBurdenValueCheck();
+
 		var data = {
 			mode : $('#moreBetterForm input[name=mode]').val()
 			, tmtbSq : $('#moreBetterForm input[name=disTmtbSq]').val()
@@ -628,7 +656,7 @@
 
 		var jsonData = JSON.stringify(data);
 
-		gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, fnMorebetterSaveCollback);
+		//gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, fnMorebetterSaveCollback);
 	});
 
 	var fnMorebetterSaveCollback = function(result){
@@ -643,7 +671,7 @@
 
 			return;
 		}else{
-			mcxDialog.alert(result.msg);
+			//mcxDialog.alert(result.message);
 			fnMorebetterFormClose();
 			$('#btnInit').trigger('click');
 			$('#btnSearch').trigger('click');
@@ -742,20 +770,31 @@
 			goodsGbVal = "G800_30";
 		}
 
+		let addCnt = 0;
+		let failCnt = 0;
+		let dupliCnt = 0;
+
 		for(let i = 0 ; i < result.length ; i++) {
 			let addChk = true, gridListValue = gagaAgGrid.getAllRowData(OriginGridListOption);		// 받아온 모든 데이터
 
 			// 받아온 data for
 			for(let j = 0 ; j < gridListValue.length ; j++) {
-				if(gridListValue[j].goodsCd == result[i].goodsCd) {	addChk = false;	}				// 중복체크
+				if(gridListValue[j].goodsCd == result[i].goodsCd) { // 중복체크
+					addChk = false;
+					dupliCnt++;
+				}
 			}
 
 			// 중복되지 않은 데이터 리스트에 추가
 			if(addChk) {
 				//gagaAgGrid.addRowData(OriginGridListOption, result[i], "goodsCd");
 				gagaAgGrid.addRowData(OriginGridListOption, {"goodsGb": goodsGbVal, "goodsCd" : result[i].goodsCd, "goodsNm" : result[i].goodsNm, "targetGb" : "G260_10"});
+				addCnt++;
 			}
 		}
+		uifnPopupClose('popupGoods');
+		failCnt = result.length - addCnt - dupliCnt;
+		mcxDialog.alert("데이터가 적용되었습니다.<br/>" + addCnt + "건 성공, "+ dupliCnt + "건 중복, " + failCnt + "건 실패");
 	}
 
 	// 공급업체 설정 업체 추가 버튼 클릭시
@@ -869,18 +908,19 @@
 		var dcWayValue = $('input:radio[name="dcWay"]:checked').val();
 		var loopRowData = gagaAgGrid.getAllRowData(gridOptionsSectionGbList);
 
-		if (loopRowData.length == 0) {
+		/*if (loopRowData.length == 0) {
 			mcxDialog.alert('ROW 데이터가 없습니다.');
 			return;
+		}*/
+		if(loopRowData.length > 0) {
+			for (i = 0; i < loopRowData.length; i++) {
+				loopRowData[i].sectionGb = sectionGbValue;
+				loopRowData[i].sectionVal = "";
+				loopRowData[i].dcWay = dcWayValue;
+				loopRowData[i].dcVal = "";
+			}
+			gridOptionsSectionGbList.api.setRowData(loopRowData);
 		}
-
-		for(i=0; i<loopRowData.length; i++){
-			loopRowData[i].sectionGb = sectionGbValue;
-			loopRowData[i].sectionVal = "";
-			loopRowData[i].dcWay = dcWayValue;
-			loopRowData[i].dcVal = "";
-		}
-		gridOptionsSectionGbList.api.setRowData(loopRowData);
 	});
 
 	// 할인구분 선택 시 기본 조건 변경
@@ -889,18 +929,19 @@
 		var dcWayValue = $(this).val();
 		var loopRowData = gagaAgGrid.getAllRowData(gridOptionsSectionGbList);
 
-		if (loopRowData.length == 0) {
+		/*if (loopRowData.length == 0) {
 			mcxDialog.alert('ROW 데이터가 없습니다.');
 			return;
+		}*/
+		if(loopRowData.length > 0) {
+			for (i = 0; i < loopRowData.length; i++) {
+				loopRowData[i].sectionGb = sectionGbValue;
+				loopRowData[i].sectionVal = "";
+				loopRowData[i].dcWay = dcWayValue;
+				loopRowData[i].dcVal = "";
+			}
+			gridOptionsSectionGbList.api.setRowData(loopRowData);
 		}
-
-		for(i=0; i<loopRowData.length; i++){
-			loopRowData[i].sectionGb = sectionGbValue;
-			loopRowData[i].sectionVal = "";
-			loopRowData[i].dcWay = dcWayValue;
-			loopRowData[i].dcVal = "";
-		}
-		gridOptionsSectionGbList.api.setRowData(loopRowData);
 	});
 
 	// 공급업체 행삭제
@@ -1038,8 +1079,119 @@
 		}
 	});
 
-	$(document).ready(function() {
 
+	// 수정 버튼 클릭시
+	$('#btnMorebetterUpdate').on('click', function() {
+		// validation
+		if (!gagajf.validation('#moreBetterForm'))
+			return false;
+
+		// 행사기간 확인
+		let fromDate = $('#moreBetterForm input[name=tmtbStdt]').val();
+		let toDate = $('#moreBetterForm input[name=tmtbEddt]').val();
+
+		if (gagajf.isNull(fromDate) || gagajf.isNull(toDate)) {
+			mcxDialog.alert("행사 기간 시작일자와 종료일자를 입력하세요.");
+			$('#moreBetterForm input[name=tmtbStdt]').focus();
+			return false;
+		}
+
+		if (fromDate > toDate) {
+			mcxDialog.alert("시작일자는 종료일자 보다 클 수 없습니다.");
+			$('#moreBetterForm input[name=tmtbStdt]').focus();
+			return false;
+		}
+
+		// disabled 값 넘겨주기
+		$('#moreBetterForm input[name=tmtbSq]').val($('#moreBetterForm input[name=disTmtbSq]').val());
+		$('#moreBetterForm input[name=tmtbStat]').val($('input:radio[name="disTmtbStat"]:checked').val());
+
+		mcxDialog.confirm('수정하시겠습니까?', {
+			cancelBtnText: "취소",
+			sureBtnText: "확인",
+			sureBtnClick: function(){
+				var compAllData = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);	//selectedRowData
+				var brandAllData = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);
+				var applyAllData = gagaAgGrid.getAllRowData(gridOptionsFGApplyGoodsList);
+				var exceptAllData = gagaAgGrid.getAllRowData(gridOptionsFGExceptGoodsList);
+				var burdenAllData = gagaAgGrid.getAllRowData(gridOptionsApplyBurdenList);
+				var sectionGbAllData = gagaAgGrid.getAllRowData(gridOptionsSectionGbList);
+
+				var jsonSupplyCompData = JSON.stringify(compAllData);
+				$('#moreBetterForm input[name=supplyCompList]').val(jsonSupplyCompData);
+				var jsonBrandData = JSON.stringify(brandAllData);
+				$('#moreBetterForm input[name=brandList]').val(jsonBrandData);
+				var jsonApplyData = JSON.stringify(applyAllData);
+				$('#moreBetterForm input[name=applyGoodsList]').val(jsonApplyData);
+				var jsonExceptData = JSON.stringify(exceptAllData);
+				$('#moreBetterForm input[name=exceptGoodsList]').val(jsonExceptData);
+				var jsonSectionGbData = JSON.stringify(sectionGbAllData);
+				$('#moreBetterForm input[name=sectionGbList]').val(jsonSectionGbData);
+				var jsonBurdenData = JSON.stringify(burdenAllData);
+				$('#moreBetterForm input[name=burdenList]').val(jsonBurdenData);
+
+				var jsonData = JSON.stringify($('#moreBetterForm').serializeObject());
+				gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, function() {
+					fnMorebetterFormClose();
+					$('#btnInit').trigger('click');
+					$('#btnSearch').trigger('click');
+				});
+			}
+		});
+	});
+
+	// 목록 버튼 클릭
+	$("#moreBetterForm #btnSearchList").on("click", function() {
+		uifnPopupClose('popupMorebetterReg');
+	});
+
+	// 진행 버튼 클릭
+	$("#moreBetterForm #btnChangeStatIng").on("click", function() {
+		mcxDialog.confirmC("프로모션을 진행하시겠습니까?<br/>진행 후에는 수정이 제한될 수 있습니다.", {
+			btn: confirmBtnText,
+			btnClick: function(index) {
+				if(index == 1) {
+					let data = { tmtbStat : "G232_11"				// 진행
+						, tmtbSq : $('#moreBetterForm input[name=disTmtbSq]').val()
+					}
+					var jsonData = JSON.stringify(data);
+					gagajf.ajaxJsonSubmit('/marketing/morebetter/changeStat', jsonData, fnMorebetterFormClose);
+				}
+			}
+		});
+	});
+
+	// 진행 버튼 클릭
+	$("#moreBetterForm #btnMorebetterStop").on("click", function() {
+		mcxDialog.confirmC("프로모션을 중지하시겠습니까?<br/>중지 후에는 진행으로 복원하실 수 없습니다.", {
+			btn: confirmBtnText,
+			btnClick: function(index) {
+				if(index == 1) {
+					let data = { tmtbStat : "G232_12"			// 중지
+						, tmtbSq : $('#moreBetterForm input[name=disTmtbSq]').val()
+					}
+					var jsonData = JSON.stringify(data);
+					gagajf.ajaxJsonSubmit('/marketing/morebetter/changeStat', jsonData, fnMorebetterFormClose);
+				}
+			}
+		});
 	});
+
+	// 삭제 버튼 클릭
+	$("#btnMorebetterDelete").on("click", function() {
+		mcxDialog.confirmC("프로모션을 삭제하시겠습니까?<br/>삭제한 프로모션은 복원하실 수 없습니다.", {
+			btn: confirmBtnText,
+			btnClick: function(index) {
+				if(index == 1) {
+					let data = { tmtbStat: "G232_14"			// 삭제
+						, tmtbSq : $('#moreBetterForm input[name=disTmtbSq]').val()
+					}
+					var jsonData = JSON.stringify(data);
+					gagajf.ajaxJsonSubmit('/marketing/morebetter/changeStat', jsonData, fnMorebetterFormClose);
+				}
+			}
+		});
+	});
+
 </script>
 </html>

src/main/webapp/WEB-INF/views/marketing/RandomCouponList.html

@@ -0,0 +1,524 @@
+<!DOCTYPE html>
+<html lang="ko"
+      xmlns:th="http://www.thymeleaf.org">
+<!--
+ *************************************************************************
+ * @source  : RandomCouponList.html
+ * @desc    : 쿠폰난수관리 Page
+ *------------------------------------------------------------------------
+ * TSIT
+ * Copyright(c) 2020 TSIT, All rights reserved.
+ *------------------------------------------------------------------------
+ * VER  DATE        AUTHOR      DESCRIPTION
+ * ---  ----------- ----------  -----------------------------------------
+ * 1.0  2021.01.22  xodud1202   쿠폰난수관리
+ *************************************************************************
+-->
+<div id="main">
+    <!-- 메인타이틀 영역 -->
+    <div class="main-title"></div>
+
+    <!-- 메뉴 설명 -->
+    <div class="infoBox menu-desc"></div>
+    
+    <form id="searchForm" name="searchForm" th:action="@{'/marketing/coupon/random/list/paging'}" th:onsubmit="fnSearch(); return false;" >
+
+        <!-- 패널 영역1 -->
+        <div class="boxStyle">
+			<span class="boxControl">
+				<i class="fa fa-chevron-up" data-view="show"></i>
+                <!-- <i class="fa fa-times" data-view="show"></i> -->
+			</span>
+            <!-- 검색조건 영역 -->
+            <div class="boxTitle">검색조건</div>
+            <ul class="boxContent">
+                <li class="boxContentTop">
+                    <table class="frmStyle">
+                        <col width="8%">
+                        <col width="12%">
+                        <col width="8%">
+                        <col width="12%">
+                        <col width="8%">
+                        <col width="12%">
+                        <col width="8%">
+                        <col width="12%">
+                        <col width="8%">
+                        <col width="12%">
+                        <tr>
+                            <th>쿠폰명</th>
+                            <td>
+                                <input type="text" name="cpnNm" maxlength="40" class="type-text" style="width: 100%;"/>
+                            </td>
+                            <th>등록가능기간</th>
+                            <td colspan="10" id="terms" class="availTerm">
+                            </td>
+                        </tr>
+                    </table>
+                    <div class="panelBtnB">
+                        <input type="button" value="조회" class="btn btn-base btn-lg btn-info" id="btnSearch" onclick="fnSearch();"/>
+                        <input type="button" value="초기화" class="btn btn-dark btn-lg " onclick="$('#searchForm')[0].reset(); fnInitCalendar();" />
+                    </div>
+                </li>
+            </ul>
+            <!-- //검색조건 영역 -->
+        </div>
+        <!-- 패널 영역1 -->
+        <div class="panelStyle2">
+            <!-- 검색결과 영역 -->
+            <!-- 상단버튼 영역  -->
+            <ul class="lrStyle">
+                <li class="aR">
+                    검색결과 : <strong><span id="gridRowTotalCount">0</span> 건</strong>&nbsp;
+                    쪽번호 <span id="pgNo">0</span>/ <strong id="endPgNo">0</strong>&nbsp;&nbsp;
+                    <select id="pageSize" name="pageSize">
+                        <option value="50" selected="selected">50개씩 보기</option>
+                        <option value="100">100개씩 보기</option>
+                        <option value="500">500개씩 보기</option>
+                        <option value="1000">1000개씩 보기</option>
+                    </select>
+                    <input type="hidden" name="pageNo" id="pageNo" value ="1"/>
+                </li>
+            </ul>
+
+            <!-- //상단버튼 영역  -->
+            <div class="panelContent">
+                <div id="gridList" style="width: 100%;height: 400px;" class="ag-theme-balham"></div>
+            </div>
+            <div class="panelBtnB">
+                <!-- Paging -->
+                <div class="tablePaging" id="couponPagination"></div>
+                <!-- //Paging -->
+            </div>
+            <!-- 검색결과 영역 -->
+        </div>
+    </form>
+    <!-- //패널 영역2 -->
+    <!-- 등록/수정 -->
+    <div class="panelStyle2">
+        <ul class="lrStyle">
+            <li>
+                <span class="infoTxt cBlue"><i class="fa fa-info-circle" aria-hidden="true"></i>쿠폰시작문자(단일)의 경우에는 중복된 코드를 삽입할 수 없습니다.</span>
+            </li>
+        </ul>
+        <form id="detailForm" name="detailForm" action="#" th:action="@{'/marketing/coupon/random/save'}">
+            <input type="hidden" name="rdCpnSq"/>
+            <table class="frmStyle">
+                <colgroup>
+                    <col style="width:10%;"/>
+                    <col style="width:23.3%;"/>
+                    <col style="width:10%;"/>
+                    <col style="width:23.3%;"/>
+                    <col style="width:10%;"/>
+                    <col/>
+                </colgroup>
+                <tr>
+                    <th>쿠폰명<i class="star"></i></th>
+                    <td>
+                        <input type="text" class="w200" name="rdCpnNm" maxlength="50" data-valid-name="랜덤쿠폰명"/>
+                    </td>
+                    <th>쿠폰생성수량<i class="star"></i></th>
+                    <td>
+                        <input type="text" class="w200" name="rdCpnIdQty" maxlength="8" data-valid-name="랜덤쿠폰생성수량" data-valid-type="numeric"/>
+                    </td>
+                    <th>쿠폰시작문자<i class="star"></i></th>
+                    <td>
+                        <select name="rdCpnPrefixGb" data-valid-name="쿠폰시작문자구분" onchange="onChangePrefixGb(this.value);">
+                            <option value="R">랜덤</option>
+                            <option value="S">단일</option>
+                        </select>
+                        <input type="text" class="w200" name="rdCpnPrefix" maxlength="4" required="required" data-valid-name="쿠폰시작문자" data-valid-type="alphaNumeric" style="text-transform: uppercase;"/>
+                    </td>
+                </tr>
+                <tr>
+                    <th>지급구분(<font color="RED">*</font>)
+                    </th>
+                    <td>
+                        <label class="rdoBox" th:if="${rdcpnGbList}" th:each="oneData, status : ${rdcpnGbList}" >
+                            <input type="radio" name="rdcpnGb" class="type-radio" th:value="${oneData.cd}" th:text="${oneData.cdNm}" onchange="onChangePdGb(this.value);"/>
+                        </label>
+                    </td>
+                    <th class="rdcpnGbCpn">적용쿠폰ID<i class="star"></i></th>
+                    <td class="rdcpnGbCpn">
+                        <input name="cpnName" type="text" class="w150" onkeypress="if (window.event.keyCode == 13) { fnOpenCouponRetrievePopup('input[name=cpnId]', 'input[name=cpnName]'); }"/>
+                        <button type="button" class="btn icn" th:onclick="fnOpenCouponRetrievePopup('input[name=cpnId]', 'input[name=cpnName]')"><i class="fa fa-search cpn" aria-hidden="true"></i></button>
+                        <input name="cpnId" type="text" class="w100" maxlength="20" readonly/>
+                    </td>
+                    <th class="rdcpnGbCpn">쿠폰발급수량<i class="star"></i></th>
+                    <td class="rdcpnGbCpn">
+                        <input type="text" class="w200" name="cpnCnt" maxlength="20" data-valid-name="쿠폰발급수량" data-valid-type="numeric"/>
+                    </td>
+                    <th class="rdcpnGbPnt">적용포인트<i class="star"></i></th>
+                    <td class="rdcpnGbPnt">
+                        <input type="text" class="w200" name="pointAmt" maxlength="20" data-valid-name="적용포인트금액" data-valid-type="numeric"/>
+                    </td>
+                    <th class="rdcpnGbPnt">포인트만료일시<i class="star"></i></th>
+                    <td  class="rdcpnGbPnt">
+                        <input name="pointExpireDt" type="text" class="w80 schDate" maxlength="10" data-valid-name="포인트만료일시" />
+                    </td>
+                </tr>
+                <tr>
+                    <th>등록기간<i class="star"></i></th>
+                    <td class="dashR">
+                        <input name="regPossibleStdt" type="text" class="w80 schDate" maxlength="10" required data-valid-name="등록가능시작일자" />
+                        ~
+                        <input name="regPossibleEddt" type="text" class="w80 schDate" maxlength="10" required data-valid-name="등록가능종료일자" />
+                    </td>
+                    <th>중복사용가능여부<i class="star"></i></th>
+                    <td>
+                        <select name="dupUsableYn" required data-valid-name="중복사용가능여부">
+                            <option th:if="${useYnList}" th:each="oneData, status : ${useYnList}" th:value="${oneData.cd}" th:text="|${oneData.cdNm}|"></option>
+                        </select>
+                    </td>
+                    <th>사용여부<i class="star"></i></th>
+                    <td>
+                        <select name="useYn" required data-valid-name="사이트">
+                            <option th:if="${useYnList}" th:each="oneData, status : ${useYnList}" th:value="${oneData.cd}" th:text="|${oneData.cdNm}|"></option>
+                        </select>
+                    </td>
+                </tr>
+            </table>
+
+            <div class="panelBtnB">
+                <button type="button" class="btn btn-info btn-lg" id="btnNew">신규</button>
+                <button type="button" class="btn btn-success btn-lg" id="btnSave">저장</button>
+            </div>
+        </form>
+    </div>
+</div>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.paging.js?v=2019072202"></script>
+<script th:inline="javascript">
+    /*<![CDATA[*/
+
+    var columnDefs = [
+        {width: 40, minWidth: 40, cellClass: 'text-right', headerCheckboxSelection: true, checkboxSelection: true, filter: false, editable: false,pinned: 'left'}
+        ,{field: "rdCpnSq"       ,headerName:"랜덤쿠폰일련번호"     		,width:150   ,cellClass:"text-center",hide:true}
+        ,{field: "rdCpnNm"		,headerName:"쿠폰명"					,width:200	,cellClass:"text-center"
+            ,cellRenderer: function(params) { return '<a href="javascript:void(0);">' + params.value + '</a>'; }
+        }
+        ,{field: "rdCpnIdQty"         ,headerName:"생성수량"     		,width:90   ,cellClass:"text-center"
+            ,cellRenderer: function(params) { return '<a href="javascript:void(0);">' + params.value + '</a>'; }
+        }
+        ,{field: "rdCpnPrefix"        ,headerName:"랜덤쿠폰시작문자"          		,width:120   ,cellClass:"text-center",hide:true}
+        ,{field: "rdCpnPrefixGb"        ,headerName:"랜덤쿠폰시작문자구분"          		,width:120   ,cellClass:"text-center",hide:true}
+        ,{field: "regPossibleStdt"    ,headerName:"등록가능시작일시"    		,width:150   ,cellClass:"text-center"
+            ,cellRenderer: function(params) {T
+                return !gagajf.isNull(params.value) ? gagaAgGrid.toDateTimeFormat(params.value) : '';
+            }
+        }
+        ,{field: "regPossibleEddt"    ,headerName:"등록가능종료일시"           	,width:150   ,cellClass:"text-center"
+            ,cellRenderer: function(params) {
+                return !gagajf.isNull(params.value) ? gagaAgGrid.toDateTimeFormat(params.value) : '';
+            }
+        }
+        ,{field: "dupUsableYn"        ,headerName:"중복사용가능여부"          		,width:120   ,cellClass:"text-center"}
+        ,{field: "rdcpnGb"            ,headerName:"구분"            	,width:80   ,cellClass:"text-center",hide:true}
+        ,{field: "rdcpnGbNm"            ,headerName:"구분"            	,width:100   ,cellClass:"text-center"}
+        ,{field: "cpnId"              ,headerName:"적용쿠폰ID"          		,width:100   ,cellClass:"text-center"}
+        ,{field: "cpnCnt"             ,headerName:"쿠폰발급수량"            ,width:100   ,cellClass:"text-center"
+            , cellRenderer: function(params) {
+                return params.value.addComma();
+            }
+        }
+        ,{field: "pointAmt"             ,headerName:"적용포인트금액"        ,width:120   ,cellClass:"text-center"
+            , cellRenderer: function(params) {
+                return params.value.addComma();
+            }
+        }
+        ,{field: "pointExpireDt"           ,headerName:"포인트만료일시"          	,width:150   ,cellClass:"text-center"
+            ,cellRenderer: function(params) {
+                return !gagajf.isNull(params.value) ? gagaAgGrid.toDateTimeFormat(params.value) : '';
+            }
+        }
+        ,{field: "useYn"             ,headerName:"사용여부"        	,width:80   ,cellClass:"text-center"}
+        ,{field: "regId"              ,headerName:"등록자"           		,width:100   ,cellClass:"text-center"}
+        ,{field: "regDt"              ,headerName:"등록일시"            	,width:150   ,cellClass:"text-center"
+            ,cellRenderer: function(params) {
+                return !gagajf.isNull(params.value) ? gagaAgGrid.toDateTimeFormat(params.value) : '';
+            }
+        }
+        ,{field: "updId"              ,headerName:"수정자ID"           		,width:100   ,cellClass:"text-center",hide:true}
+        ,{field: "updDt"              ,headerName:"수정일시"            	,width:150   ,cellClass:"text-center",hide:true
+            ,cellRenderer: function(params) {
+                return !gagajf.isNull(params.value) ? gagaAgGrid.toDateTimeFormat(params.value) : '';
+            }
+        }
+    ];
+
+    var cpnListOpt = gagaAgGrid.getGridOptions(columnDefs);
+    cpnListOpt.rowSelection = 'multiple';
+    cpnListOpt.suppressRowClickSelection = true;
+
+    // 셀 클릭 이벤트
+    cpnListOpt.onCellClicked = function(event) {
+        var field = event.colDef.field;
+        if (event.colDef.field == "rdCpnIdQty"){
+            var rdCpnSq = event.data.rdCpnSq;
+            var actionUrl = "/marketing/coupon/random/cpnUseDetail/popup/form?rdCpnSq="+rdCpnSq;
+            cfnOpenModalPopup(actionUrl,'RandomCpnDetailPopup');
+        }
+
+        if (event.colDef.field == "rdCpnNm"){
+            var formId = '#detailForm';
+
+            // 기본정보 입력
+            $(formId + ' input[name=rdCpnSq]').val(event.data.rdCpnSq);
+            $(formId + ' input[name=rdCpnNm]').val(event.data.rdCpnNm);
+            $(formId + ' input[name=rdCpnIdQty]').val(event.data.rdCpnIdQty.addComma());
+            $(formId + ' select[name=dupUsableYn]').val(event.data.dupUsableYn);
+            $(formId + ' input[name=cpnId]').val(event.data.cpnId);
+            $(formId + ' input[name=cpnCnt]').val(event.data.cpnCnt.addComma());
+            $(formId + ' input[name=pointAmt]').val(event.data.pointAmt.addComma());
+            $(formId + ' select[name=useYn]').val(event.data.useYn);
+            $(formId + ' input[name=rdCpnPrefix]').val(event.data.rdCpnPrefix);
+            $(formId + ' select[name=rdCpnPrefixGb]').val(event.data.rdCpnPrefixGb);
+
+            $("input[name=rdcpnGb][value="+event.data.rdcpnGb+"]").prop('checked', true);
+            onChangePdGb(event.data.rdcpnGb);
+
+            // 등록 기간 설정
+            var stDate = event.data.regPossibleStdt.split(" ")[0];
+            var edDate = event.data.regPossibleEddt.split(" ")[0];
+            var exDate = '';
+            if(!gagajf.isNull(event.data.pointExpireDt)) {
+                exDate = event.data.pointExpireDt.split(" ")[0];
+            }
+
+            $(formId + ' input[name=regPossibleStdt]').val(stDate);
+            $(formId + ' input[name=regPossibleEddt]').val(edDate);
+            $(formId + ' input[name=pointExpireDt]').val(exDate);
+
+            //setComma("detailForm", true);
+
+        }
+    }
+
+    $(document).ready(function() {
+        var hideList = [];
+        cfnCreateCalendar('#terms', 'availStdt', 'availEddt', true, '지급일', '');
+        //$('.btnToday').trigger('click');
+
+        //대상구분 초기화
+        $("input[name=rdcpnGb][value=C]").prop('checked', true);
+        onChangePdGb("C");
+
+        $("select[name=dupUsableYn]").val("N");
+        $("select[name=rdCpnPrefixGb]").val("R");
+
+        setComma("detailForm", true);
+
+        // Create a agGrid
+        gagaAgGrid.createGrid('gridList', cpnListOpt);
+
+        uifnFitGrid('auto');
+
+        // fnSearch();
+    });
+
+    var fnInitCalendar = function() {
+        //$(".btnToday").trigger('click');
+    }
+
+    /**
+     * 목록 조회
+     */
+
+    function fnSearch() {
+        gagaPaging.init('searchForm', fnSearchCallBack, 'couponPagination', $('#searchForm').find('#pageSize').val());
+        gagaPaging.load(1);
+    }
+
+    var fnSearchCallBack = function(result) {
+        $('#searchForm').find('#gridRowTotalCount').html(result.paging.totalCount.addComma());
+        $('#searchForm').find('#pageNo').val(result.paging.pageNo.addComma());
+        $('#searchForm').find('#pgNo').html(result.paging.pageNo.addComma());
+        $('#searchForm').find('#endPgNo').html(result.paging.totalPage.addComma());
+        cpnListOpt.api.setRowData(result.CouponList);
+        gagaPaging.createPagination(result.paging);
+    }
+
+    //페이징
+    $('#searchForm select[name=pageSize]').on('change', function() {
+        $("#searchForm input[name=pageNo]").val('1');
+        $('#btnSearch').click();
+    });
+
+    $("#btnNew").on("click", function(){
+        $("#detailForm")[0].reset();
+        setComma("detailForm", false);
+        $("input[name=rdcpnGb][value=C]").prop('checked', true);
+        onChangePdGb("C");
+        $("select[name=dupUsableYn]").val("N");
+        $("select[name=rdCpnPrefixGb]").val("R");
+        setComma("detailForm", true);
+    });
+
+    $("#btnSave").on("click", function(){
+        var formId = '#detailForm';
+        var formJson = $(formId).serializeObject();
+
+        if(gagajf.isNull(formJson.rdCpnNm)){
+            mcxDialog.alert("쿠폰명을 입력해주세요");
+            return;
+        }
+
+        if(gagajf.isNull(formJson.rdCpnIdQty) || formJson.rdCpnIdQty < 1){
+            mcxDialog.alert("쿠폰생성수량을 입력해주세요");
+            return;
+        }
+
+        if(formJson.rdcpnGb == "C"){
+            if(gagajf.isNull(formJson.cpnId)){
+                mcxDialog.alert("적용할 쿠폰ID를 입력해주세요");
+                return;
+            }
+            if(gagajf.isNull(formJson.cpnCnt) || formJson.cpnCnt < 1){
+                mcxDialog.alert("쿠폰발급수량을 입력해주세요");
+                return;
+            }
+        }else if(formJson.rdcpnGb == "P"){
+            if(gagajf.isNull(formJson.pointAmt)){
+                mcxDialog.alert("적용할 포인트를 입력해주세요");
+                return;
+            }
+            if(gagajf.isNull(formJson.pointExpireDt)){
+                mcxDialog.alert("포인트만료일자를 입력해주세요");
+                return;
+            }
+        }
+
+        /*
+                if(formJson.rdCpnPrefixGb == "S" && formJson.rdCpnIdQty > 1){
+                    mcxDialog.alert("단일문자일 경우 쿠폰생성수량은 1개만 가능합니다.");
+                    return;
+                }
+        */
+
+        // 날짜 유효성 체크
+        var st = formJson.regPossibleStdt.replaceAll("-", "");
+        var ed = formJson.regPossibleEddt.replaceAll("-", "");
+
+        if (Number(st) > Number(ed)) {
+            mcxDialog.alert('등록시작일은 등록종료일보다 클 수 없습니다.');
+            return;
+        }
+
+        setComma("detailForm", false); // 숫자타입 콤마 제거
+
+        if(!gagajf.isNull(formJson.cpnId)){
+            $("input[name=cpnId]").val($("input[name=cpnId]").val().toUpperCase());
+        }
+        if(!gagajf.isNull(formJson.rdCpnPrefix)){
+            $("input[name=rdCpnPrefix]").val($("input[name=rdCpnPrefix]").val().toUpperCase());
+        }
+
+        mcxDialog.confirm('저장하시겠습니까?', {
+            cancelBtnText: "취소",
+            sureBtnText: "확인",
+            sureBtnClick: function(){
+                gagajf.ajaxFormSubmit($(formId).prop('action'), formId, fnSaveCallback);
+            }
+        });
+    });
+
+    function setComma(formId, pBoolean){
+        //숫자타입 콤마 찍어주기
+        $("#"+formId+" [data-valid-type=numeric]").each(function(){
+            $(this).change(function(){
+                if(pBoolean){
+                    $(this).val($(this).val().addComma());
+                }else{
+                    $(this).val($(this).val().removeComma());
+                }
+            });
+            if(pBoolean){
+                $(this).val($(this).val().addComma());
+            }else{
+                $(this).val($(this).val().removeComma());
+            }
+        });
+    }
+
+    function fnSaveCallback(){
+        $("#btnNew").trigger('click');
+        //setComma("detailForm", true);
+        fnSearch();
+    }
+
+    function fnCouponCreate(){
+        cfnCouponCreatePopup();
+    }
+
+    function fnCouponCopy(){
+        var selectedData = cpnListOpt.api.getSelectedRows();
+
+        if (selectedData.length == 0) {
+            mcxDialog.alert('선택된 행이 없습니다.');
+            return;
+        }
+        if (selectedData.length > 1) {
+            mcxDialog.alert('하나의 쿠폰만 선택하세요.');
+            return;
+        }
+        var cpnId = selectedData[0].cpnId;
+        var mode = "copy"
+        var actionUrl = "/marketing/coupon/popup/form?cpnId="+cpnId;
+        actionUrl += "&mode="+mode;
+        cfnOpenModalPopup(actionUrl,'CouponCreatePopup');
+    }
+
+    function fnCouponDetail(cpnId){
+        var actionUrl = "/marketing/coupon/popup/form?cpnId="+cpnId;
+        cfnOpenModalPopup(actionUrl,'CouponCreatePopup');
+    }
+
+    function fnCpnUseDetail(cpnId){
+        var actionUrl = "/marketing/coupon/cpnUseDetail/popup/form?cpnId="+cpnId;
+        cfnOpenModalPopup(actionUrl,'CpnUseDetailPopup');
+    }
+
+    // 쿠폰조회 팝업
+    var fnOpenCouponRetrievePopup = function(strReturnCode, strReturnName) {
+        var oParam = new Object();
+        oParam.returnCode = strReturnCode;
+        oParam.returnName = strReturnName;
+        cfnOpenCouponRetrievePopup($(strReturnName).val(), oParam);
+    }
+
+    /*유효기간구분온체인지이벤트*/
+    function onChangePdGb(val){
+        if(val == "C"){
+            $(".rdcpnGbCpn").show();
+            $(".rdcpnGbPnt").hide();
+        }else{
+            $(".rdcpnGbCpn").hide();
+            $(".rdcpnGbPnt").show();
+        }
+
+    }
+
+    function onChangePrefixGb(val){
+        $("input[name=rdCpnPrefix]").val('');
+        if(val == "S"){
+            $("input[name=rdCpnPrefix]").attr("maxlength", 10);
+            $("input[name=rdCpnPrefix]").attr("data-valid-type", "");
+        }else{
+            $("input[name=rdCpnPrefix]").attr("maxlength", 4);
+        }
+
+    }
+
+    var fnCouponExcelDownLoad = function(){
+        var selectedData = cpnListOpt.api.getSelectedRows();
+
+        if (selectedData.length == 0) {
+            mcxDialog.alert('선택된 행이 없습니다.');
+            return;
+        }
+
+        gagaAgGrid.exportToExcel('쿠폰목록', cpnListOpt, true);
+    }
+
+    /*]]>*/
+</script>
+
+</html>

src/main/webapp/WEB-INF/views/order/ExchangeRequestForm.html

@@ -89,7 +89,7 @@
 						<tr>
 							<th>회수지주소 <i class="star"></i></th>
 							<td colspan="3">
-								<input type="text" name ="chgerZipNo" class="w100" readonly="readonly"/>
+								<input type="text" name ="chgerZipcode" class="w100" readonly="readonly"/>
 								<button type="button" class="btn btn-info" onclick="fnOpenDaumAddr('delvLoc');">우편번호찾기</button>
 								<input type="text" name ="chgerBaseAddr" class="w300"/>
 								<input type="text" name ="chgerDtlAddr" class="w300"/>
@@ -115,6 +115,12 @@
 								- <input type="text" name ="chgerPhnno3" class="w60" value="0000" />
 							</td>
 						</tr>
+						<tr>
+							<th>반품메모</th>
+							<td colspan="3">
+								<textarea id="chgerRtnMemo" name="chgerRtnMemo" style="height:80px;" placeholder="반품메모(수거시요청사항)를 300자내외로 작성해 주세요"></textarea>
+							</td>
+						</tr>
 					</tbody>
 				</table>
 
@@ -134,7 +140,7 @@
 					<tr>
 						<th>교환지주소 <i class="star"></i></th>
 						<td colspan="3">
-							<input type="text" name ="recipZipNo" class="w100" readonly="readonly"/>
+							<input type="text" name ="recipZipcode" class="w100" readonly="readonly"/>
 							<button type="button" class="btn btn-info" onclick="fnOpenDaumAddr('delvLoc');">우편번호찾기</button>
 							<input type="text" name ="recipBaseAddr" class="w300"/>
 							<input type="text" name ="recipDtlAddr" class="w300"/>
@@ -160,6 +166,12 @@
 							- <input type="text" name ="recipPhnno3" class="w60" value="0000" />
 						</td>
 					</tr>
+					<tr>
+						<th>배송메모</th>
+						<td colspan="3">
+							<textarea id="delvMemo" name="delvMemo" style="height:80px;" placeholder="배송메모를 300자내외로 작성해 주세요"></textarea>
+						</td>
+					</tr>
 					</tbody>
 				</table>
 			</form>
@@ -288,7 +300,7 @@ var columnExchangeReqList = [
 			{headerName: "재고수량"	, field: "currStockQty"			, width: 100			, cellClass: 'text-center', hide: temp2},
 			{
 				headerName		: "교환신청수량"
-				, field			: "ordCanChgQty"
+				, field			: "chgQty"
 				, width			: 100
 				, cellClass		: 'text-center'
 				, cellRenderer	: function (params) {
@@ -298,10 +310,10 @@ var columnExchangeReqList = [
 					var ordCanChgQty 	= ordQty - (cnclRtnQty +  ordReqChgQty);
 					
 					var strVal 			= "";
-					strVal += '<select class="ordCanChgQty ' + params.data.ordDtlNo + '" name="ordCanChgQty" ordDtlNo="'+params.data.ordDtlNo+'" onchange="fnChangeQty(this)">';
+					strVal += '<select class="ordCanChgQty ' + params.data.ordDtlNo + '" name="chgQty" ordDtlNo="'+params.data.ordDtlNo+'" onchange="fnChangeQty(this)">';
 					
 					for (i=0 ; i<=ordCanChgQty ; i++) {
-						if (i == params.data.ordCanChgQty) {
+						if (i == params.data.chgQty) {
 							strVal += "	<option value='"+i+"' selected>"+i+"</option>";
 						} else {
 							strVal += "	<option value='"+i+"'>"+i+"</option>";
@@ -531,8 +543,8 @@ var fnChangeChgReason = function(reasonCd){
 		$("#imputeReason").text("회사");
 	}
 
-	$('#cancelRequestFrm input[name=chgReason]').val(arrReasonCd[0]);
-	$('#cancelRequestFrm input[name=chgReasonDesc]').val(arrReasonCd[1]);
+	$('#exchangeRequestFrm input[name=chgReason]').val(arrReasonCd[0]);
+	$('#exchangeRequestFrm input[name=chgReasonDesc]').val(arrReasonCd[1]);
 	
 	// 추가배송비 설정
 	fnChangeQty();
@@ -540,14 +552,13 @@ var fnChangeChgReason = function(reasonCd){
 
 // 교환요청
 var fnExchange = function () {
-	console.log('a');
 	var qty		= false;
 	var opt		= false;
 	var wdGb	= $('#wdGb:checked').val();
 
 	// 1. 교환수량 체크
 	$.each(cancelRequestTargetList, function(idx, item) {
-		if (item.ordCanChgQty > 0) {
+		if (item.chgQty > 0) {
 			qty = true;
 			
 			if (!gagajf.isNull(item.ordChgOpt)) {
@@ -577,7 +588,7 @@ var fnExchange = function () {
 	// 5. 회수지정보설정
 	if (wdGb == 'W') {
 		var chgerNm			= $("#exchangeRequestFrm input[name=chgerNm]").val();
-		var chgerZipNo		= $("#exchangeRequestFrm input[name=chgerZipNo]").val();
+		var chgerZipcode	= $("#exchangeRequestFrm input[name=chgerZipcode]").val();
 		var chgerBaseAddr	= $("#exchangeRequestFrm input[name=chgerBaseAddr]").val();
 		var chgerDtlAddr	= $("#exchangeRequestFrm input[name=chgerDtlAddr]").val();
 		
@@ -589,7 +600,7 @@ var fnExchange = function () {
 		var chgerTelno2		= $("#exchangeRequestFrm input[name=chgerTelno2]").val();
 		var chgerTelno3		= $("#exchangeRequestFrm input[name=chgerTelno3]").val();
 	
-		if (gagajf.isNull(chgerZipNo)) {
+		if (gagajf.isNull(chgerZipcode)) {
 			mcxDialog.alert("회수지주소를 입력하세요."); return;
 		}
 		if (gagajf.isNull(chgerBaseAddr)) {
@@ -616,7 +627,7 @@ var fnExchange = function () {
 
 	// 교환지정보 설정
 	var recipNm			= $("#exchangeRequestFrm input[name=recipNm]").val();
-	var recipZipNo		= $("#exchangeRequestFrm input[name=recipZipNo]").val();
+	var recipZipcode	= $("#exchangeRequestFrm input[name=recipZipcode]").val();
 	var recipBaseAddr	= $("#exchangeRequestFrm input[name=recipBaseAddr]").val();
 	var recipDtlAddr	= $("#exchangeRequestFrm input[name=recipDtlAddr]").val();
 
@@ -628,7 +639,7 @@ var fnExchange = function () {
 	var recipTelno2		= $("#exchangeRequestFrm input[name=recipTelno2]").val();
 	var recipTelno3		= $("#exchangeRequestFrm input[name=recipTelno3]").val();
 	
-	if (gagajf.isNull(recipZipNo)) {
+	if (gagajf.isNull(recipZipcode)) {
 		mcxDialog.alert("교환지주소를 입력하세요."); return;
 	}
 	if (gagajf.isNull(recipBaseAddr)) {
@@ -662,18 +673,20 @@ var fnExchange = function () {
 		,"addPayCost"		: addDelvFee
 		,"chgerNm"			: chgerNm
 		,"chgerEmail"		: chgerEmail
-		,"chgerZipNo"		: chgerZipNo
+		,"chgerZipcode"		: chgerZipcode
 		,"chgerBaseAddr"	: chgerBaseAddr
 		,"chgerDtlAddr"		: chgerDtlAddr
 		,"chgerPhnno"		: chgerPhnno
 		,"chgerTelno"		: chgerTelno
+		,"chgerRtnMemo"		: $("#exchangeRequestFrm textarea[name=chgerRtnMemo]").val()
 		,"recipNm"			: recipNm
 		,"recipEmail"		: recipEmail
-		,"recipZipNo"		: recipZipNo
+		,"recipZipcode"		: recipZipcode
 		,"recipBaseAddr"	: recipBaseAddr
 		,"recipDtlAddr"		: recipDtlAddr
 		,"recipPhnno"		: recipPhnno
 		,"recipTelno"		: recipTelno
+		,"delvMemo"			: $("#exchangeRequestFrm textarea[name=delvMemo]").val()
 	}
 
 	// 주문번호, 교환사유, 교환메모, (취소, 반품, 교환 신청 정보 목록)
@@ -687,9 +700,9 @@ var fnExchange = function () {
 				'/orderChange/exchangeRequest/'
 				, jsonData
 				, function() {
-					//uifnPopupClose('popupOrderDetail');
-					//fnReOpenOrderDetailPopup();
-					//uifnPopupClose('popupReturnRequestForm');
+					uifnPopupClose('popupOrderDetail');
+					fnReOpenOrderDetailPopup();
+					uifnPopupClose('popupExchangeRequestForm');
 				}
 			);
 		}
@@ -702,11 +715,11 @@ var fnOpenDaumAddr = function(loc) {
 		oncomplete: function(data) {
 			// 우편번호와 주소 정보를 해당 필드에 넣는다.
 			if (loc == 'withdraw') {
-				$('#exchangeRequestFrm input[name=chgerZipNo]').val(data.zonecode);
+				$('#exchangeRequestFrm input[name=chgerZipcode]').val(data.zonecode);
 				$('#exchangeRequestFrm input[name=chgerBaseAddr]').val(cfnGetDaumRoadAddr(data));
 				$('#exchangeRequestFrm input[name=chgerDtlAddr]').focus();
 			} else if (loc == 'exchange') {
-				$('#exchangeRequestFrm input[name=recipZipNo]').val(data.zonecode);
+				$('#exchangeRequestFrm input[name=recipZipcode]').val(data.zonecode);
 				$('#exchangeRequestFrm input[name=recipBaseAddr]').val(cfnGetDaumRoadAddr(data));
 				$('#exchangeRequestFrm input[name=recipDtlAddr]').focus();
 			}
@@ -726,7 +739,7 @@ var fnSetChger = function(){
 	var spRecipTelno = (data.recipTelno != null) ? data.recipTelno.split('-') : null;
 	
 	$("#exchangeRequestFrm input[name=chgerNm]").val(data.recipNm);
-	$("#exchangeRequestFrm input[name=chgerZipNo]").val(data.recipZipNo);
+	$("#exchangeRequestFrm input[name=chgerZipcode]").val(data.recipZipcode);
 	$("#exchangeRequestFrm input[name=chgerBaseAddr]").val(data.recipBaseAddr);
 	$("#exchangeRequestFrm input[name=chgerDtlAddr]").val(data.recipDtlAddr);
 	
@@ -750,9 +763,10 @@ var fnSetExchangeAddr = function(){
 	var spRecipTelno = (data.recipTelno != null) ? data.recipTelno.split('-') : null;
 	
 	$("#exchangeRequestFrm input[name=recipNm]").val(data.recipNm);
-	$("#exchangeRequestFrm input[name=recipZipNo]").val(data.recipZipNo);
+	$("#exchangeRequestFrm input[name=recipZipcode]").val(data.recipZipcode);
 	$("#exchangeRequestFrm input[name=recipBaseAddr]").val(data.recipBaseAddr);
 	$("#exchangeRequestFrm input[name=recipDtlAddr]").val(data.recipDtlAddr);
+	$("#exchangeRequestFrm textarea[name=delvMemo]").val(data.delvMemo);
 	
 	if (spRecipPhnno) {
 		$("#exchangeRequestFrm select[name=recipPhnno1]").val(spRecipPhnno[0]);
@@ -789,7 +803,7 @@ var fnChangeOption = function(param) {
 
 // 교환수량 변경 이벤트
 var fnChangeQty = function(param) {
-	var ordCanChgQty = $(param).val();
+	var chgQty = $(param).val();
 	var ordDtlNo = $(param).attr('ordDtlNo');
 	var exchangeRequestTargetList = [];
 
@@ -800,12 +814,12 @@ var fnChangeQty = function(param) {
 				return false;
 			}
 			
-			item.ordCanChgQty = ordCanChgQty;
+			item.chgQty = chgQty;
 			
-			if (ordCanChgQty > 0) {
+			if (chgQty > 0) {
 				exchangeRequestTargetList.push(item);
 			}
-		} else if (item.ordCanChgQty > 0) {
+		} else if (item.chgQty > 0) {
 			exchangeRequestTargetList.push(item);
 		}
 	});