제휴몰 검색 기능

src/main/java/com/style24/batch/biz/job/delivery/TsbWithdrawRequestJob.java

@@ -56,7 +56,7 @@ public class TsbWithdrawRequestJob extends TsbAbstractJob<Collection<Delivery>,
 		 */
 		Integer recallNo = 0;
 		String ordChgSq  = "";
-		for(Delivery wmsData : reqList) {
+		for (Delivery wmsData : reqList) {
 			// 2.wms  회수정보 등록 
 			if (!ordChgSq.equals(wmsData.getOrderexceptionno()+"")) {
 				recallNo = wmsDeliveryService.insertWmsRecallDelivery(wmsData);

src/main/java/com/style24/batch/biz/task/TsbWithdrawTask.java

@@ -69,7 +69,7 @@ public class TsbWithdrawTask {
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "${cron.withdraw.wms.request}")
-	//@Scheduled(fixedDelay = 3500000)
+	@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void withdrawWmsRequestJob() throws Exception {
 		tsbWithdrawRequestJob.runById("cron.withdraw.wms.request");

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

@@ -1144,223 +1144,236 @@
 	<!-- WMS 회수요청 대상 조회      -->	
 	<select id="getWithdrawRequestList" resultType="Delivery" timeout="600">
 		/*TsbDelivery.getWithdrawRequestList*/
-	SELECT * FROM (
-		SELECT
-			  A.ORD_CHG_SQ                                          AS OrderExceptionNo -- 주문변경번호 
-			, CASE WHEN A.CHG_GB ='G680_30' THEN '10' ELSE '20' END AS RecallTypeCd
-			, A.CHGER_NM                                            AS Receiver
-			, A.CHGER_TELNO                                         AS ReceiverTelNum
-			, A.CHGER_PHNNO                                         AS ReceiverCellNum
-			, A.CHGER_ZIPCODE                                       AS DeliveryPostalCode
-			, A.CHGER_BASE_ADDR                                     AS DeliveryAddr1
-			, A.CHGER_DTL_ADDR                                      AS DeliveryAddr2
-			, G.ORD_NO                                              AS OrderNo
-			, G.ORD_NM                                              AS CustomerName
-			, (SELECT CC.CUST_ID FROM TB_CUSTOMER CC WHERE CC.CUST_NO = G.CUST_NO) AS LoginId
-			, CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[고객]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
-			, A.UPD_DT                                              AS DateCSMemoUpdated
-			, 0                                                     AS IsDeleted
-			, ''                                                    AS DeliveryAddrNew 
-			, CASE WHEN A.WD_TARGET_YN  = 'N' THEN 'N' WHEN A.WD_GB ='W'  THEN 'Y' ELSE 'N' END          AS RecallRequestYn
-			, '0'                                                   AS IfStat
-			, D.PRODUCT_NO                                          AS ProductNo
-			, D.PRODUCT_CODE                                        AS ProductCode
-			, E.GOODS_NM                                            AS ProductName
-			, D.OPT_CD                                              AS SKUCode
-			, CONCAT(D.OPT_CD1,'/',D.OPT_CD2)                       AS SKUValue
-			, B.CHG_QTY * D.ITEM_QTY                                AS RecallQty
-			, '입고대기'                                         	    AS StatusCd
-			, (SELECT SS.SHIP_COMP_NM FROM TB_SHIP_COMPANY SS WHERE SS.SHIP_COMP_CD = A.SHIP_COMP_CD  ) AS LogisticsName
-			, CASE WHEN NULLIF(A.SHIP_COMP_CD, '') IS NOT NULL THEN IFNULL((SELECT SS.WMS_SHIP_COMP_CD FROM TB_SHIP_COMPANY SS WHERE SS.SHIP_COMP_CD = A.SHIP_COMP_CD), '90')
-			       ELSE ''
-			   END                                                  AS LogisticsCode
-			, A.WD_INVOICE_NO                                       AS RecallInvoiceNo
-			, C.ORD_DTL_NO                                          AS OrderDtlNo
-			, C.INVOICE_NO                                          AS InvoiceNo
-			, A.CHGER_RTN_MEMO                                      AS chgerRtnMemo
-			, A.WD_GB
-			, A.WD_TARGET_YN
-			, (SELECT MAX(CASE WHEN PG_GB ='NAVER_ORDER' THEN 'NAVER' ELSE 'KCP' END)   FROM TB_PAYMENT WHERE ORD_NO= G.ORD_NO AND PAY_GB ='O'  ) AS PAY_GB 
-		  FROM TB_ORDER_CHANGE        A 
-		  JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
-		  JOIN TB_ORDER_DETAIL        C ON B.ORD_DTL_NO = C.ORD_DTL_NO 
-		  JOIN TB_ORDER_DETAIL_ITEM   D ON C.ORD_DTL_NO = D.ORD_DTL_NO 
-		  JOIN TB_GOODS               E ON C.GOODS_CD   = E.GOODS_CD
-		  JOIN TB_ORDER               G ON C.ORD_NO     = G.ORD_NO 
-		 WHERE A.CHG_GB         = 'G680_30' -- 반품요청
-		   AND B.CHG_STAT       = 'G685_50' -- 반품접수
-		   AND B.DEL_YN         = 'N' 
-		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품 
-		   AND E.RETURNABLE_YN  = 'Y' -- 반품가능여부 
-		   AND G.MALL_GB        = 'G011_10' -- 자사몰
-		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-',''), '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
-
-		
-		UNION ALL 
-		
-		SELECT 
-			  A.ORD_CHG_SQ                                          AS OrderExceptionNo -- 주문변경번호 
-			, CASE WHEN A.CHG_GB ='G680_30' THEN '10' ELSE '20' END AS RecallTypeCd
-			, A.CHGER_NM                                            AS Receiver
-			, A.CHGER_TELNO                                         AS ReceiverTelNum
-			, A.CHGER_PHNNO                                         AS ReceiverCellNum
-			, A.CHGER_ZIPCODE                                       AS DeliveryPostalCode
-			, A.CHGER_BASE_ADDR                                     AS DeliveryAddr1
-			, A.CHGER_DTL_ADDR                                      AS DeliveryAddr2
-			, G.ORD_NO                                              AS OrderNo
-			, G.ORD_NM                                              AS CustomerName
-			, (SELECT CC.CUST_ID FROM TB_CUSTOMER CC WHERE CC.CUST_NO = G.CUST_NO) AS LoginId
-			, CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[고객]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
-			, A.UPD_DT                                              AS DateCSMemoUpdated
-			, 0                                                     AS IsDeleted
-			, ''                                                    AS DeliveryAddrNew 
-			, CASE WHEN A.WD_TARGET_YN  = 'N' THEN 'N' WHEN A.WD_GB ='W'  THEN 'Y' ELSE 'N' END          AS RecallRequestYn
-			, '0'                                                   AS IfStat
-			, D.PRODUCT_NO                                          AS ProductNo
-			, D.PRODUCT_CODE                                        AS ProductCode
-			, E.GOODS_NM                                            AS ProductName
-			, D.OPT_CD                                              AS SKUCode
-			, CONCAT(D.OPT_CD1,'/',D.OPT_CD2)                       AS SKUValue
-			, B.CHG_QTY * D.ITEM_QTY                                AS RecallQty
-			, '입고대기'                                         	    AS StatusCd
-			, (SELECT SS.SHIP_COMP_NM FROM TB_SHIP_COMPANY SS WHERE SS.SHIP_COMP_CD = A.SHIP_COMP_CD  ) AS LogisticsName
-			, CASE WHEN NULLIF(A.SHIP_COMP_CD, '') IS NOT NULL THEN IFNULL((SELECT SS.WMS_SHIP_COMP_CD FROM TB_SHIP_COMPANY SS WHERE SS.SHIP_COMP_CD = A.SHIP_COMP_CD), '90')
-			       ELSE ''
-			   END                                                  AS LogisticsCode
-			, A.WD_INVOICE_NO                                       AS RecallInvoiceNo
-			, C.ORD_DTL_NO                                          AS OrderDtlNo
-			, C.INVOICE_NO                                          AS InvoiceNo
-			, A.CHGER_RTN_MEMO                                      AS chgerRtnMemo
-			, A.WD_GB
-			, A.WD_TARGET_YN
-			, (SELECT MAX(CASE WHEN PG_GB ='NAVER_ORDER' THEN 'NAVER' ELSE 'KCP' END)   FROM TB_PAYMENT WHERE ORD_NO= G.ORD_NO AND PAY_GB ='O'  ) AS PAY_GB 
-		  FROM TB_ORDER_CHANGE        A 
-		  JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
-		  JOIN TB_ORDER_DETAIL        C ON B.ORD_DTL_NO = C.ORD_DTL_NO 
-		  JOIN TB_ORDER_DETAIL_ITEM   D ON C.ORD_DTL_NO = D.ORD_DTL_NO 
-		  JOIN TB_GOODS               E ON C.GOODS_CD   = E.GOODS_CD
-		  JOIN TB_ORDER               G ON C.ORD_NO     = G.ORD_NO 
-		 WHERE A.CHG_GB         = 'G680_40' -- 교환요청
-		   AND B.CHG_STAT       = 'G685_20' -- 교환접수 
-		   AND B.DEL_YN         = 'N'
-		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품
-		   AND E.CHANGEABLE_YN  = 'Y' -- 교환가능여부
-		   AND G.MALL_GB        = 'G011_10' -- 자사몰 
-		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-',''), '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
-
-		
-		UNION ALL 
-		
-		SELECT 
-			  A.ORD_CHG_SQ                                          AS OrderExceptionNo -- 주문변경번호 
-			, CASE WHEN A.CHG_GB ='G680_30' THEN '10' ELSE '20' END AS RecallTypeCd
-			, A.CHGER_NM                                            AS Receiver
-			, A.CHGER_TELNO                                         AS ReceiverTelNum
-			, A.CHGER_PHNNO                                         AS ReceiverCellNum
-			, A.CHGER_ZIPCODE                                       AS DeliveryPostalCode
-			, A.CHGER_BASE_ADDR                                     AS DeliveryAddr1
-			, A.CHGER_DTL_ADDR                                      AS DeliveryAddr2
-			, G.ORD_NO                                              AS OrderNo
-			, G.ORD_NM                                              AS CustomerName
-			, (SELECT CC.CUST_ID FROM TB_CUSTOMER CC WHERE CC.CUST_NO = G.CUST_NO) AS LoginId
-			, CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[C/S]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
-			, A.UPD_DT                                              AS DateCSMemoUpdated
-			, 0                                                     AS IsDeleted
-			, ''                                                    AS DeliveryAddrNew 
-			, CASE WHEN F.DWDP_YN = 'Y'       THEN 'N'
-			       WHEN A.WD_TARGET_YN  = 'N' THEN 'N' 
-			       WHEN A.WD_GB ='W'          THEN 'Y' ELSE 'N' END AS RecallRequestYn
-			, '0'                                                   AS IfStat
-			, D.PRODUCT_NO                                          AS ProductNo
-			, D.PRODUCT_CODE                                        AS ProductCode
-			, E.GOODS_NM                                            AS ProductName
-			, D.OPT_CD                                              AS SKUCode
-			, CONCAT(D.OPT_CD1,'/',D.OPT_CD2)                       AS SKUValue
-			, B.CHG_QTY * D.ITEM_QTY                                AS RecallQty
-			, '입고대기'                                         	    AS StatusCd
-			, (SELECT SS.SHIP_COMP_NM FROM TB_SHIP_COMPANY SS WHERE SS.SHIP_COMP_CD = A.SHIP_COMP_CD  ) AS LogisticsName
-			, CASE WHEN NULLIF(A.SHIP_COMP_CD, '') IS NOT NULL THEN IFNULL((SELECT SS.WMS_SHIP_COMP_CD FROM TB_SHIP_COMPANY SS WHERE SS.SHIP_COMP_CD = A.SHIP_COMP_CD), '90')
-			       ELSE ''
-			   END                                                  AS LogisticsCode
-			, A.WD_INVOICE_NO                                       AS RecallInvoiceNo
-			, C.ORD_DTL_NO                                          AS OrderDtlNo
-			, C.INVOICE_NO                                          AS InvoiceNo
-			, A.CHGER_RTN_MEMO                                      AS chgerRtnMemo
-			, A.WD_GB
-			, A.WD_TARGET_YN
-			, (SELECT MAX(CASE WHEN PG_GB ='NAVER_ORDER' THEN 'NAVER' ELSE 'KCP' END)   FROM TB_PAYMENT WHERE ORD_NO= G.ORD_NO AND PAY_GB ='O'  ) AS PAY_GB 
-		  FROM TB_ORDER_CHANGE        A 
-		  JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
-		  JOIN TB_ORDER_DETAIL        C ON B.ORD_DTL_NO = C.ORD_DTL_NO 
-		  JOIN TB_ORDER_DETAIL_ITEM   D ON C.ORD_DTL_NO = D.ORD_DTL_NO 
-		  JOIN TB_GOODS               E ON C.GOODS_CD   = E.GOODS_CD
-		  JOIN TB_EXTMALL             F ON C.VENDOR_ID  = F.VENDOR_ID AND C.EXTMALL_ID = F.EXTMALL_ID 
-		  JOIN TB_ORDER               G ON C.ORD_NO     = G.ORD_NO 
-		 WHERE A.CHG_GB         = 'G680_30' -- 반품요청
-		   AND B.CHG_STAT       = 'G685_50' -- 반품접수 
-		   AND B.DEL_YN         = 'N'
-		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품 
-		   AND E.RETURNABLE_YN  = 'Y' -- 반품가능여부 
-		   AND G.MALL_GB        = 'G011_20' -- 제휴몰 
-		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-',''), '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
-
-		
-		UNION ALL 
-		
-		SELECT 
-			  A.ORD_CHG_SQ                                          AS OrderExceptionNo -- 주문변경번호 
-			, CASE WHEN A.CHG_GB ='G680_30' THEN '10' ELSE '20' END AS RecallTypeCd
-			, A.CHGER_NM                                            AS Receiver
-			, A.CHGER_TELNO                                         AS ReceiverTelNum
-			, A.CHGER_PHNNO                                         AS ReceiverCellNum
-			, A.CHGER_ZIPCODE                                       AS DeliveryPostalCode
-			, A.CHGER_BASE_ADDR                                     AS DeliveryAddr1
-			, A.CHGER_DTL_ADDR                                      AS DeliveryAddr2
-			, G.ORD_NO                                              AS OrderNo
-			, G.ORD_NM                                              AS CustomerName
-			, (SELECT CC.CUST_ID FROM TB_CUSTOMER CC WHERE CC.CUST_NO = G.CUST_NO) AS LoginId
-			, CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[C/S]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
-			, A.UPD_DT                                              AS DateCSMemoUpdated
-			, 0                                                     AS IsDeleted
-			, ''                                                    AS DeliveryAddrNew 
-			, CASE WHEN F.DWDP_YN = 'Y'       THEN 'N'
-			       WHEN A.WD_TARGET_YN  = 'N' THEN 'N' 
-			       WHEN A.WD_GB ='W'          THEN 'Y' ELSE 'N' END AS RecallRequestYn
-			, '0'                                                   AS IfStat
-			, D.PRODUCT_NO                                          AS ProductNo
-			, D.PRODUCT_CODE                                        AS ProductCode
-			, E.GOODS_NM                                            AS ProductName
-			, D.OPT_CD                                              AS SKUCode
-			, CONCAT(D.OPT_CD1,'/',D.OPT_CD2)                       AS SKUValue
-			, B.CHG_QTY * D.ITEM_QTY                                AS RecallQty
-			, '입고대기'                                         	    AS StatusCd
-			, (SELECT SS.SHIP_COMP_NM FROM TB_SHIP_COMPANY SS WHERE SS.SHIP_COMP_CD = A.SHIP_COMP_CD  ) AS LogisticsName
-			, CASE WHEN NULLIF(A.SHIP_COMP_CD, '') IS NOT NULL THEN IFNULL((SELECT SS.WMS_SHIP_COMP_CD FROM TB_SHIP_COMPANY SS WHERE SS.SHIP_COMP_CD = A.SHIP_COMP_CD), '90')
-			       ELSE ''
-			   END                                                  AS LogisticsCode
-			, A.WD_INVOICE_NO                                       AS RecallInvoiceNo
-			, C.ORD_DTL_NO                                          AS OrderDtlNo
-			, C.INVOICE_NO                                          AS InvoiceNo
-			, A.CHGER_RTN_MEMO                                      AS chgerRtnMemo
-			, A.WD_GB
-			, A.WD_TARGET_YN
-			, (SELECT MAX(CASE WHEN PG_GB ='NAVER_ORDER' THEN 'NAVER' ELSE 'KCP' END)   FROM TB_PAYMENT WHERE ORD_NO= G.ORD_NO AND PAY_GB ='O'  ) AS PAY_GB 
-		  FROM TB_ORDER_CHANGE        A 
-		  JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
-		  JOIN TB_ORDER_DETAIL        C ON B.ORD_DTL_NO = C.ORD_DTL_NO 
-		  JOIN TB_ORDER_DETAIL_ITEM   D ON C.ORD_DTL_NO = D.ORD_DTL_NO 
-		  JOIN TB_GOODS               E ON C.GOODS_CD   = E.GOODS_CD
-		  JOIN TB_EXTMALL             F ON C.VENDOR_ID  = F.VENDOR_ID AND C.EXTMALL_ID = F.EXTMALL_ID 
-		  JOIN TB_ORDER               G ON C.ORD_NO     = G.ORD_NO 
-		 WHERE A.CHG_GB         = 'G680_40' -- 교환요청
-		   AND B.CHG_STAT       = 'G685_20' -- 교환요청
-		   AND B.DEL_YN         = 'N'
-		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품
-		   AND E.CHANGEABLE_YN  = 'Y' -- 교환가능여부
-		   AND G.MALL_GB        = 'G011_20' -- 제휴몰
-		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-',''), '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
-
-		) A ORDER BY OrderExceptionNo
+		SELECT * 
+		FROM (
+		    SELECT A.ORD_CHG_SQ                                          AS OrderExceptionNo -- 주문변경번호 
+		         , CASE WHEN A.CHG_GB ='G680_30' THEN '10' ELSE '20' END AS RecallTypeCd
+		         , A.CHGER_NM                                            AS Receiver
+		         , A.CHGER_TELNO                                         AS ReceiverTelNum
+		         , A.CHGER_PHNNO                                         AS ReceiverCellNum
+		         , A.CHGER_ZIPCODE                                       AS DeliveryPostalCode
+		         , A.CHGER_BASE_ADDR                                     AS DeliveryAddr1
+		         , A.CHGER_DTL_ADDR                                      AS DeliveryAddr2
+		         , G.ORD_NO                                              AS OrderNo
+		         , G.ORD_NM                                              AS CustomerName
+		         , (SELECT CC.CUST_ID FROM TB_CUSTOMER CC WHERE CC.CUST_NO = G.CUST_NO) AS LoginId
+		         , CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[고객]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
+		         , A.UPD_DT                                              AS DateCSMemoUpdated
+		         , 0                                                     AS IsDeleted
+		         , ''                                                    AS DeliveryAddrNew 
+		         , CASE WHEN A.WD_TARGET_YN  = 'N' THEN 'N' WHEN A.WD_GB ='W'  THEN 'Y' ELSE 'N' END          AS RecallRequestYn
+		         , '0'                                                   AS IfStat
+		         , D.PRODUCT_NO                                          AS ProductNo
+		         , D.PRODUCT_CODE                                        AS ProductCode
+		         , E.GOODS_NM                                            AS ProductName
+		         , D.OPT_CD                                              AS SKUCode
+		         , CONCAT(D.OPT_CD1,'/',D.OPT_CD2)                       AS SKUValue
+		         , B.CHG_QTY * D.ITEM_QTY                                AS RecallQty
+		         , '입고대기'                                         	    AS StatusCd
+		         , (SELECT SS.SHIP_COMP_NM FROM TB_SHIP_COMPANY SS WHERE SS.SHIP_COMP_CD = A.SHIP_COMP_CD  ) AS LogisticsName
+		         , CASE WHEN NULLIF(A.SHIP_COMP_CD, '') IS NOT NULL 
+		                THEN IFNULL((SELECT SS.WMS_SHIP_COMP_CD FROM TB_SHIP_COMPANY SS WHERE SS.SHIP_COMP_CD = A.SHIP_COMP_CD), '90')
+		                ELSE ''
+		           END                                                   AS LogisticsCode
+		         , A.WD_INVOICE_NO                                       AS RecallInvoiceNo
+		         , C.ORD_DTL_NO                                          AS OrderDtlNo
+		         , C.INVOICE_NO                                          AS InvoiceNo
+		         , A.CHGER_RTN_MEMO                                      AS chgerRtnMemo
+		         , A.WD_GB
+		         , A.WD_TARGET_YN
+		         , (SELECT MAX(CASE WHEN PG_GB ='NAVER_ORDER' THEN 'NAVER' ELSE 'KCP' END)   FROM TB_PAYMENT WHERE ORD_NO= G.ORD_NO AND PAY_GB ='O'  ) AS PAY_GB
+		         , C.VENDOR_ID
+		         , C.EXTMALL_ID
+		         , C.AGENT_ORDER_ID
+		         , C.EXTMALL_ORDER_ID
+		         , C.GOODS_CD
+		         , E.GOODS_TYPE
+		      FROM TB_ORDER_CHANGE        A 
+		      JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
+		      JOIN TB_ORDER_DETAIL        C ON B.ORD_DTL_NO = C.ORD_DTL_NO 
+		      JOIN TB_ORDER_DETAIL_ITEM   D ON C.ORD_DTL_NO = D.ORD_DTL_NO 
+		      JOIN TB_GOODS               E ON C.GOODS_CD   = E.GOODS_CD
+		      JOIN TB_ORDER               G ON C.ORD_NO     = G.ORD_NO 
+		     WHERE A.CHG_GB         = 'G680_30' -- 반품요청
+		       AND B.CHG_STAT       = 'G685_50' -- 반품접수
+		       AND B.DEL_YN         = 'N' 
+		       AND E.SELF_GOODS_YN  = 'Y' -- 자사상품 
+		       AND E.RETURNABLE_YN  = 'Y' -- 반품가능여부 
+		       AND G.MALL_GB        = 'G011_10' -- 자사몰
+		       AND a.REG_DT >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-',''), '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
+		     UNION ALL 
+		    SELECT A.ORD_CHG_SQ                                          AS OrderExceptionNo -- 주문변경번호 
+		         , CASE WHEN A.CHG_GB ='G680_30' THEN '10' ELSE '20' END AS RecallTypeCd
+		         , A.CHGER_NM                                            AS Receiver
+		         , A.CHGER_TELNO                                         AS ReceiverTelNum
+		         , A.CHGER_PHNNO                                         AS ReceiverCellNum
+		         , A.CHGER_ZIPCODE                                       AS DeliveryPostalCode
+		         , A.CHGER_BASE_ADDR                                     AS DeliveryAddr1
+		         , A.CHGER_DTL_ADDR                                      AS DeliveryAddr2
+		         , G.ORD_NO                                              AS OrderNo
+		         , G.ORD_NM                                              AS CustomerName
+		         , (SELECT CC.CUST_ID FROM TB_CUSTOMER CC WHERE CC.CUST_NO = G.CUST_NO) AS LoginId
+		         , CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[고객]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
+		         , A.UPD_DT                                              AS DateCSMemoUpdated
+		         , 0                                                     AS IsDeleted
+		         , ''                                                    AS DeliveryAddrNew 
+		         , CASE WHEN A.WD_TARGET_YN  = 'N' THEN 'N' WHEN A.WD_GB ='W'  THEN 'Y' ELSE 'N' END          AS RecallRequestYn
+		         , '0'                                                   AS IfStat
+		         , D.PRODUCT_NO                                          AS ProductNo
+		         , D.PRODUCT_CODE                                        AS ProductCode
+		         , E.GOODS_NM                                            AS ProductName
+		         , D.OPT_CD                                              AS SKUCode
+		         , CONCAT(D.OPT_CD1,'/',D.OPT_CD2)                       AS SKUValue
+		         , B.CHG_QTY * D.ITEM_QTY                                AS RecallQty
+		         , '입고대기'                                         	    AS StatusCd
+		         , (SELECT SS.SHIP_COMP_NM FROM TB_SHIP_COMPANY SS WHERE SS.SHIP_COMP_CD = A.SHIP_COMP_CD  ) AS LogisticsName
+		         , CASE WHEN NULLIF(A.SHIP_COMP_CD, '') IS NOT NULL 
+		                THEN IFNULL((SELECT SS.WMS_SHIP_COMP_CD FROM TB_SHIP_COMPANY SS WHERE SS.SHIP_COMP_CD = A.SHIP_COMP_CD), '90')
+		                ELSE ''
+		           END                                                   AS LogisticsCode
+		         , A.WD_INVOICE_NO                                       AS RecallInvoiceNo
+		         , C.ORD_DTL_NO                                          AS OrderDtlNo
+		         , C.INVOICE_NO                                          AS InvoiceNo
+		         , A.CHGER_RTN_MEMO                                      AS chgerRtnMemo
+		         , A.WD_GB
+		         , A.WD_TARGET_YN
+		         , (SELECT MAX(CASE WHEN PG_GB ='NAVER_ORDER' THEN 'NAVER' ELSE 'KCP' END)   FROM TB_PAYMENT WHERE ORD_NO= G.ORD_NO AND PAY_GB ='O'  ) AS PAY_GB
+		         , C.VENDOR_ID
+		         , C.EXTMALL_ID
+		         , C.AGENT_ORDER_ID
+		         , C.EXTMALL_ORDER_ID
+		         , C.GOODS_CD
+		         , E.GOODS_TYPE
+		      FROM TB_ORDER_CHANGE        A 
+		      JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
+		      JOIN TB_ORDER_DETAIL        C ON B.ORD_DTL_NO = C.ORD_DTL_NO 
+		      JOIN TB_ORDER_DETAIL_ITEM   D ON C.ORD_DTL_NO = D.ORD_DTL_NO 
+		      JOIN TB_GOODS               E ON C.GOODS_CD   = E.GOODS_CD
+		      JOIN TB_ORDER               G ON C.ORD_NO     = G.ORD_NO 
+		     WHERE A.CHG_GB         = 'G680_40' -- 교환요청
+		       AND B.CHG_STAT       = 'G685_20' -- 교환접수 
+		       AND B.DEL_YN         = 'N'
+		       AND E.SELF_GOODS_YN  = 'Y' -- 자사상품
+		       AND E.CHANGEABLE_YN  = 'Y' -- 교환가능여부
+		       AND G.MALL_GB        = 'G011_10' -- 자사몰 
+		       AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-',''), '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
+		     UNION ALL 
+		    SELECT A.ORD_CHG_SQ                                          AS OrderExceptionNo -- 주문변경번호 
+		         , CASE WHEN A.CHG_GB ='G680_30' THEN '10' ELSE '20' END AS RecallTypeCd
+		         , A.CHGER_NM                                            AS Receiver
+		         , A.CHGER_TELNO                                         AS ReceiverTelNum
+		         , A.CHGER_PHNNO                                         AS ReceiverCellNum
+		         , A.CHGER_ZIPCODE                                       AS DeliveryPostalCode
+		         , A.CHGER_BASE_ADDR                                     AS DeliveryAddr1
+		         , A.CHGER_DTL_ADDR                                      AS DeliveryAddr2
+		         , G.ORD_NO                                              AS OrderNo
+		         , G.ORD_NM                                              AS CustomerName
+		         , (SELECT CC.CUST_ID FROM TB_CUSTOMER CC WHERE CC.CUST_NO = G.CUST_NO) AS LoginId
+		         , CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[C/S]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
+		         , A.UPD_DT                                              AS DateCSMemoUpdated
+		         , 0                                                     AS IsDeleted
+		         , ''                                                    AS DeliveryAddrNew 
+		         , CASE WHEN F.DWDP_YN = 'Y'       THEN 'N'
+		                WHEN A.WD_TARGET_YN  = 'N' THEN 'N' 
+		                WHEN A.WD_GB ='W'          THEN 'Y' ELSE 'N' END AS RecallRequestYn
+		         , '0'                                                   AS IfStat
+		         , D.PRODUCT_NO                                          AS ProductNo
+		         , D.PRODUCT_CODE                                        AS ProductCode
+		         , E.GOODS_NM                                            AS ProductName
+		         , D.OPT_CD                                              AS SKUCode
+		         , CONCAT(D.OPT_CD1,'/',D.OPT_CD2)                       AS SKUValue
+		         , B.CHG_QTY * D.ITEM_QTY                                AS RecallQty
+		         , '입고대기'                                         	    AS StatusCd
+		         , (SELECT SS.SHIP_COMP_NM FROM TB_SHIP_COMPANY SS WHERE SS.SHIP_COMP_CD = A.SHIP_COMP_CD  ) AS LogisticsName
+		         , CASE WHEN NULLIF(A.SHIP_COMP_CD, '') IS NOT NULL 
+		                THEN IFNULL((SELECT SS.WMS_SHIP_COMP_CD FROM TB_SHIP_COMPANY SS WHERE SS.SHIP_COMP_CD = A.SHIP_COMP_CD), '90')
+		                ELSE ''
+		           END                                                   AS LogisticsCode
+		         , A.WD_INVOICE_NO                                       AS RecallInvoiceNo
+		         , C.ORD_DTL_NO                                          AS OrderDtlNo
+		         , C.INVOICE_NO                                          AS InvoiceNo
+		         , A.CHGER_RTN_MEMO                                      AS chgerRtnMemo
+		         , A.WD_GB
+		         , A.WD_TARGET_YN
+		         , (SELECT MAX(CASE WHEN PG_GB ='NAVER_ORDER' THEN 'NAVER' ELSE 'KCP' END)   FROM TB_PAYMENT WHERE ORD_NO= G.ORD_NO AND PAY_GB ='O'  ) AS PAY_GB
+		         , C.VENDOR_ID
+		         , C.EXTMALL_ID
+		         , C.AGENT_ORDER_ID
+		         , C.EXTMALL_ORDER_ID 
+		         , C.GOODS_CD
+		         , E.GOODS_TYPE
+		      FROM TB_ORDER_CHANGE        A 
+		      JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
+		      JOIN TB_ORDER_DETAIL        C ON B.ORD_DTL_NO = C.ORD_DTL_NO 
+		      JOIN TB_ORDER_DETAIL_ITEM   D ON C.ORD_DTL_NO = D.ORD_DTL_NO 
+		      JOIN TB_GOODS               E ON C.GOODS_CD   = E.GOODS_CD
+		      JOIN TB_EXTMALL             F ON C.VENDOR_ID  = F.VENDOR_ID AND C.EXTMALL_ID = F.EXTMALL_ID 
+		      JOIN TB_ORDER               G ON C.ORD_NO     = G.ORD_NO 
+		     WHERE A.CHG_GB         = 'G680_30' -- 반품요청
+		       AND B.CHG_STAT       = 'G685_50' -- 반품접수 
+		       AND B.DEL_YN         = 'N'
+		       AND E.SELF_GOODS_YN  = 'Y' -- 자사상품 
+		       AND E.RETURNABLE_YN  = 'Y' -- 반품가능여부 
+		       AND G.MALL_GB        = 'G011_20' -- 제휴몰 
+		       AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-',''), '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
+		     UNION ALL
+		    SELECT A.ORD_CHG_SQ                                          AS OrderExceptionNo -- 주문변경번호 
+		         , CASE WHEN A.CHG_GB ='G680_30' THEN '10' ELSE '20' END AS RecallTypeCd
+		         , A.CHGER_NM                                            AS Receiver
+		         , A.CHGER_TELNO                                         AS ReceiverTelNum
+		         , A.CHGER_PHNNO                                         AS ReceiverCellNum
+		         , A.CHGER_ZIPCODE                                       AS DeliveryPostalCode
+		         , A.CHGER_BASE_ADDR                                     AS DeliveryAddr1
+		         , A.CHGER_DTL_ADDR                                      AS DeliveryAddr2
+		         , G.ORD_NO                                              AS OrderNo
+		         , G.ORD_NM                                              AS CustomerName
+		         , (SELECT CC.CUST_ID FROM TB_CUSTOMER CC WHERE CC.CUST_NO = G.CUST_NO) AS LoginId
+		         , CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[C/S]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
+		         , A.UPD_DT                                              AS DateCSMemoUpdated
+		         , 0                                                     AS IsDeleted
+		         , ''                                                    AS DeliveryAddrNew 
+		         , CASE WHEN F.DWDP_YN = 'Y'       THEN 'N'
+		                WHEN A.WD_TARGET_YN  = 'N' THEN 'N' 
+		                WHEN A.WD_GB ='W'          THEN 'Y' ELSE 'N' END AS RecallRequestYn
+		         , '0'                                                   AS IfStat
+		         , D.PRODUCT_NO                                          AS ProductNo
+		         , D.PRODUCT_CODE                                        AS ProductCode
+		         , E.GOODS_NM                                            AS ProductName
+		         , D.OPT_CD                                              AS SKUCode
+		         , CONCAT(D.OPT_CD1,'/',D.OPT_CD2)                       AS SKUValue
+		         , B.CHG_QTY * D.ITEM_QTY                                AS RecallQty
+		         , '입고대기'                                         	    AS StatusCd
+		         , (SELECT SS.SHIP_COMP_NM FROM TB_SHIP_COMPANY SS WHERE SS.SHIP_COMP_CD = A.SHIP_COMP_CD  ) AS LogisticsName
+		         , A.SHIP_COMP_CD                                        AS LogisticsCode
+		         , A.WD_INVOICE_NO                                       AS RecallInvoiceNo			
+		         , C.ORD_DTL_NO                                          AS OrderDtlNo
+		         , C.INVOICE_NO                                          AS InvoiceNo
+		         , A.CHGER_RTN_MEMO                                      AS chgerRtnMemo
+		         , A.WD_GB
+		         , A.WD_TARGET_YN
+		         , (SELECT MAX(CASE WHEN PG_GB ='NAVER_ORDER' THEN 'NAVER' ELSE 'KCP' END)   FROM TB_PAYMENT WHERE ORD_NO= G.ORD_NO AND PAY_GB ='O'  ) AS PAY_GB
+		         , C.VENDOR_ID
+		         , C.EXTMALL_ID
+		         , C.AGENT_ORDER_ID
+		         , C.EXTMALL_ORDER_ID 
+		         , C.GOODS_CD
+		         , E.GOODS_TYPE
+		      FROM TB_ORDER_CHANGE        A 
+		      JOIN TB_ORDER_CHANGE_DETAIL B ON A.ORD_CHG_SQ = B.ORD_CHG_SQ 
+		      JOIN TB_ORDER_DETAIL        C ON B.ORD_DTL_NO = C.ORD_DTL_NO 
+		      JOIN TB_ORDER_DETAIL_ITEM   D ON C.ORD_DTL_NO = D.ORD_DTL_NO 
+		      JOIN TB_GOODS               E ON C.GOODS_CD   = E.GOODS_CD
+		      JOIN TB_EXTMALL             F ON C.VENDOR_ID  = F.VENDOR_ID AND C.EXTMALL_ID = F.EXTMALL_ID 
+		      JOIN TB_ORDER               G ON C.ORD_NO     = G.ORD_NO 
+		     WHERE A.CHG_GB         = 'G680_40' -- 교환요청
+		       AND B.CHG_STAT       = 'G685_20' -- 교환요청
+		       AND B.DEL_YN         = 'N'
+		       AND E.SELF_GOODS_YN  = 'Y' -- 자사상품
+		       AND E.CHANGEABLE_YN  = 'Y' -- 교환가능여부
+		       AND G.MALL_GB        = 'G011_20' -- 제휴몰 		
+		       AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-',''), '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
+		) A 
+		ORDER BY OrderExceptionNo
 	</select>
 		
 	<!-- 주문변경상세 상태값 변경   -->

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

@@ -559,6 +559,8 @@
 			, AGENT_ORDER_ID	-- 에이젼트주문번호
 			, EXTMALL_ORDER_ID	-- 외부몰주문번호
 			, CHG_REG_DT        -- 클레임접수일
+			, GOODS_CD          -- 상품코드(세트상품,일반상품)
+			, GOODS_TYPE        -- 상품타입
 		)
 		VALUES
 		(
@@ -583,6 +585,8 @@
 			, #{agentOrderId}
 			, #{extmallOrderId}
 			, #{chgRegDt}
+			, #{goodsCd}
+			, #{goodsType}
 		)
 	</insert>