Merge branch 'develop' into bin2107

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

@@ -333,13 +333,20 @@ public interface TsaOrderDao {
 	/**
 	 * 배송 > 배송지 정보 수정
 	 *
-	 * @param deliveryAddr
+	 * @param Order
 	 * @author jsh77b
 	 * @since 2021. 01. 15
 	 */
 	void updateOrderAddr(Order order);
 
-
+	/**
+	 * 반품/교환 > 회수지 정보 수정
+	 *
+	 * @param Order
+	 * @author jsh77b
+	 * @since 2021. 01. 18
+	 */
+	void updateOrderChange(Order order);
 
 
 

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

@@ -548,8 +548,21 @@ public class TsaOrderService {
 	 */
 	@Transactional("shopTxnManager")
 	public void updateOrderAddr(Order order) {
-		order.setUpdNo(TsaSession.getInfo().getUserNo());;
+		order.setUpdNo(TsaSession.getInfo().getUserNo());
 		orderDao.updateOrderAddr(order);
 	}
+	
+	/**
+	 * 반품/교환 > 회수지 정보 수정
+	 *
+	 * @param Order - 배송지 정보
+	 * @author jsh77b
+	 * @since 2021. 01. 18
+	 */
+	@Transactional("shopTxnManager")
+	public void updateOrderChange(Order order) {
+		order.setUpdNo(TsaSession.getInfo().getUserNo());
+		orderDao.updateOrderChange(order);
+	}
 
 }

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

@@ -614,7 +614,22 @@ public class TsaOrderController extends TsaBaseController {
 	@ResponseBody
 	public GagaResponse udpateDeliveryAddrUpdate(@RequestBody Order order) {
 		orderService.updateOrderAddr(order);
-		return super.ok("수정이 완료되었습니다.");
+		return super.ok(message.getMessage("SUCC_0002"));
+	}
+	
+	/**
+	 * 반품/교환 > 회수지 정보 수정
+	 *
+	 * @param order - 주문번호
+	 * @return GagaResponse
+	 * @author jsh77b
+	 * @since 2021. 01. 18
+	 */
+	@PostMapping("/change/info/addr/update")
+	@ResponseBody
+	public GagaResponse udpateChangeInfoAddr(@RequestBody Order order) {
+		orderService.updateOrderChange(order);
+		return super.ok(message.getMessage("SUCC_0002"));
 	}
 }
 

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/java/com/style24/persistence/mybatis/shop/TsaOrder.xml

@@ -1542,19 +1542,29 @@
 	<update id="updateOrderAddr" parameterType="Order">
 		/* order.updateOrderAddr : 주문 변경 업데이트(주문자 주소) */
 		UPDATE TB_DELIVERY_ADDR
-		SET    RECIP_NM        = #{recipNm}
-		     , RECIP_PHNNO     = #{recipPhnno}
-		     , RECIP_TELNO     = #{recipTelno}
-		     , RECIP_ZIP_NO    = #{recipZipNo}
-		     , RECIP_BASE_ADDR = #{recipBaseAddr}
-		     , RECIP_DTL_ADDR  = #{recipDtlAddr}
-		     , DELV_MEMO       = #{delvMemo}
-		     , UPD_NO          = #{updNo}
-		     , UPD_DT          = SYSDATE()
-		WHERE  DELV_ADDR_SQ = #{delvAddrSq}
+		SET    RECIP_NM        	= #{recipNm}
+		     , RECIP_PHNNO     	= #{recipPhnno}
+		     , RECIP_TELNO     	= #{recipTelno}
+		     , RECIP_ZIP_NO    	= #{recipZipNo}
+		     , RECIP_BASE_ADDR 	= #{recipBaseAddr}
+		     , RECIP_DTL_ADDR  	= #{recipDtlAddr}
+		     , DELV_MEMO       	= #{delvMemo}
+		     , UPD_NO          	= #{updNo}
+		     , UPD_DT          	= SYSDATE()
+		WHERE  DELV_ADDR_SQ 	= #{delvAddrSq}
 	</update>
 
-
+	<!-- 반품/교환 > 회수지 정보 수정 -->
+	<update id="updateOrderChange" parameterType="Order">
+		/* order.updateOrderChange : 반품/교환 > 회수지 정보 수정 */
+		UPDATE TB_ORDER_CHANGE
+		SET    CHGER_ZIP_NO    	= #{chgerZipNo}
+		     , CHGER_BASE_ADDR 	= #{chgerBaseAddr}
+		     , CHGER_DTL_ADDR  	= #{chgerDtlAddr}
+		     , UPD_NO          	= #{updNo}
+		     , UPD_DT          	= SYSDATE()
+		WHERE  ORD_CHG_SQ 		= #{ordChgSq}
+	</update>
 
 
 

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

@@ -135,9 +135,15 @@
 					<tr>	
 						<th>공급업체<i class="required" title="필수"></i></th>
 						<td>
-							<select name="supplyCompCd" required="required" data-valid-name="공급업체">
+
+<!-- 							<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>
@@ -339,7 +345,9 @@
 		$("#detailForm input[name=brandGrpNm]").val(event.data.brandGrpNm);
 		$("#detailForm input[name=erpBrandCd]").val(event.data.erpBrandCd);
 		$("#detailForm select[name=distributionGb]").val(event.data.distributionGb);
-		fnGetSupplyCompCdList(event.data.supplyCompCd, event.data.delvFeeCd);
+		$("#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
@@ -354,6 +362,9 @@
 			}
 		);
 		
