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

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

@@ -4,6 +4,7 @@ import java.util.Collection;
 
 import com.style24.core.support.annotation.ShopDs;
 import com.style24.persistence.domain.Delivery;
+import com.style24.persistence.domain.WmsWithdraw;
 
 /**
  * 배송관리 Dao
@@ -380,6 +381,14 @@ public interface TsaDeliveryDao {
 	 * @since 2021. 09. 15
 	 */
 	Collection<Delivery> getDeliveryScmList(Delivery delivery);
-
+	
+	/**
+	 * 2021.10.06 회수목록, 회수예외관리 제휴사명, 외부몰주문번호 검색기능 추가
+	 * @param SweetTracker
+	 * @return
+	 * @author moon
+	 * @since 2021. 10. 06
+	 */
+	Collection<WmsWithdraw> getWithdrawExtmallList(WmsWithdraw WmsWithdraw);
 	
 }

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

@@ -24,6 +24,7 @@ import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.domain.Delivery;
 import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.WmsDelivery;
+import com.style24.persistence.domain.WmsWithdraw;
 import com.style24.core.biz.service.TscKakaotalkService;
 
 
@@ -738,4 +739,16 @@ public class TsaDeliveryService {
 		return deliveryDao.getDeliveryScmList(delivery);
 	}
 	
+	/**
+	 * 2021.10.06 회수목록, 회수예외관리 제휴사명, 외부몰주문번호 검색기능 추가
+	 *
+	 * @param -WmsWithdraw
+	 * @return Collection<WmsWithdraw>
+	 * @author jsh77b
+	 * @since 2021. 10. 06
+	 */
+	public Collection<WmsWithdraw> getWithdrawExtmallList(WmsWithdraw WmsWithdraw) {
+		return deliveryDao.getWithdrawExtmallList(WmsWithdraw);
+	}
+	
 }

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

