112233

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

@@ -173,6 +173,8 @@ public class Delivery extends TscBaseDomain {
 	private String delvCnclYnNm;
 	private int cnclRtnQty;
 	private String delvFailReason;
+	private String delvFeeCd;
+	private String delvFeeCdGrp;
 	
 	
 	

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

@@ -1189,15 +1189,21 @@
 		     , O.ORD_NM
 		     , O.ORD_PHNNO 
 		     , O.ORD_EMAIL 
+		     , OD.DELV_FEE_CD
+		     , CASE WHEN G1.SELF_GOODS_YN IN ('Y')
+		            THEN 'WMS'
+		            ELSE OD.DELV_FEE_CD
+		            END  DELV_FEE_CD_GRP
 		FROM   TB_EXCHANGE_DELV_FAIL EDF
 		INNER  JOIN TB_ORDER_DETAIL OD
-		ON     OD.ORD_NO = EDF.ORD_NO
+		ON     OD.ORD_DTL_NO = EDF.ORD_DTL_NO
 		INNER  JOIN TB_GOODS G1
 		ON     OD.GOODS_CD = G1.GOODS_CD
 		INNER  JOIN TB_ORDER O
 		ON     EDF.ORD_NO = O.ORD_NO
 		WHERE  1=1
 		AND    EDF.DEL_YN = 'N'
+		AND    EDF.CNCL_RTN_QTY > 0
 		<if test='ordNm != null and ordNm != ""'>
 		AND    O.ORD_NM = #{ordNm}
 		</if>

src/main/webapp/WEB-INF/views/delivery/ExchangeDelvFailListForm.html

@@ -96,64 +96,124 @@
 
 <script th:inline="javascript">
 /*<![CDATA[*/ 
-	var columnDefs = [
-		{headerName: "교환배송취소번호",	field: "exchangeDelvFailSq",	width: 50,	cellClass: 'text-center', hide: true},
-		{headerName: "변경요청번호",		field: "ordChgSq",				width: 150,	cellClass: 'text-center'},
-		{headerName: "주문번호",			field: "ordNo",					width: 150,	cellClass: 'text-center'},
-		{headerName: "주문상세번호",		field: "ordDtlNo",				width: 150,	cellClass: 'text-center'},
-		{headerName: "교환배송취소여부",	field: "delvCnclYn",			width: 150,	cellClass: 'text-center'},
-		{headerName: "출고가능수량",		field: "ordQty",				width: 150,	cellClass: 'text-center'},
-		{headerName: "품절취소수량",		field: "cnclRtnQty",			width: 150,	cellClass: 'text-center'},
-		{headerName: "품절취소사유",		field: "delvFailReason",		width: 150,	cellClass: 'text-center'},
-		{headerName: "상품코드",			field: "goodsCd",				width: 150,	cellClass: 'text-center'},
-		{headerName: "상품명",			field: "goodsNm",				width: 150,	cellClass: 'text-center'},
-		{headerName: "주문자",			field: "ordNm",					width: 150,	cellClass: 'text-center'},
-		{headerName: "핸드폰번호",			field: "ordPhnno",				width: 150,	cellClass: 'text-center'},
-		{headerName: "이메일",			field: "ordEmail",				width: 150,	cellClass: 'text-center'}
-	];
-
-	var gridOptions = gagaAgGrid.getGridOptions(columnDefs);
-	gridOptions.rowSelection = 'multiple';
-	
-	$('#btnSearch').on('click', function() {
-		fnSearchList();
-	});
-
-	var fnSearchList = function() {
-		if ($('#stDate').val() == '') {
-			mcxDialog.alert('시작 기간을 입력하세요.');
-			return;
+var columnDefs = [
+	{headerName: "교환배송취소번호",	field: "exchangeDelvFailSq",	width: 50,	cellClass: 'text-center', hide: true},
+	{headerName: "변경요청번호",		field: "ordChgSq",				width: 100,	cellClass: 'text-center', hide: true},
+	{
+		headerName		: "변경요청"
+		, field			: "ordChgSq"
+		, width			: 100
+		, cellClass		: 'text-center'
+		, cellRenderer: function (params) {
+			var rtnStr = "";
+			
+			var paramData 	= params.data.ordNo;
+			paramData 		+= '@' + params.data.ordDtlNo;
+			paramData 		+= '@' + params.data.delvFeeCd;
+			paramData 		+= '@' + params.data.delvFeeCdGrp;
+										
+			rtnStr = '<a href="javascript:void(0);" onclick="fnCancelRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
+			return rtnStr;
 		}
+	},
+	{headerName: "주문번호",			field: "ordNo",					width: 100,	cellClass: 'text-center'},
+	{headerName: "주문상세번호",		field: "ordDtlNo",				width: 100,	cellClass: 'text-center'},
+	{headerName: "교환배송취소여부",	field: "delvCnclYn",			width: 120,	cellClass: 'text-center'},
+	{headerName: "출고가능수량",		field: "ordQty",				width: 100,	cellClass: 'text-center'},
+	{headerName: "품절취소수량",		field: "cnclRtnQty",			width: 100,	cellClass: 'text-center'},
+	{headerName: "품절취소사유",		field: "delvFailReason",		width: 120,	cellClass: 'text-center'},
+	{headerName: "상품코드",			field: "goodsCd",				width: 130,	cellClass: 'text-center'},
+	{headerName: "상품명",			field: "goodsNm",				width: 180,	cellClass: 'text-center'},
+	{headerName: "주문자",			field: "ordNm",					width: 120,	cellClass: 'text-center'},
+	{headerName: "핸드폰번호",			field: "ordPhnno",				width: 120,	cellClass: 'text-center'},
+	{headerName: "이메일",			field: "ordEmail",				width: 160,	cellClass: 'text-center'}
+];
 
-		if ($('#edDate').val() == '') {
-			mcxDialog.alert('종료 기간을 입력하세요.');
-			return;
-		}
+var gridOptions = gagaAgGrid.getGridOptions(columnDefs);
+gridOptions.rowSelection = 'multiple';
 
-		// 날짜 유효성 체크
-		if (Number($('#stDate').val().replaceAll("-", "")) > Number($('#edDate').val().replaceAll("-", ""))) {
-			mcxDialog.alert("시작일은 종료일보다 클 수 없습니다.");
-			return;
-		}
+$('#btnSearch').on('click', function() {
+	fnSearchList();
+});
 
-		gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptions, '#searchForm', function() {
-			
-		});
+var fnSearchList = function() {
+	if ($('#stDate').val() == '') {
+		mcxDialog.alert('시작 기간을 입력하세요.');
+		return;
+	}
+
+	if ($('#edDate').val() == '') {
+		mcxDialog.alert('종료 기간을 입력하세요.');
+		return;
 	}
 
-	/*************************************************************************
-	*  달력 초기화 
-	**************************************************************************/
-	var fnInitCalendar = function() {
-		cfnChangeCalendar('1d', $('#stDate'), $('#edDate')); //달력 초기화
+	// 날짜 유효성 체크
+	if (Number($('#stDate').val().replaceAll("-", "")) > Number($('#edDate').val().replaceAll("-", ""))) {
+		mcxDialog.alert("시작일은 종료일보다 클 수 없습니다.");
+		return;
 	}
 
-	$(document).ready(function() {
-		gagaAgGrid.createGrid('gridList', gridOptions);
+	gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptions, '#searchForm', function() {
 		
-		cfnCreateCalendar('#terms', 'stDate', 'edDate', true, '출고금지상품관리');
-		fnInitCalendar();
 	});
+}
+
+/*************************************************************************
+*  달력 초기화 
+**************************************************************************/
+var fnInitCalendar = function() {
+	cfnChangeCalendar('1d', $('#stDate'), $('#edDate')); //달력 초기화
+}
+
+$(document).ready(function() {
+	gagaAgGrid.createGrid('gridList', gridOptions);
+	
+	cfnCreateCalendar('#terms', 'stDate', 'edDate', true, '출고금지상품관리');
+	fnInitCalendar();
+});
+
+//2021.01.25 추가
+//취소요청, 교환요청, 반품요청 일때는 요청 정보 확인 팝업 정보
+var fnCancelRequest = function (paramData, ordChgSq) {
+	// 취소요청 구분 (orChgSq null 이면 취소요청화면 있으면 취소요청정보화면)
+	if (ordChgSq == null) {
+		ordChgSq = 0;
+	}
+	
+	var paramArr 	= paramData.split("@");
+	var param 		= "";
+	param += "&ordNo=" 			+ paramArr[0];
+	param += "&ordDtlNo=" 		+ paramArr[1];
+	param += "&delvFeeCd="		+ paramArr[2];
+	param += "&delvFeeCdGrp="	+ paramArr[3];
+	param += "&ordChgSq=" 		+ ordChgSq;
+	
+	var actionUrl = "/orderChange/cncl/req/form?" + param;
+	
+	cfnOpenModalPopup(actionUrl, 'popupCancelRequestForm');
+	
+	return false;
+};
+
+// 교환요청
+var fnExchangeRequest = function (paramData, ordChgSq) {
+	console.log(paramData);
+	// 취소요청 구분 (orChgSq null 이면 취소요청화면 있으면 취소요청정보화면)
+	if (ordChgSq == null) {
+		ordChgSq = 0;
+	}
+	
+	var paramArr 	= paramData.split("@");
+	var param 		= "";
+	param += "&ordNo=" 			+ paramArr[0];
+	param += "&ordDtlNo=" 		+ paramArr[1];
+	param += "&delvFeeCd="		+ paramArr[2];
+	param += "&delvFeeCdGrp="	+ paramArr[3];
+	param += "&ordChgSq=" 		+ ordChgSq;
+	
+	var actionUrl = "/orderChange/exchange/request/form?" + param;
+	cfnOpenModalPopup(actionUrl, 'popupExchangeRequestForm');
+};
 
 /*]]>*/
 </script>

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

@@ -182,9 +182,10 @@ var payGb 						= orderInfoList[0].payGb;						// 결제수단
 var payMeans 					= orderInfoList[0].payMeans;					// 결제방법
 var chgReason					= "";											// 변경사유코드
 var chgMemo						= "";											// 변경사유메모
+var chgStat						= cancelRequestTargetList[0].chgStat			// 변경상태
 
 // 변경요청정보 승인, 철회
-if (ordChgSq > 0) {
+if (ordChgSq > 0 && chgStat != 'G685_40') {
 	chgReason					= orderChangeDetailList[0].chgReason;			// 변경사유코드
 	chgMemo						= orderChangeDetailList[0].chgMemo;				// 변경사유메모
 }
@@ -233,7 +234,7 @@ var columnCancelReqList = [
 	},
 	{
 		headerName		: "취소/반품"		
-		, field			: "ordCanChgQty"			
+		, field			: "ordCanChgQty"
 		, width			: 100		
 		, cellClass		: 'text-center'
 		, cellRenderer	: function (params) {
@@ -244,7 +245,7 @@ var columnCancelReqList = [
 			var rtnStr 			= "";
 			
 			// 취소신청가능수량있으면 수량만 표시 (취소,반품,교환 신청정보 처리)
-			if (ordChgSq > 0) {
+			if (ordChgSq > 0 && chgStat != 'G685_40') {
 				rtnStr = ordCanChgQty;
 			} else {
 				ordCanChgQty = ordQty - (cnclRtnQty +  ordReqChgQty);
@@ -432,7 +433,7 @@ var columnCancelReqToBeList = [
 			{headerName: "주문번호"		, field: "ordNo"			, width: 80		, cellClass: 'text-center', hide: temp1},
 			{headerName: "주문상세"		, field: "ordDtlNo"			, width: 80		, cellClass: 'text-center'},
 			{headerName: "주문상세"		, field: "ordDtlStat"		, width: 80		, cellClass: 'text-center', hide: temp1},
-			{headerName: "주문상세상태"		, field: "ordDtlStatNm"		, width: 100	, cellClass: 'text-center', hide: temp1},
+			{headerName: "주문상세상태"	, field: "ordDtlStatNm"		, width: 100	, cellClass: 'text-center', hide: temp1},
 			{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-center', hide: temp1},
 			{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-center', hide: temp1},
 			{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center', hide: temp2}
@@ -1133,7 +1134,7 @@ $(document).ready(function() {
 	}
 	
 	// 5. 취소신청, 취소완료, 취소승인, 취소철회 버튼 제어
-	if (ordChgSq > 0) {
+	if (ordChgSq > 0 && chgStat != 'G685_40') {
 		$("#cnclReqBtn").css("display", "none");
 		$("#cnclCompleteBtn").css("display", "none");
 	} else {
@@ -1142,7 +1143,7 @@ $(document).ready(function() {
 	}
 	
 	// 6. 취소사유 선택
-	if (ordChgSq > 0) {
+	if (ordChgSq > 0 && chgStat != 'G685_40') {
 		$("select[name='selectChgReason']").val(chgReason);										// 변경사유코드
 		$("select[name='selectChgReason']").attr("disabled", "true");							// 변경사유 비활성화
 		$("#chgMemo").text(chgMemo);															// 변경사유메모

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

@@ -736,7 +736,7 @@ var columnDefsOrderChangeInfo = [
 	},
 	{headerName: "요청메모"		, field: "chgMemo"		, width: 150	, cellClass: 'text-left'},
 	{headerName: "변경자명"		, field: "chgerNm"		, width: 100	, cellClass: 'text-center'},
-	{headerName: "변경자핸드폰"		, field: "chgerPhnno"	, width: 120	, cellClass: 'text-center', editable: true},
+	{headerName: "변경자핸드폰"	, field: "chgerPhnno"	, width: 120	, cellClass: 'text-center', editable: true},
 	{
 		headerName		: "우편번호"		
 		, field			: "chgerZipcode"
@@ -761,7 +761,7 @@ var columnDefsOrderChangeInfo = [
 			return rtnStr;
 		}
 	},
-	{headerName: "주소(기본)"		, field: "chgerBaseAddr"	, width: 220, cellClass: 'text-left'},
+	{headerName: "주소(기본)"		, field: "chgerBaseAddr", width: 220	, cellClass: 'text-left'},
 	{headerName: "주소(상세)"		, field: "chgerDtlAddr"	, width: 150	, cellClass: 'text-center'	, editable: true},
 	{
 		headerName		: "택배사전송"