+		// 배송비 정책
+		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=sellFeeRate]").val(event.data.sellFeeRate);
@@ -415,7 +426,7 @@
 	$('#detailForm select[name=brandGb]').on('change', function() {
 		// 구매포인트적립율 설정
 		fnSetPntRate($(this).val());
-		
+/*		
 		$.getJSON('/renderer/supply/company/list/' + $(this).val()
 			, function(result, status) {
 				$('#detailForm select[name=supplyCompCd]').empty().append('<option value="">[선택]</option>');
@@ -425,10 +436,11 @@
 				});
 				$('#detailForm select[name=supplyCompCd]').trigger('change');
 			});
+*/			
 	});
 	
 	// 공급업체 변경 시
-	$('#detailForm select[name=supplyCompCd]').on('change', function() {
+/*	$('#detailForm select[name=supplyCompCd]').on('change', function() {
 		if (gagajf.isNull($(this).val())) {
 			$('#detailForm select[name=delvLocCd]').empty().append('<option value="">[선택]</option>');
 			return;
@@ -463,9 +475,9 @@
 			
 		});
 	});
-	
+*/	
 	// 해당공급업체 조회
-	var fnGetSupplyCompCdList = function(supplyCompCd, delvFeeCd){
+/*	var fnGetSupplyCompCdList = function(supplyCompCd, delvFeeCd){
 		$.getJSON('/renderer/supply/company/list/' + $('#detailForm select[name=brandGb]').val()
 			, function(result, status) {
 				$('#detailForm select[name=supplyCompCd]').empty().append('<option value="">[선택]</option>');
@@ -478,7 +490,37 @@
 		
 		cfnCreateCombo('/renderer/delvFee/list/' + supplyCompCd, $('#detailForm select[name=delvFeeCd]'), "[선택]", delvFeeCd);
 	}
+*/	
+	// 공급업체 선택시
+	$('#btnSearchSupplyComp').on('click', function() {
+/*
+		if (gagajf.isNull($("#detailForm input[name=searchTxt]").val())){
+			mcxDialog.alert('공급업체 검색어를 입력하세요.');
+			return false;
+		}
+*/		
+		cfnOpenCompanyListPopup('fnSetSupplyCompInfo', 'S', $("#detailForm input[name=searchTxt]").val());
+		
+	});
 	
+	// 공급업체 조회 팝업에서 호출
+	var fnSetSupplyCompInfo = function(result) {
+		$("#detailForm input[name=supplyCompCd]").val(result[0].supplyCompCd);
+		$("#detailForm input[name=supplyCompNm]").val(result[0].supplyCompNm);
+		
+		// 출고처 정보
+		$.getJSON('/renderer/delvloc/list/' + result[0].supplyCompCd
+			, function(delvLocList, status) {
+				$('#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);
+				});
+			}
+		);
+		
+		cfnCreateCombo('/renderer/delvFee/list/' + result[0].supplyCompCd, $('#detailForm select[name=delvFeeCd]'), "[선택]");
+	}
 	
 	// 브랜드담당MD 목록
 	var fnGetBrandMdList = function(brandCd) {
@@ -645,6 +687,7 @@
 		$("#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 input[type=checkbox]").removeClass("checked");
 		$("#detailForm input[type=checkbox]").parent("label").removeClass("checked");

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) {

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

@@ -1079,10 +1079,10 @@
 	// 브랜드 조회 선택시
 	$('#btnSearchBrand').on('click', function() {
 
-		if (gagajf.isNull($("#searchForm input[name=searchTxt]").val())){
+		/* if (gagajf.isNull($("#searchForm input[name=searchTxt]").val())){
 			mcxDialog.alert('브랜드 검색어를 입력하세요.');
 			return false;
-		}
+		} */
 		
 		cfnOpenBrandListPopup('fnSetBrandInfo', 'S', $("#searchForm input[name=searchTxt]").val());