Merge remote-tracking branch 'origin/develop' into xodud1202

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

@@ -16,7 +16,7 @@ public class SupplyCompany extends TscBaseDomain {
 
 	private String supplyCompCd;		// 공급업체코드
 	private String supplyCompNm;		// 공급업체명
-	private String supplyCompUcd;		// 상위공급업체코드
+	private String supplyVendorCd;		// 상위공급업체코드
 	private int provierNo;				// ProvierNo(WMS)
 	private String bizGb;				// 사업자구분
 	private String bizNo;				// 사업자번호
@@ -58,4 +58,5 @@ public class SupplyCompany extends TscBaseDomain {
 	private String searchGb;			// 검색구분
 	private String searchTxt;			// 검색어
 	private String callbackFn;			// 콜백함수
+	private String multiGb;
 }

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

@@ -7,25 +7,25 @@
 		/* TsaBusiness.getSupplyCompanyList */
 		SELECT SC.SUPPLY_COMP_CD       /*공급업체코드*/
 		     , SC.SUPPLY_COMP_NM       /*공급업체명*/
-		     , SC.SUPPLY_COMP_UCD      /*상위공급업체코드*/
-		     , SC.BIZ_GB               /*사업자구분*/
-		     , SC.BIZ_NO               /*사업자등록번호*/
-		     , SC.BIZ_KIND             /*업종*/
-		     , SC.BIZ_TYPE             /*업태*/
-		     , SC.OWNER_NM             /*대표자명*/
-		     , SC.BIZ_ZIPCODE          /*사업장우편번호*/
-		     , SC.BIZ_BASE_ADDR        /*사업장기본주소*/
-		     , SC.BIZ_DTL_ADDR         /*사업장상세주소*/
-		     , SC.MAIN_TELNO           /*대표전화번호*/
-		     , SC.MAIN_FAXNO           /*대표팩스번호*/
-		     , SC.HOMEPAGE_URL         /*홈페이지URL*/
+		     , SC.SUPPLY_VENDOR_CD     /*상위공급업체코드*/
+		     -- , SC.BIZ_GB               /*사업자구분*/
+		     -- , SC.BIZ_NO               /*사업자등록번호*/
+		     -- , SC.BIZ_KIND             /*업종*/
+		     -- , SC.BIZ_TYPE             /*업태*/
+		     -- , SC.OWNER_NM             /*대표자명*/
+		     -- , SC.BIZ_ZIPCODE          /*사업장우편번호*/
+		     -- , SC.BIZ_BASE_ADDR        /*사업장기본주소*/
+		     -- , SC.BIZ_DTL_ADDR         /*사업장상세주소*/
+		     -- , SC.MAIN_TELNO           /*대표전화번호*/
+		     -- , SC.MAIN_FAXNO           /*대표팩스번호*/
+		     -- , SC.HOMEPAGE_URL         /*홈페이지URL*/
 		     , SC.DISTRIBUTION_GB      /*유통구분*/
 		     , SC.SHOT_DELV_YN         /*총알배송여부*/
 		     , SC.SUPPLY_STAT          /*입점상태*/
 		     , (SELECT CD_NM FROM TB_COMMON_CODE CC WHERE SC.SUPPLY_STAT = CC.CD AND CC.CD_GB = 'G010') AS SUPPLY_STAT_NM
-		     , SC.MIN_ORD_AMT          /*무료배송비최소주문금액*/
-		     , SC.DELV_FEE             /*배송비*/
-		     , SC.SELL_FEE_RATE        /*판매수수료율*/
+		    --  , SC.MIN_ORD_AMT          /*무료배송비최소주문금액*/
+		     -- , SC.DELV_FEE             /*배송비*/
+		     -- , SC.SELL_FEE_RATE        /*판매수수료율*/
 		     , SC.SETTLE_DAY           /*정산일*/
 		     , SC.BANK_CD              /*은행코드*/
 		     , SC.ACCOUNT_NO           /*계좌번호*/

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

@@ -67,15 +67,17 @@
 
 	<script th:inline="javascript">
 		/*<![CDATA[*/
+		let headerSelection = false;
+		if([[${params.multiGb}]] == "M") headerSelection = true;
 		let columnCompanyPopupDefList = [
-			{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+			{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: headerSelection, checkboxSelection: true, filter: false},
 			{headerName: "공급업체번호", field: "supplyCompCd", width: 120, cellClass: 'text-center'},
 			{headerName: "공급업체국문명", field: "supplyCompNm", width: 150, cellClass: 'text-center'},
 			{headerName: "입점상태", field: "supplyStatNm", width: 150, cellClass: 'text-center'}
 		];
 
 		let gridOptionsCompanyPopupList = gagaAgGrid.getGridOptions(columnCompanyPopupDefList);
-		gridOptionsCompanyPopupList.rowSelection = "multiple";
+		if(headerSelection) {	gridOptionsCompanyPopupList.rowSelection = "multiple";	}
 
 		// Row double click
 		gridOptionsCompanyPopupList.onRowDoubleClicked = function(event) {