Merge branch 'develop' into bin2107

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

@@ -166,6 +166,14 @@ public interface TsaBusinessDao {
 	 */
 	void saveBrandSite(SiteBrand siteBrand);
 
+	/**
+	 * 브랜드 공급업체 목록
+	 * @param brandCd - 브랜드코드
+	 * @author eskim
+	 * @since 2021. 01. 21
+	 */
+	Collection<SiteBrand> getBrandSupplyList(String brandCd);
+
 	/**
 	 * 브랜드 등록
 	 * @param brand - 브랜드 정보
@@ -182,6 +190,14 @@ public interface TsaBusinessDao {
 	 */
 	void updateBrand(Brand brand);
 
+	/**
+	 * 브랜드별 업체 정보 저장
+	 * @param brand - 브랜드 정보
+	 * @author eskim
+	 * @since 2021. 01. 22
+	 */
+	void saveBrandSupply(Brand brandSupply);
+
 	/**
 	 * 출고처관리 저장
 	 * @param delvLoc - 출고처 정보

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

@@ -1,6 +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.Customer;
 import com.style24.persistence.domain.CustomerSearch;
 import com.style24.persistence.domain.Delivery;
@@ -82,6 +83,16 @@ public interface TsaCustomerDao {
 	 */
 	void saveCustomerDeliveryAddr(Delivery delivery);
 
+	/**
+	 * 회원상세-쿠폰내역
+	 *
+	 * @param custNo -고객일련번호
+	 * @return Collection<Coupon>
+	 * @author jsshin
+	 * @since 2021. 01. 21
+	 */
+	Collection<Coupon> getCustomerCouponList(Integer custNo);
+
 	/**
 	 * 탈퇴회원 목록
 	 * @param customerSearch - 검색조건
@@ -102,4 +113,5 @@ public interface TsaCustomerDao {
 
 	void createException();
 
+
 }

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

@@ -10,6 +10,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.style24.admin.biz.dao.TsaBusinessDao;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.support.message.TscMessageByLocale;
@@ -230,6 +232,17 @@ public class TsaBusinessService {
 		}
 	}
 
+	/**
+	 * 브랜드 공급업체 목록
+	 * @param brandCd - 브랜드코드
+	 * @author eskim
+	 * @since 2021. 01. 21
+	 */
+	public Collection<SiteBrand> getBrandSupplyList(String brandCd) {
+		return businessDao.getBrandSupplyList(brandCd);
+	}
+
+
 	/**
 	 * 브랜드 등록/수정
 	 * @param brand - 브랜드 정보
@@ -265,11 +278,33 @@ public class TsaBusinessService {
 
 		}
 
+		// eskim
+		Collection<Brand> brandSupplyList = null;
+		ObjectMapper mapper = new ObjectMapper();
+
+		try {
+			if (brand.getBrandSupplyListInfo() != null) {
+				brandSupplyList = mapper.readValue(brand.getBrandSupplyListInfo(), new TypeReference<Collection<Brand>>() {
+				});
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
 		if (brand.getMode().equals("N")) { // 신규
 			businessDao.createBrand(brand);
 		} else { // 수정
 			businessDao.updateBrand(brand);
 		}
+
+		if (brandSupplyList != null && !brandSupplyList.isEmpty()) {
+			for(Brand brandSupply: brandSupplyList){
+				brandSupply.setRegNo(TsaSession.getInfo().getUserNo());
+				brandSupply.setBrandCd(brand.getBrandCd());
+				businessDao.saveBrandSupply(brandSupply);
+			}
+
+		}
 	}
 
 	/**

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

@@ -4,6 +4,7 @@ import com.style24.admin.biz.dao.TsaCustomerDao;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.biz.dao.TscCustomerDao;
 import com.style24.core.biz.service.TscCustomerService;
+import com.style24.persistence.domain.Coupon;
 import com.style24.persistence.domain.Customer;
 import com.style24.persistence.domain.CustomerSearch;
 import com.style24.persistence.domain.Delivery;
@@ -122,6 +123,17 @@ public class TsaCustomerService {
 		customerDao.saveCustomerDeliveryAddr(delivery);
 	}
 
+	/**
+	 * 회원상세-쿠폰내역
+	 *
+	 * @param custNo -고객일련번호
+	 * @return Collection<Coupon>
+	 * @author jsshin
+	 * @since 2021. 01. 21
+	 */
+	public Collection<Coupon> getCustomerCouponList(Integer custNo) {
+		return customerDao.getCustomerCouponList(custNo);
+	}
 
 	/**
 	 * 탈퇴회원 목록
@@ -146,4 +158,5 @@ public class TsaCustomerService {
 	}
 
 
+
 }

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

@@ -1501,7 +1501,7 @@ public class TsaGoodsService {
 		float pntPrate = 0f;
 		float pntMrate = 0f;
 		float sellFeeRate = 0f;
-		String delvFeeCd = "";
+		//String delvFeeCd = "";
 		for (Brand tmpBrand : brandList) {
 
 			if ("10".equals(regGoods.getFormalGb())) {
@@ -1512,9 +1512,9 @@ public class TsaGoodsService {
 				pntMrate = tmpBrand.getPntMrate20();
 			}
 			sellFeeRate = tmpBrand.getSellFeeRate();
-			delvFeeCd = tmpBrand.getDelvFeeCd();
+			//delvFeeCd = tmpBrand.getDelvFeeCd();
 		}
-		regGoods.setDelvFeeCd(delvFeeCd);// 배송비전책코드
+		//regGoods.setDelvFeeCd(delvFeeCd);// 배송비전책코드
 		regGoods.setPntPrate(pntPrate); // 포인트적립율(PC)
 		regGoods.setPntMrate(pntMrate); // 포인트적립율(MOBILE)
 		regGoods.setSellFeeRate(sellFeeRate); // 판매수수료율
@@ -2300,8 +2300,6 @@ public class TsaGoodsService {
 
 			// 판매가 변경
 			if (goodsPriceRes.getResGoodsPrice() > 0) {
-				log.info("goodsPriceRes.getTagPrice() ={}", goodsPriceRes.getListPrice());
-				log.info("goodsPriceRes.getResGoodsPrice() ={}", goodsPriceRes.getResGoodsPrice());
 				goods.setDcRate((int)(this.getDcRate(goodsPriceRes.getListPrice(), goodsPriceRes.getResGoodsPrice())));
 				goods.setCurrBprice(goodsPriceRes.getCurrPrice());
 				goods.setCurrPrice(goodsPriceRes.getResGoodsPrice());
@@ -2309,7 +2307,7 @@ public class TsaGoodsService {
 			}
 
 			// 판매수수료율 변경
-			if (goodsPriceRes.getSellFeeRate() != null) {
+			if (Float.compare(goodsPriceRes.getSellFeeRate(), 0) > 0) {
 				goods.setSellFeeRate(goodsPriceRes.getSellFeeRate());
 				goodsDao.updateSellFeeRate(goods);
 			}

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

@@ -164,6 +164,7 @@ public class TsaBusinessController extends TsaBaseController {
 	@PostMapping("/supply/company/list")
 	@ResponseBody
 	public Collection<SupplyCompany> getSupplyCompanyList(@RequestBody SupplyCompany supplyComp) {
+		log.info("supplyComp={}", supplyComp);
 		return businessService.getSupplyCompanyList(supplyComp);
 	}
 
@@ -403,6 +404,19 @@ public class TsaBusinessController extends TsaBaseController {
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 
+	/**
+	 * 브랜드 공급업체 목록
+	 * @param brandCd - 브랜드코드
+	 * @return
+	 * @author eskim
+	 * @since 2021. 01. 21
+	 */
+	@GetMapping("/brand/supply/list/{brandCd}")
+	@ResponseBody
+	public Collection<SiteBrand> getBrandSupplyList(@PathVariable String brandCd) {
+		return businessService.getBrandSupplyList(brandCd);
+	}
+
 	/**
 	 * 브랜드 등록/수정 처리
 	 * @param brand - 브랜드 정보
@@ -696,7 +710,7 @@ public class TsaBusinessController extends TsaBaseController {
 	@GetMapping("/comapny/search/form")
 	public ModelAndView companySearchForm(SupplyCompany company) {
 		ModelAndView mav = new ModelAndView();
-
+		log.info("company={}", company);
 		mav.addObject("params", company);
 		mav.setViewName("business/SupplyCompanyPopupForm");
 		return mav;

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

@@ -8,6 +8,7 @@ import com.style24.admin.biz.service.TsaKakaoService;
 import com.style24.admin.biz.service.TsaSystemService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.session.TscSession;
+import com.style24.core.support.util.CryptoUtils;
 import com.style24.persistence.domain.Coupon;
 import com.style24.persistence.domain.Customer;
 import com.style24.persistence.domain.CustomerSearch;
@@ -642,6 +643,20 @@ public class TsaCustomerController extends TsaBaseController {
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 
+	/**
+	 * 회원상세-쿠폰내역
+	 *
+	 * @param custNo -고객일련번호
+	 * @return Collection<Coupon>
+	 * @author jsshin
+	 * @since 2021. 01. 21
+	 */
+	@GetMapping("/coupon/list/{custNo}")
+	@ResponseBody
+	public Collection<Coupon> getCustomerCouponList(@PathVariable Integer custNo) {
+		return customerService.getCustomerCouponList(custNo);
+	}
+
 	/**
 	 * 회원상세-1:1문의내역
 	 *
@@ -689,20 +704,6 @@ public class TsaCustomerController extends TsaBaseController {
 		return mav;
 	}
 
-	/**
-	 * 회원상세-쿠폰내역
-	 *
-	 * @param custNo -고객일련번호
-	 * @return Collection<Coupon>
-	 * @author jsshin
-	 * @since 2021. 01. 21
-	 */
-	@GetMapping("/coupon/list/{custNo}")
-	@ResponseBody
-	public Collection<Coupon> getCustomerCouponList(@PathVariable Integer custNo) {
-		//return customerService.getCustomerCouponList(custNo);
-		return null;
-	}
 
 	/**
 	 * 회원상세-포인트

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

@@ -1,5 +1,7 @@
 package com.style24.persistence.domain;
 
+import java.util.Collection;
+
 import com.style24.persistence.TscBaseDomain;
 
 import lombok.Data;
@@ -27,9 +29,9 @@ public class Brand extends TscBaseDomain {
 	private String delvLocNm;		// 출고처명
 	private String erpBrandCd;		// ERP브랜드코드
 	private String selfYn;			// 자사여부(Y:자사, N:입점)
-	private String delvFeeCd;		// 배송비정책코드
-	private int delvFee;			// 기본배송비
-	private int minOrdAmt;			// 무료배송비최소주문금액
+//	private String delvFeeCd;		// 배송비정책코드
+//	private int delvFee;			// 기본배송비
+//	private int minOrdAmt;			// 무료배송비최소주문금액
 	private float sellFeeRate;		// 판매수수료율
 	private float pntPrate10;		// 포인트적립율(PC정상)
 	private float pntMrate10;		// 포인트적립율(모바일정상)
@@ -43,6 +45,9 @@ public class Brand extends TscBaseDomain {
 
 	private String newSysFileNm;	//신규이미지파일명
 
+	private String brandSupplyListInfo;	//브래드의 업체정보
+	private Collection<Brand> brandSupplyList; // 고시항목
+
 	// 검색조건
 	private String searchTxt;		// 검색어
 	private String callbackFn;		// 콜백함수

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

@@ -18,7 +18,7 @@ public class GoodsPriceRes extends TscBaseDomain {
 	private String goodsCd;
 	private int resGoodsPrice;
 	private int endGoodsPrice;
-	private Float sellFeeRate;
+	private float sellFeeRate;
 	private String applyStdt;
 	private String applyEddt;
 	private String cfrmYn;

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

@@ -163,6 +163,16 @@
 		<if test="supplyCompCd != null and supplyCompCd != ''"> <!-- 브랜드관리 화면에서 사용 -->
 		AND    SC.SUPPLY_COMP_CD = #{supplyCompCd}
 		</if>
+		<if test='selfYn != null and (selfYn == "Y" or selfYn == "N")'>
+		<choose>
+		    <when test='selfYn  == "Y"'>
+		AND    SC.DISTRIBUTION_GB IN ('G065_10','G065_11','G065_12') 
+		    </when>
+		    <otherwise>
+		AND    SC.DISTRIBUTION_GB IN ('G065_20')
+		    </otherwise>
+		</choose>
+		</if>
 	</select>
 	
 	<!-- 공급업체 생성 -->
@@ -467,13 +477,13 @@
 		     , A.DISP_NM_LANG                /*노출명언어*/
 		     , A.RGB_CD                      /*RGB코드*/
 		     , A.DISTRIBUTION_GB             /*유통구분*/
-		     , A.SUPPLY_COMP_CD              /*업체코드*/
+		     -- , A.SUPPLY_COMP_CD              /*업체코드*/
 		     , B.SUPPLY_COMP_NM              /*업체명*/
-		     , A.DELV_LOC_CD                 /*출고처코드*/
+		     -- , A.DELV_LOC_CD                 /*출고처코드*/
 		     , C.DELV_LOC_NM                 /*출고처명*/
 		     , A.ERP_BRAND_CD                /*ERP브랜드코드*/
 		     , A.SELF_YN                     /*자사여부*/
-		     , A.DELV_FEE_CD                 /*배송비정책코드*/
+		     -- , A.DELV_FEE_CD                 /*배송비정책코드*/
 		     , A.SELL_FEE_RATE               /*판매수수료율*/
 		     , A.USE_YN                      /*사용여부*/
 		     , A.PNT_PRATE10                 /*포인트적립율(PC)*/
@@ -482,13 +492,13 @@
 		     , A.PNT_MRATE20                 /*포인트적립율(모바일)*/
 		     , A.LOGO_FILE_NM                 /*로고파일명*/
 		     , A.DISP_ORD                    /*표시순서*/
-		     , D.MIN_ORD_AMT                 /*무료배송최소금액*/
-		     , D.DELV_FEE                    /*배송비*/
+		    -- , D.MIN_ORD_AMT                 /*무료배송최소금액*/
+		    -- , D.DELV_FEE                    /*배송비*/
 		FROM   TB_BRAND A
 		INNER JOIN TB_SUPPLY_COMPANY B ON A.SUPPLY_COMP_CD = B.SUPPLY_COMP_CD
 		LEFT OUTER JOIN TB_DELIVERY_LOC C ON A.DELV_LOC_CD = C.DELV_LOC_CD
-		LEFT OUTER JOIN TB_DELV_FEE_POLICY D ON A.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
-		                                  AND A.DELV_FEE_CD =  D.DELV_FEE_CD
+		-- LEFT OUTER JOIN TB_DELV_FEE_POLICY D ON A.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
+		--                                  AND A.DELV_FEE_CD =  D.DELV_FEE_CD
 		WHERE  1 = 1
 		<if test='supplyCompCd != null and supplyCompCd != ""'>
 		AND    A.SUPPLY_COMP_CD = #{supplyCompCd}
@@ -623,8 +633,22 @@
 		     , UPD_DT = NOW()
 	</insert>
 	
+	<!-- 브랜드 공급업체 목록 -->
+	<select id="getBrandSupplyList" parameterType="String" resultType="Brand">
+		/* TsaBusiness.getBrandSupplyList */
+		SELECT A.BRAND_CD
+		     , A.SUPPLY_COMP_CD
+		     , B.SUPPLY_COMP_NM
+		     , 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_BRAND_SUPPLY A
+		INNER JOIN TB_SUPPLY_COMPANY B ON A.SUPPLY_COMP_CD = B.SUPPLY_COMP_CD
+		WHERE  BRAND_CD = #{brandCd}
+	</select>
+	
 	<!-- 브랜드 등록 -->
-	<insert id="createBrand" parameterType="Brand">
+	<insert id="createBrand" parameterType="Brand" keyProperty="brandCd">
 		/* TsaBusiness.createBrand */
 		INSERT INTO TB_BRAND (
 		       BRAND_CD
@@ -633,12 +657,9 @@
 		     , BRAND_GRP_NM
 		     , DISP_NM_LANG
 		     , RGB_CD
-		     , SUPPLY_COMP_CD
 		     , DISTRIBUTION_GB
 		     , SELF_YN
 		     , ERP_BRAND_CD
-		     , DELV_FEE_CD
-		     , DELV_LOC_CD
 		     , SELL_FEE_RATE
 		     , PNT_PRATE10
 		     , PNT_MRATE10
@@ -663,14 +684,11 @@
 		     , #{brandGrpNm}
 		     , #{dispNmLang}
 		     , #{rgbCd}
-		     , #{supplyCompCd}
 		     , #{distributionGb}
 		     , CASE WHEN #{distributionGb} IN ('G065_10','G065_11','G065_12') THEN 'Y'
 		            ELSE 'N'
 		       END
 		     , #{erpBrandCd}
-		     , #{delvFeeCd}
-		     , #{delvLocCd}
 		     , IFNULL(#{sellFeeRate},0)
 		     , IFNULL(#{pntPrate10},0)
 		     , IFNULL(#{pntMrate10},0)
@@ -701,14 +719,11 @@
 		     , BRAND_GRP_NM = #{brandGrpNm}
 		     , DISP_NM_LANG = #{dispNmLang}
 		     , RGB_CD = #{rgbCd}
-		     , SUPPLY_COMP_CD = #{supplyCompCd}
 		     , DISTRIBUTION_GB = #{distributionGb}
 		     , SELF_YN = CASE WHEN #{distributionGb} IN ('G065_10','G065_11','G065_12') THEN 'Y'
 		                      ELSE 'N'
 		                 END
 		     , ERP_BRAND_CD = #{erpBrandCd}
-		     , DELV_FEE_CD = #{delvFeeCd}
-		     , DELV_LOC_CD = #{delvLocCd}
 		     , SELL_FEE_RATE = IFNULL(#{sellFeeRate},0)
 		     , PNT_PRATE10 = IFNULL(#{pntPrate10},0)
 		     , PNT_MRATE10 = IFNULL(#{pntMrate10},0)
@@ -722,6 +737,25 @@
 		WHERE  BRAND_CD = #{brandCd}
 	</insert>
 	
+	<!-- 브랜드별 업체 정보 저장 -->
+	<insert id="saveBrandSupply" parameterType="Brand">
+		/* TsaBusiness.saveBrandSupply */
+		INSERT INTO TB_BRAND_SUPPLY ( 
+		    BRAND_CD
+		  , SUPPLY_COMP_CD
+		  , REG_NO
+		  , REG_DT
+		)
+		VALUES
+		(   #{brandCd}
+		  , #{supplyCompCd}
+		  , #{regNo}
+		  , NOW()
+		)
+		ON DUPLICATE KEY UPDATE
+		     SUPPLY_COMP_CD = #{supplyCompCd} -- 무의미한 데이터
+	</insert>
+	
 	<!-- 재고연계관리 - 출고처 목록 -->
 	<select id="getStockSyncDeliveryLocList" parameterType="DeliveryLoc" resultType="DeliveryLoc">
 		/* TsaBusiness.getStockSyncDeliveryLocList */

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

@@ -196,8 +196,8 @@
 		                    END,
 		     SMS_AGREE_YN = #{smsAgreeYn},
 		    </if>
-		    <if test="homePostNo != null and homePostNo != ''">
-		     HOME_POST_NO = #{homePostNo},
+		    <if test="homeZipNo != null and homeZipNo != ''">
+		     HOME_POST_NO = #{homeZipNo},
 		    </if>
 		    <if test="homeBaseAddr != null and homeBaseAddr != ''">
 		     HOME_BASE_ADDR = #{homeBaseAddr},
@@ -256,18 +256,23 @@
 		     , C.CUST_NO
 		     , DA.RECIP_NM
 		FROM   TB_CUSTOMER C
-		     , TB_ORDER O
-		     , TB_ORDER_DETAIL OD
-		     , TB_ORDER_DETAIL_ITEM ODI
-		     , TB_GOODS E
-		     , TB_DELIVERY_ADDR DA
-		WHERE  C.CUST_NO = O.CUST_NO
-		AND    O.ORD_NO = OD.ORD_NO
-		AND    OD.ORD_NO = ODI.ORD_NO
+		INNER JOIN
+		       TB_ORDER O
+		ON     C.CUST_NO = O.CUST_NO
+		INNER JOIN
+		       TB_ORDER_DETAIL OD
+		ON     O.ORD_NO = OD.ORD_NO
+		INNER JOIN
+		       TB_ORDER_DETAIL_ITEM ODI
+		ON     OD.ORD_NO = ODI.ORD_NO
 		AND    OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		AND    OD.GOODS_CD = E.GOODS_CD
-		AND    OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
-		AND    C.CUST_NO = #{custNo}
+		INNER JOIN
+		       TB_GOODS E
+		ON     OD.GOODS_CD = E.GOODS_CD
+		INNER JOIN
+		       TB_DELIVERY_ADDR DA
+		ON     OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
+		WHERE  C.CUST_NO = #{custNo}
 		ORDER BY O.ORD_NO DESC, OD.ORD_DTL_NO
 	</select>
 
@@ -283,6 +288,7 @@
 		     , CDA.RECIP_NM
 		     , CDA.RECIP_PHNNO
 		     , CDA.RECIP_TELNO
+		     , CDA.RECIP_ZIP_NO
 		     , CDA.RECIP_BASE_ADDR
 		     , CDA.RECIP_DTL_ADDR
 		     , CDA.DEL_YN
@@ -291,9 +297,10 @@
 		     , FN_GET_USER_NM(CDA.UPD_NO)              AS UPD_NM
 		     , DATE_FORMAT(CDA.UPD_DT, '%Y%m%d%H%i%S') AS UPD_DT
 		FROM   TB_CUSTOMER C
-		     , TB_CUST_DELIVERY_ADDR CDA
-		WHERE  C.CUST_NO = CDA.CUST_NO
-		AND    C.CUST_NO = #{custNo}
+		INNER JOIN
+		       TB_CUST_DELIVERY_ADDR CDA
+		ON     C.CUST_NO = CDA.CUST_NO
+		WHERE  C.CUST_NO = #{custNo}
 	</select>
 
 	<!-- 주소정보 - 기본배송지 초기화 -->
@@ -329,7 +336,7 @@
 		VALUES (
 		       #{custNo}
 		     , #{delvAddrNm}
-		     , #{defaultYn}
+		     , IFNULL(#{defaultYn}, 'N')
 		     , #{recipNm}
 		     , #{recipPhnno}
 		     , #{recipTelno}
@@ -337,7 +344,7 @@
 		     , #{recipBaseAddr}
 		     , #{recipDtlAddr}
 		     , #{delvMemo}
-		     , #{delYn}
+		     , IFNULL(#{delYn}, 'N')
 		     , #{regNo}
 		     , NOW()
 		     , #{updNo}
@@ -357,6 +364,68 @@
 		     , UPD_DT = NOW()
 	</update>
 
+	<!--회원 쿠폰내역  -->
+	<select id="getCustomerCouponList" parameterType="Integer" resultType="Coupon">
+		/* TsaCustomer.getCustomerCounponList */
+		WITH TAB1 AS (
+		              SELECT O.ORD_NO             AS ORD_NO
+		                   , MAX(OD.GOODS_CPN_SQ) AS GOODS_CPN_SQ
+		                   , MAX(OD.CART_CPN_SQ)  AS CART_CPN_SQ
+		                   , MAX(OD.CPN1_CPN_SQ)  AS CPN1_CPN_SQ
+		              FROM   TB_ORDER O
+		              INNER JOIN
+		                     TB_ORDER_DETAIL OD
+		              ON     O.ORD_NO = OD.ORD_NO
+		              WHERE  O.CUST_NO = #{custNo}
+		              GROUP BY O.ORD_NO
+		)
+		, TAB2 AS (
+		           SELECT ORD_NO
+		                , CPN1_CPN_SQ AS CPN_SQ
+		           FROM   TAB1
+		           WHERE  CPN1_CPN_SQ > 0
+		           AND    CPN1_CPN_SQ IS NOT NULL
+		           UNION ALL
+		           SELECT ORD_NO
+		                , GOODS_CPN_SQ AS CPN_SQ
+		           FROM   TAB1
+		           WHERE  GOODS_CPN_SQ > 0
+		           AND    GOODS_CPN_SQ IS NOT NULL
+		           UNION ALL
+		           SELECT ORD_NO
+		                , CART_CPN_SQ AS CPN_SQ
+		           FROM   TAB1
+		           WHERE  CART_CPN_SQ > 0
+		           AND    CART_CPN_SQ IS NOT NULL
+		)
+		SELECT C.SITE_CD
+		     , CC.CUST_CPN_SQ
+		     , CC.CUST_NO
+		     , C.CPN_ID
+		     , C.CPN_NM
+		     , DATE_FORMAT(CC.AVAIL_STDT, '%Y%m%d%H%i%S')             AS AVAIL_STDT
+		     , DATE_FORMAT(CC.AVAIL_EDDT, '%Y%m%d%H%i%S')             AS AVAIL_EDDT
+		     , CC.PUB_REASON
+		     , CC.PUB_REASON_DTL
+		     , DATE_FORMAT(CC.USED_DT, '%Y%m%d%H%i%S')               AS USED_DT
+		     , FN_GET_USER_NM(CC.REG_NO)                             AS REG_NM
+		     , FN_GET_USER_NM(CC.UPD_NO)                             AS USER_NM
+		     , DATE_FORMAT(CC.REG_DT, '%Y%m%d%H%i%S')                AS REG_DT
+		     , E.ORD_NO
+		FROM   TB_COUPON C
+		INNER JOIN
+		       TB_CUST_COUPON CC
+		ON     C.CPN_ID = CC.CPN_ID
+		INNER JOIN
+		       TB_CUSTOMER CU
+		ON     CC.CUST_NO = CU.CUST_NO
+		LEFT OUTER JOIN
+		       TAB2 E
+		ON     CC.CUST_CPN_SQ = E.CPN_SQ
+		WHERE  CC.CUST_NO = #{custNo}
+		ORDER BY E.ORD_NO DESC, CC.REG_DT DESC
+	</select>
+
 	<!-- 탈퇴회원목록 -->
 	<select id="getCustomerSecedeList" parameterType="CustomerSearch" resultType="Customer">
 		/* TsaCustomer.getSecedeCustomerList */

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

@@ -911,8 +911,10 @@
 		     , FN_GET_USER_NM(G.UPD_NO) AS UPD_NM
 		     , E.CERT_NUM
 		     , E.CERT_DT
+		     , C.SUPPLY_VENDOR_CD
 		FROM TB_GOODS G
 		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
+		INNER JOIN TB_SUPPLY_COMPANY C ON G.SUPPLY_COMP_CD = C.SUPPLY_COMP_CD 
 		LEFT OUTER JOIN TB_DELV_FEE_POLICY D ON G.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
 		                                     AND G.DELV_FEE_CD =  D.DELV_FEE_CD
 		LEFT OUTER JOIN TB_GOODS_SAFE_NO E ON G.GOODS_CD = E.GOODS_CD

src/main/webapp/WEB-INF/views/business/BrandForm.html

@@ -97,7 +97,7 @@
 		<div class="panelStyle">
 			<form id="detailForm" name="detailForm" action="#" th:action="@{'/business/brand/save'}">
 				<input type="hidden" name="mode" value="N"/>
-				
+				<input type="hidden" name="brandSupplyListInfo" />
 				<table class="frmStyle" aria-describedby="등록/수정 폼">
 					<colgroup>
 						<col style="width:10%;"/>
@@ -132,19 +132,20 @@
 							<label class="rdoBtn"><input type="radio" name="dispNmLang" value="KR">국문</label>
 						</td>
 					</tr>
-					<tr>	
+					<tr>
+					<!--	
 						<th>공급업체<i class="required" title="필수"></i></th>
 						<td>
-
-<!-- 							<select name="supplyCompCd" required="required" data-valid-name="공급업체">
-								<option value="">[선택]</option>
-							</select>
- -->							
 							<input type="text" class="w100" name="searchTxt" id="searchTxt" maxlength="20" />
 							<button type="button" class="btn icn" id="btnSearchSupplyComp"><i class="fa fa-search"></i></button>
 							<input type="text" class="w100" name="supplyCompNm" readonly="readonly"/>
 							<input type="hidden" class="w100" name="supplyCompCd" />
 						</td>
+					-->	
+						<th>판매수수료율<i class="required" title="필수"></i></th>
+						<td>
+							<input type="text" class="w100 aR" name="sellFeeRate" value="0" maxlength="3" required="required" data-valid-name="판매수수료율" data-valid-type="real"/>%
+						</td>
 						<th>유통구분<i class="required" title="필수"></i></th>
 						<td>
 							<select name="distributionGb" required="required" data-valid-name="유통구분">
@@ -153,7 +154,7 @@
 							</select>
 						</td>
 					</tr>
-					<tr>	
+					<!--  <tr>	
 						<th>출고처<i class="required" title="필수"></i></th>
 						<td>
 							<select name="delvLocCd">
@@ -167,14 +168,7 @@
 							</select>
 							<span class="marL10 cRed"><i class="fa fa-info-circle" aria-hidden="true"></i> 변경된 배송정책은 이후 등록된 상품부터 적용됩니다.</span>
 						</td>
-					</tr>	
-					<tr>
-						<th>판매수수료율<i class="required" title="필수"></i></th>
-						<td>
-							<input type="text" class="w100 aR" name="sellFeeRate" value="0" maxlength="3" required="required" data-valid-name="판매수수료율" data-valid-type="real"/>%
-						</td>
-						<td colspan="2"></td>
-					</tr>
+					</tr>-->	
 					<tr>
 						<th>포인트적립율(PC정상)<i class="required" title="필수"></i></th>
 						<td>
@@ -209,12 +203,10 @@
 					</tr>
 					<tr>
 						<th>RGB코드</th>
-						<td>
+						<td  colspan="3">
 							<input type="text" class="w100 aR" name="rgbCd" maxlength="6" data-valid-name="REG코드" />
 							<span class="marL10 cRed"><i class="fa fa-info-circle" aria-hidden="true"></i> 브랜드메인 GBN 배경색으로 적용, 미 입력시 기본색상으로 설정됩니다.</span>
 						</td>
-						<td colspan="2">
-						</td>
 					</tr>
 					<tr id="brandImgArea" class="off">
 						<th>브랜드이미지</th>
@@ -256,11 +248,16 @@
 							<button type="button" class="btn btn-success btn-lg" id="btnSaveSiteBrand">전시사이트 수정</button>
 						</td>
 					</tr>
-					
-					
 				</table>
+				<div>
+					<ul class="panelBar">
+						<li class="left">
+							<button type="button" class="btn btn-base btn-lg" id="btnSearchSupplyComp">공급업체조회</button>
+						</li>
+					</ul>
+					<div id="gridList2" style="width: 100%; height: 200px" class="ag-theme-balham"></div>
+				</div>
 			</form>
-			
 			<!-- 버튼 배치 영역 -->
 			<ul class="panelBar">
 				<li class="right">
@@ -289,28 +286,28 @@
 		{headerName: "브랜드영문명", field: "brandEnm", width: 150, cellClass: 'text-center'},
 		{headerName: "브랜드국문명", field: "brandKnm", width: 150, cellClass: 'text-center'},
 		{headerName: "브랜드그룹명", field: "brandGrpNm", width: 150, cellClass: 'text-center'},
-		{
+		/*{
 			headerName: "공급업체", field: "supplyCompCd", width: 150, cellClass: 'text-center',
 			valueGetter: function (params) {
 				return gagaAgGrid.lookupValue(supplyCompList, params.data.supplyCompCd);
 			}
-		},
+		},*/
 		{
 			headerName: "유통구분", field: "distributionGb", width: 150, cellClass: 'text-center',
 			valueGetter: function (params) {
 				return gagaAgGrid.lookupValue(distributionGbList, params.data.distributionGb);
 			}
 		},
-		{headerName: "출고처코드", field: "delvLocCd", width: 120, cellClass: 'text-center'},
-		{headerName: "출고처명", field: "delvLocNm", width: 150, cellClass: 'text-center'},
+		/*{headerName: "출고처코드", field: "delvLocCd", width: 120, cellClass: 'text-center'},
+		{headerName: "출고처명", field: "delvLocNm", width: 150, cellClass: 'text-center'},*/
 		{headerName: "ERP브랜드코드", field: "erpBrandCd", width: 120, cellClass: 'text-center', hide: true},
-		{
+		/*{
 			headerName: "무료배송비기준",
 			children : [
 				{headerName: "기본배송비", field: "delvFee", width: 120, cellClass: 'text-center', valueFormatter: function(params) { return Number(params.value).addComma(); }},
 				{headerName: "최소주문금액", field: "minOrdAmt", width: 120, cellClass: 'text-center', valueFormatter: function(params) { return Number(params.value).addComma(); }}
 			]
-		},
+		},*/
 		{headerName: "판매수수료율(%)", field: "sellFeeRate", width: 150, cellClass: 'text-center'},
 		{
 			headerName: "포인트적립율(%)",
@@ -326,7 +323,16 @@
 		{headerName: "사용여부", field: "useYn", width: 80, cellClass: 'text-center'}
 	];
 
+	let columnDefs2 = [
+		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+		{headerName: "공급업체코드", field: "supplyCompCd", width: 150, cellClass: 'text-center'},
+		{headerName: "공급업체명", field: "supplyCompNm", width: 150}
+	];
+	
 	let gridOptions = gagaAgGrid.getGridOptions(columnDefs);
+	let gridOptions2 = gagaAgGrid.getGridOptions(columnDefs2);
+	
+	gridOptions2.rowSelection = "multiple";
 
 	// Cell click
 	gridOptions.onCellClicked = function(event) {
@@ -345,28 +351,28 @@
 		$("#detailForm input[name=brandGrpNm]").val(event.data.brandGrpNm);
 		$("#detailForm input[name=erpBrandCd]").val(event.data.erpBrandCd);
 		$("#detailForm select[name=distributionGb]").val(event.data.distributionGb);
-		$("#detailForm input[name=supplyCompCd]").val(event.data.supplyCompCd);
-		$("#detailForm input[name=supplyCompNm]").val(event.data.supplyCompNm);
+		//$("#detailForm input[name=supplyCompCd]").val(event.data.supplyCompCd);
+		//$("#detailForm input[name=supplyCompNm]").val(event.data.supplyCompNm);
 		//fnGetSupplyCompCdList(event.data.supplyCompCd, event.data.delvFeeCd);
 		
 		// 출고처 정보
-		$.getJSON('/renderer/delvloc/list/' + event.data.supplyCompCd
-			, function(delvLocList) {
-				$('#detailForm select[name=delvLocCd]').empty().append('<option value="">[선택]</option>');
-				$.each(delvLocList, function(idx, item) {
-					var optionHtml = '<option value="' + item.cd + '">[' + item.cd + '] '+ item.cdNm + '</option>\n';
-					$('#detailForm select[name=delvLocCd]').append(optionHtml);
-				});
-				
-				$("#detailForm select[name=delvLocCd]").val(event.data.delvLocCd);
-			}
-		);
+		//$.getJSON('/renderer/delvloc/list/' + event.data.supplyCompCd
+		//	, function(delvLocList) {
+		//		$('#detailForm select[name=delvLocCd]').empty().append('<option value="">[선택]</option>');
+		//		$.each(delvLocList, function(idx, item) {
+		//			var optionHtml = '<option value="' + item.cd + '">[' + item.cd + '] '+ item.cdNm + '</option>\n';
+		//			$('#detailForm select[name=delvLocCd]').append(optionHtml);
+		//		});
+		//		
+		//		$("#detailForm select[name=delvLocCd]").val(event.data.delvLocCd);
+		//	}
+		//);
 		
 		// 배송비 정책
-		cfnCreateCombo('/renderer/delvFee/list/' + event.data.supplyCompCd, $('#detailForm select[name=delvFeeCd]'), "[선택]", event.data.delvFeeCd);
+		//cfnCreateCombo('/renderer/delvFee/list/' + event.data.supplyCompCd, $('#detailForm select[name=delvFeeCd]'), "[선택]", event.data.delvFeeCd);
 		
-		$("#detailForm input[name=delvFee]").val(Number(event.data.delvFee).addComma());
-		$("#detailForm input[name=minOrdAmt]").val(Number(event.data.minOrdAmt).addComma());
+		//$("#detailForm input[name=delvFee]").val(Number(event.data.delvFee).addComma());
+		//$("#detailForm input[name=minOrdAmt]").val(Number(event.data.minOrdAmt).addComma());
 		$("#detailForm input[name=sellFeeRate]").val(event.data.sellFeeRate);
 		$("#detailForm input[name=pntPrate10]").val(event.data.pntPrate10);
 		$("#detailForm input[name=pntMrate10]").val(event.data.pntMrate10);
@@ -396,6 +402,9 @@
 		// 로고이미지 영역 노출
 		$("#brandImgArea").removeClass("off").addClass("on");
 		
+		// 공급업체정보 조회
+		gagaAgGrid.fetch("/business/brand/supply/list/" + $('#detailForm input[name=brandCd]').val() , gridOptions2);
+		
 		$("#detailForm select[name=supplyCompCd]").val(event.data.supplyCompCd);
 	}
 
@@ -493,22 +502,51 @@
 */	
 	// 공급업체 선택시
 	$('#btnSearchSupplyComp').on('click', function() {
-/*
-		if (gagajf.isNull($("#detailForm input[name=searchTxt]").val())){
-			mcxDialog.alert('공급업체 검색어를 입력하세요.');
-			return false;
+		var selfYn = "";
+		selfYn = 'Y'; //자사
+		if($("#detailForm select[name=brandGb]").val() == 'E'){	//입점
+			selfYn = 'N';
 		}
-*/		
-		cfnOpenCompanyListPopup('fnSetSupplyCompInfo', 'S', $("#detailForm input[name=searchTxt]").val());
-		
+
+		cfnOpenCompanyListPopup('fnSetSupplyCompInfo', 'S', $("#detailForm input[name=searchTxt]").val(), '' , selfYn);
 	});
 	
 	// 공급업체 조회 팝업에서 호출
 	var fnSetSupplyCompInfo = function(result) {
-		$("#detailForm input[name=supplyCompCd]").val(result[0].supplyCompCd);
-		$("#detailForm input[name=supplyCompNm]").val(result[0].supplyCompNm);
+		//$("#detailForm input[name=supplyCompCd]").val(result[0].supplyCompCd);
+		//$("#detailForm input[name=supplyCompNm]").val(result[0].supplyCompNm);
 		
-		// 출고처 정보
+		if (result.length < 1) return;
+		
+		// 기존상품
+		var brandSupplyList = gagaAgGrid.getAllRowData(gridOptions2);
+		var idx = brandSupplyList.length+1; 
+		
+		var isExist = false;
+		result.forEach(function(supply){
+			isExist = false;
+
+			gridOptions2.api.forEachNode(function(rowNode, index) {
+				if (supply.supplyCompCd == rowNode.data.supplyCompCd){
+					isExist = true;
+				}
+			});
+			
+			if(!isExist){
+				var data = { 
+						supplyCompCd: supply.supplyCompCd
+						, supplyCompNm: supply.supplyCompNm
+						};
+				//그리드 마지막에 추가해야함
+				gridOptions2.api.updateRowData({add: [data], addIndex: idx});
+				
+				idx++;
+			
+			}
+		});
+		gridOptions2.api.refreshCells();
+		
+		/* // 출고처 정보
 		$.getJSON('/renderer/delvloc/list/' + result[0].supplyCompCd
 			, function(delvLocList, status) {
 				$('#detailForm select[name=delvLocCd]').empty().append('<option value="">[선택]</option>');
@@ -519,7 +557,7 @@
 			}
 		);
 		
-		cfnCreateCombo('/renderer/delvFee/list/' + result[0].supplyCompCd, $('#detailForm select[name=delvFeeCd]'), "[선택]");
+		cfnCreateCombo('/renderer/delvFee/list/' + result[0].supplyCompCd, $('#detailForm select[name=delvFeeCd]'), "[선택]"); */
 	}
 	
 	// 브랜드담당MD 목록
@@ -686,8 +724,8 @@
 		$("#detailForm input[name=mode]").val("N");
 		$("#detailForm select[name=brandGb]").trigger('change');
 		$("#detailForm select[name=brandGb]").removeAttr("disabled");
-		$('#detailForm select[name=delvLocCd]').empty().append('<option value="">[선택]</option>');
-		$('#detailForm select[name=delvFeeCd]').empty().append('<option value="">[선택]</option>');
+		//$('#detailForm select[name=delvLocCd]').empty().append('<option value="">[선택]</option>');
+		//$('#detailForm select[name=delvFeeCd]').empty().append('<option value="">[선택]</option>');
 		
 		$("#detailForm input[type=checkbox]").removeClass("checked");
 		$("#detailForm input[type=checkbox]").parent("label").removeClass("checked");
@@ -763,13 +801,29 @@
 			}
 		}
 		
+		//공급업체
+		var allData = gagaAgGrid.getAllRowData(gridOptions2);
+		if (allData.length <= 0){
+			mcxDialog.alert("공급업체를 추가해 주세요.");
+			return false;
+		}
+		
 		mcxDialog.confirm('저장하시겠습니까?', {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
 			sureBtnClick: function() {
+				
+				var jsonData = JSON.stringify(allData);
+				$('#detailForm input[name=brandSupplyListInfo]').val(jsonData);
+				
 				gagajf.ajaxFormSubmit($('#detailForm').prop('action'), '#detailForm', function() {
 					$('#btnNew').trigger('click');
 					$('#btnSearch').trigger('click');
+
+					// 그리드 삭제
+					allData.forEach(function(item, index) {
+						gridOptions2.api.updateRowData({remove: [item]});
+					});
 				});
 			}
 		});
@@ -778,6 +832,7 @@
 	$(document).ready(function() {
 		// Create a agGrid
 		gagaAgGrid.createGrid('gridList', gridOptions);
+		gagaAgGrid.createGrid('gridList2', gridOptions2);
 		
 		$('#detailForm select[name=brandGb]').trigger('change');
 	});

src/main/webapp/WEB-INF/views/business/SupplyCompanyPopupForm.html

@@ -27,7 +27,7 @@
 		<div class="panelContent">
 			<form id="searchCompanyListForm" name="searchCompanyListForm" action="#" th:action="@{'/business/supply/company/list'}" onsubmit="$('#btnSearchCompanyList').trigger('click'); return false;">
 				<input type="hidden" name="searchGb" value="NAME" />		<!-- 공급업체 목록 검색 조건은 업체명으로만 -->
-
+				<input type="hidden" name="selfYn" th:value="${params.selfYn}" />
 				<table class="frmStyle" aria-describedby="검색조건">
 					<colgroup>
 						<col style="width:15%;"/>

src/main/webapp/WEB-INF/views/customer/CustomerDetailForm.html

@@ -14,7 +14,7 @@
  * 1.0  2021.01.18   jsshin     최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" id="popupCustomerDetail" data-width="1600">
+<div class="modalPopup" data-width="1600">
 	<div class="panelStyle">
 		<!-- TITLE -->
 		<div class="panelTitle">
@@ -148,7 +148,7 @@
 									<tr>
 										<th class="dashR">자택주소</th>
 										<td class="dashR" colspan="3">
-											<input type="text" id="homePostNo" name="homePostNo" class="w100" readonly="readonly"/>
+											<input type="text" id="homeZipNo" name="homeZipNo" class="w100" readonly="readonly"/>
 											<button type="button" class="btn btn-info btn-lg" onclick="fnOpenDaumAddr('custInfoForm');">우편번호찾기</button>
 											<br/>
 											<input type="text" id="homeBaseAddr" name="homeBaseAddr" class="w300" readonly="readonly"/>
@@ -277,9 +277,9 @@
 									</tr>
 									<tr>
 										<th>전화번호</th>
-										<td>
-											<input th:type="hidden" id="recipTelno" name="recipTelno">
-											<select class="w100" id="telFirstNo" name="telFirstNo"/>
+										<td >
+											<input type="hidden" id="recipTelno" name="recipTelno"/>
+											<select class="w100" id="telFirstNo" name="telFirstNo">
 												<option value="">선택</option>
 												<option th:if="${nationalNumberList}" th:each="oneData, status : ${nationalNumberList}"
 														th:value="${oneData.cd}" th:text="|${oneData.cd}|"></option>
@@ -291,7 +291,7 @@
 										</td>
 										<th>휴대전화번호<i class="star"></i></th>
 										<td colspan="4">
-											<input th:type="hidden" id="recipPhnno" name="recipPhnno"/>
+											<input type="hidden" id="recipPhnno" name="recipPhnno"/>
 											<select class="w100" id="recipFirstNo" name="recipFirstNo">
 												<option value="">선택</option>
 												<option th:if="${nationalHpNumberList}" th:each="oneData, status : ${nationalHpNumberList}"
@@ -662,7 +662,7 @@
 			}
 		},
 		{headerName: "쿠폰발행 상세사유", field: "pubReasonDtl", width: 300, cellClass: 'text-center'},
-		{headerName: "등록자", field: "regId", width: 100, cellClass: 'text-center'},
+		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
 		{
 			headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center',
 			cellRenderer: function (params) {
@@ -785,8 +785,7 @@
 		{headerName: "수령자", field: "recipNm", width: 100, cellClass: 'text-center'},
 		{headerName: "전화번호", field: "recipTelno", width: 130, cellClass: 'text-center'},
 		{headerName: "휴대전화번호", field: "recipPhnno", width: 130, cellClass: 'text-center'},
-		{headerName: "이메일", field: "recipEmail", width: 150, cellClass: 'text-center'},
-		{headerName: "우편번호", field: "recipPostNo", width: 100, cellClass: 'text-center'},
+		{headerName: "우편번호", field: "recipZipNo", width: 100, cellClass: 'text-center'},
 		{headerName: "기본주소", field: "recipBaseAddr", width: 300, cellClass: 'text-left'},
 		{headerName: "상세주소", field: "recipDtlAddr", width: 150, cellClass: 'text-left'},
 		{
@@ -796,7 +795,7 @@
 			}
 		},
 		{headerName: "삭제", field: "delYn", width: 50, cellClass: 'text-center'},
-		{headerName: "수정자", field: "updId", width: 100, cellClass: 'text-center'},
+		{headerName: "수정자", field: "updNm", width: 100, cellClass: 'text-center'},
 		{
 			headerName: "수정일시", field: "updDt", width: 150, cellClass: 'text-center',
 			cellRenderer: function (params) {
@@ -947,13 +946,13 @@
 			return false;
 
 		// 전화번호
-		let telFirstNo = $('#custAddrForm input[name=telFirstNo]').val();
+		let telFirstNo = $('#custAddrForm select[name=telFirstNo]').val();
 		let telMiddleNo = $('#custAddrForm input[name=telMiddleNo]').val();
 		let telLastNo = $('#custAddrForm input[name=telLastNo]').val();
 		$('#custAddrForm input[name=recipTelno]').val(telFirstNo + '-' + telMiddleNo + '-' + telLastNo);
 
 		// 핸드폰번호 필수값 validation 함수에서 null 체크
-		let recipFirstNo = $('#custAddrForm input[name=recipFirstNo]').val();
+		let recipFirstNo = $('#custAddrForm select[name=recipFirstNo]').val();
 		let recipMiddleNo = $('#custAddrForm input[name=recipMiddleNo]').val();
 		let recipLastNo = $('#custAddrForm input[name=recipLastNo]').val();
 		$('#custAddrForm input[name=recipPhnno]').val(recipFirstNo + '-' + recipMiddleNo + '-' + recipLastNo);
@@ -1068,21 +1067,20 @@
 		if (!gagajf.isNull(event.data)) {
 			$('#custAddrForm input[name=custDelvAddrSq]').val(event.data.custDelvAddrSq);
 			$('#custAddrForm input[name=delvAddrNm]').val(event.data.delvAddrNm);
-			$('#custAddrForm input[name=recipEmail]').val(event.data.recipEmail);
 			$('#custAddrForm input[name=recipNm]').val(event.data.recipNm);
 
 			if (!gagajf.isNull(event.data.recipPhnno)) {
 				let phnNoSplit = event.data.recipPhnno.split("-");
-				$('#custAddrForm input[name=recipFirstNo]').val(phnNoSplit[0]);
+				$('#custAddrForm select[name=recipFirstNo]').val(phnNoSplit[0]);
 				$('#custAddrForm input[name=recipMiddleNo]').val(phnNoSplit[1]);
 				$('#custAddrForm input[name=recipLastNo]').val(phnNoSplit[2]);
 			}
 
 			if (!gagajf.isNull(event.data.recipTelno)) {
 				let telNoSplit = event.data.recipTelno.split("-");
-				$('#custAddrForm input[name=telFirstNo]').val(telNoSplit[0]);
+				$('#custAddrForm select[name=telFirstNo]').val(telNoSplit[0]);
 				$('#custAddrForm input[name=telMiddleNo]').val(telNoSplit[1]);
-				$('#custAddrForm input[name=telLiastNo]').val(telNoSplit[2]);
+				$('#custAddrForm input[name=telLastNo]').val(telNoSplit[2]);
 			}
 
 			$('#custAddrForm input[name=recipZipNo]').val(event.data.recipZipNo);
@@ -1125,7 +1123,7 @@
 					let snsType = fnGetSnsType(data.nvJoinId, data.kkJoinId, data.ysJoinId);
 					$('#snsType').text(snsType);
 
-					$('#homePostNo').val(data.homePostNo);
+					$('#homeZipNo').val(data.homeZipNo);
 					$('#homeBaseAddr').val(data.homeBaseAddr);
 					$('#homeDtlAddr').val(data.homeDtlAddr);
 					$('#sexGb').text(gagaAgGrid.lookupValue(genderGbList, data.sexGb));
@@ -1136,9 +1134,6 @@
 					fnDisplayCellPhnno(data.maskingCellPhnno);		// 핸드폰
 					fnDisplayManaged(data.managedRsn);			// 관리대상
 
-					//custInfoForm Hidden : LMS팝업 사용시 필요
-					$('#custNm').val(data.maskingCustNm);
-
 					//기존데이트 저장
 					orgData = data;
 
@@ -1220,7 +1215,7 @@
 			oncomplete: function(data) {
 				// 우편번호와 주소 정보를 해당 필드에 넣는다.
 				if (id === 'custInfoForm') {
-					$('#homePostNo').val(data.zonecode);
+					$('#homeZipNo').val(data.zonecode);
 					$('#homeBaseAddr').val(cfnGetDaumRoadAddr(data));
 					$('#homeDtlAddr').focus();
 				}

src/main/webapp/WEB-INF/views/customer/LmsPopupForm.html

@@ -14,7 +14,7 @@
  * 1.0  2021.01.21   jsshin     최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" id="popupLmsForm" data-width="800">
+<div class="modelessPopup draggable" data-width="634">
 	<div class="panelStyle">
 		<!-- TITLE -->
 		<div class="panelTitle">

src/main/webapp/ux/js/admin.popup.js

@@ -734,19 +734,22 @@ var cfnOpenFreeGoodsPromotionSetPopup = function(gbn, freegiftSq) {
  *     or
  *     cfnOpenCompanyListPopup('fnResult', 'S', 'TBJ');							// 1번 파라미터 : callBack 함수, 2번 파라미터 : 선택구분, 3번 파라미터 : 팝업 default 검색어
  *     or
- *     cfnOpenCompanyListPopup('fnResult', 'S', 'TBJ', 'inputId');				// 마지막 문자열은 멀티구분 S이고, 결과가 하나일때 supplyCompCd값을 넣어줄 html tag id, S가 아니고, inputId가 존재하지 않으면 무조건 팝업이 열림.
+ *     cfnOpenCompanyListPopup('fnResult', 'S', 'TBJ', 'inputId');				// 문자열은 멀티구분 S이고, 결과가 하나일때 supplyCompCd값을 넣어줄 html tag id, S가 아니고, inputId가 존재하지 않으면 무조건 팝업이 열림.
+ *     or
+ *     cfnOpenCompanyListPopup('fnResult', 'S', 'TBJ', 'inputId', 'Y');			// '': 전체 공급업체(기본값), Y: 자사공급업체, N:입점공급업체
+ *     
  * </pre>
  * @since  : 2020/12/23
  * @author : xodud1202
  */
-var cfnOpenCompanyListPopup = function(callbackfn, multiGb, searchTxt, inputId) {
+var cfnOpenCompanyListPopup = function(callbackfn, multiGb, searchTxt, inputId, selfYn) {
 	var actionUrl = "/business/comapny/search/form?callbackFn=" + callbackfn;
 	if (typeof(multiGb) != 'undefined' && multiGb != null && multiGb == "M") actionUrl += "&multiGb=" + multiGb; else actionUrl += "&multiGb=S";
 	if (typeof(searchTxt) != 'undefined') actionUrl += "&searchTxt=" + encodeURIComponent(searchTxt);
-
+	if (typeof(selfYn) != 'undefined') actionUrl += "&selfYn="+ selfYn ; else actionUrl += "&selfYn=" ;
 	if(multiGb == "S") {
 		if(searchTxt && searchTxt != "" && inputId && inputId != "") {
-			var data = {  searchTxt : searchTxt, searchGb : "NAME"	};
+			var data = {  searchTxt : searchTxt, searchGb : "NAME"};
 			var jsonData = JSON.stringify(data);
 
 			gagajf.ajaxJsonSubmit('/business/supply/company/list', jsonData, function(result) {