@@ -109,20 +109,24 @@ public class TsaOrderChangeController extends TsaBaseController {
 
 		// 1. 취소가능 주문상세상탭값 설정
 		if (TscConstants.OrderChangeStat.CANCEL.value().equals(chgStat)) {
-			String[] ordDtlStatArr = new String[5];
+			String[] ordDtlStatArr = new String[6];
 			ordDtlStatArr[0] = TscConstants.OrderDetailStat.DEPOSIT_WAIT.value();
 			ordDtlStatArr[1] = TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value();
 			ordDtlStatArr[2] = TscConstants.OrderDetailStat.GOODS_PREPARE.value();
 			ordDtlStatArr[3] = TscConstants.OrderDetailStat.DELIVERY_PREPARE.value();
 			ordDtlStatArr[4] = TscConstants.OrderDetailStat.SHIPPING.value();
+			// 2021.10.08 출고처정 상태값 추가
+			ordDtlStatArr[5] = TscConstants.OrderDetailStat.DELIVERY_LOC_ASSIGN.value();
 			
 			order.setOrdDtlStatArr(ordDtlStatArr);
 		} else {
-			String[] ordDtlStatArr = new String[4];
+			String[] ordDtlStatArr = new String[5];
 			ordDtlStatArr[0] = TscConstants.OrderDetailStat.DEPOSIT_WAIT.value();
 			ordDtlStatArr[1] = TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value();
 			ordDtlStatArr[2] = TscConstants.OrderDetailStat.GOODS_PREPARE.value();
 			ordDtlStatArr[3] = TscConstants.OrderDetailStat.DELIVERY_PREPARE.value();
+			// 2021.10.08 출고처정 상태값 추가
+			ordDtlStatArr[4] = TscConstants.OrderDetailStat.DELIVERY_LOC_ASSIGN.value();
 			
 			order.setOrdDtlStatArr(ordDtlStatArr);
 		}

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

@@ -2,6 +2,7 @@ package com.style24.admin.biz.web;
 
 import java.util.Collection;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,6 +15,7 @@ import org.springframework.web.servlet.ModelAndView;
 import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
 import com.style24.admin.biz.service.TsaDeliveryService;
+import com.style24.admin.biz.service.TsaOcmService;
 import com.style24.admin.biz.service.TsaRendererService;
 import com.style24.admin.biz.service.TsaWithdrawService;
 import com.style24.admin.biz.service.TsaWmsWithdrawService;
@@ -21,9 +23,11 @@ import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.biz.service.TscKakaotalkService;
 import com.style24.core.biz.service.TscOrderChangeService;
+import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.core.support.session.TscSession;
 import com.style24.persistence.TscPageRequest;
+import com.style24.persistence.domain.Extmall;
 import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.OrderChange;
 import com.style24.persistence.domain.Withdraw;
@@ -65,6 +69,9 @@ public class TsaWithdrawController extends TsaBaseController {
 
 	@Autowired
 	private TscKakaotalkService kakaotalkService;
+	
+	@Autowired
+	private TsaOcmService ocmService;
 
 	
 	/**
@@ -235,6 +242,16 @@ public class TsaWithdrawController extends TsaBaseController {
 	public ModelAndView withdrawExceptionListForm() throws Exception {
 		ModelAndView mav = new ModelAndView();
 		mav.addObject("reasonCodeList", rendererService.getAvailCommonCodeList("G325"));
+		
+		// 2021.10.06 제휴몰 검색기능 추가
+		// 제휴몰벤더
+		mav.addObject("vendorList", rendererService.getCommonCodeList("G003", "Y", TsaSession.getInfo().getSupplyCompCd()));
+
+		// 제휴몰
+		Extmall extmall = new Extmall();
+		extmall.setVendorId(TscConstants.VendorId.SHOPLINKER.value()); // 샵링커
+		mav.addObject("extmallList", ocmService.getExtmallList(extmall));
+		
 		mav.setViewName("/withdraw/WithdrawExceptionListForm");
 
 		return mav;
@@ -254,6 +271,45 @@ public class TsaWithdrawController extends TsaBaseController {
 	public GagaMap getWithdrawExceptionList(@RequestBody WithdrawExc withdrawExc) throws Exception {
 		
 		GagaMap result = new GagaMap();
+		
+		// 2021.10.06 샾링커 관련 주문번호
+		if (!StringUtils.isBlank(withdrawExc.getCondition()) || !StringUtils.isBlank(withdrawExc.getExtmallId())) {
+			if (StringUtils.isBlank(withdrawExc.getCondition())) {
+				withdrawExc.setSearch("");
+			} else {
+				withdrawExc.setConditions(withdrawExc.getCondition().replaceAll("\r", "").trim().split("\n"));
+			}
+			
+			// 데이타변환
+			WmsWithdraw wmsWithdraw = new WmsWithdraw();
+			wmsWithdraw.setExtmallId(withdrawExc.getExtmallId());
+			wmsWithdraw.setSearch(withdrawExc.getSearch());
+			wmsWithdraw.setConditions(withdrawExc.getConditions());
+			wmsWithdraw.setStDate(withdrawExc.getStDate());
+			wmsWithdraw.setEdDate(withdrawExc.getEdDate());
+
+			// 외부몰 주문번호 조회
+			Collection<WmsWithdraw> widthdrawExtmallList = deliveryService.getWithdrawExtmallList(wmsWithdraw);
+			
+			if (widthdrawExtmallList != null && widthdrawExtmallList.size() > 0) {
+				int [] ordNoList = new int[widthdrawExtmallList.size()];
+				int idx = 0;
+				for (WmsWithdraw vo : widthdrawExtmallList) {
+					ordNoList[idx] = vo.getOrdNo();
+					idx++;
+				}
+				withdrawExc.setOrdNoList(ordNoList);
+			} else {
+				int [] ordNoList = new int[1];
+				ordNoList[0] = 123;
+				withdrawExc.setOrdNoList(ordNoList);
+			}
+		}
+		
+		if (withdrawExc.getOrdNoList() != null) {
+			log.info("withdrawExc.getOrdNoList()[0] ::: {}", withdrawExc.getOrdNoList()[0]);
+		}
+
 		withdrawExc.setPageable(new TscPageRequest(withdrawExc.getPageNo() - 1, withdrawExc.getPageSize()));
 		withdrawExc.getPageable().setTotalCount(withdrawService.getWithdrawExceptionListCount(withdrawExc));
 		TscSession.setAttribute("maskingYn", TsaSession.getInfo().getMaskingYn());
@@ -360,6 +416,15 @@ public class TsaWithdrawController extends TsaBaseController {
 	@ResponseBody
 	public ModelAndView wmsWithdrawListForm() throws Exception {
 		ModelAndView mav = new ModelAndView();
+		
+		// 2021.10.06 제휴몰 검색기능 추가
+		// 제휴몰벤더
+		mav.addObject("vendorList", rendererService.getCommonCodeList("G003", "Y", TsaSession.getInfo().getSupplyCompCd()));
+
+		// 제휴몰
+		Extmall extmall = new Extmall();
+		extmall.setVendorId(TscConstants.VendorId.SHOPLINKER.value()); // 샵링커
+		mav.addObject("extmallList", ocmService.getExtmallList(extmall));
 		mav.setViewName("/withdraw/WmsWithdrawListForm");
 
 		return mav;
@@ -379,6 +444,30 @@ public class TsaWithdrawController extends TsaBaseController {
 	public GagaMap getWmsWithdrawList(@RequestBody WmsWithdraw wmsWithdraw) throws Exception {
 		
 		GagaMap result = new GagaMap();
+		
+		// 2021.10.06 샾링커 관련 주문번호
+		if (!StringUtils.isBlank(wmsWithdraw.getCondition()) || !StringUtils.isBlank(wmsWithdraw.getExtmallId())) {
+			
+			if (StringUtils.isBlank(wmsWithdraw.getCondition())) {
+				wmsWithdraw.setSearch("");
+			} else {
+				wmsWithdraw.setConditions(wmsWithdraw.getCondition().replaceAll("\r", "").trim().split("\n"));
+			}
+			
+			// 외부몰 주문번호 조회
+			Collection<WmsWithdraw> widthdrawExtmallList = deliveryService.getWithdrawExtmallList(wmsWithdraw);
+			
+			if (widthdrawExtmallList != null && widthdrawExtmallList.size() > 0) {
+				int [] ordNoList = new int[widthdrawExtmallList.size()];
+				int idx = 0;
+				for (WmsWithdraw vo : widthdrawExtmallList) {
+					ordNoList[idx] = vo.getOrdNo();
+					idx++;
+				}
+				wmsWithdraw.setOrdNoList(ordNoList);
+			}
+		}
+
 		wmsWithdraw.setPageable(new TscPageRequest(wmsWithdraw.getPageNo() - 1, wmsWithdraw.getPageSize()));
 		wmsWithdraw.getPageable().setTotalCount(wmsWithdrawService.getWmsWithdrawListCount(wmsWithdraw));
 		TscSession.setAttribute("maskingYn", TsaSession.getInfo().getMaskingYn());
@@ -386,13 +475,13 @@ public class TsaWithdrawController extends TsaBaseController {
 		if ("N".equals(wmsWithdraw.getPageingYn())) {
 			wmsWithdraw.setPageable(null);
 		}
+		
 		result.set("pageing", wmsWithdraw);
 		Collection<WmsWithdraw> wmsList = wmsWithdrawService.getWmsWithdrawList(wmsWithdraw);
 		
 		wmsList = withdrawService.getOptionInfo(wmsList);
 		
 		result.set("wmsWithdrawList", wmsList);
-		
 
 		return result;
 	}	

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

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import com.style24.persistence.TscBaseDomain;
 import com.style24.persistence.TscPageRequest;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.style24.core.support.session.TscSession;
 import com.style24.core.support.util.CryptoUtils;
 import com.style24.core.support.util.MaskingUtils;
@@ -135,7 +136,6 @@ public class WithdrawExc extends TscBaseDomain {
 	
 	
 	// Masking
-
 	public String getMaskingCustomerName() {
 		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.name(this.customerName) : this.customerName;
 	}
@@ -143,6 +143,18 @@ public class WithdrawExc extends TscBaseDomain {
 	public String getMaskingOrdPhnno() {
 		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.phoneNo(this.ordPhnno) : this.ordPhnno;
 	}
+	
+	// 2021.10.06 외부몰 주문번호 검색 관련 칼럼 생성
+	private String vendorId;
+	private String extmallId;
+	private String search;				// 검색어
+	private String condition;			//
+	
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] conditions = null;	//
+	
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private int[] ordNoList;			// 주문번호배열
 
 
 }

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

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import com.style24.persistence.TscBaseDomain;
 import com.style24.persistence.TscPageRequest;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.style24.core.support.session.TscSession;
 import com.style24.core.support.util.CryptoUtils;
 import com.style24.core.support.util.MaskingUtils;
@@ -73,7 +74,6 @@ public class WmsWithdraw extends TscBaseDomain {
 	private String edDate;					// 조회 종료 기간
 	
 	// Masking
-
 	public String getMaskingReceiver() {
 		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.name(this.receiver) : this.receiver;
 	}
@@ -92,5 +92,19 @@ public class WmsWithdraw extends TscBaseDomain {
 	
 	public String getMaskingLoginid() {
 		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.id(this.loginid) : this.loginid;
-	}		
+	}
+	
+	// 2021.10.06 외부몰 주문번호 검색 관련 칼럼 생성
+	private String vendorId;
+	private String extmallId;
+	private String search;				// 검색어
+	private String condition;			//
+	private int ordNo;					// 주문번호
+	
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] conditions = null;	//
+	
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private int[] ordNoList;			// 주문번호배열
+	
 }

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

@@ -1634,6 +1634,31 @@
 		</if>
 		AND B.ORD_DTL_STAT != 'G013_00'
 	</sql>
+	
+	<!-- 2021.10.06 회수목록, 회수예외관리 제휴사명, 외부몰주문번호 검색기능 추가 -->
+	<select id="getWithdrawExtmallList" parameterType="WmsWithdraw" resultType="WmsWithdraw">
+		SELECT OD.ORD_NO
+		FROM   TB_ORDER_DETAIL OD
+		WHERE  1=1
+		<choose>
+			<when test='search != null and search == "shoplinkerOrderId"'>
+		AND    OD.AGENT_ORDER_ID IN
+				<foreach collection="conditions" item="item" index="index"  open="(" close=")" separator=",">
+		       #{item}
+				</foreach>
+			</when>
+			<when test='search != null and search == "mallOrderId"'>
+		AND    OD.EXTMALL_ORDER_ID IN
+				<foreach collection="conditions" item="item" index="index"  open="(" close=")" separator=",">
+		       #{item}
+				</foreach>
+			</when>
+		</choose>
+		<if test='extmallId != null and extmallId != ""'>
+		AND    OD.EXTMALL_ID = #{extmallId}
+		</if>
+		GROUP BY OD.ORD_NO
+	</select>
 
 
 </mapper>

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

@@ -164,9 +164,11 @@
 		        LEFT OUTER JOIN TB_EXTMALL E ON OD.EXTMALL_ID = E.EXTMALL_ID
 		        LEFT OUTER JOIN TB_COUPON_BURDEN CB1 ON OD.CPN1_CPN_SQ = CB1.CPN_ID
 		                                            AND OD.SUPPLY_COMP_CD = CB1.SUPPLY_COMP_CD
-		        LEFT OUTER JOIN TB_COUPON_BURDEN CB2 ON OD.GOODS_CPN_SQ = CB2.CPN_ID
+		        LEFT OUTER JOIN TB_CUST_COUPON CC2 ON OD.GOODS_CPN_SQ = CC2.CUST_CPN_SQ
+		        LEFT OUTER JOIN TB_COUPON_BURDEN CB2 ON CC2.CPN_ID = CB2.CPN_ID
 		                                            AND OD.SUPPLY_COMP_CD = CB2.SUPPLY_COMP_CD
-		        LEFT OUTER JOIN TB_COUPON_BURDEN CB3 ON OD.CART_CPN_SQ = CB3.CPN_ID
+		        LEFT OUTER JOIN TB_CUST_COUPON CC3 ON OD.CART_CPN_SQ = CC3.CUST_CPN_SQ
+		        LEFT OUTER JOIN TB_COUPON_BURDEN CB3 ON CC3.CPN_ID = CB3.CPN_ID
 		                                            AND OD.SUPPLY_COMP_CD = CB3.SUPPLY_COMP_CD
 		        LEFT OUTER JOIN TB_TMTB_BURDEN TB1 ON OD.TMTB1_SQ = TB1.TMTB_SQ
 		                                          AND OD.SUPPLY_COMP_CD = TB1.TMTB_SUPPLY_CD
@@ -347,9 +349,11 @@
 		                LEFT OUTER JOIN TB_EXTMALL E ON OD.EXTMALL_ID = E.EXTMALL_ID
 		                LEFT OUTER JOIN TB_COUPON_BURDEN CB1 ON OD.CPN1_CPN_SQ = CB1.CPN_ID
 		                                                    AND OD.SUPPLY_COMP_CD = CB1.SUPPLY_COMP_CD
-		                LEFT OUTER JOIN TB_COUPON_BURDEN CB2 ON OD.GOODS_CPN_SQ = CB2.CPN_ID
+		                LEFT OUTER JOIN TB_CUST_COUPON CC2 ON OD.GOODS_CPN_SQ = CC2.CUST_CPN_SQ
+		                LEFT OUTER JOIN TB_COUPON_BURDEN CB2 ON CC2.CPN_ID = CB2.CPN_ID
 		                                                    AND OD.SUPPLY_COMP_CD = CB2.SUPPLY_COMP_CD
-		                LEFT OUTER JOIN TB_COUPON_BURDEN CB3 ON OD.CART_CPN_SQ = CB3.CPN_ID
+		                LEFT OUTER JOIN TB_CUST_COUPON CC3 ON OD.CART_CPN_SQ = CC3.CUST_CPN_SQ
+		                LEFT OUTER JOIN TB_COUPON_BURDEN CB3 ON CC3.CPN_ID = CB3.CPN_ID
 		                                                    AND OD.SUPPLY_COMP_CD = CB3.SUPPLY_COMP_CD
 		                LEFT OUTER JOIN TB_TMTB_BURDEN TB1 ON OD.TMTB1_SQ = TB1.TMTB_SQ
 		                                                  AND OD.SUPPLY_COMP_CD = TB1.TMTB_SUPPLY_CD

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

@@ -178,6 +178,14 @@
 					<if test='userNameCreated != null and userNameCreated != ""'>
 					AND A.USER_NAME_CREATED = #{userNameCreated}
 					</if>					
+					<choose>
+					     <when test='ordNoList != null and ordNoList != ""'>
+					AND   A.ORDER_NO IN
+					          <foreach collection="ordNoList" item="item" index="index"  open="(" close=")" separator=",">
+					      #{item}
+					         </foreach>
+					     </when>
+					</choose>
 				) A
 				LEFT OUTER JOIN TB_ORDER_CHANGE_DETAIL  CD ON A.ORDER_DTL_NO = CD.ORD_DTL_NO AND CD.DEL_YN ='N' AND CD.CHG_STAT = 'G685_31'
 				LEFT OUTER JOIN TB_ORDER_CHANGE         OC ON CD.ORD_CHG_SQ = OC.ORD_CHG_SQ 
@@ -290,7 +298,14 @@
 							<if test='userNameCreated != null and userNameCreated != ""'>
 							AND A.USER_NAME_CREATED = #{userNameCreated}
 							</if>
-							
+							<choose>
+							     <when test='ordNoList != null and ordNoList != ""'>
+							AND   A.ORDER_NO IN
+							          <foreach collection="ordNoList" item="item" index="index"  open="(" close=")" separator=",">
+							      #{item}
+							         </foreach>
+							     </when>
+							</choose>
 						UNION ALL
 						
 						SELECT 
@@ -364,7 +379,14 @@
 							<if test='userNameCreated != null and userNameCreated != ""'>
 							AND A.USER_NAME_CREATED = #{userNameCreated}
 							</if>
-							
+							<choose>
+							     <when test='ordNoList != null and ordNoList != ""'>
+							AND   A.ORDER_NO IN
+							          <foreach collection="ordNoList" item="item" index="index"  open="(" close=")" separator=",">
+							      #{item}
+							         </foreach>
+							     </when>
+							</choose>
 						UNION ALL
 						
 						SELECT 
@@ -438,7 +460,14 @@
 							<if test='userNameCreated != null and userNameCreated != ""'>
 							AND A.USER_NAME_CREATED = #{userNameCreated}
 							</if>
-														
+							<choose>
+							     <when test='ordNoList != null and ordNoList != ""'>
+							AND   A.ORDER_NO IN
+							          <foreach collection="ordNoList" item="item" index="index"  open="(" close=")" separator=",">
+							      #{item}
+							         </foreach>
+							     </when>
+							</choose>
 				) A
 				WHERE 1=1
 				<if test='chgGb != null and chgGb != "" and chgGb !="G680" and chgGb !="G680_00"'>

src/main/java/com/style24/persistence/mybatis/wms/TsaWmsWithdraw.xml

@@ -7,10 +7,10 @@
 		/* TsaWmsWithdraw.getWmsWithdrawListCount */
 		SELECT COUNT(*) AS TOTCNT
 		  FROM (		
-				SELECT 
-					  A.RecallNo			-- 반품 번호 
-					, B.RecallItemNo		-- 반품 항목 번호 
-				  FROM ISTYLE24_WMSIF.DBO.TB_IF_RECALLDELIVERY A , ISTYLE24_WMSIF.DBO.TB_IF_RECALLDELIVERYITEM B
+				SELECT A.RecallNo			-- 반품 번호 
+					 , B.RecallItemNo		-- 반품 항목 번호 
+				  FROM ISTYLE24_WMSIF.DBO.TB_IF_RECALLDELIVERY A 
+				     , ISTYLE24_WMSIF.DBO.TB_IF_RECALLDELIVERYITEM B
 				 WHERE A.RECALLNO = B.RECALLNO 
 					<if test='customername != null and customername != ""'> -- 주문자
 					AND   A.CustomerName = #{customername}
@@ -21,12 +21,11 @@
 					<if test='statuscd != null and statuscd != ""'>  -- 입고상태
 					AND   B.StatusCd  = #{statuscd}
 					</if>
-	
 					<if test='recalltypecd != null and recalltypecd != ""'>  -- 반품타입
 					AND   A.RecallTypeCd = #{recalltypecd}
 					</if>
 					<if test='isdeleted != null and isdeleted != ""'>  -- 삭제여부 1삭제 
-					AND    A.IsDeleted = #{isdeleted}
+					AND   A.IsDeleted = #{isdeleted}
 					</if>				
 					<if test='stDate != null and stDate != ""'> -- 회수요청일 
 					AND   A.DateCreated <![CDATA[>= ]]>  CONVERT(datetime,#{stDate}) 
@@ -34,8 +33,15 @@
 					<if test='edDate != null and edDate != ""'>
 					AND   A.DateCreated <![CDATA[<]]> CONVERT(datetime,#{edDate})+1 
 					</if>
+					<choose>
+					     <when test='ordNoList != null and ordNoList != ""'>
+					AND   A.OrderNo IN
+					          <foreach collection="ordNoList" item="item" index="index"  open="(" close=")" separator=",">
+					      #{item}
+					         </foreach>
+					     </when>
+					</choose>
 			) A
-
 	</select>
 		
 	<!-- WMS회수목록 -->
@@ -46,7 +52,6 @@
 		FROM (
 		    SELECT A.*,  ROW_NUMBER() OVER (ORDER BY RecallNo DESC, RecallItemNo ) as RNUM 
 		    FROM (
-		    
 				SELECT 
 					  A.RecallNo			-- 반품 번호 
 					, B.RecallItemNo		-- 반품 항목 번호 X
@@ -93,7 +98,6 @@
 					<if test='statuscd != null and statuscd != ""'>  -- 입고상태
 					AND   B.StatusCd  = #{statuscd}
 					</if>
-	
 					<if test='recalltypecd != null and recalltypecd != ""'>  -- 반품타입
 					AND   A.RecallTypeCd = #{recalltypecd}
 					</if>
@@ -106,6 +110,14 @@
 					<if test='edDate != null and edDate != ""'>
 					AND   A.DateCreated <![CDATA[<]]> CONVERT(datetime,#{edDate})+1 
 					</if>
+					<choose>
+					     <when test='ordNoList != null and ordNoList != ""'>
+					AND   A.OrderNo IN
+					          <foreach collection="ordNoList" item="item" index="index"  open="(" close=")" separator=",">
+					      #{item}
+					         </foreach>
+					     </when>
+					</choose>
 		    ) A
 		)Z WHERE RNUM BETWEEN  #{pageable.startRow} AND #{pageable.endRow}
 	</select>

src/main/webapp/WEB-INF/views/withdraw/WithdrawExceptionListForm.html

@@ -48,6 +48,7 @@
 							<col style="width:8%;"/>
 							<col style="width:12%;"/>
 						</colgroup>
+						<!-- 2021.10.06 제휴몰 검색기능 추가 -->
 						<tr>
 							<th class="dashR">주문자명</th>
 							<td class="dashR">
@@ -57,13 +58,13 @@
 							<td class="dashR">
 								<input type="text" class="w40p" name="orderNo" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');" placeholder="" maxlength="9" />
 							</td>
-							<th class="dashR">처리상태</th>
-							<td class="dashR">
-								<select name="recallStat" id="recallStat" class="w40p">
-									<option value="">전체</option>
-									<option value="P" selected>대기</option>
-									<option value="S">처리완료</option>
-								</select>
+							<th rowspan="3">키워드</th>
+							<td rowspan="3">
+								<select name="search" id="search">
+									<option value="shoplinkerOrderId">샵링커주문번호</option><!-- AGENT_ORDER_ID -->
+									<option value="mallOrderId">쇼핑몰주문번호</option><!-- EXTMALL_ORDER_ID -->
+								</select><br>
+								<textarea class="textareaR2 w90p" name="condition" id="condition"></textarea>
 							</td>
 						</tr>
 						<tr>
@@ -84,11 +85,21 @@
 									<option value="G680_40">교환요청</option>
 								</select>
 							</td>
+						</tr>
+						<tr>
 							<th class="dashR">작업자</th>
 							<td class="dashR">
 								<input type="text" class="w40p" name="userNameCreated" placeholder="" maxlength="20" />
 							</td>
-						</tr>						
+							<th class="dashR">처리상태</th>
+							<td class="dashR" >
+								<select name="recallStat" id="recallStat" class="w40p">
+									<option value="">전체</option>
+									<option value="P" selected>대기</option>
+									<option value="S">처리완료</option>
+								</select>
+							</td>
+						</tr>
 						<tr>
 							<th class="dashR">등록일</th>
 							<td colspan="6" class="dashR">

src/main/webapp/WEB-INF/views/withdraw/WmsWithdrawListForm.html

@@ -57,8 +57,19 @@
 							<td class="dashR">
 								<input type="text" class="w40p" name="orderno" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');" placeholder="" maxlength="9" />
 							</td>
+							<th rowspan="4">키워드</th>
+							<td rowspan="4">
+								<select name="search" id="search">
+									<option value="shoplinkerOrderId">샵링커주문번호</option><!-- AGENT_ORDER_ID -->
+									<option value="mallOrderId">쇼핑몰주문번호</option><!-- EXTMALL_ORDER_ID -->
+								</select><br>
+								<textarea class="textareaR2 w90p" name="condition" id="condition"></textarea>
+							</td>
+						</tr>
+						<!-- 2021.10.06 제휴몰 검색기능 추가 -->
+						<tr>
 							<th class="dashR">입고상태</th>
-							<td class="dashR">
+							<td class="dashR" colspan="3">
 								<select name="statuscd" id="statuscd" class="w100">
 									<option value="" selected>전체</option>
 									<option value="입고대기">입고대기</option>
@@ -76,7 +87,7 @@
 								</select>
 							</td>
 							<th class="dashR">삭제여부</th>
-							<td colspan="4" class="dashR">
+							<td class="dashR">
 								<select name="isdeleted" id="isdeleted" class="w100">
 									<option value="">전체</option>
 									<option value="1">Y</option>
@@ -86,7 +97,7 @@
 						</tr>						
 						<tr>
 							<th class="dashR">회수요청일</th>
-							<td colspan="6" class="dashR">
+							<td colspan="4" class="dashR">
 								<span id="terms"></span>
 							</td>
 						</tr>