교환TO취소 작업중

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

@@ -330,4 +330,14 @@ public interface TsaDeliveryDao {
 	 */
 	void cancelAssignDelvLoc(Delivery delivery);
 	
+	/**
+	 * 교환배송미출고대상 목록
+	 *
+	 * @param Delivery 
+	 * @return Collection<Delivery>
+	 * @author jsh77b
+	 * @since 2021. 06. 07
+	 */
+	Collection<Delivery> getExchangeDelvFailList(Delivery delivery);
+	
 }

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

@@ -610,6 +610,18 @@ public class TsaDeliveryService {
 		order.setUpdNo(userId);
 		order.setRegNo(userId);
 		orderDao.createOrderDetailHst(order);		
-	}	
+	}
+	
+	/**
+	 * 교환배송미출고대상 목록
+	 *
+	 * @param -Delivery
+	 * @return Collection<Delivery>
+	 * @author jsh77b
+	 * @since 2021. 06. 07
+	 */
+	public Collection<Delivery> getExchangeDelvFailList(Delivery delivery) {
+		return deliveryDao.getExchangeDelvFailList(delivery);
+	}
 	
 }

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

@@ -540,4 +540,37 @@ public class TsaDeliveryController extends TsaBaseController {
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 	
+	/**
+	 * 교환배송미출고대상
+	 * 
+	 * @return ModelAndView
+	 * @throws Exception
+	 * @author jsh77b
+	 * @since 2021. 06. 07
+	 */
+	@RequestMapping(value = "/exchangeDelvFail/list/form")
+	public ModelAndView deliveryExchangeDelvFailListForm() throws Exception {
+		ModelAndView mav = new ModelAndView();
+
+		mav.setViewName("delivery/ExchangeDelvFailListForm");
+
+		return mav;
+	}
+	
+	/**
+	 * 교환배송미출고대상 목록
+	 *
+	 * @param
+	 * @return
+	 * @throws Exception
+	 * @author jsh77b
+	 * @since 2021. 06. 07
+	 */
+	@PostMapping("/exchangeDelvFail/list")
+	@ResponseBody
+	public Collection<Delivery> getExchangeDelvFailList(@RequestBody Delivery delivery) throws Exception {
+		Collection<Delivery> dataList = deliveryService.getExchangeDelvFailList(delivery);
+		return dataList;
+	}
+	
 }

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

@@ -1,7 +1,5 @@
 package com.style24.persistence.domain;
 
-import java.util.Collection;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.style24.persistence.TscBaseDomain;
 import com.style24.persistence.TscPageRequest;
