정산. 공급업체 -> 공급벤더 기준으로 변경

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

@@ -33,7 +33,7 @@ public interface TsaSettleDao {
 	 * @author gagamel
 	 * @since 2021. 7. 30
 	 */
-	void deleteSettleConfirm(String settleYm);
+	void deleteSettleConfirm(SettleConfirm settleConfirm);
 
 	/**
 	 * 정산확정 데이터 생성

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

@@ -57,14 +57,11 @@ public class TsaSettleService {
 	 * @since 2021. 7. 30
 	 */
 	@Transactional("shopTxnManager")
-	public void saveSettleConfirm(String settleYm) {
+	public void saveSettleConfirm(SettleConfirm settleConfirm) {
 		// 정산데이터 삭제
-		settleDao.deleteSettleConfirm(settleYm);
+		settleDao.deleteSettleConfirm(settleConfirm);
 
 		// 정산데이터 생성
-		SettleConfirm settleConfirm = new SettleConfirm();
-		settleConfirm.setSettleYm(settleYm);
-		settleConfirm.setRegNo(TsaSession.getInfo().getUserNo());
 		settleDao.createSettleConfirm(settleConfirm);
 	}
 
@@ -105,8 +102,8 @@ public class TsaSettleService {
 			throw new IllegalStateException("발생연월은 필수입니다.");
 		}
 
-		if (StringUtils.isBlank(settleConfirm.getSupplyCompCd())) {
-			throw new IllegalStateException("업체번호는 필수입니다.");
+		if (StringUtils.isBlank(settleConfirm.getSupplyVendorCd())) {
+			throw new IllegalStateException("벤더업체코드는 필수입니다.");
 		}
 
 		if (settleConfirm.getRewardAmt() <= 0) {
@@ -145,7 +142,7 @@ public class TsaSettleService {
 		String[] listTitles = {"작성연월", "품목", "공급가액", "세액", "현금거래액", "사업자번호", "상호", "대표자명", "업태", "업종", "기본주소", "상세주소", "정산담당자", "전화번호", "계산서이메일", "계산서발행금액"};
 
 		// DB 처리 시 사용되는 셀명 설정
-		String[] cellNames = {"usacYm", "billType", "supplyAmt", "taxAmt", "tradeAmt", "bizNo", "supplyCompNm", "ownerNm", "bizType", "bizKind", "bizBaseAddr", "bizDtlAddr", "settleChargeNm", "settleChargeTelno", "billEmail", "billAmt"};
+		String[] cellNames = {"usacYm", "billType", "supplyAmt", "taxAmt", "tradeAmt", "bizNo", "supplyVendorNm", "ownerNm", "bizType", "bizKind", "bizBaseAddr", "bizDtlAddr", "settleChargeNm", "settleChargeTelno", "billEmail", "billAmt"};
 
 		String[] cellTypes = {
 			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),

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

@@ -12,7 +12,6 @@ import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -125,15 +124,18 @@ public class TsaSettleController extends TsaBaseController {
 
 	/**
 	 * 정산확정 처리 - 업체별정산데이터 생성
-	 * @param settleYm - 정산기준월
+	 * @param settleConfirm - 정산확정 정보
 	 * @return
 	 * @author gagamel
 	 * @since 2021. 7. 30
 	 */
-	@PostMapping("/confirm/save/{settleYm}")
+	@PostMapping("/confirm/save")
 	@ResponseBody
-	public GagaResponse saveSettleConfirm(@PathVariable String settleYm) {
-		settleService.saveSettleConfirm(settleYm);
+	public GagaResponse saveSettleConfirm(@RequestBody SettleConfirm settleConfirm) {
+		settleConfirm.setRegNo(TsaSession.getInfo().getUserNo());
+
+		settleService.saveSettleConfirm(settleConfirm);
+
 		return super.ok(message.getMessage("SUCC_0004"));
 	}
 
@@ -251,7 +253,7 @@ public class TsaSettleController extends TsaBaseController {
 		String targetPath = GagaFileUtil.getConcatenationPath(env.getProperty("upload.excel.target.path"), "excel");
 
 		// DB 처리 시 사용되는 셀명 설정
-		String[] cellNames = {"occurYm", "custId", "custNm", "ordNo", "cateNm", "supplyCompCd", "supplyCompNm", "chargeNm", "ordGoods", "currPrice", "rewardAmt", "reason"};
+		String[] cellNames = {"occurYm", "custId", "custNm", "ordNo", "cateNm", "supplyVendorCd", "supplyVendorNm", "chargeNm", "ordGoods", "currPrice", "rewardAmt", "reason"};
 
 		Collection<GagaMap> ecxelList = GagaExcelUtil.getList(GagaFileUtil.getConcatenationPath(targetPath, settleConfirm.getExcelFileNm()), 0, cellNames, 0);
 

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

@@ -16,6 +16,8 @@ import lombok.Data;
 public class DelvFeeSettle extends TscBaseDomain {
 
 	private String occurDt;				// 발생(출고/회수)일시
+	private String supplyVendorCd;		// 공급벤더코드
+	private String supplyVendorNm;		// 공급벤더명
 	private String supplyCompCd;		// 공급업체코드
 	private String supplyCompNm;		// 공급업체명
 	private String distributionGb;		// 유통구분

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

@@ -22,6 +22,8 @@ public class GoodsSettle extends TscBaseDomain {
 	private String extmallOrderId;		// 제휴몰주문번호
 	private String extmallId;			// 제휴몰ID
 	private String extmallNm;			// 제휴몰명
+	private String supplyVendorCd;		// 공급벤더코드
+	private String supplyVendorNm;		// 공급벤더명
 	private String supplyCompCd;		// 공급업체코드
 	private String supplyCompNm;		// 공급업체명
 	private String distributionGb;		// 유통구분

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

@@ -16,6 +16,8 @@ import lombok.Data;
 public class SettleConfirm extends TscBaseDomain {
 
 	private String usacYm;				// 정산연월
+	private String supplyVendorCd;		// 공급벤더코드
+	private String supplyVendorNm;		// 공급벤더명
 	private String supplyCompCd;		// 공급업체코드
 	private String supplyCompNm;		// 공급업체명
 	private String econtractYn;			// 전자계약여부
@@ -58,6 +60,8 @@ public class SettleConfirm extends TscBaseDomain {
 	private String settleChargeTelno;	// 정산담당자연락처
 
 	// 검색조건
+	private String salesStdt;			// 매출시작일
+	private String salesEddt;			// 매출종료일
 	private String settleYm;			// 정산연월
 	private String supplyCompList;		// 공급업체코드목록
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)

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

@@ -12,6 +12,8 @@
 		     , ODIH.EXTMALL_ORDER_ID                                                      /*제휴몰주문번호*/
 		     , ODIH.EXTMALL_ID                                                            /*제휴몰ID*/
 		     , ODIH.EXTMALL_NM                                                            /*제휴몰명*/
+		     , ODIH.SUPPLY_VENDOR_CD                                                      /*공급벤더코드*/
+		     , ODIH.SUPPLY_VENDOR_NM                                                      /*공급벤더명*/
 		     , ODIH.SUPPLY_COMP_CD                                                        /*공급업체코드*/
 		     , ODIH.SUPPLY_COMP_NM                                                        /*공급업체명*/
 		     , ODIH.DISTRIBUTION_GB                                                       /*유통구분*/
@@ -76,12 +78,14 @@
 		             , OD.EXTMALL_ORDER_ID                                                                             /*제휴몰주문번호*/
 		             , OD.EXTMALL_ID                                                                                   /*제휴몰ID*/
 		             , E.EXTMALL_NM                                                                                    /*제휴몰명*/
+		             , SC.SUPPLY_VENDOR_CD                                                                             /*공급벤더코드*/
+		             , SV.SUPPLY_VENDOR_NM                                                                             /*공급벤더명*/
 		             , OD.SUPPLY_COMP_CD                                                                               /*공급업체코드*/
 		             , SC.SUPPLY_COMP_NM                                                                               /*공급업체명*/
 		             , SC.DISTRIBUTION_GB                                                                              /*유통구분*/
 		             , FN_GET_CODE_NM('G065',SC.DISTRIBUTION_GB)                            AS DISTRIBUTION_GB_NM      /*유통구분명*/
-		             , SC.SETTLE_DAY                                                                                   /*정산주기*/
-		             , FN_GET_CODE_NM('G075',SC.SETTLE_DAY)                                 AS SETTLE_DAY_NM           /*정산주기명*/
+		             , SV.SETTLE_DAY                                                                                   /*정산주기*/
+		             , FN_GET_CODE_NM('G075',SV.SETTLE_DAY)                                 AS SETTLE_DAY_NM           /*정산주기명*/
 		             , DATE_FORMAT(O.PAY_DT,'%Y-%m-%d %H:%i:%S')                            AS ORD_DT                  /*주문일시*/
 		             , ODIH.ORD_DTL_STAT                                                    AS SETTLE_GB               /*정산구분*/
 		             , FN_GET_CODE_NM('G720',ODIH.ORD_DTL_STAT)                             AS SETTLE_GB_NM            /*정산구분명*/
@@ -153,6 +157,7 @@
 		        INNER JOIN TB_ORDER_DETAIL OD ON ODIH.ORD_DTL_NO = OD.ORD_DTL_NO
 		        INNER JOIN TB_ORDER O ON ODIH.ORD_NO = O.ORD_NO
 		        INNER JOIN TB_SUPPLY_COMPANY SC ON OD.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
+		        INNER JOIN TB_SUPPLY_VENDOR SV ON SC.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
 		        INNER JOIN TB_GOODS G ON OD.GOODS_CD = G.GOODS_CD
 		        INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		        LEFT OUTER JOIN TB_EXTMALL E ON OD.EXTMALL_ID = E.EXTMALL_ID
@@ -197,21 +202,18 @@
 	</select>
 	
 	<!-- 정산확정 데이터 삭제 -->
-	<delete id="deleteSettleConfirm" parameterType="String">
+	<delete id="deleteSettleConfirm" parameterType="SettleConfirm">
 		/* TsaSettle.deleteSettleConfirm */
 		DELETE FROM TB_USAC
-		WHERE  USAC_YM = REPLACE(#{settleYm},'-','')
+		WHERE  USAC_DT BETWEEN REPLACE(#{salesStdt},'-','') AND REPLACE(#{salesEddt},'-','')
 	</delete>
 	
 	<!-- 정산확정 데이터 생성 -->
 	<insert id="createSettleConfirm" parameterType="SettleConfirm">
 		/* TsaSettle.createSettleConfirm */
 		INSERT INTO TB_USAC (
-		       USAC_YM
-		     , SUPPLY_COMP_CD
-		     , ECONTRACT_YN
-		     , DISTRIBUTION_GB
-		     , SETTLE_DAY
+		       USAC_DT
+		     , SUPPLY_VENDOR_CD
 		     , SELL_QTY
 		     , REAL_SELL_AMT
 		     , SELL_FEE_AMT
@@ -225,18 +227,11 @@
 		     , SUPPLY_AMT
 		     , TAX_AMT
 		     , DELV_FEE
-		     , BANK_CD
-		     , ACCOUNT_NO
-		     , DEPOSITOR_NM
-		     , BILL_EMAIL
 		     , REG_NO
 		     , REG_DT
 		)
-		SELECT ODIH.USAC_YM                                                       /*정산연월*/
-		     , ODIH.SUPPLY_COMP_CD                                                /*공급업체코드*/
-		     , SC.ECONTRACT_YN                                                    /*전자계약여부*/
-		     , SC.DISTRIBUTION_GB                                                 /*유통구분*/
-		     , SC.SETTLE_DAY                                                      /*정산주기*/
+		SELECT ODIH.USAC_DT                                                       /*정산일*/
+		     , SC.SUPPLY_VENDOR_CD                                                /*공급벤더코드*/
 		     , SUM(ODIH.SELL_QTY)                      AS SELL_QTY                /*판매수량*/
 		     , SUM(ODIH.REAL_SELL_AMT)                 AS REAL_SELL_AMT           /*실판매금액(=상품총액)*/
 		     , SUM(ODIH.SELL_FEE_AMT)                  AS SELL_FEE_AMT            /*수수료*/
@@ -258,14 +253,10 @@
 		                                     ELSE ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT)
 		                                END) / 1.1,0)) AS TAX_AMT                /*세액*/
 		     , SUM(ODIH.DELV_FEE)                      AS DELV_FEE               /*배송비*/
-		     , SC.BANK_CD                                                        /*은행코드*/
-		     , SC.ACCOUNT_NO                                                     /*계좌번호*/
-		     , SC.DEPOSITOR_NM                                                   /*예금주명*/
-		     , SC.BILL_EMAIL                                                     /*세금계산서이메일*/
 		     , #{regNo}                                AS REG_NO
 		     , NOW()                                   AS REG_DT
 		FROM   (
-		        SELECT DATE_FORMAT(ODIH.OCCUR_DT,'%Y%m')            AS USAC_YM                 /*정산연월*/
+		        SELECT DATE_FORMAT(ODIH.OCCUR_DT,'%Y%m%d')          AS USAC_DT                 /*정산일*/
 		             , ODIH.SUPPLY_COMP_CD                                                     /*공급업체코드*/
 		             , SUM(ODIH.SELL_QTY)                           AS SELL_QTY                /*판매수량*/
 		             , SUM(ODIH.SELL_AMT
@@ -345,28 +336,28 @@
 		                                                  AND OD.SUPPLY_COMP_CD = TB2.TMTB_SUPPLY_CD
 		                LEFT OUTER JOIN TB_EXTMALL_USAC_PRICE EUP ON ODIH.ORD_DTL_ITEM_HST_SQ = EUP.ORD_DTL_ITEM_HST_SQ
 		                WHERE  1 = 1
-		                AND    ODIH.REG_DT <![CDATA[>=]]> STR_TO_DATE(CONCAT(#{settleYm},'-01'),'%Y-%m-%d')
-		                AND    ODIH.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(CONCAT(#{settleYm},'-01'),'%Y-%m-%d'), INTERVAL 1 MONTH)
+		                AND    ODIH.REG_DT <![CDATA[>=]]> STR_TO_DATE(#{salesStdt},'%Y-%m-%d')
+		                AND    ODIH.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(#{salesEddt},'%Y-%m-%d'), INTERVAL 1 DAY)
 		                AND    ODIH.ORD_DTL_STAT IN ('G720_20','G720_50','G720_60') /*판매-배송중,환입-반품완료,환입-교환완료*/
 		               ) ODIH
-		        GROUP  BY DATE_FORMAT(ODIH.OCCUR_DT,'%Y%m')
+		        GROUP  BY DATE_FORMAT(ODIH.OCCUR_DT,'%Y%m%d')
 		                , ODIH.SUPPLY_COMP_CD
 		        
 		        UNION ALL
 		        
 		        /*업체별배송비*/
-		        SELECT DATE_FORMAT(OD.OCCUR_DT,'%Y%m') AS USAC_YM                 /*정산연월*/
-		             , OD.SUPPLY_COMP_CD                                          /*공급업체코드*/
-		             , 0                               AS SELL_QTY                /*판매수량*/
-		             , 0                               AS REAL_SELL_AMT           /*실판매금액(=상품총액. 쿠폰과 다다익선만 차감. 상품권과 포인트는 포함)*/
-		             , 0                               AS SELL_FEE_AMT            /*수수료*/
-		             , 0                               AS CPN_DC_AMT              /*쿠폰할인금액*/
-		             , 0                               AS SELF_CPN_DC_AMT         /*자사쿠폰분담액*/
-		             , 0                               AS SUPPLY_COMP_CPN_DC_AMT  /*입점쿠폰분담액*/
-		             , 0                               AS TMTB_DC_AMT             /*다다익선할인금액*/
-		             , 0                               AS SELF_TMTB_DC_AMT        /*자사다다익선분담액*/
-		             , 0                               AS SUPPLY_COMP_TMTB_DC_AMT /*입점다다익선분담액*/
-		             , SUM(DF.DELV_FEE)                AS DELV_FEE                /*배송비*/
+		        SELECT DATE_FORMAT(OD.OCCUR_DT,'%Y%m%d') AS USAC_DT                 /*정산일*/
+		             , OD.SUPPLY_COMP_CD                                            /*공급업체코드*/
+		             , 0                                 AS SELL_QTY                /*판매수량*/
+		             , 0                                 AS REAL_SELL_AMT           /*실판매금액(=상품총액. 쿠폰과 다다익선만 차감. 상품권과 포인트는 포함)*/
+		             , 0                                 AS SELL_FEE_AMT            /*수수료*/
+		             , 0                                 AS CPN_DC_AMT              /*쿠폰할인금액*/
+		             , 0                                 AS SELF_CPN_DC_AMT         /*자사쿠폰분담액*/
+		             , 0                                 AS SUPPLY_COMP_CPN_DC_AMT  /*입점쿠폰분담액*/
+		             , 0                                 AS TMTB_DC_AMT             /*다다익선할인금액*/
+		             , 0                                 AS SELF_TMTB_DC_AMT        /*자사다다익선분담액*/
+		             , 0                                 AS SUPPLY_COMP_TMTB_DC_AMT /*입점다다익선분담액*/
+		             , SUM(DF.DELV_FEE)                  AS DELV_FEE                /*배송비*/
 		        FROM   (
 		                SELECT DISTINCT
 		                       ODIH.REG_DT       AS OCCUR_DT  /*발생일시*/
@@ -378,34 +369,29 @@
 		                     , TB_GOODS G
 		                WHERE  ODIH.ORD_DTL_NO = OD.ORD_DTL_NO
 		                AND    OD.GOODS_CD = G.GOODS_CD
-		                AND    ODIH.REG_DT <![CDATA[>=]]> STR_TO_DATE(CONCAT(#{settleYm},'-01'),'%Y-%m-%d')
-		                AND    ODIH.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(CONCAT(#{settleYm},'-01'),'%Y-%m-%d'), INTERVAL 1 MONTH)
+		                AND    ODIH.REG_DT <![CDATA[>=]]> STR_TO_DATE(#{salesStdt},'%Y-%m-%d')
+		                AND    ODIH.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(#{salesEddt},'%Y-%m-%d'), INTERVAL 1 DAY)
 		                AND    ODIH.ORD_DTL_STAT IN ('G720_20','G720_50','G720_60') /*판매-배송중,환입-반품완료,환입-교환완료*/
 		               ) OD
 		             , TB_DELIVERY_FEE DF
 		        WHERE  OD.SUPPLY_COMP_CD = DF.SUPPLY_COMP_CD
 		        AND    OD.ORD_NO = DF.ORD_NO
 		        AND    OD.OCCUR_DT >= DF.REG_DT /*출고기준의 일자 보다 배송비 발생일자가 적은 넘만*/
-		        GROUP  BY DATE_FORMAT(OD.OCCUR_DT,'%Y%m')
+		        GROUP  BY DATE_FORMAT(OD.OCCUR_DT,'%Y%m%d')
 		                , OD.SUPPLY_COMP_CD
 		       ) ODIH
 		     , TB_SUPPLY_COMPANY SC
 		WHERE  ODIH.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
-		GROUP  BY ODIH.USAC_YM
-		     , ODIH.SUPPLY_COMP_CD
-		     , SC.ECONTRACT_YN
-		     , SC.DISTRIBUTION_GB
-		     , SC.SETTLE_DAY
-		     , SC.BANK_CD
-		     , SC.ACCOUNT_NO
-		     , SC.DEPOSITOR_NM
-		     , SC.BILL_EMAIL
+		GROUP  BY ODIH.USAC_DT
+		        , SC.SUPPLY_VENDOR_CD
 	</insert>
 	
 	<!-- 배송비정산 목록 -->
 	<select id="getDeliveryFeeSettleList" parameterType="DelvFeeSettle" resultType="DelvFeeSettle">
 		/* TsaSettle.getDeliveryFeeSettleList */
 		SELECT DATE_FORMAT(OD.OCCUR_DT,'%Y-%m-%d')       AS OCCUR_DT           /*발생(출고/회수)일시*/
+		     , SV.SUPPLY_VENDOR_CD                                             /*공급벤더코드*/
+		     , SV.SUPPLY_VENDOR_NM                                             /*공급벤더명*/
 		     , OD.SUPPLY_COMP_CD                                               /*공급업체코드*/
 		     , SC.SUPPLY_COMP_NM                                               /*공급업체명*/
 		     , FN_GET_CODE_NM('G065',SC.DISTRIBUTION_GB) AS DISTRIBUTION_GB_NM /*유통구분명*/
@@ -433,41 +419,45 @@
 		            #{item}
 		            </foreach>
 		        </if>
-			    <if test="multiBrand != null and multiBrand != ''">
+		        <if test="multiBrand != null and multiBrand != ''">
 		        AND    G.BRAND_CD IN
 		            <foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
 		            #{item}
 		            </foreach>
 		        </if>
-			   ) OD
-			 , TB_DELIVERY_FEE DF
+		       ) OD
+		     , TB_DELIVERY_FEE DF
 		     , TB_SUPPLY_COMPANY SC
+		     , TB_SUPPLY_VENDOR SV
 		WHERE  OD.SUPPLY_COMP_CD = DF.SUPPLY_COMP_CD
 		AND    OD.ORD_NO = DF.ORD_NO
 		AND    OD.OCCUR_DT >= DF.REG_DT /*출고기준의 일자 보다 배송비 발생일자가 적은 넘만*/
 		AND    OD.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
+		AND    SC.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
 		<if test='distributionGb != null and distributionGb != ""'>
 		AND    SC.DISTRIBUTION_GB = #{distributionGb}
 		</if>
 		GROUP  BY DATE_FORMAT(OD.OCCUR_DT,'%Y-%m-%d')
+		        , SV.SUPPLY_VENDOR_CD
+		        , SV.SUPPLY_VENDOR_NM
 		        , OD.SUPPLY_COMP_CD
 		        , SC.SUPPLY_COMP_NM
 		        , SC.DISTRIBUTION_GB
 		        , DF.DELV_FEE_GB
 		        , OD.ORD_NO
-		ORDER  BY DATE_FORMAT(OD.OCCUR_DT,'%Y-%m-%d'), OD.SUPPLY_COMP_CD, DF.DELV_FEE_GB
+		ORDER  BY DATE_FORMAT(OD.OCCUR_DT,'%Y-%m-%d'), SV.SUPPLY_VENDOR_CD, OD.SUPPLY_COMP_CD, DF.DELV_FEE_GB
 	</select>
 	
 	<!-- 정산확정 목록 -->
 	<select id="getSettleConfirmList" parameterType="SettleConfirm" resultType="SettleConfirm">
 		/* TsaSettle.getSettleConfirmList */
 		SELECT U.USAC_YM                                                                                                 /*정산연월*/
-		     , U.SUPPLY_COMP_CD                                                                                          /*공급업체코드*/
-		     , SC.SUPPLY_COMP_NM                                                                                         /*공급업체명*/
-		     , U.ECONTRACT_YN                                                                                            /*전자계약여부*/
+		     , U.SUPPLY_VENDOR_CD                                                                                        /*공급벤더코드*/
+		     , SV.SUPPLY_VENDOR_NM                                                                                       /*공급벤더명*/
+		     , SV.ECONTRACT_YN                                                                                           /*전자계약여부*/
 		     , SV.BIZ_NO                                                                                                 /*사업자번호*/
-		     , U.SETTLE_DAY                                                                                              /*정산주기*/
-		     , FN_GET_CODE_NM('G075',U.SETTLE_DAY)                                                     AS SETTLE_DAY_NM  /*정산주기명*/
+		     , SV.SETTLE_DAY                                                                                             /*정산주기*/
+		     , FN_GET_CODE_NM('G075',SV.SETTLE_DAY)                                                     AS SETTLE_DAY_NM /*정산주기명*/
 		     , U.SELL_QTY                                                                                                /*판매수량*/
 		     , U.REAL_SELL_AMT                                                                                           /*실판매금액(=상품총액)*/
 		     , U.SELL_FEE_AMT                                                                                            /*수수료*/
@@ -488,7 +478,7 @@
 		     , (U.REAL_SELL_AMT - U.SELL_FEE_AMT + U.SELF_CPN_DC_AMT + U.SELF_TMTB_DC_AMT)
 		       + U.DELV_FEE - IFNULL(UR2.ETC_DEDUCT_AMT,0)
 		       - IFNULL(UR1.RECEIVABLE_AMT,0)                                                          AS TOT_GIVE_AMT   /*총지급금액*/
-		     , CASE WHEN U.ECONTRACT_YN = 'N' THEN '보류'
+		     , CASE WHEN SV.ECONTRACT_YN = 'N' THEN '보류'
 		            ELSE
 		                CASE WHEN (U.BILL_AMT + U.DELV_FEE - IFNULL(UR2.ETC_DEDUCT_AMT,0)) <![CDATA[<]]> 0 THEN
 		                         '미수금'
@@ -496,32 +486,54 @@
 		                         '정상'
 		                END
 		       END                                                                                     AS SETTLE_STAT    /*정산상태*/
-		     , U.BANK_CD                                                                                                 /*은행코드*/
-		     , FN_GET_CODE_NM('G940',U.BANK_CD)                                                        AS BANK_NM        /*은행명*/
-		     , U.ACCOUNT_NO                                                                                              /*계좌번호*/
-		     , U.DEPOSITOR_NM                                                                                            /*예금주명*/
-		     , U.BILL_EMAIL                                                                                              /*계산서이메일*/
-		FROM   TB_USAC U
-		INNER JOIN TB_SUPPLY_COMPANY SC ON U.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
-		INNER JOIN TB_SUPPLY_VENDOR SV ON SC.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
+		     , SV.BANK_CD                                                                                                /*은행코드*/
+		     , FN_GET_CODE_NM('G940',SV.BANK_CD)                                                       AS BANK_NM        /*은행명*/
+		     , SV.ACCOUNT_NO                                                                                             /*계좌번호*/
+		     , SV.DEPOSITOR_NM                                                                                           /*예금주명*/
+		     , SV.BILL_EMAIL                                                                                             /*계산서이메일*/
+		FROM   (
+		        SELECT DATE_FORMAT(U.USAC_DT,'%Y%m')                    AS USAC_YM                 /*정산연월*/
+		             , U.SUPPLY_VENDOR_CD                                                          /*공급벤더코드*/
+		             , SUM(U.SELL_QTY)                                  AS SELL_QTY                /*판매수량*/
+		             , SUM(U.REAL_SELL_AMT)                             AS REAL_SELL_AMT           /*실판매금액(=상품총액)*/
+		             , SUM(U.SELL_FEE_AMT)                              AS SELL_FEE_AMT            /*수수료*/
+		             , SUM(U.CPN_DC_AMT)                                AS CPN_DC_AMT              /*쿠폰할인금액*/
+		             , SUM(U.SELF_CPN_DC_AMT)                           AS SELF_CPN_DC_AMT         /*자사쿠폰분담액*/
+		             , SUM(U.SUPPLY_COMP_CPN_DC_AMT)                    AS SUPPLY_COMP_CPN_DC_AMT  /*입점쿠폰분담액*/
+		             , SUM(U.TMTB_DC_AMT)                               AS TMTB_DC_AMT             /*다다익선할인금액*/
+		             , SUM(U.SELF_TMTB_DC_AMT)                          AS SELF_TMTB_DC_AMT        /*자사다다익선분담액*/
+		             , SUM(U.SUPPLY_COMP_TMTB_DC_AMT)                   AS SUPPLY_COMP_TMTB_DC_AMT /*입점다다익선분담액*/
+		             , SUM(U.BILL_AMT)                                  AS BILL_AMT                /*계산서발행금액*/
+		             , SUM(U.SUPPLY_AMT)                                AS SUPPLY_AMT              /*공급금액*/
+		             , SUM(U.TAX_AMT)                                   AS TAX_AMT                 /*세액*/
+		             , SUM(U.DELV_FEE)                                  AS DELV_FEE                /*배송비*/
+		        FROM   TB_USAC U
+		        WHERE  1 = 1
+		        AND    U.USAC_DT <![CDATA[>=]]> REPLACE(CONCAT(#{settleYm},'-01'),'-','')
+		        AND    U.USAC_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(CONCAT(#{settleYm},'-01'),'%Y-%m-%d'), INTERVAL 1 MONTH)
+		        <if test="multiSupplyComp != null and multiSupplyComp != ''">
+		        AND    U.SUPPLY_VENDOR_CD IN (SELECT SUPPLY_VENDOR_CD
+		                                      FROM   TB_SUPPLY_COMPANY
+		                                      WHERE  SUPPLY_COMP_CD IN
+		                                      <foreach collection="multiSupplyComp" item="item" index="index"  open="(" close=")" separator=",">
+		                                      #{item}
+		                                      </foreach>
+		                                     )
+		        </if>
+		        GROUP  BY DATE_FORMAT(U.USAC_DT,'%Y%m'), U.SUPPLY_VENDOR_CD
+		       ) U
+		INNER JOIN TB_SUPPLY_VENDOR SV ON U.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
 		LEFT OUTER JOIN TB_USAC_RECEIVE UR1 ON U.USAC_YM = UR1.USAC_YM
-		                                   AND U.SUPPLY_COMP_CD = UR1.SUPPLY_COMP_CD
+		                                   AND U.SUPPLY_VENDOR_CD = UR1.SUPPLY_VENDOR_CD
 		LEFT OUTER JOIN (
-		                 SELECT OCCUR_YM        AS USAC_YM
-		                      , SUPPLY_COMP_CD
-		                      , SUM(REWARD_AMT) AS ETC_DEDUCT_AMT
+		                 SELECT OCCUR_YM         AS USAC_YM
+		                      , SUPPLY_VENDOR_CD
+		                      , SUM(REWARD_AMT)  AS ETC_DEDUCT_AMT
 		                 FROM   TB_USAC_DEDUCT
 		                 WHERE  OCCUR_YM = REPLACE(#{settleYm},'-','')
-		                 GROUP  BY OCCUR_YM, SUPPLY_COMP_CD
+		                 GROUP  BY OCCUR_YM, SUPPLY_VENDOR_CD
 		                ) UR2 ON U.USAC_YM = UR2.USAC_YM
-		                     AND U.SUPPLY_COMP_CD = UR2.SUPPLY_COMP_CD
-		WHERE  U.USAC_YM = REPLACE(#{settleYm},'-','')
-		<if test="multiSupplyComp != null and multiSupplyComp != ''">
-		AND    U.SUPPLY_COMP_CD IN
-		    <foreach collection="multiSupplyComp" item="item" index="index"  open="(" close=")" separator=",">
-		    #{item}
-		    </foreach>
-		</if>
+		                     AND U.SUPPLY_VENDOR_CD = UR2.SUPPLY_VENDOR_CD
 	</select>
 	
 	<!-- 정산확정 미수금 생성 -->
@@ -529,7 +541,7 @@
 		/* TsaSettle.createReceivableAmt */
 		INSERT INTO TB_USAC_RECEIVE (
 		       USAC_YM
-		     , SUPPLY_COMP_CD
+		     , SUPPLY_VENDOR_CD
 		     , RECEIVABLE_AMT
 		     , REG_NO
 		     , REG_DT
@@ -538,7 +550,7 @@
 		)
 		VALUES (
 		       #{usacYm}
-		     , #{supplyCompCd}
+		     , #{supplyVendorCd}
 		     , IFNULL(#{receivableAmt},0)
 		     , #{regNo}
 		     , NOW()
@@ -557,8 +569,8 @@
 		INSERT INTO TB_USAC_DEDUCT (
 		       DEDUCT_SQ
 		     , OCCUR_YM
-		     , SUPPLY_COMP_CD
-		     , SUPPLY_COMP_NM
+		     , SUPPLY_VENDOR_CD
+		     , SUPPLY_VENDOR_NM
 		     , CUST_ID
 		     , CUST_NM
 		     , ORD_NO
@@ -574,8 +586,8 @@
 		VALUES (
 		       NULL
 		     , REPLACE(#{occurYm},'-','')
-		     , #{supplyCompCd}
-		     , #{supplyCompNm}
+		     , #{supplyVendorCd}
+		     , #{supplyVendorNm}
 		     , #{custId}
 		     , #{custNm}
 		     , #{ordNo}
@@ -593,27 +605,42 @@
 	<!-- 세금계산서용 정산 목록 -->
 	<select id="getTaxBillSettleList" parameterType="SettleConfirm" resultType="SettleConfirm">
 		/* TsaSettle.getTaxBillSettleList */
-		SELECT U.USAC_YM                                /*정산연월*/
-		     , '상품판매수수료'            AS BILL_TYPE /*계산서유형*/
-		     , U.SUPPLY_AMT                             /*공급가액*/
-		     , U.TAX_AMT                                /*세액*/
-		     , U.BILL_AMT                  AS TRADE_AMT /*계산서발행금액*/
-		     , SV.BIZ_NO                                /*사업자번호*/
-		     , U.SUPPLY_COMP_CD                         /*공급업체코드*/
-		     , SC.SUPPLY_COMP_NM                        /*공급업체명*/
-		     , SV.OWNER_NM                              /*대표자명*/
-		     , SV.BIZ_TYPE                              /*업태*/
-		     , SV.BIZ_KIND                              /*업종*/
-		     , SV.BIZ_BASE_ADDR                         /*사업장기본주소*/
-		     , SV.BIZ_DTL_ADDR                          /*사업장상세주소*/
-		     , SC.SETTLE_CHARGE_NM                      /*정산담당자명*/
-		     , SC.SETTLE_CHARGE_TELNO                   /*정산담당자전화번호*/
-		     , U.BILL_EMAIL                             /*계산서이메일*/
-		     , U.BILL_AMT                               /*계산서발행금액*/
-		FROM   TB_USAC U
-		INNER JOIN TB_SUPPLY_COMPANY SC ON U.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
-		INNER JOIN TB_SUPPLY_VENDOR SV ON SC.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
-		WHERE  U.USAC_YM = REPLACE(#{settleYm},'-','')
+		SELECT U.USAC_YM                                  /*정산연월*/
+		     , '상품판매수수료'    AS BILL_TYPE           /*계산서유형*/
+		     , U.SUPPLY_AMT                               /*공급가액*/
+		     , U.TAX_AMT                                  /*세액*/
+		     , U.BILL_AMT          AS TRADE_AMT           /*거래금액*/
+		     , SV.BIZ_NO                                  /*사업자번호*/
+		     , U.SUPPLY_VENDOR_CD                         /*공급업체코드*/
+		     , SV.SUPPLY_VENDOR_NM                        /*공급업체명*/
+		     , SV.OWNER_NM                                /*대표자명*/
+		     , SV.BIZ_TYPE                                /*업태*/
+		     , SV.BIZ_KIND                                /*업종*/
+		     , SV.BIZ_BASE_ADDR                           /*사업장기본주소*/
+		     , SV.BIZ_DTL_ADDR                            /*사업장상세주소*/
+		     , (SELECT MAX(SETTLE_CHARGE_NM)
+		        FROM   TB_SUPPLY_COMPANY
+		        WHERE  SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
+		       )                   AS SETTLE_CHARGE_NM    /*정산담당자명*/
+		     , (SELECT MAX(SETTLE_CHARGE_TELNO)
+		        FROM   TB_SUPPLY_COMPANY
+		        WHERE  SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
+		       )                   AS SETTLE_CHARGE_TELNO /*정산담당자전화번호*/
+		     , SV.BILL_EMAIL                              /*계산서이메일*/
+		     , U.BILL_AMT                                 /*계산서발행금액*/
+		FROM   (
+		        SELECT DATE_FORMAT(U.USAC_DT,'%Y%m') AS USAC_YM    /*정산연월*/
+		             , U.SUPPLY_VENDOR_CD                          /*공급업체코드*/
+		             , SUM(U.SUPPLY_AMT)             AS SUPPLY_AMT /*공급가액*/
+		             , SUM(U.TAX_AMT)                AS TAX_AMT    /*세액*/
+		             , SUM(U.BILL_AMT)               AS BILL_AMT   /*계산서발행금액*/
+		        FROM   TB_USAC U
+		        WHERE  1 = 1
+		        AND    U.USAC_DT <![CDATA[>=]]> REPLACE(CONCAT(#{settleYm},'-01'),'-','')
+		        AND    U.USAC_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(CONCAT(#{settleYm},'-01'),'%Y-%m-%d'), INTERVAL 1 MONTH)
+		        GROUP  BY DATE_FORMAT(U.USAC_DT,'%Y%m'), U.SUPPLY_VENDOR_CD
+		       ) U
+		INNER JOIN TB_SUPPLY_VENDOR SV ON U.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
 	</select>
 	
 	<!-- 상품권현황 목록 -->

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

@@ -105,7 +105,8 @@
 
 	let columnDefs = [
 		{ headerName: "발생(출고/회수)일자", field: "occurDt", width: 150, cellClass: 'text-center' },
-		{ headerName: "공급업체", field: "supplyCompNm", width: 200, cellClass: 'text-center' },
+		{ headerName: "공급벤더", field: "supplyVendorNm", width: 200, cellClass: 'text-center' },
+// 		{ headerName: "공급업체", field: "supplyCompNm", width: 200, cellClass: 'text-center' },
 		{ headerName: "유통구분", field: "distributionGbNm", width: 150, cellClass: 'text-center' },
 		{ headerName: "배송비구분", field: "delvFeeGbNm", width: 150, cellClass: 'text-center' },
 		{ headerName: "주문번호", field: "ordNo", width: 100, cellClass: 'text-center' },

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

@@ -105,11 +105,11 @@
 		<div class="panelStyle" th:if="${sessionInfo.roleCd == 'G001_A106' or sessionInfo.roleCd == 'G001_0000' or sessionInfo.roleCd == 'G001_A000'}">
 			<ul class="panelBar">
 				<li class="center">
-					<h3><strong>정산기준월</strong> : </h3>
-					<input type="text" class="schMonth w60" name="settleYm" id="settleYm" maxlength="7"/>
-					<button type="button" class="btn icn schBtn" data-id="settleYm"><i class="fa fa-calendar" aria-hidden="true"></i></button>
-					<button type="button" class="btn btn-base btn-lg" id="btnConfirmSettle">정산확정</button>
-					<span class="infoTxt cBlue marL20"><i class="fa fa-info-circle" aria-hidden="true"></i>[정산확정] 버튼 클릭 시 해당월의 업체별 정산 데이터가 재확정됩니다.</span>
+<!-- 					<h3><strong>정산기준월</strong> : </h3> -->
+<!-- 					<input type="text" class="schMonth w60" name="settleYm" id="settleYm" maxlength="7"/> -->
+<!-- 					<button type="button" class="btn icn schBtn" data-id="settleYm"><i class="fa fa-calendar" aria-hidden="true"></i></button> -->
+					<button type="button" class="btn btn-base btn-lg" id="btnConfirmSettle">정산확정</button><br/>
+					<p class="infoTxt cBlue marL20"><i class="fa fa-info-circle" aria-hidden="true"></i>[정산확정] 버튼 클릭 시 매출기간 동안의 업체별 정산 데이터가 재확정됩니다.</p>
 				</li>
 			</ul>
 		</div>
@@ -160,13 +160,14 @@
 		{ headerName: "몰구분", field: "mallGbNm", width: 100, cellClass: 'text-center' },
 		{ headerName: "제휴몰주문번호", field: "extmallOrderId", width: 150, cellClass: 'text-center' },
 		{ headerName: "제휴몰명", field: "extmallNm", width: 150, cellClass: 'text-center' },
+		{ headerName: "공급벤더", field: "supplyVendorNm", width: 150, cellClass: 'text-center' },
 // 		{
 // 			headerName: "공급업체", field: "supplyCompCd", width: 100, cellClass: 'text-center',
 // 			valueGetter: function (params) {
 // 				return gagaAgGrid.lookupValue(supplyCompList, params.data.supplyCompCd);
 // 			}
 // 		},
-		{ headerName: "공급업체", field: "supplyCompNm", width: 150, cellClass: 'text-center' },
+// 		{ headerName: "공급업체", field: "supplyCompNm", width: 150, cellClass: 'text-center' },
 // 		{
 // 			headerName: "유통구분", field: "distributionGb", width: 100, cellClass: 'text-center',
 // 			valueGetter: function (params) {
@@ -371,23 +372,68 @@
 	
 	// 정산확정
 	$('#btnConfirmSettle').on('click', function() {
-		if (gagajf.isNull($('#settleYm').val())) {
-			mcxDialog.alertC('정산기준월을 입력해 주세요.', {
+		if (gagajf.isNull($('#salesStdt').val())) {
+			mcxDialog.alertC('매출시작일자를 입력해 주세요.', {
 				sureBtnText: "확인",
 				sureBtnClick: function() {
-					$('#settleYm').focus();
+					$('#salesStdt').focus();
 				}
 			});
 			return;
 		}
 		
-		mcxDialog.confirm('정산확정을 하시면 업체별 정산 데이터가 생성됩니다.<br/>' + $('#settleYm').val() + '월의 정산을 확정하시겠습니까?', {
+		if (gagajf.isNull($('#salesEddt').val())) {
+			mcxDialog.alertC('매출종료일자를 입력해 주세요.', {
+				sureBtnText: "확인",
+				sureBtnClick: function() {
+					$('#salesEddt').focus();
+				}
+			});
+			return;
+		}
+		
+		mcxDialog.confirm('매출기간 ' + $('#salesStdt').val().toDate('YYYY-MM-DD').format('YYYY-MM-DD') + '~' + $('#salesEddt').val().toDate('YYYY-MM-DD').format('YYYY-MM-DD') + ' 동안의<br/>업체별 정산 데이터를 확정하시겠습니까?', {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
 			sureBtnClick: function() {
-				gagajf.ajaxJsonSubmit('/settle/confirm/save/' + $('#settleYm').val(), null);
+				let jsonData = JSON.stringify({
+					salesStdt : $('#salesStdt').val(),
+					salesEddt : $('#salesEddt').val()
+				});
+				gagajf.ajaxJsonSubmit('/settle/confirm/save', jsonData);
 			}
 		});
+		
+// 		if (gagajf.isNull($('#settleYm').val())) {
+// 			mcxDialog.alertC('정산기준월을 입력해 주세요.', {
+// 				sureBtnText: "확인",
+// 				sureBtnClick: function() {
+// 					$('#settleYm').focus();
+// 				}
+// 			});
+// 			return;
+// 		}
+		
+// 		let salesEdYm = $('#salesEddt').val().toDate('YYYY-MM');
+// 		let settleYm = ($('#settleYm').val() + '-01').toDate('YYYY-MM');
+		
+// 		if (salesEdYm > settleYm) {
+// 			mcxDialog.alertC('정산기준월은 매출종료일자 보다 커야 합니다.', {
+// 				sureBtnText: "확인",
+// 				sureBtnClick: function() {
+// 					$('#salesEddt').focus();
+// 				}
+// 			});
+// 			return;
+// 		}
+		
+// 		mcxDialog.confirm('정산확정을 하시면 업체별 정산 데이터가 생성됩니다.<br/>매출기간 ' + $('#salesStdt').val().toDate('YYYY-MM-DD').format('YYYY-MM-DD') + '~' + $('#salesEddt').val().toDate('YYYY-MM-DD').format('YYYY-MM-DD') + ' 동안의 업체별 정산 데이터를<br/>' + $('#settleYm').val() + '월로 확정하시겠습니까?', {
+// 			cancelBtnText: "취소",
+// 			sureBtnText: "확인",
+// 			sureBtnClick: function() {
+// 				gagajf.ajaxJsonSubmit('/settle/confirm/save/' + $('#settleYm').val(), null);
+// 			}
+// 		});
 	});
 	
 	// 엑셀다운로드

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

@@ -43,10 +43,14 @@
 						</td>
 						<th>공급업체</th>
 						<td>
-							<select name="supplyCompCd">
-								<option value="">[전체]</option>
-								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
+<!-- 							<select name="supplyCompCd"> -->
+<!-- 								<option value="">[전체]</option> -->
+<!-- 								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option> -->
+<!-- 							</select> -->
+							<input type="text" class="w100" name="supplyCompSearchTxt" id="supplyCompSearchTxt" maxlength="20"/>
+							<button type="button" class="btn icn" onclick="cfnOpenCompanyListPopup('fnSetSupplyCompInfo', 'M');"><i class="fa fa-search"></i></button>
+							<span id="supplyCompTxt"></span>
+							<input type="hidden" name="supplyCompList"/>
 						</td>
 					</tr>
 				</table>
@@ -117,8 +121,10 @@
 // 			}
 // 		},
 		{ headerName: "정산연월", field: "usacYm", width: 80, cellClass: 'text-center', hide: true },
-		{ headerName: "공급업체코드", field: "supplyCompCd", width: 100, cellClass: 'text-center', hide: true },
-		{ headerName: "공급업체", field: "supplyCompNm", width: 200 },
+		{ headerName: "공급벤더코드", field: "supplyVendorCd", width: 100, cellClass: 'text-center' },
+		{ headerName: "공급벤더명", field: "supplyVendorNm", width: 200 },
+// 		{ headerName: "공급업체코드", field: "supplyCompCd", width: 100, cellClass: 'text-center', hide: true },
+// 		{ headerName: "공급업체", field: "supplyCompNm", width: 200 },
 		{ headerName: "전자계약여부", field: "econtractYn", width: 100, cellClass: 'text-center' },
 		{ headerName: "사업자등록번호", field: "bizNo", width: 120, cellClass: 'text-center' },
 		{ headerName: "정산주기", field: "settleDay", width: 100, cellClass: 'text-center', hide:true },
@@ -229,13 +235,38 @@
 		{ headerName: "은행", field: "bankNm", width: 100, cellClass: 'text-center' },
 		{ headerName: "계좌번호", field: "accountNo", width: 150, cellClass: 'text-center' },
 		{ headerName: "예금주명", field: "depositorNm", width: 100, cellClass: 'text-center' },
-		{ headerName: "계산서이메일", field: "billEmail", width: 100, cellClass: 'text-center' }
+		{ headerName: "계산서이메일", field: "billEmail", width: 200 }
 	];
 
 	let gridOptions = gagaAgGrid.getGridOptions(columnDefs);
 
 	gridOptions.stopEditingWhenGridLosesFocus = true;
 	
+	// 업체 조회 팝업에서 호출
+	var fnSetSupplyCompInfo = function(result) {
+		var arrSupplyComp = [];
+		var supplyCompTxt = "";
+		var sIndex = 0;
+		$('#supplyCompTxt').html('');
+		$('#searchForm input[name=supplyCompSearchTxt]').val('');
+		
+		result.forEach(function(supplyComp) {
+			sIndex++; 
+			arrSupplyComp.push(supplyComp.supplyCompCd);
+		});
+
+		// 조회 값이 하나일 경우 화면에 코드 노출. 그 외는 갯수 처리 
+		if (sIndex == 1) {
+			$('#searchForm input[name=supplyCompSearchTxt]').val(arrSupplyComp[0]);
+		} else {
+			supplyCompTxt = sIndex + " 개";
+			$('#supplyCompTxt').html(supplyCompTxt);
+		}
+		
+		var jsonData = JSON.stringify(arrSupplyComp);
+		$("#searchForm input[name=supplyCompList]").val(jsonData);
+	}
+	
 	// 검색
 	$('#btnSearch').on('click', function() {
 		// 입력 값 체크