Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin.git into develop

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

@@ -65,7 +65,8 @@ public class TsaOrderChangeService {
 		orderChange.setWdTargetYn(this.getWdTargetYnInfo(orderChange));
 
 		// 3. WMS 반품 정보 삭제 처리
-		coreWmsService.updateWmsRecallCancel(orderChange.getOrdNo(), orderChange.getOrdChgSq());
+		// 2021.07.14 card007 반품 철회 시 WMS 정보 삭제 처리
+		// coreWmsService.updateWmsRecallCancel(orderChange.getOrdNo(), orderChange.getOrdChgSq());
 
 		// 4. 회수송장정보 설정
 		orderChange = this.setWdInvoiceInfo(orderChange);
@@ -90,7 +91,8 @@ public class TsaOrderChangeService {
 		orderChange.setWdTargetYn("N");
 
 		// 3. WMS 반품 정보 삭제 처리
-		coreWmsService.updateWmsRecallCancel(orderChange.getOrdNo(), orderChange.getOrdChgSq());
+		// 2021.07.14 card007 반품 철회 시 WMS 정보 삭제 처리
+		// coreWmsService.updateWmsRecallCancel(orderChange.getOrdNo(), orderChange.getOrdChgSq());
 
 		// 4. 회수송장정보 설정
 		orderChange = this.setWdInvoiceInfo(orderChange);
@@ -126,7 +128,8 @@ public class TsaOrderChangeService {
 		orderChange.setWdTargetYn("N");
 
 		// 3. WMS 교환 정보 삭제 처리
-		coreWmsService.updateWmsRecallCancel(orderChange.getOrdNo(), orderChange.getOrdChgSq());
+		// 2021.07.14 card007 교환 철회 시 WMS 정보 삭제 처리
+		// coreWmsService.updateWmsRecallCancel(orderChange.getOrdNo(), orderChange.getOrdChgSq());
 
 		// 4. 회수송장정보 설정
 		orderChange = this.setWdInvoiceInfo(orderChange);

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

@@ -482,7 +482,7 @@ public class TsaDisplayController extends TsaBaseController {
 		categoryGoods.setRegNo(TsaSession.getInfo().getUserNo());	//엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		categoryGoods.setPageable(new TscPageRequest(categoryGoods.getPageNo() - 1, categoryGoods.getPageSize()));
 		categoryGoods.getPageable().setTotalCount(displayService.getCategoryGoodsListCount(categoryGoods));
-
+		categoryGoods.setDispUseGb("Y");
 		result.set("pageing", categoryGoods);
 		result.set("categoryGoodsList", displayService.getCategoryGoodsList(categoryGoods));
 

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

@@ -71,6 +71,8 @@ public class CategoryGoods extends TscBaseDomain {
 	private String brandGrpNm;
 	private String regNm;
 
+	private String dispUseGb;
+
 	// Pagination
 	private TscPageRequest pageable;
 	private int pageNo = 1;

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

@@ -1099,7 +1099,9 @@
 					<if test="goodsCd != null and goodsCd !='' and searchGb !='EXCEL'">
 						AND G.GOODS_CD = #{goodsCd}
 					</if>
-					ORDER BY A.DISP_ORD ASC, G.UPD_DT DESC, G.CURR_PRICE DESC, G.GOODS_CD ASC
+					<if test='dispUseGb != null and dispUseGb != "" and dispUseGb == "Y"'>
+						ORDER BY A.DISP_ORD ASC, G.UPD_DT DESC, G.CURR_PRICE DESC, G.GOODS_CD ASC
+					</if>
 			<include refid="getListPagingCondition_sql"/>
 	</select>
 

src/main/webapp/WEB-INF/views/display/CategoryGoodsForm.html

@@ -102,7 +102,7 @@
 		<ul class="panelBar">
 			<li class="aR" id="btnGoodsEdit" style="display:none">
 				<button type="button" class="btn btn-primary btn-lg leafCateBtn" id="btnAddGoods" style="display:none">상품추가</button>
-				<button type="button" class="btn btn-primary btn-lg" id="btnDispChange">순서변경</button>
+<!--				<button type="button" class="btn btn-primary btn-lg" id="btnDispChange">순서변경</button>-->
 				<!--<button type="button" class="btn btn-primary btn-lg" id="btnSelectTop">선택최상위로</button>-->
 				<button type="button" class="btn btn-danger btn-lg" id="btnSelectDel">선택삭제</button>
 			</li>

src/main/webapp/WEB-INF/views/display/LookbookBannerPopupForm.html

@@ -188,6 +188,10 @@
 
 	var fnBannerImgFileUpload = function (obj, idx){
 		var file = obj.files[0];
+		// 파일 용량 체크 10MB
+		if(!gagajf.checkFileSize(file)){
+			return;
+		}
 		file.name = 'test';
 		if (typeof(file) == 'undefined'){
 			return;

src/main/webapp/WEB-INF/views/order/ExchangeRequestForm.html

@@ -34,7 +34,7 @@
 				
 				<div style="text-align:right; padding-bottom:5px; padding-top:5px;">
 					<button type="button" class="btn btn-success" th:unless="${ordChgSq > 0}" id="fnExchangeRequestSubmit" onclick="fnExchange()">교환요청</button>
-					<button type="button" class="btn btn-success" id="fnExchangeCancelRequestSubmit" onclick="fnExchangeCancel()">교환철회</button>
+					<button type="button" class="btn btn-success" th:if="${chgStat == 'G685_20' or chgStat == 'G685_21' or (recallExceptionInfo != null and (chgStat == 'G685_30' or chgStat == 'G685_31'))}" id="fnExchangeCancelRequestSubmit" onclick="fnExchangeCancel()">교환철회</button>
 					<button type="button" class="btn btn-success" th:if="${ordChgSq > 0 and (ordChgGb == 'G681_20' or ordChgGb == 'G681_40')}" id="fnReturnToExchangeSubmit" onclick="fnExchange()">교환변경</button>
 				</div>
 				
@@ -623,12 +623,6 @@ var fnChangeChgReason = function(reasonCd){
 			$('#wdBfSendYn').attr('disabled', false);
 		}
 	}
-	
-	// 2021.05.25 반품접수, 반품대기 상태에서만 철회가능
-	// 2021.07.13 회수예외정보가 있고 회수요청, 상품검수중 상태에서 철회 가능 처리
-	if (chgStat != "G685_20" && chgStat != "G685_21" && (recallExceptionInfo == null || (chgStat != "G685_30" && chgStat != "G685_31"))) {
-		$("#fnExchangeCancelRequestSubmit").css("display", "none");
-	}
 
 	$('#exchangeRequestFrm input[name=chgReason]').val(arrReasonCd[0]);
 	$('#exchangeRequestFrm input[name=chgReasonDesc]').val(arrReasonCd[1]);
@@ -642,6 +636,10 @@ var fnExchange = function () {
 	var qty		= true;
 	var opt		= true;
 	var wdGb	= $('#wdGb:checked').val();
+	
+	if (ordChgGb == 'G681_50') {
+		wdGb = 'D';
+	}
 
 	// 1. 교환수량 체크
 	//$.each(cancelRequestTargetList, function(idx, item) {
@@ -1207,13 +1205,19 @@ $(document).ready(function() {
 	fnSetExchangeAddr();
 	
 	// 5. 회수방법 라디오 체크 처리
-	if (wdGb == 'D') {
+	if (ordChgGb != 'G681_50') {
 		$('input:radio[name="wdGb"]:radio[value="D"]').prop('checked', true);
 		$('.chger').css('display', 'none');
+		$('input:radio[name=wdGb]').attr('disabled', true);
 	} else {
-		$('input:radio[name="wdGb"]:radio[value="W"]').prop('checked', true);
+		if (wdGb == 'D') {
+			$('input:radio[name="wdGb"]:radio[value="D"]').prop('checked', true);
+			$('.chger').css('display', 'none');
+		} else {
+			$('input:radio[name="wdGb"]:radio[value="W"]').prop('checked', true);
+		}
 	}
-	
+
 	// 교환철회 처리
 	if (ordChgSq > 0) {
 		// 5. 교환사유설정