@@ -158,6 +156,16 @@ public class Delivery extends TscBaseDomain {
 	private int pageSize = 50;
 	private int pageUnit = 10;
 	
+	private int exchangeDelvFailSq;
+	private int ordChgSq;
+	private String delvCnclYn;
+	private String delvCnclYnNm;
+	private int cnclRtnQty;
+	private String delvFailReason;
+	
+	
+	
+	
 	
 
 	

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

@@ -1128,14 +1128,14 @@
 	
 	<!-- 출고처지정 삭제   -->
 	<delete id="deleteTbDeliveryAssign" parameterType="Delivery" >
-		/*TsbDelivery.deleteTbDeliveryAssign*/
+		/*TsaDelivery.deleteTbDeliveryAssign*/
 		DELETE FROM TB_DELIVERY_ASSIGN
 		WHERE ORD_DTL_NO  = #{ordDtlNo}
 	</delete>	
 	
 	<!-- 주문상세 출고처지정 취소   -->
 	<update id="cancelAssignDelvLoc" parameterType="Delivery" >
-		/*TsbDelivery.cancelAssignDelvLoc*/
+		/*TsaDelivery.cancelAssignDelvLoc*/
 		UPDATE TB_ORDER_DETAIL SET
 			  ORD_DTL_STAT     = #{ordDtlStat}
 			, DELV_LOC_CD      = NULL
@@ -1144,7 +1144,49 @@
 			, UPD_NO           = #{updNo}
 			, UPD_DT           = NOW()
 		WHERE ORD_DTL_NO = #{ordDtlNo}
-	</update>	
+	</update>
+	
+	<!-- 교환배송미출고대상 목록   -->
+	<select id="getExchangeDelvFailList" parameterType="Delivery" resultType="Delivery">
+		/* TsaDelivery.getExchangeDelvFailList */
+		SELECT EDF.EXCHANGE_DELV_FAIL_SQ
+		     , EDF.ORD_CHG_SQ
+		     , EDF.ORD_NO
+		     , EDF.ORD_DTL_NO
+		     , EDF.DELV_CNCL_YN
+		     , CASE WHEN DELV_CNCL_YN IN ('Y')
+		            THEN '대기'
+		            ELSE '완료'
+		            END  DELV_CNCL_YN_NM
+		     , EDF.ORD_QTY
+		     , EDF.CNCL_RTN_QTY
+		     , EDF.DELV_FAIL_REASON
+		     , G1.GOODS_CD
+		     , G1.GOODS_NM
+		     , G1.GOODS_TYPE
+		     , O.ORD_NM
+		     , O.ORD_PHNNO 
+		     , O.ORD_EMAIL 
+		FROM   TB_EXCHANGE_DELV_FAIL EDF
+		INNER  JOIN TB_ORDER_DETAIL OD
+		ON     OD.ORD_NO = EDF.ORD_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'
+		<if test='ordNm != null and ordNm != ""'>
+		AND    O.ORD_NM = #{ordNm}
+		</if>
+		<if test='ordNo != null and ordNo != ""'>
+		AND    O.ORD_No = #{ordNo}
+		</if>
+		<if test='delvCnclYn != null and delvCnclYn != ""'>
+		AND    EDF.DELV_CNCL_YN = #{delvCnclYn}
+		</if>
+		ORDER  BY EDF.REG_DT ASC
+	</select>
 		
 	
 </mapper>

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

@@ -4,14 +4,14 @@
 <!--
  *******************************************************************************
  * @source  : ExchangeDelvFailListForm.html
- * @desc    : 교환출고 품절취소 목록 Page
+ * @desc    : 교환배송 미출곡 목록 대상
  *=============================================================
  * ISTYLE24
  * Copyright(C) 2021 TSIT, All rights reserved.
  *=============================================================
  * VER  DATE         AUTHOR      DESCRIPTION
  * ===  ===========  ==========  ==================================
- * 1.0  2021.06.03   jsh77b        최초 작성
+ * 1.0  2021.06.07   jsh77b        최초 작성
  * 1.1  
  ********************************************************************************
  -->
@@ -20,10 +20,12 @@
 		<div class="main-title">
 		</div>
 		<!-- //메인타이틀 영역 -->
+		
 		<!-- 메뉴 설명 -->
 		<div class="infoBox menu-desc">
 		</div>
 		<!-- //메뉴 설명 -->
+		
 		<!-- 검색조건 영역 -->
 		<div class="panelStyle">
 			<!-- TITLE -->
@@ -36,7 +38,7 @@
 			<!-- //TITLE -->
 			
 			<div class="panelContent">	
-				<form id="searchForm" name="searchForm" action="#" th:action="@{'/delivery/exchange/delvFail/list'}" onsubmit="fnSearchList(); return false;">
+				<form id="searchForm" name="searchForm" action="#" th:action="@{'/delivery/exchangeDelvFail/list'}" onsubmit="fnSearchList(); return false;">
 					<table class="frmStyle">
 						<colgroup>
 							<col style="width:8%;"/>
@@ -57,10 +59,10 @@
 							</td>
 							<th class="dashR">처리상태</th>
 							<td class="dashR">
-								<select name="delYn" id="delYn">
+								<select name="delvCnclYn" id="delvCnclYn">
 									<option value="">전체</option>
-									<option value="대기" selected>대기</option>
-									<option value="처리완료">처리완료</option>
+									<option value="N" selected>대기</option>
+									<option value="y">처리완료</option>
 								</select>
 							</td>
 						</tr>
@@ -76,7 +78,6 @@
 						<li class="center">
 							<button type="button" class="btn btn-base btn-lg" id="btnSearch">조회</button>
 							<button type="button" class="btn btn-gray btn-lg" onclick="$('#searchForm')[0].reset(); fnInitCalendar();">초기화</button>
-							<button type="button" id="btnExcel" class="btn btn-info btn-lg" >엑셀다운로드</button>
 						</li>
 					</ul>
 				</form>
@@ -96,11 +97,11 @@
 <script th:inline="javascript">
 /*<![CDATA[*/ 
 	var columnDefs = [
-		{headerName: "교환배송취소번호",		field: "exchangeDelvFailSq",	width: 50,	cellClass: 'text-center', hide: true},
+		{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: "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'},
@@ -147,64 +148,10 @@
 		cfnChangeCalendar('1d', $('#stDate'), $('#edDate')); //달력 초기화
 	}
 
-	/*************************************************************************
-	*  삭제
-	**************************************************************************/	
-	var deleteBangoods = function(){
-		
-		var selectedData = gridOptions.api.getSelectedNodes();
-		
-		$.each(selectedData, function(idx, row) {
-	
-	 		if(row.data.delYn == "Y") {
-	 			gridOptions.api.deselectIndex(row.rowIndex);
-	 		}
-	 	});
-		
-		
-		mcxDialog.confirm("삭제하시겠습니까?", {
-		    cancelBtnText: "취소",
-		    sureBtnText: "확인",
-		    sureBtnClick: function() {
-
-	            var gridData = gagaAgGrid.removeRowData(gridOptions,false);
-
-	            if (gridData.length == 0) {
-	            	mcxDialog.alert('선택된 행이 없습니다.');
-	                return;
-	            }
-
-	            var createData = [];
-	            $.each(gridData, function(idx, item) {
-	                var param = new Object;
-
-	                param.delvBanGoodsSq = item.delvBanGoodsSq;
-	                param.goodsCd = item.goodsCd;
-	                param.colorCd = item.colorCd;
-	                param.sizeCd = item.sizeCd;
-
-	                createData.push(param);
-	            });
-
-	            var jsonData = JSON.stringify(createData);
-	            gagajf.ajaxJsonSubmit('/delivery/bangoods/delete', jsonData, fnSearchList);
-	        }
-		});
-	}
-
-	/*************************************************************************
-	*  등록 팝업 호출 
-	**************************************************************************/	
-	var registerBangoods = function(){
-		var actionUrl = "/delivery/bangoods/regist/form";
-		cfnOpenModalPopup(actionUrl,'popupRegistBangoods');
-	}
-
 	$(document).ready(function() {
 		gagaAgGrid.createGrid('gridList', gridOptions);
+		
 		cfnCreateCalendar('#terms', 'stDate', 'edDate', true, '출고금지상품관리');
-		//var hideList = ["btnThisWeek", "btnYesterWeek", "btnRecentMonth", "btnThisMonth", "btnYesterMonth", "btnRecent3Month"];
-		//cfnCreateCalendar('#terms', 'stDate', 'edDate', true, '출고금지상품관리', '', hideList);
 		fnInitCalendar();
 	});