최수빈-0107 다다익선 화면 중간 커밋

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

@@ -1,10 +1,7 @@
 package com.style24.admin.biz.dao;
 
 import com.style24.core.support.annotation.ShopDs;
-import com.style24.persistence.domain.Coupon;
-import com.style24.persistence.domain.FreeGoodsPromotion;
-import com.style24.persistence.domain.Itemkind;
-import com.style24.persistence.domain.MoreBetter;
+import com.style24.persistence.domain.*;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -54,12 +51,66 @@ public interface TsaMarketingDao {
 
 	/* CSB 진행 */
 	/**
-	 * 사은품 프로모션 리스트
+	 * 다다익선 프로모션 리스트
 	 * @param MoreBetter
 	 * @return
 	 * @author bin2107
 	 * @since 2020. 12. 28
 	 */
 	Collection<MoreBetter> getMorebetterList(MoreBetter param);
+
+	/**
+	 * 다다익선 마스터(TB_TMTB) 저장
+	 * @param MoreBetter
+	 * @return
+	 * @author bin2107
+	 * @since 2020. 12. 28
+	 */
+	void saveMorebetterMst(MoreBetter tmtb);
+
+	/**
+	 * 다다익선 할인구간설정 2차조건(TB_TMTB_SECTION) 저장
+	 * @param MoreBetter
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 1. 6
+	 */
+	void saveMorebetterSection(MoreBetterSection regSection);
+
+	/**
+	 * 다다익선 조건에 따른 할인혜택(금액할인) 설정(TB_TMTB_VAL) 저장
+	 * @param MoreBetter
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 1. 6
+	 */
+	void saveMorebetterVal(MoreBetterSection regSection);
+
+	/**
+	 * 다다익선 업체분담율(TB_TMTB_BURDEN) 저장
+	 * @param MoreBetter
+	 * @return
+	 * @author bin2107
+	 * @since 2020. 12. 28
+	 */
+	void saveMorebetterBurden(MoreBetterBurden regBurden);
+
+	/**
+	 * 다다익선 할인구간설정(TB_TMTB_SECTION) 삭제
+	 * @param MoreBetter
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 1. 6
+	 */
+	void deleteTmtbSectionList(MoreBetterSection sectionVal);
+
+	/**
+	 * 다다익선 조건에 따른 할인혜택(금액할인) 설정(TB_TMTB_VAL) 삭제
+	 * @param MoreBetter
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 1. 6
+	 */
+	void deleteTmtbValList(MoreBetterSection sectionVal);
 	/* // CSB 진행 */
 }

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

@@ -124,5 +124,76 @@ public class TsaMarketingService {
 	public Collection<MoreBetter> getMorebetterList(MoreBetter param) {
 		return marketingDao.getMorebetterList(param);
 	}
+
+	/**
+	 * 다다익선 저장
+	 * @param tmtb
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 1. 5
+	 */
+	@Transactional("shopTxnManager")
+	public void saveMoreBetterDetail(MoreBetter tmtb) {
+		// <,> replace 처리
+		tmtb.setRegNo(TsaSession.getInfo().getUserNo());
+		tmtb.setUdpNo(TsaSession.getInfo().getUserNo());
+
+
+		// TMTB 마스터(TB_TMTB) 저장
+		marketingDao.saveMorebetterMst(tmtb);
+
+		// 다다익선 할인구간 저장
+		Collection<MoreBetterSection> sectionGbList = tmtb.getSectionGbListNew();
+		for(MoreBetterSection regSection : sectionGbList){
+			// 다다익선 할인구간설정 2차조건(TB_TMTB_SECTION) 저장
+			// tmtbSectionSq 생성
+			Integer tmtbSectionSq =  commonService.getNextSequence("SEQ_TMTB_SECTION");
+			regSection.setTbTmtbSectionSq(tmtbSectionSq);
+
+			// 다다익선 조건에 따른 할인혜택(금액할인) 설정(TB_TMTB_VAL) 저장
+			// tmtbValSq 생성
+			Integer tmtbValSq =  commonService.getNextSequence("SEQ_TMTB_VAL");
+			regSection.setTbTmtbValSq(tmtbValSq);
+			regSection.setTmtbSq(tmtb.getTmtbSq());
+			regSection.setRegNo(tmtb.getRegNo());//udpNo UdpNo
+			regSection.setUdpNo(tmtb.getUdpNo());
+
+			marketingDao.saveMorebetterSection(regSection);
+			marketingDao.saveMorebetterVal(regSection);
+		}
+
+		// 다다익선 업체분담율(TB_TMTB_BURDEN) 저장
+		Collection<MoreBetterBurden> burdenList = tmtb.getBurdenListNew();
+		for (MoreBetterBurden regBurden : burdenList) {
+			// tmtbBurdenSq 생성
+			Integer tmtbBurdenSq =  commonService.getNextSequence("SEQ_TMTB_BURDEN");
+			regBurden.setTbTmtbBurdenSq(tmtbBurdenSq);
+			regBurden.setTmtbSq(tmtb.getTmtbSq());
+			regBurden.setRegNo(tmtb.getRegNo());//udpNo UdpNo
+			regBurden.setUdpNo(tmtb.getUdpNo());
+
+			log.info("MoreBetterBurden regBurden ::" +regBurden);
+
+			marketingDao.saveMorebetterBurden(regBurden);
+		}
+
+		log.info("newBurdenSq = {}, newTmtbSq = {}, newSupplyCd = {}, newBurdenRate = {} , newUseYn = {}");
+
+	}
+
+	/**
+	 * 다다익선 다다익선 할인구간 삭제
+	 * @param tmtb
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 1. 5
+	 */
+	@Transactional("shopTxnManager")
+	public void deleteSectionValList(Collection<MoreBetterSection> sectionValList) {
+		for (MoreBetterSection sectionVal : sectionValList) {
+			marketingDao.deleteTmtbSectionList(sectionVal);
+			marketingDao.deleteTmtbValList(sectionVal);
+		}
+	}
 	/* // CSB 진행 */
 }

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

@@ -1,16 +1,16 @@
 package com.style24.admin.biz.web;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.rest.server.GagaResponse;
 import com.style24.admin.biz.service.*;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.TsaPageRequest;
-import com.style24.persistence.domain.CommonCode;
-import com.style24.persistence.domain.Coupon;
-import com.style24.persistence.domain.FreeGoodsPromotion;
+import com.style24.persistence.domain.*;
 
-import com.style24.persistence.domain.MoreBetter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -243,6 +243,7 @@ public class TsaMarketingController extends TsaBaseController {
 	@GetMapping("/morebetter/form")
 	public ModelAndView morebetterForm() {
 		ModelAndView mav = new ModelAndView();
+
 		mav.setViewName("marketing/MorebetterListForm");
 		return mav;
 	}
@@ -268,5 +269,142 @@ public class TsaMarketingController extends TsaBaseController {
 
 		return result;
 	}
+
+	/**
+	 * 다다익선 등록 화면
+	 *
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @since 2020. 12. 29
+	 */
+	@ResponseBody
+	@GetMapping("/morebetterRegPopup/form")
+	public ModelAndView morebetterRegForm(MoreBetter tmtb) {
+		ModelAndView mav = new ModelAndView();
+
+		// 상품상태 : 등록일때는 '대기'
+		String[] exceptCds = {"G008_00"};
+		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", exceptCds));
+		log.info("CHECK param goodsStatList>>"+rendererService.getCommonCodeList("G008", "Y", exceptCds));
+
+		// 할인구간 목록
+		mav.addObject("sectionGbList", rendererService.getAvailCommonCodeList("G810"));
+		log.info("CHECK param sectionGbList>>"+rendererService.getAvailCommonCodeList("G810"));
+		// 할인구분 목록
+		mav.addObject("dcWayList", rendererService.getAvailCommonCodeList("G240"));
+		log.info("CHECK param dcWayList>>"+rendererService.getAvailCommonCodeList("G240"));
+
+
+		String tmtbStat = "G232_10";
+		tmtb.setTmtbStat(tmtbStat);
+
+		//tmtb sq 자동생성 추가해야함
+		Integer tmtbSq;
+		tmtbSq =  commonService.getNextSequence("SEQ_TMTB");
+		tmtb.setTmtbSq(tmtbSq);
+
+		mav.addObject("params", tmtb);
+		log.info("CHECK param tmtbSq>>"+tmtb.getTmtbSq());
+		mav.setViewName("marketing/MorebetterRegForm");
+		return mav;
+	}
+
+	/**
+	 * 다다익선 등록
+	 *
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 1. 5
+	 */
+	@PostMapping("/morebetter/save")
+	@ResponseBody
+	public GagaResponse saveMorebetterDetail(@RequestBody MoreBetter tmtb) {
+		Collection<MoreBetterGoods> tmtbCompList = null;
+		Collection<MoreBetterGoods> tmtbBrandList = null;
+		Collection<MoreBetterBurden> tmtbBurdenList = null;
+		Collection<MoreBetterSection> tmtbSectionGbList = null;
+		ObjectMapper mapper = new ObjectMapper();
+
+		/*
+		// 공급업체
+		try {
+			if (tmtb.getSupplyCompList() != null) {
+				tmtbCompList = mapper.readValue(tmtb.getSupplyCompList(), new TypeReference<Collection<MoreBetterComp>>() {
+				});
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		*/
+/*
+		// 브랜드
+		try {
+			if (tmtb.getBrandList() != null) {
+				tmtbBrandList = mapper.readValue(tmtb.getBrandList(), new TypeReference<Collection<MoreBetterBrand>>() {
+				});
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+*/
+		// 할인구간
+		try {
+			if (tmtb.getSectionGbList() != null) {
+				log.info("getSectionGbList here1");
+				tmtbSectionGbList = mapper.readValue(tmtb.getSectionGbList(), new TypeReference<Collection<MoreBetterSection>>() {
+				});
+				log.info("getSectionGbList here2");
+			}
+			log.info("getSectionGbList here123");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		// 업체분담율
+		try {
+			if (tmtb.getBurdenList() != null) {
+				log.info("here1");
+				tmtbBurdenList = mapper.readValue(tmtb.getBurdenList(), new TypeReference<Collection<MoreBetterBurden>>() {
+				});
+				log.info("here2");
+			}
+			log.info("here123");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		log.info("tmtb::"+tmtb);
+
+		// html에서 SectionVal -> DcVal 안되서...여기서 set 왜지..?
+		//tmtb.setDcVal(tmtb.getSectionVal());
+
+		//tmtb.setSupplyCompListNew(tmtbCompList);
+		//tmtb.setBrandListNew(tmtbBrandList);
+		tmtb.setSectionGbListNew(tmtbSectionGbList);
+		tmtb.setBurdenListNew(tmtbBurdenList);
+
+		marketingService.saveMoreBetterDetail(tmtb);
+
+		return super.ok(message.getMessage("SUCC_0001"));
+	}
+	/**
+	 * 다다익선 할인구간 삭제
+	 *
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 1. 5
+	 */
+	@PostMapping("/morebetter/sectionVal/delete")
+	@ResponseBody
+	public GagaResponse deleteSectionValList(@RequestBody Collection<MoreBetterSection> sectionValList) {
+		// 추후에 더 개발 ㅠㅠ
+		log.info("[deleteSectionValList]");
+		marketingService.deleteSectionValList(sectionValList);
+		return super.ok(message.getMessage("SUCC_0003"));
+	}
+
 	/* // CSB 진행 */
 }

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

@@ -4,6 +4,8 @@ import com.style24.persistence.TsaPageRequest;
 import com.style24.persistence.TscBaseDomain;
 import lombok.Data;
 
+import java.util.Collection;
+
 /**
  * 품목 Domain
  *
@@ -13,12 +15,13 @@ import lombok.Data;
 @SuppressWarnings("serial")
 @Data
 public class MoreBetter extends TscBaseDomain {
-	// 사은품 프로모션
+	// 다다익선 마스터
 	private int tmtbSq;				// 프로모션ID
 	private String tmtbNm;			// 프로모션명
 	private String tmtbStat;		// 프로모션 상태
 	private String tmtbStdt;		// 프로모션 시작일
 	private String tmtbEddt;		// 프로모션 종료일
+	private String multiYn;			// 복수,단수설정
 	private String delYn;			// 삭제여부
 	private Integer regNo;			// 등록자
 	private String  regDt;			// 등록일시
@@ -28,6 +31,37 @@ public class MoreBetter extends TscBaseDomain {
 	private String searchTxt;		// 프로모션 검색 조건
 	private String gbn;				// 팝업 구분 : C=등록, U=수정
 
+	// 다다익선 할인구간설정 2차조건(TB_TMTB_SECTION)
+	private int tmtbSectionSq;		// 다다익선 할인구간 시퀀스
+	private String sectionGb;		// 구간설정 구분값(G810_10:수량,G810_11:금액)
+	private int sectionVal;		// 구간설정값, 구간할인시작(수량이상, 금액이상)
+
+	// 다다익선 조건에 따른 할인혜택(금액할인)(TB_TMTB_VAL)
+	private int tmtbValSq;			// 다다익선 할인값 시퀀스
+	private String dcWay;			// 할인방식(G240_10:할인금액,G240_11:할인율)
+	private int dcVal;				// 할인값
+
+	// 다다익선 업체분담율(TB_TMTB_BURDEN)
+	private int tbTmtbBurdenSq;		// 업체분담율Sq
+	private String tmtbSupplyCd;	// 업체코드
+	private String tmtbBurdenRate;	// 업체분담율
+	//private String burdenRate;	// 업체분담율
+	private String useYn;			// 사용여부
+
+	private Collection<MoreBetterGoods> supplyCompListNew;
+	private Collection<MoreBetterGoods> brandListNew;
+	private Collection<MoreBetterGoods> applyGoodsListNew;
+	private Collection<MoreBetterGoods> exceptGoodsListNew;
+	private Collection<MoreBetterBurden> burdenListNew;
+	private Collection<MoreBetterSection> sectionGbListNew;
+
+	private String supplyCompList;
+	private String brandList;
+	private String applyGoodsList;
+	private String exceptGoodsList;
+	private String burdenList;
+	private String sectionGbList;
+
 	// Pagination
 	private TsaPageRequest pageable;
 	private int pageNo = 1;

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

@@ -0,0 +1,29 @@
+package com.style24.persistence.domain;
+
+import com.style24.persistence.TscBaseDomain;
+import lombok.Data;
+
+/**
+ * 품목 Domain
+ *
+ * @author bin2107
+ * @since 2021. 1.
+ */
+@SuppressWarnings("serial")
+@Data
+public class MoreBetterBurden extends TscBaseDomain {
+	// 다다익선 업체 분담율
+	private Integer tbTmtbBurdenSq;		// 업체분담율Sq
+	private Integer tmtbSq;				// 프로모션Sq
+	private String tmtbSupplyCd;	// 업체코드
+	private String tmtbBurdenRate;	// 업체분담율
+	private String useYn;			// 사용여부
+	private Integer regNo;			// 등록자
+	private String  regDt;			// 등록일시
+	private Integer udpNo;			// 수정자
+	private String  udtDt;			// 수정일시
+
+	//private String supplyCompCd;
+	private String burdenRate;
+
+}

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

@@ -0,0 +1,92 @@
+package com.style24.persistence.domain;
+
+import com.style24.persistence.TsaPageRequest;
+import com.style24.persistence.TscBaseDomain;
+import lombok.Data;
+
+import java.util.Collection;
+
+/**
+ * 품목 Domain
+ *
+ * @author bin2107
+ * @since 2021. 1.
+ */
+@SuppressWarnings("serial")
+@Data
+public class MoreBetterGoods extends TscBaseDomain {
+	// 다다익선 적용대상
+	private int tbTmtbGoodsSq;		// 업체분담율Sq
+	private int tmtbSq;				// 프로모션Sq
+	private String goodsGb;
+	private String targetGb;
+	private String targetVal;
+	private String delYn;
+	private Integer regNo;			// 등록자
+	private String  regDt;			// 등록일시
+	private Integer udpNo;			// 수정자
+	private String  udtDt;			// 수정일시
+
+	// 공급업체
+	private String supplyCompCd;
+	private String supplyCompNm;
+	private int provierNo;
+	private String bizGb;				// 사업자구분
+	private String bizNo;				// 사업자번호
+	private String bizKind;				// 업종
+	private String bizType;				// 업태
+	private String ownerNm;				// 대표자명
+	private String bizZipcode;			// 사업장우편번호
+	private String bizBaseAddr;			// 사업장기본주소
+	private String bizDtlAddr;			// 사업장상세주소
+	private String mainTelno;			// 대표전화번호
+	private String mainFaxno;			// 대표팩스번호
+	private String homepageUrl;			// 홈페이지URL
+	private String selfYn;				// 자사여부(Y:자사, N:입점)
+	private String distributionGb;		// 유통구분(공통코드G065)
+	private String shotDelvYn;			// 총알배송여부
+	private String supplyStat;			// 입점상태(공통코드G010)
+	private int minOrdAmt;				// 무료배송비최소주문금액
+	private int delvFee;				// 배송비
+	private float sellFeeRate;			// 판매수수료율
+	private String settleDay;			// 정산일(매월)
+	private String bankCd;				// 은행코드
+	private String accountNo;			// 계좌번호
+	private String depositorNm;			// 예금주명
+	private String csChargeNm;			// CS담당자명
+	private String csChargeTelno;		// CS담당자전화번호
+	private String settleChargeNm;		// 정산담당자명
+	private String settleChargeTelno;	// 정산담당자전화번호
+	private String settleChargeEmail;	// 정산담당자이메일
+	private String billEmail;			// 계산서이메일
+	private String econtractYn;			// 전자계약여부
+	private String remarks;				// 비고
+	private String supplyStatNm;		// 입점상태명
+
+	// 브랜드
+	private String brandGb;			// 브랜드구분
+	private String brandCd;			// 브랜드코드
+	private String brandEnm;		// 브랜드영문명
+	private String brandKnm;		// 브랜드한글명
+	private String dispNmLang;		// 노출명언어
+	private String rgbCd;			// RGB코드(front 브랜드메인 GNB 색상)
+	private String brandGrpNm;		// 브랜드그룹명
+	private String delvLocCd;		// 출고처코드(출고처)
+	private String delvLocNm;		// 출고처명
+	private String erpBrandCd;		// ERP브랜드코드
+	private String delvFeeCd;		// 배송비정책코드
+	private float pntPrate10;		// 포인트적립율(PC정상)
+	private float pntMrate10;		// 포인트적립율(모바일정상)
+	private float pntPrate20;		// 포인트적립율(PC이월)
+	private float pntMrate20;		// 포인트적립율(모바일이월)
+	private String logoFileNm;		// 로고파일명
+	private int dispOrd;			// 표시순서
+	private String useYn;			// 사용여부(Y:사용)
+	private int brandNo;			// 브랜드번호(WMS 연동용)
+	private String newSysFileNm;	//신규이미지파일명
+
+	// 검색조건
+	private String searchGb;			// 검색구분
+	private String searchTxt;			// 검색어
+	private String callbackFn;			// 콜백함수
+}

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

@@ -0,0 +1,32 @@
+package com.style24.persistence.domain;
+
+import com.style24.persistence.TscBaseDomain;
+import lombok.Data;
+
+/**
+ * 품목 Domain
+ *
+ * @author bin2107
+ * @since 2021. 1.
+ */
+@SuppressWarnings("serial")
+@Data
+public class MoreBetterSection extends TscBaseDomain {
+	// 다다익선 상품
+	private Integer tmtbSq;
+	private Integer tbTmtbSectionSq;	// 업체분담율Sq
+	private Integer tbTmtbValSq;		// 업체분담율Sq
+
+	private String  sectionGb;		// 구간설정구분값(G810_10:수량,G810_11:금액)
+	private Integer sectionVal;		// 구간설정값/구간할인시작(수량이상,금액이상)
+
+	private String  dcWay;			// 할인방식(G240_10:할인금액,G240_11:할인율)
+	private Integer dcVal;			// 할인값
+
+	private String  delYn;			// 삭제여부
+	private Integer regNo;			// 등록자
+	private String  regDt;			// 등록일시
+	private Integer udpNo;			// 수정자
+	private String  udtDt;			// 수정일시
+
+}

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

@@ -137,6 +137,7 @@
 
 	<!-- // 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
@@ -150,8 +151,8 @@
 		FROM TB_TMTB
 		WHERE 1=1
 		<if test="tmtbStdt != null and tmtbStdt != '' and tmtbEddt != null and tmtbEddt != ''">
-			AND TMTB_ST_DT >= DATE_FORMAT(#{tmtbStdt} , '%Y-%m-%d')
-			AND TMTB_ED_DT <![CDATA[ <= ]]> DATE_FORMAT(#{tmtbEddt} , '%Y-%m-%d')
+			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')
 		</if>
 		<if test="searchTxt != null and searchTxt != ''">
 			<if test="searchGubun != null and searchGubun == 'tmtbSq'">
@@ -163,5 +164,121 @@
 		</if>
 		ORDER BY REG_DT DESC
 	</select>
+
+	<insert id="saveMorebetterMst" parameterType="MoreBetter" >
+		/* TsaMarketing.saveMorebetterMst */
+		INSERT INTO TB_TMTB(
+					 TMTB_SQ
+					,TMTB_NM
+					,TMTB_STAT
+					,TMTB_ST_DT
+					,TMTB_ED_DT
+					,MULTI_YN
+					,DEL_YN
+					,REG_NO
+					,REG_DT
+					,UDP_NO
+					,UDT_DT
+			)
+			VALUES (
+			         #{tmtbSq}
+					,#{tmtbNm}
+				    ,#{tmtbStat}
+				    ,#{tmtbStdt}
+				    ,#{tmtbEddt}
+				    ,#{multiYn}
+				    ,'N'
+				    ,#{regNo}
+				    ,NOW()
+				    ,#{udpNo}
+				    ,NOW()
+				   )
+	</insert>
+
+	<insert id="saveMorebetterSection" parameterType="MoreBetterSection" >
+		/* TsaMarketing.saveMorebetterSection */
+		INSERT INTO TB_TMTB_SECTION(
+					 TMTB_SECTION_SQ
+					,TMTB_SQ
+					,SECTION_GB
+					,SECTION_VAL
+					,DEL_YN
+					,REG_NO
+					,REG_DT
+					,UDP_NO
+					,UDT_DT
+			)
+			VALUES (
+					 #{tbTmtbSectionSq}
+					,#{tmtbSq}
+					,#{sectionGb}
+				    ,#{sectionVal}
+				    ,'N'
+				    ,#{regNo}
+				    ,NOW()
+				    ,#{udpNo}
+				    ,NOW()
+				   )
+	</insert>
+
+	<insert id="saveMorebetterVal" parameterType="MoreBetterSection" >
+		/* TsaMarketing.saveMorebetterVal */
+		INSERT INTO TB_TMTB_VAL(
+					 TMTB_VAL_SQ
+					,TMTB_SQ
+					,TMTB_SECTION_SQ
+					,DC_WAY
+					,DC_VAL
+					,DEL_YN
+					,REG_NO
+					,REG_DT
+					,UDP_NO
+					,UDT_DT
+			)
+			VALUES (
+					#{tbTmtbValSq}
+				   ,#{tmtbSq}
+				   ,#{tbTmtbSectionSq}
+				   ,#{dcWay}
+				   ,#{dcVal}
+				   ,'N'
+				   ,#{regNo}
+				   ,NOW()
+				   ,#{udpNo}
+				   ,NOW()
+				   )
+	</insert>
+
+	<insert id="saveMorebetterBurden" parameterType="MoreBetterBurden" >
+		/* TsaMarketing.saveMorebetterBurden */
+		INSERT INTO TB_TMTB_BURDEN(
+					 TB_TMTB_BURDEN_SQ
+					,TMTB_SQ
+					,TMTB_SUPPLY_CD
+					,TMTB_BURDEN_RATE
+					,USE_YN
+					,REG_NO
+					,REG_DT
+					,UDP_NO
+					,UDT_DT
+			)
+			VALUES (
+			         #{tbTmtbBurdenSq}
+			        ,#{tmtbSq}
+			        ,#{tmtbSupplyCd}
+			        ,#{tmtbBurdenRate}
+			        ,#{useYn}
+				    ,#{regNo}
+				    ,NOW()
+				    ,#{udpNo}
+				    ,NOW()
+				   )
+		ON DUPLICATE KEY UPDATE
+					 TMTB_SUPPLY_CD = #{tmtbSupplyCd}
+					,TMTB_BURDEN_RATE = #{tmtbBurdenRate}
+					,USE_YN = #{useYn}
+					,UDP_NO = #{udpNo}
+					,UDT_DT = NOW()
+	</insert>
 	<!--// CSB 진행 -->
 </mapper>

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

@@ -89,7 +89,7 @@
 				</ul>
 				<div class="panelBar">
 					<div class="right">
-						<button type="button" class="btn btn-info btn-lg" id="btnFreeGoodsRegi" >프로모션등록</button>
+						<button type="button" class="btn btn-info btn-lg" id="btnMorebetterReg" >다다익선 등록</button>
 					</div>
 				</div>
 				<!-- 검색결과 영역 -->
@@ -103,7 +103,7 @@
 	var columnDefs = [];
 	columnDefs = [
 		{headerName: "프로모션ID", field: "tmtbSq", width: 80, cellClass: 'text-center'},
-		{headerName: "프로모션명", field: "tmtbNm", width: 130, cellClass: 'text-center'},
+		{headerName: "프로모션명", field: "tmtbNm", width: 200, cellClass: 'text-center'},
 		{headerName: "상태", field: "tmtbStat", width: 140, cellClass: 'text-center'},
 		{headerName: "시작일", field: "tmtbStdt", width: 140, cellClass: 'text-center'},
 		{headerName: "종료일", field: "tmtbEddt", width: 140, cellClass: 'text-center'},
@@ -205,8 +205,8 @@
 		
 	}
 
-	// 조회클릭시
-	$('#btnMorebetterRegi').on('click', function() {
+	// 등록클릭시
+	$('#btnMorebetterReg').on('click', function() {
 		cfnOpenMorebetterSetPopup();
 	});
 

style24.admin/src/main/webapp/WEB-INF/views/marketing/MorebetterRegForm.html

@@ -0,0 +1,736 @@
+<!DOCTYPE html>
+<html lang="ko"
+	xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : MorebetterRegForm.html
+ * @desc    : 다다익선 등록 화면
+ *============================================================================
+ * SISUN
+ * Copyright(C) 2019 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2020.12.29   bin2107     최초 작성
+ *******************************************************************************
+ -->	
+	<div class="modalPopup frGoodsPro" data-width="1100">
+		<div class="panelStyle" style="max-height:900px;overflow-y:scroll;">
+			<div class="panelTitle">
+				<h2>다다익선 등록</h2>
+				<button type="button" class="close" onclick="fnMorebetterFormClose()"><i class="fa fa-times"></i></button>
+			</div>
+
+			<form id="moreBetterForm" name="moreBetterForm" action="#" th:action="@{'/marketing/morebetter/save'}"> <!--th:method="post" >-->
+				<input type="hidden" name="gbn" th:value="${params.gbn}" />				<!-- 신규/수정 구분 -->
+				<input type="hidden" name="supplyCompList"/>			<!-- 공급업체 리스트 -->
+				<input type="hidden" name="brandList"/>					<!-- 브랜드 리스트 -->
+				<input type="hidden" name="applyGoodsList"/>			<!-- 적용상품 리스트 -->
+				<input type="hidden" name="exceptGoodsList"/>			<!-- 제외상품 리스트 -->
+				<input type="hidden" name="burdenList"/>				<!-- 업체 분담율 리스트 -->
+				<input type="hidden" name="sectionGbList"/>				<!-- 다다익선 구간/혜택 리스트 -->
+
+				<div class="panelContent">
+					<ul class="notice">
+						<li>구성상품 등록시 기본값&nbsp;
+							<!-- 아이콘 툴팁 -->
+							<div class="iconTooltip">
+								<i class="fa fa-info" aria-hidden="true"></i>
+								<span class="left" style="width:400px; text-align:left;">
+									<!-- class="left" 또는 class="right" -->
+									- 상품상태 : 정보부족<br/>
+									- 정상가 : 구성상품의 정상가 합<br/>
+									- 판매가 : 구성상품 판매가 입력값의 합<br/>
+									- 브랜드코드 : 구성상품의 기준여부 'Y'상품의 브랜드코드<br/>
+									- 품목코드 : 구성상품의 기준여부 'Y'상품의 품목코드<br/>
+									- 포인트 : 구성상품의 기준여부 'Y'상품의 브랜드 포인트<br/>
+									- 배송비정책 : 구성상품의 기준여부 'Y'상품의 브랜드 배송비정책<br/>
+								</span>
+							</div>
+							<!-- //아이콘 툴팁 -->
+						</li>
+					</ul>
+					<table class="frmStyle">
+						<colgroup>
+							<col width="10%"/>
+							<col width="40%"/>
+							<col width="10%"/>
+							<col width="40%"/>
+						</colgroup>
+						<tr>
+							<th>프로모션명<em class="required" title="필수"></em></th>
+							<td>
+								<!-- 수정시 프로모션명 입력 : before -->
+								<input class="w50p" type="text" id="tmtbNm" name="tmtbNm" maxlength="30" required="required" data-valid-name="프로모션명"/>
+							</td>
+							<th>프로모션ID</th>
+							<td>
+								<!-- 프로모션 ID 입력 : before -->
+								<input class="w50p" type="text" id="disTmtbSq" name="disTmtbSq" maxlength="30" th:value="${params.tmtbSq}"  disabled=""/>
+								<input type="hidden" id="tmtbSq" name="tmtbSq"/>
+							</td>
+						</tr>
+						<tr>
+							<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="종료일자"/>
+							</td>
+							<th>상태</th>
+							<td>
+								<!-- 상태 입력 : before -->
+								<input class="w50p" type="text" id="disTmtbStat" name="disTmtbStat" maxlength="30" th:value="${params.tmtbStat}" disabled=""/>
+								<input type="hidden" id="tmtbStat" name="tmtbStat"/>
+							</td>
+						</tr>
+						<tr>
+							<th>할인 구간<em class="required" title="필수"></em></th>
+							<td>
+								<label class="rdoBtn"><input type="radio" name="sectionGb" id="sectionGbQty" value="G810_10" checked="checked"/>수량</label>
+								<label class="rdoBtn"><input type="radio" name="sectionGb" id="sectionGbAmt" value="G810_11"/>금액</label>
+							</td>
+							<th>할인 구분<em class="required" title="필수"></em></th>
+							<td>
+								<label class="rdoBtn"><input type="radio" name="dcWay" id="dcWayQty" value="G240_10" checked="checked"/>할인금액</label>
+								<label class="rdoBtn"><input type="radio" name="dcWay" id="dcWayAmt" value="G240_11"/>할인율</label>
+							</td>
+						</tr>
+						<tr>
+							<th>상품여부<em class="required" title="필수"></em></th>
+							<td>
+								<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>
+
+						</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><i class="fa fa-info-circle"></i> 브랜드/공급업체/상품 중 1가지는 필수로 지정하셔야 합니다.</div>
+						<div><i class="fa fa-info-circle"></i> 브랜드와 공급업체는 지정 시, 해당 브랜드의 공급처와 같은 AND조건으로 적용됩니다.(예시:A브랜드 상품 중 B업체 상품만)</div>
+						<div><i class="fa fa-info-circle"></i> 공급업체와 브랜드를 적용하시더라도 적용상품은 별개로 등록된 상품을 기준으로 사은품 지급기준으로 적용하실 수 있습니다.</div>-->
+
+						<div class="panelContent">
+							<table class="frmStyle">
+								<colgroup>
+									<col width="10%"/>
+									<col width="90%"/>
+								</colgroup>
+								<tr>
+									<th>공급업체/브랜드</th>
+									<td>
+										<!-- 수정시 프로모션명 입력 : before -->
+										<div class="padding10 wid45">
+											<span>공급업체 설정</span>
+											<div class="padding10 inner-tb-solid">
+												<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddCompany">업체 추가</button>
+												<button type="button" class="btn btnRight btn-success btn-lg" id="btnDeleteCompany">선택삭제</button>
+												<span>선택 : 00개</span>
+												<br/>
+												<div id="gridFGPromotionCompanyList" style="width:100%; height:200px;" class="ag-theme-balham"></div>
+											</div>
+										</div>
+										<div class="padding10 wid45">
+											<span>브랜드 설정</span>
+											<div class="padding10 inner-tb-solid">
+												<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddBrand">브랜드 추가</button>
+												<button type="button" class="btn btnRight btn-success btn-lg" id="btnDeleteBrand">선택삭제</button>
+												<span>선택 : 00개</span>
+												<br/>
+												<!-- 브랜드 선택 팝업(단수 선택 팝업... 복수를 새로 만들어야하는지 ? 아니면 변수처리해야하는지 ? -->
+												<div id="gridFGBrandList" style="width:100%; height:200px;" class="ag-theme-balham"></div>
+											</div>
+										</div>
+									</td>
+								</tr>
+								<tr>
+									<th>적용상품</th>
+									<td>
+										<div class="padding10">
+											<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddApplyGoods">상품 추가</button>
+											<button type="button" class="btn btnRight btn-success btn-lg" id="btnDeleteApplyGoods">선택삭제</button>
+											<span>선택 : 00개</span>
+											<br/>
+											<div id="gridFGApplyGoodsList" 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">
+						<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="btnAddExceptGoods">상품 추가</button>
+											<button type="button" class="btn btnRight btn-success btn-lg" id="btnDeleteExtGoods">선택삭제</button>
+											<span>선택 : 00개</span>
+											<br/>
+											<div id="gridFGExceptGoodsList" 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">
+						<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>
+											<span>선택 : 00개</span>
+											<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">
+						<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="btnAddApplyBurden">업체추가</button>
+											<button type="button" class="btn btnRight btn-success btn-lg" id="btnDelApplyBurden">선택삭제</button>
+											<span>선택 : 00개</span>
+											<br/>
+											<div id="gridApplyBurdenList" style="width:100%; height:200px;" class="ag-theme-balham"></div>
+										</div>
+									</td>
+								</tr>
+							</table>
+						</div>
+					</div>
+				</div>
+			</form>
+
+			<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="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> -->
+				</li>
+			</ul>
+		</div>	
+	</div>
+
+	<script th:inline="javascript">
+		var FGAddGoodsStatList = gagajf.convertToArray([[${goodsStatList}]]);		// 상품 상태 리스트
+		var sectionGbList = gagajf.convertToArray([[${sectionGbList}]]);	// 할인구간 리스트
+		var dcWayList = gagajf.convertToArray([[${dcWayList}]]);	// 할인구분 리스트
+
+		// 공급업체 리스트 설정
+		var columnFGCompanyList = [
+			{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+			{headerName: "공급처ID", field: "supplyCompCd", width: 120, cellClass: 'text-center'},
+			{headerName: "공급업체명", field: "supplyCompNm", width: 150, cellClass: 'text-center'}
+		];
+		// 브랜드 리스트 설정
+		var columnBrandList = [
+			{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+			{headerName: "브랜드ID", field: "brandCd", width: 120, cellClass: 'text-center'},
+			{headerName: "공급업체명", field: "brandEnm", width: 150, cellClass: 'text-center'}
+		];
+		// 적용상품 리스트 설정
+		var columnApplyGoodsList = [
+			{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+			{headerName: "Product ID", field: "goodsCd", width: 120, cellClass: 'text-center'},
+			{headerName: "브랜드명", field: "brandEnm", width: 150, cellClass: 'text-center'},
+			{headerName: "상품명", field: "goodsNm", width: 120, cellClass: 'text-center'},
+			{headerName: "판매상태", field: "goodsStat" , width: 120, cellClass: 'text-center',
+				cellEditorParams: { values: gagaAgGrid.extractValues(FGAddGoodsStatList) },
+				valueFormatter: function (params) { return gagaAgGrid.lookupValue(FGAddGoodsStatList, params.value); },
+				valueParser: function (params) { return gagaAgGrid.lookupKey(FGAddGoodsStatList, params.newValue); }
+			},
+			{headerName: "정상가", field: "listPrice", width: 120, cellClass: 'text-center', valueFormatter: function(params) {return params.value.addComma();}},
+			{headerName: "판매가", field: "currPrice", width: 120, cellClass: 'text-center', valueFormatter: function(params) {return params.value.addComma();}}
+		];
+		// 제외상품 리스트 설정
+		var columnExceptGoodsList = [
+			{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+			{headerName: "Product ID", field: "goodsCd", width: 120, cellClass: 'text-center'},
+			{headerName: "브랜드명", field: "brandEnm", width: 150, cellClass: 'text-center'},
+			{headerName: "상품명", field: "goodsNm", width: 120, cellClass: 'text-center'},
+			{headerName: "판매상태", field: "goodsStat" , width: 120, cellClass: 'text-center',
+				cellEditorParams: { values: gagaAgGrid.extractValues(FGAddGoodsStatList) },
+				valueFormatter: function (params) { return gagaAgGrid.lookupValue(FGAddGoodsStatList, params.value); },
+				valueParser: function (params) { return gagaAgGrid.lookupKey(FGAddGoodsStatList, params.newValue); }
+			},
+			{headerName: "정상가", field: "listPrice", width: 120, cellClass: 'text-center',valueFormatter: function(params) {return params.value.addComma();}},
+			{headerName: "판매가", field: "currPrice", width: 120, cellClass: 'text-center',valueFormatter: function(params) {return params.value.addComma();}}
+		];
+
+		// 업체분담율 리스트 설정
+		var columnApplyBurdenList = [
+			{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',editable: true, required: true},
+			{headerName: "사용여부", field: "useYn" , width: 120, cellClass: 'text-center'}
+		];
+
+		// 구간 할인/혜택 설정
+		var columnSectionGbList = [
+			{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'},
+			{headerName: "할인구간", field: "sectionGb", width: 100, cellClass: 'text-center',
+				cellEditor: 'agRichSelectCellEditor',
+				cellEditorParams: { values: gagaAgGrid.extractValues(sectionGbList), required: true },
+				valueFormatter: function (params) { return gagaAgGrid.lookupValue(sectionGbList, params.value); },
+				valueParser: function (params) { return gagaAgGrid.lookupKey(sectionGbList, params.newValue); }
+			},
+			{headerName: "구간값", field: "sectionVal", width: 100, cellClass: 'text-right',
+				cellEditor: 'textCellEditor',
+				cellEditorParams: { maxlength: 50, required: true }
+			},
+			{headerName: "할인구분", field: "dcWay", width: 100, cellClass: 'text-center',
+				cellEditor: 'agRichSelectCellEditor',
+				cellEditorParams: { values: gagaAgGrid.extractValues(dcWayList), required: true },
+				valueFormatter: function (params) { return gagaAgGrid.lookupValue(dcWayList, params.value); },
+				valueParser: function (params) { return gagaAgGrid.lookupKey(dcWayList, params.newValue); }
+			},
+			{headerName: "할인값", field: "dcVal", width: 100, cellClass: 'text-right',
+				cellEditor: 'textCellEditor',
+				cellEditorParams: { maxlength: 50, required: true }
+			}
+		];
+
+		// 공급업체 리스트 설정
+		var gridOptionsFGCompanyList = gagaAgGrid.getGridOptions(columnFGCompanyList);
+		gridOptionsFGCompanyList.rowSelection = "multiple";
+		// 브랜드 리스트 설정
+		var gridOptionsFGBrandList = gagaAgGrid.getGridOptions(columnBrandList);
+		gridOptionsFGBrandList.rowSelection = "multiple";
+		// 적용상품 리스트 설정
+		var gridOptionsFGApplyGoodsList = gagaAgGrid.getGridOptions(columnApplyGoodsList);
+		gridOptionsFGApplyGoodsList.rowSelection = "multiple";
+		// 제외상품 리스트 설정
+		var gridOptionsFGExceptGoodsList = gagaAgGrid.getGridOptions(columnExceptGoodsList);
+		gridOptionsFGExceptGoodsList.rowSelection = "multiple";
+		// 업체분담율 리스트 설정
+		var gridOptionsApplyBurdenList = gagaAgGrid.getGridOptions(columnApplyBurdenList);
+		gridOptionsApplyBurdenList.rowSelection = "multiple";
+		// 구간 할인/혜택 설정
+		var gridOptionsSectionGbList = gagaAgGrid.getGridOptions(columnSectionGbList);
+		// Grid editable
+		gridOptionsSectionGbList.defaultColDef.editable = true;
+		// Add on options
+		gridOptionsSectionGbList.suppressRowClickSelection = true;
+		gridOptionsSectionGbList.rowSelection = "multiple";
+		gridOptionsSectionGbList.stopEditingWhenGridLosesFocus = true;
+
+		$(document).ready(function() {
+			gagaAgGrid.createGrid("gridFGPromotionCompanyList", gridOptionsFGCompanyList);
+			gagaAgGrid.createGrid("gridFGBrandList", gridOptionsFGBrandList);
+			gagaAgGrid.createGrid("gridFGApplyGoodsList", gridOptionsFGApplyGoodsList);
+			gagaAgGrid.createGrid("gridFGExceptGoodsList", gridOptionsFGExceptGoodsList);
+			gagaAgGrid.createGrid("gridApplyBurdenList", gridOptionsApplyBurdenList);
+			gagaAgGrid.createGrid("gridSectionGbList", gridOptionsSectionGbList);
+
+			cfnCreateCalendar('#tmtbTerms', 'tmtbStdt', 'tmtbEddt', true, '행사기간', 'X');
+		});
+
+		// 저장 버튼 클릭시
+		$('#btnMorebetterSave').on('click', function() {
+			console.log('save 1818');
+			// 각 ag-grid list 수량
+			let supplyCompCnt = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList).length;
+			let brandCnt = gagaAgGrid.getAllRowData(gridOptionsFGBrandList).length;
+			let applyGoodsCnt = gagaAgGrid.getAllRowData(gridOptionsFGApplyGoodsList).length;
+			let exceptGoodsCnt = gagaAgGrid.getAllRowData(gridOptionsFGExceptGoodsList).length;
+			let applyBurdenCnt = gagaAgGrid.getAllRowData(gridOptionsApplyBurdenList).length;
+			let sectionGbCnt = gagaAgGrid.getAllRowData(gridOptionsSectionGbList).length;
+			console.log('supplyCompCnt>>'+supplyCompCnt);
+			console.log('brandCnt>>'+brandCnt);
+			console.log('applyGoodsCnt>>'+applyGoodsCnt);
+			console.log('exceptGoodsCnt>>'+exceptGoodsCnt);
+			console.log('applyBurdenCnt>>'+applyBurdenCnt);
+			console.log('sectionGbCnt>>'+sectionGbCnt);
+
+			// 행사기간 확인
+			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;
+			}
+
+
+			// validation
+			if (!gagajf.validation('#moreBetterForm'))
+				return false;
+
+			// disabled 값 넘겨주기
+			$('#moreBetterForm input[name=tmtbSq]').val($('#moreBetterForm input[name=disTmtbSq]').val());
+			$('#moreBetterForm input[name=tmtbStat]').val($('#moreBetterForm input[name=disTmtbStat]').val());
+
+
+			mcxDialog.confirm('저장하시겠습니까?', {
+				cancelBtnText: "취소",
+				sureBtnText: "확인",
+				sureBtnClick: function(){
+					var comp_idx = 0;
+					var brand_idx = 0;
+					var apply_idx = 0;
+					var except_idx = 0;
+					var burden_idx = 0;
+
+					var compAllData = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);
+					/*$.each(compAllData, function(comp_idx, item) {
+						item.dispOrd = comp_idx+1;
+					});*/
+
+					var brandAllData = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);
+					/*$.each(brandAllData, function(brand_idx, item) {
+						item.dispOrd = brand_idx+1;
+					});*/
+
+					var applyAllData = gagaAgGrid.getAllRowData(gridOptionsFGApplyGoodsList);
+					/*$.each(applyAllData, function(apply_idx, item) {
+						item.dispOrd = apply_idx+1;
+					});*/
+
+					var exceptAllData = gagaAgGrid.getAllRowData(gridOptionsFGExceptGoodsList);
+					/*$.each(exceptAllData, function(except_idx, item) {
+						item.dispOrd = except_idx+1;
+					});*/
+
+					var burdenAllData = gagaAgGrid.getAllRowData(gridOptionsApplyBurdenList);
+					/*$.each(burdenAllData, function(burden_idx, item) {
+						item.dispOrd = burden_idx+1;
+					});*/
+
+					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 jsonBurdenData = JSON.stringify(burdenAllData);
+					$('#moreBetterForm input[name=burdenList]').val(jsonBurdenData);
+
+					var jsonSectionGbData = JSON.stringify(sectionGbAllData);
+					$('#moreBetterForm input[name=sectionGbList]').val(jsonSectionGbData);
+
+					var jsonData = JSON.stringify($('#moreBetterForm').serializeObject());
+					gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, function() {
+						//$('#btnSearch').trigger('click');
+						//$('#btnNew').trigger('click');
+						console.log('save 11111');
+					});
+				}
+			});
+
+		});
+
+		// 공급업체 설정 / 업체 추가 콜백함수
+		var fnSetPopupComapnyInfo = function(result) {
+			// 기존 리스트 데이터 for
+			for(let i = 0 ; i < result.length ; i++) {
+				let addChk = true, gridListValue = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);		// 받아온 모든 데이터
+
+				// 받아온 data for
+				for(let j = 0 ; j < gridListValue.length ; j++) {
+					// 동일한 data는 추가하지 않음
+					if(gridListValue[j].supplyCompCd == result[i].supplyCompCd) {	addChk = false;	}		// 중복체크
+				}
+
+				// 중복되지 않은 데이터 리스트에 추가
+				if(addChk) {	gagaAgGrid.addRowData(gridOptionsFGCompanyList, result[i], "supplyCompCd");	}
+			}
+		};
+
+		// 브랜드 설정 / 브랜드 추가 콜백함수 (단수로 가져오므로 복수일 경우에 수정 확인 필요)
+		var fnSetPopupBrandInfo = function(result) {
+			for(let i = 0 ; i < result.length ; i++) {
+				let addChk = true, gridListValue = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);		// 받아온 모든 데이터
+
+				// 받아온 data for
+				for(let j = 0 ; j < gridListValue.length ; j++) {
+					if(gridListValue[j].brandCd == result[i].brandCd) {	addChk = false;	}					// 중복체크
+				}
+
+				// 중복되지 않은 데이터 리스트에 추가
+				if(addChk) {	gagaAgGrid.addRowData(gridOptionsFGBrandList, result[i], "brandCd");	}
+			}
+		};
+
+		// 분담업체율 설정 / 업체 추가 콜백함수
+		var fnSetPopupApplyBurdenInfo = function(result) {
+			// 기존 리스트 데이터 for
+			for(let i = 0 ; i < result.length ; i++) {
+				console.log('old i::'+i+"::"+result[i].supplyCompCd);
+				let addChk = true, gridListValue = gagaAgGrid.getAllRowData(gridOptionsApplyBurdenList);		// 받아온 모든 데이터
+
+				// 받아온 data for
+				for(let j = 0 ; j < gridListValue.length ; j++) {
+					console.log('new add j::'+j+":supplyCompCd:"+gridListValue[j].tmtbSupplyCd);
+					// 동일한 data는 추가하지 않음
+					if(gridListValue[j].tmtbSupplyCd == result[i].supplyCompCd) {	addChk = false;	}		// 중복체크
+				}
+
+				// 중복되지 않은 데이터 리스트에 추가
+				if(addChk) {
+					//gagaAgGrid.addRowData(gridOptionsApplyBurdenList, result[i], "tmtbSupplyCd");
+					console.log('add compCd>>'+result[i].supplyCompCd);
+					console.log('add useYn>>'+result[i].useYn);
+					gagaAgGrid.addRowData(gridOptionsApplyBurdenList, {"tmtbSupplyCd" : result[i].supplyCompCd, "useYn" : result[i].useYn});
+				}
+			}
+		};
+
+		// 적용 상품 리스트 콜백함수
+		var fnSetPopupApplyGoodsInfo = function(result) {
+			gridAddGoodsList(gridOptionsFGApplyGoodsList, result);
+		};
+
+		// 제외 상품 리스트 콜백함수
+		var fnSetPopupExceptGoodsInfo = function(result) {
+			gridAddGoodsList(gridOptionsFGExceptGoodsList, result);
+		};
+
+
+		// ag-grid 상품관련 list 콜백함수
+		function gridAddGoodsList(OriginGridListOption, result) {
+			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(addChk) {	gagaAgGrid.addRowData(OriginGridListOption, result[i], "goodsCd");	}
+			}
+		}
+
+		// 공급업체 설정 업체 추가 버튼 클릭시
+		$('#moreBetterForm #btnAddCompany').on('click', function() {
+			cfnOpenCompanyListPopup("fnSetPopupComapnyInfo");
+		});
+
+		// 브랜드 추가 버튼 클릭시 (복수 브랜드때 수정 필요)
+		$('#moreBetterForm #btnAddBrand').on('click', function() {
+			cfnOpenBrandListPopup("fnSetPopupBrandInfo", "M");
+		});
+
+		// 적용 상품 추가 버튼 클릭시
+		$('#moreBetterForm #btnAddApplyGoods').on('click', function() {
+			cfnOpenGoodsPopup("fnSetPopupApplyGoodsInfo");
+		});
+		// 제외 상품 추가 버튼 클릭시
+		$('#moreBetterForm #btnAddExceptGoods').on('click', function() {
+			cfnOpenGoodsPopup("fnSetPopupExceptGoodsInfo");
+		});
+		// 업체분담율 추가 버튼 클릭시
+		$('#moreBetterForm #btnAddApplyBurden').on('click', function() {
+			//cfnOpenApplyBurdenPopup("fnSetPopupApplyBurdenInfo");
+			cfnOpenCompanyListPopup("fnSetPopupApplyBurdenInfo");
+		});
+
+		// 공급업체 설정 선택삭제 버튼 클릭시
+		$('#moreBetterForm #btnDeleteCompany').on('click', function() {
+			gridOptionsFGCompanyList.api.updateRowData({remove:gagaAgGrid.selectedRowData(gridOptionsFGCompanyList)});
+		});
+		// 브랜드 설정 선택삭제 버튼 클릭시
+		$('#moreBetterForm #btnDeleteBrand').on('click', function() {
+			gridOptionsFGBrandList.api.updateRowData({remove:gagaAgGrid.selectedRowData(gridOptionsFGBrandList)});
+		});
+		// 적용상품 선택삭제 버튼 클릭시
+		$('#moreBetterForm #btnDeleteApplyGoods').on('click', function() {
+			gridOptionsFGApplyGoodsList.api.updateRowData({remove:gagaAgGrid.selectedRowData(gridOptionsFGApplyGoodsList)});
+		});
+		// 제외상품 선택삭제 버튼 클릭시
+		$('#moreBetterForm #btnDeleteExtGoods').on('click', function() {
+			gridOptionsFGExceptGoodsList.api.updateRowData({remove:gagaAgGrid.selectedRowData(gridOptionsFGExceptGoodsList)});
+		});
+		// 업체분담율 선택삭제 버튼 클릭시
+		$('#moreBetterForm #btnDelApplyBurden').on('click', function() {
+			gridOptionsApplyBurdenList.api.updateRowData({remove:gagaAgGrid.selectedRowData(gridOptionsApplyBurdenList)});
+		});
+
+		//패널영역 줄이기
+		$(document).on("click",".panelControl .inner-fa-chevron-up", function() {
+			$(this).parent().parent().parent().find(".inner-panelContent").slideUp(100);
+			$(this).attr("class","fa inner-fa-chevron-down");
+		});
+		//패널영역 펼치기
+		$(document).on("click",".panelControl .inner-fa-chevron-down", function() {
+			$(this).parent().parent().parent().find(".inner-panelContent").slideDown(100);
+			$(this).attr("class","fa inner-fa-chevron-up");
+		});
+
+		// 창 닫기
+		var fnMorebetterFormClose = function(){
+			uifnPopupClose('popupMorebetterReg');
+		}
+
+		// 행추가
+		$('#btnAddSectionRow').on('click', function() {
+			var tmtbSq = $('#moreBetterForm input[name=disTmtbSq]').val();
+			var sectionGbValue = $('input:radio[name="sectionGb"]:checked').val();
+			var dcWayValue = $('input:radio[name="dcWay"]:checked').val();
+
+			var data = { tmtbSq: tmtbSq ,sectionGb: sectionGbValue, sectionVal: null, dcWay: dcWayValue, dcVal: null };
+			gagaAgGrid.addRowData(gridOptionsSectionGbList, data, "sectionVal");
+		});
+
+		// 행삭제
+		$('#btnDelSectionRow').on('click', function() {
+			var selectedData = gridOptionsSectionGbList.api.getSelectedRows();
+			var removedData = gagaAgGrid.removeRowData(gridOptionsSectionGbList);
+
+			if (selectedData.length == 0) {
+				mcxDialog.alert('선택된 행이 없습니다.');
+				return;
+			}
+
+			if (removedData.length > 0) {
+
+				mcxDialog.confirm('삭제하시겠습니까?', {
+					cancelBtnText: "취소",
+					sureBtnText: "확인",
+					sureBtnClick: function(){
+						var deleteData = [];
+
+						$.each(removedData, function(idx, item) {
+							deleteData.push(item);
+						});
+
+						var jsonData = JSON.stringify(deleteData);
+						gagajf.ajaxJsonSubmit('/morebetter/sectionVal/delete', jsonData, fnSearch);
+					}
+				});
+			}
+		});
+
+		// 할인구간 선택 시 기본 조건 변경
+		$("#moreBetterForm input[name=sectionGb]").bind('click change', function () {
+			var sectionGbValue = $(this).val();
+			var dcWayValue = $('input:radio[name="dcWay"]:checked').val();
+			var loopRowData = gagaAgGrid.getAllRowData(gridOptionsSectionGbList);
+
+			if (loopRowData.length == 0) {
+				mcxDialog.alert('ROW 데이터가 없습니다.');
+				return;
+			}
+
+			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);
+		});
+
+		// 할인구분 선택 시 기본 조건 변경
+		$("#moreBetterForm input[name=dcWay]").bind('click change', function () {
+			var sectionGbValue = $('input:radio[name="sectionGb"]:checked').val();
+			var dcWayValue = $(this).val();
+			var loopRowData = gagaAgGrid.getAllRowData(gridOptionsSectionGbList);
+
+			if (loopRowData.length == 0) {
+				mcxDialog.alert('ROW 데이터가 없습니다.');
+				return;
+			}
+
+			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);
+		});
+
+		$(document).ready(function() {
+
+		});
+	</script>
+</html>