쿼리정리

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

@@ -516,51 +516,51 @@
 	<select id="getBangoodsList" parameterType="Delivery" resultType="Delivery">
 		/* TsaDelivery.getBangoodsList */
 		SELECT DBG.DEL_YN
-			, G.BRAND_CD
-			, B.BRAND_KNM
-			, (SELECT MAX(DELV_LOC_NM) FROM TB_DELIVERY_LOC DL WHERE DL.DELV_LOC_CD = DBG.DELV_LOC_CD ) AS DELV_LOC_NM
-			, (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = DBG.GOODS_CD AND COLOR_CD = DBG.OPT_CD1 AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM
-			, G.GOODS_NM
-			, DBG.GOODS_CD
-			, DBG.OPT_CD1
-			, DBG.OPT_CD2
-			, FN_GET_CODE_NM('G008', G.GOODS_STAT) AS GOODS_STAT
-			, DBG.DELV_BAN_STDT
-			, DBG.DELV_BAN_EDDT
-			, DBG.DELV_BAN_GOODS_SQ
-			, DBG.REG_DT
-		FROM  TB_DELIVERY_BAN_GOODS DBG
-		INNER JOIN TB_GOODS        G    ON DBG.GOODS_CD = G.GOODS_CD
-		INNER JOIN TB_BRAND        B    ON G.BRAND_CD = B.BRAND_CD
-		WHERE 1=1
+		     , G.BRAND_CD
+		     , B.BRAND_KNM
+		     , (SELECT MAX(DELV_LOC_NM) FROM TB_DELIVERY_LOC DL WHERE DL.DELV_LOC_CD = DBG.DELV_LOC_CD ) AS DELV_LOC_NM
+		     , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = DBG.GOODS_CD AND COLOR_CD = DBG.OPT_CD1 AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM
+		     , G.GOODS_NM
+		     , DBG.GOODS_CD
+		     , DBG.OPT_CD1
+		     , DBG.OPT_CD2
+		     , FN_GET_CODE_NM('G008', G.GOODS_STAT) AS GOODS_STAT
+		     , DBG.DELV_BAN_STDT
+		     , DBG.DELV_BAN_EDDT
+		     , DBG.DELV_BAN_GOODS_SQ
+		     , DBG.REG_DT
+		FROM   TB_DELIVERY_BAN_GOODS DBG
+		INNER  JOIN TB_GOODS        G    ON DBG.GOODS_CD = G.GOODS_CD
+		INNER  JOIN TB_BRAND        B    ON G.BRAND_CD = B.BRAND_CD
+		WHERE  1=1
 		<if test='supplyCompCd != null and supplyCompCd != ""'>
-			AND G.SUPPLY_COMP_CD = #{supplyCompCd}
+		AND    G.SUPPLY_COMP_CD = #{supplyCompCd}
 		</if>
 		<if test='brandCd != null and brandCd != ""'>
-			AND G.BRAND_CD = #{brandCd}
+		AND    G.BRAND_CD = #{brandCd}
 		</if>
 		<if test='searchTxt != null and searchTxt != ""'>
 			<if test='goodsGb == "goodsCd"'>
-				AND G.GOODS_CD LIKE  CONCAT(UPPER( #{searchTxt}), '%')
+		AND    G.GOODS_CD LIKE  CONCAT(UPPER( #{searchTxt}), '%')
 			</if>
 			<if test='goodsGb == "goodsNm"'>
-				AND G.GOODS_NM LIKE CONCAT(UPPER( #{searchTxt}), '%')
+		AND    G.GOODS_NM LIKE CONCAT(UPPER( #{searchTxt}), '%')
 			</if>
 		</if>
 		<if test='delvLocCd != null and delvLocCd != ""'>
-			AND DBG.DELV_LOC_CD = #{delvLocCd}
+		AND    DBG.DELV_LOC_CD = #{delvLocCd}
 		</if>
 		<if test='delYn != null and delYn != ""'>
-			AND DBG.DEL_YN = #{delYn}
+		AND    DBG.DEL_YN = #{delYn}
 		</if>
 		<if test="stDate != null and stDate != '' and edDate != null and edDate != ''">
-			AND DBG.REG_DT BETWEEN STR_TO_DATE(CONCAT(#{stDate},' 000000'),'%Y-%m-%d %H%i%S') AND STR_TO_DATE(CONCAT(#{edDate},' 235959'), '%Y-%m-%d %H%i%S')
+		AND    DBG.REG_DT BETWEEN STR_TO_DATE(CONCAT(#{stDate},' 000000'),'%Y-%m-%d %H%i%S') AND STR_TO_DATE(CONCAT(#{edDate},' 235959'), '%Y-%m-%d %H%i%S')
 		</if>
 		<if test="stDate2 != null and stDate2 != '' and edDate2 != null and edDate2 != ''">
-			AND DBG.DELV_BAN_STDT BETWEEN STR_TO_DATE(CONCAT(#{stDate2},' 000000'),'%Y-%m-%d %H%i%S') AND STR_TO_DATE(CONCAT(#{edDate2},' 235959'), '%Y-%m-%d %H%i%S')
+		AND    DBG.DELV_BAN_STDT BETWEEN STR_TO_DATE(CONCAT(#{stDate2},' 000000'),'%Y-%m-%d %H%i%S') AND STR_TO_DATE(CONCAT(#{edDate2},' 235959'), '%Y-%m-%d %H%i%S')
 		</if>
 		<if test="stDate3 != null and stDate3 != '' and edDate3 != null and edDate3 != ''">
-			AND DBG.DELV_BAN_EDDT BETWEEN STR_TO_DATE(CONCAT(#{stDate3},' 000000'),'%Y-%m-%d %H%i%S') AND STR_TO_DATE(CONCAT(#{edDate3},' 235959'), '%Y-%m-%d %H%i%S')
+		AND    DBG.DELV_BAN_EDDT BETWEEN STR_TO_DATE(CONCAT(#{stDate3},' 000000'),'%Y-%m-%d %H%i%S') AND STR_TO_DATE(CONCAT(#{edDate3},' 235959'), '%Y-%m-%d %H%i%S')
 		</if>
 	</select>
 
@@ -622,7 +622,7 @@
 	<!-- 출고금지상품 카운트 -->
 	<select id="getBangoodsListCnt" parameterType="Delivery"	resultType="int">
 		/* TsaDelivery.getBangoodsListCnt */
-		SELECT COUNT(*)
+		SELECT COUNT(1)
 		  FROM TB_DELIVERY_BAN_GOODS
 		 WHERE DELV_LOC_CD = #{delvLocCd}
 		   AND GOODS_CD    = #{goodsCd}
@@ -635,105 +635,99 @@
 	<insert id="createBangoods" parameterType="Delivery" >
 		/* TsaDelivery.createBangoods */
 		INSERT INTO TB_DELIVERY_BAN_GOODS (
-			  DELV_LOC_CD
-			, GOODS_CD
-			, OPT_CD1
-			, OPT_CD2
-			, DELV_BAN_STDT
-			, DELV_BAN_EDDT
-			, DEL_YN
-			, REG_NO
-			, REG_DT
-			, UPD_NO
-			, UPD_DT
-		)
-		VALUES (
-			  #{delvLocCd}
-			, #{goodsCd}
-			, #{optCd1}
-			, #{optCd2}
-			, replace(#{delvBanStdt},'-','')
-			, STR_TO_DATE(CONCAT(#{delvBanEddt},' 235959'), '%Y-%m-%d %H%i%S')
-			, 'N'
-			, #{regNo}
-			, NOW()
-			, #{updNo}
-			, NOW()
+		       DELV_LOC_CD
+		     , GOODS_CD
+		     , OPT_CD1
+		     , OPT_CD2
+		     , DELV_BAN_STDT
+		     , DELV_BAN_EDDT
+		     , DEL_YN
+		     , REG_NO
+		     , REG_DT
+		     , UPD_NO
+		     , UPD_DT
+		) VALUES (
+		       #{delvLocCd}
+		     , #{goodsCd}
+		     , #{optCd1}
+		     , #{optCd2}
+		     , replace(#{delvBanStdt},'-','')
+		     , STR_TO_DATE(CONCAT(#{delvBanEddt},' 235959'), '%Y-%m-%d %H%i%S')
+		     , 'N'
+		     , #{regNo}
+		     , NOW()
+		     , #{updNo}
+		     , NOW()
 		)
 	</insert>
 
 	<!-- 배송/회수지시 목록 건수 -->
 	<select id="getDeliveryWithdrawDirectiveListCount" parameterType="Delivery" resultType="int">
 		/* TsaDelivery.getDeliveryWithdrawDirectiveListCount */
-				SELECT COUNT(*) AS TOTCNT
-				  FROM (
-						SELECT
-						       '배송'                              AS DELV_GB_NM  -- 지시구분명
-						     , OD.INVOICE_SEND_YN                 AS SEND_YN     -- 전송여부
-						     , O.SITE_CD                                         -- 사이트코드
-						     , O.ORD_NO                                          -- 주문번호
-						     , OD.ORD_DTL_NO                                     -- 주문상세번호
-						     , OD.GOODS_CD                                       -- 상품코드
-						FROM   TB_ORDER O
-						 JOIN  TB_ORDER_DETAIL OD      ON O.ORD_NO = OD.ORD_NO
-						 JOIN  TB_DELIVERY_ADDR DA     ON OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ AND OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
-						 JOIN  TB_GOODS G              ON OD.GOODS_CD      = G.GOODS_CD
-						WHERE 1=1
-						<if test="delvGb != null and delvGb != ''">
-						AND    'D' = #{delvGb} -- 배송지시
-						</if>
-						<if test="stDate != null and stDate != ''">
-						AND    O.ORD_DT <![CDATA[>=]]> STR_TO_DATE(REPLACE(#{stDate},'-','') , '%Y%m%d%H%i%s')
-						</if>
-						<if test="edDate != null and edDate != ''">
-						AND    O.ORD_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') , '%Y%m%d%H%i%s'), INTERVAL 1 DAY)
-						</if>
-						<if test="siteCd != null and siteCd != ''">
-						AND    O.SITE_CD = #{siteCd}
-						</if>
-						AND    OD.ORD_DTL_STAT = 'G013_50' -- 배송중
-						<if test="sendYn != null and sendYn != ''">
-						AND    OD.INVOICE_SEND_YN = #{sendYn}
-						</if>
-						AND    G.SELF_GOODS_YN = 'Y' -- 자사상품만
-
-						UNION ALL
-
-						SELECT
-						       '회수'                 AS DELV_GB_NM      -- 지시구분명
-						     , OC.WD_INVOICE_SEND_YN AS SEND_YN         -- 전송여부
-						     , O.SITE_CD                                -- 사이트코드
-						     , O.ORD_NO                                 -- 주문번호
-						     , OCD.ORD_DTL_NO                           -- 주문상세번호
-						     , OD.GOODS_CD                              -- 상품코드
-						FROM   TB_ORDER_CHANGE OC
-						JOIN   TB_ORDER_CHANGE_DETAIL OCD ON OC.ORD_CHG_SQ  = OCD.ORD_CHG_SQ
-						JOIN   TB_ORDER_DETAIL OD         ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
-						JOIN   TB_ORDER O                 ON OD.ORD_NO      = O.ORD_NO
-						JOIN   TB_GOODS G                 ON OD.GOODS_CD     = G.GOODS_CD
-						JOIN   TB_DELIVERY_LOC D          ON OD.DELV_LOC_CD = D.DELV_LOC_CD AND OD.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
-						WHERE  1=1
-						<if test="delvGb != null and delvGb != ''">
-						AND    'W' = #{delvGb} -- 회수지시
-						</if>
-						AND    OC.CHG_GB IN ('G680_30','G680_40') -- 반품요청,교환요청
-						<if test="sendYn != null and sendYn != ''">
-						AND    OC.WD_INVOICE_SEND_YN = #{sendYn}
-						</if>
-						<if test="stDate != null and stDate != ''">
-						AND    OC.REG_DT <![CDATA[>=]]> STR_TO_DATE(REPLACE(#{stDate},'-','') , '%Y%m%d%H%i%s')
-						</if>
-						<if test="edDate != null and edDate != ''">
-						AND    OC.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') , '%Y%m%d%H%i%s'), INTERVAL 1 DAY)
-						</if>
-						AND    OCD.CHG_STAT IN ('G685_30','G685_31') -- 회수요청 상품검수중
-						<if test="siteCd != null and siteCd != ''">
-						AND    O.SITE_CD = #{siteCd}
-						</if>
-						AND    G.SELF_GOODS_YN = 'Y' -- 자사상품만
-						AND    OCD.DEL_YN      = 'N'
-					) A
-
+		SELECT COUNT(1) AS TOTCNT
+		FROM (
+		    SELECT '배송'                              AS DELV_GB_NM  -- 지시구분명
+		         , OD.INVOICE_SEND_YN                 AS SEND_YN     -- 전송여부
+		         , O.SITE_CD                                         -- 사이트코드
+		         , O.ORD_NO                                          -- 주문번호
+		         , OD.ORD_DTL_NO                                     -- 주문상세번호
+		         , OD.GOODS_CD                                       -- 상품코드
+		    FROM   TB_ORDER O
+		    JOIN   TB_ORDER_DETAIL OD      ON O.ORD_NO = OD.ORD_NO
+		    JOIN   TB_DELIVERY_ADDR DA     ON OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ AND OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
+		    JOIN   TB_GOODS G              ON OD.GOODS_CD      = G.GOODS_CD
+		    WHERE  1=1
+			<if test="delvGb != null and delvGb != ''">
+		    AND    'D' = #{delvGb} -- 배송지시
+			</if>
+			<if test="stDate != null and stDate != ''">
+		    AND    O.ORD_DT <![CDATA[>=]]> STR_TO_DATE(REPLACE(#{stDate},'-','') , '%Y%m%d%H%i%s')
+			</if>
+			<if test="edDate != null and edDate != ''">
+		    AND    O.ORD_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') , '%Y%m%d%H%i%s'), INTERVAL 1 DAY)
+			</if>
+			<if test="siteCd != null and siteCd != ''">
+		    AND    O.SITE_CD = #{siteCd}
+			</if>
+		    AND    OD.ORD_DTL_STAT = 'G013_50' -- 배송중
+			<if test="sendYn != null and sendYn != ''">
+		    AND    OD.INVOICE_SEND_YN = #{sendYn}
+			</if>
+		    AND    G.SELF_GOODS_YN = 'Y' -- 자사상품만
+			UNION  ALL
+		    SELECT '회수'                 AS DELV_GB_NM      -- 지시구분명
+		         , OC.WD_INVOICE_SEND_YN AS SEND_YN         -- 전송여부
+		         , O.SITE_CD                                -- 사이트코드
+		         , O.ORD_NO                                 -- 주문번호
+		         , OCD.ORD_DTL_NO                           -- 주문상세번호
+		         , OD.GOODS_CD                              -- 상품코드
+		    FROM   TB_ORDER_CHANGE OC
+		    JOIN   TB_ORDER_CHANGE_DETAIL OCD ON OC.ORD_CHG_SQ  = OCD.ORD_CHG_SQ
+		    JOIN   TB_ORDER_DETAIL OD         ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
+		    JOIN   TB_ORDER O                 ON OD.ORD_NO      = O.ORD_NO
+		    JOIN   TB_GOODS G                 ON OD.GOODS_CD     = G.GOODS_CD
+		    JOIN   TB_DELIVERY_LOC D          ON OD.DELV_LOC_CD = D.DELV_LOC_CD AND OD.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
+		    WHERE  1=1
+			<if test="delvGb != null and delvGb != ''">
+		    AND    'W' = #{delvGb} -- 회수지시
+			</if>
+		    AND    OC.CHG_GB IN ('G680_30','G680_40') -- 반품요청,교환요청
+			<if test="sendYn != null and sendYn != ''">
+		    AND    OC.WD_INVOICE_SEND_YN = #{sendYn}
+			</if>
+			<if test="stDate != null and stDate != ''">
+		    AND    OC.REG_DT <![CDATA[>=]]> STR_TO_DATE(REPLACE(#{stDate},'-','') , '%Y%m%d%H%i%s')
+			</if>
+			<if test="edDate != null and edDate != ''">
+		    AND    OC.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') , '%Y%m%d%H%i%s'), INTERVAL 1 DAY)
+			</if>
+		    AND    OCD.CHG_STAT IN ('G685_30','G685_31') -- 회수요청 상품검수중
+			<if test="siteCd != null and siteCd != ''">
+		    AND    O.SITE_CD = #{siteCd}
+			</if>
+		    AND    G.SELF_GOODS_YN = 'Y' -- 자사상품만
+		    AND    OCD.DEL_YN      = 'N'
+		) A
 	</select>
 
 	<!-- 배송/회수지시 목록 -->
@@ -741,99 +735,100 @@
 		/* TsaDelivery.getDeliveryWithdrawDirectiveList */
 		SELECT Z.*
 		FROM (
-		    SELECT A.*, ROW_NUMBER() OVER(ORDER BY  A.DELV_GB_NM, A.ORD_NO DESC, A.ORD_DTL_NO )  RNUM
+		    SELECT A.*
+		         , ROW_NUMBER() OVER(ORDER BY  A.DELV_GB_NM, A.ORD_NO DESC, A.ORD_DTL_NO )  RNUM
 		    FROM (
-				SELECT A.*
-				  FROM (
-						SELECT DISTINCT
-						       '배송'                              AS DELV_GB_NM  -- 지시구분명
-						     , OD.INVOICE_SEND_YN                 AS SEND_YN     -- 전송여부
-						     , O.SITE_CD                                         -- 사이트코드
-						     , O.ORD_NO                                          -- 주문번호
-						     , OD.ORD_DTL_NO                                     -- 주문상세번호
-						     , OD.GOODS_CD                                       -- 상품코드
-						     , G.GOODS_NM                                        -- 상품명
-						     , DA.RECIP_NM                                       -- 수취인명
-						     , DA.RECIP_PHNNO                                    -- 수취인휴대전화번호
-						     , DA.RECIP_TELNO                                    -- 수취인전화번호
-						     , DA.RECIP_ZIPCODE                                  -- 수취인우편번호
-						     , DA.RECIP_BASE_ADDR                                -- 수취인기본주소
-						     , DA.RECIP_DTL_ADDR                                 -- 수취인상세주소
-						     , O.ORD_NM                                          -- 주문자명
-						     , O.ORD_PHNNO                                       -- 주문자휴대전화번호
-						     , O.ORD_TELNO                                       -- 주문자전화번호
-						     , O.ORD_EMAIL                                       -- 주문자이메일
-						FROM   TB_ORDER O
-						 JOIN  TB_ORDER_DETAIL OD      ON O.ORD_NO = OD.ORD_NO
-						 JOIN  TB_DELIVERY_ADDR DA     ON OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ AND OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
-						 JOIN  TB_GOODS G              ON OD.GOODS_CD      = G.GOODS_CD
-						WHERE 1=1
-						<if test="delvGb != null and delvGb != ''">
-						AND    'D' = #{delvGb} -- 배송지시
-						</if>
-						<if test="stDate != null and stDate != ''">
-						AND    O.ORD_DT <![CDATA[>=]]> STR_TO_DATE(REPLACE(#{stDate},'-','') , '%Y%m%d%H%i%s')
-						</if>
-						<if test="edDate != null and edDate != ''">
-						AND    O.ORD_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') , '%Y%m%d%H%i%s'), INTERVAL 1 DAY)
-						</if>
-						<if test="siteCd != null and siteCd != ''">
-						AND    O.SITE_CD = #{siteCd}
-						</if>
-						AND    OD.ORD_DTL_STAT = 'G013_50' -- 배송중
-						<if test="sendYn != null and sendYn != ''">
-						AND    OD.INVOICE_SEND_YN = #{sendYn}
-						</if>
-						AND    G.SELF_GOODS_YN = 'Y' -- 자사상품만
-
-						UNION ALL
-
-						SELECT DISTINCT
-						       '회수'                 AS DELV_GB_NM      -- 지시구분명
-						     , OC.WD_INVOICE_SEND_YN AS SEND_YN         -- 전송여부
-						     , O.SITE_CD                                -- 사이트코드
-						     , O.ORD_NO                                 -- 주문번호
-						     , OCD.ORD_DTL_NO                           -- 주문상세번호
-						     , OD.GOODS_CD                              -- 상품코드
-						     , G.GOODS_NM                               -- 상품명
-						     , D.RTN_LOC_NM          AS RECIP_NM        -- 수취인명
-						     , NULL                  AS RECIP_PHNNO     -- 수취인휴대전화번호
-						     , D.RTN_LOC_TELNO       AS RECIP_TELNO     -- 수취인전화번호
-						     , D.RTN_LOC_ZIPCODE     AS RECIP_POST_NO   -- 수취인우편번호
-						     , D.RTN_LOC_BASE_ADDR   AS RECIP_BASE_ADDR -- 수취인주소
-						     , D.RTN_LOC_DTL_ADDR    AS RECIP_DTL_ADDR  -- 수취인상세주소
-						     , O.ORD_NM                                 -- 주문자명
-						     , O.ORD_PHNNO                              -- 주문자휴대전화번호
-						     , O.ORD_TELNO                              -- 주문자전화번호
-						     , O.ORD_EMAIL                              -- 주문자이메일
-						FROM   TB_ORDER_CHANGE OC
-						JOIN   TB_ORDER_CHANGE_DETAIL OCD ON OC.ORD_CHG_SQ  = OCD.ORD_CHG_SQ
-						JOIN   TB_ORDER_DETAIL OD         ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
-						JOIN   TB_ORDER O                 ON OD.ORD_NO      = O.ORD_NO
-						JOIN   TB_GOODS G                 ON OD.GOODS_CD     = G.GOODS_CD
-						JOIN   TB_DELIVERY_LOC D          ON OD.DELV_LOC_CD = D.DELV_LOC_CD AND OD.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
-						WHERE  1=1
-						<if test="delvGb != null and delvGb != ''">
-						AND    'W' = #{delvGb} -- 회수지시
-						</if>
-						AND    OC.CHG_GB IN ('G680_30','G680_40') -- 반품요청,교환요청
-						<if test="sendYn != null and sendYn != ''">
-						AND    OC.WD_INVOICE_SEND_YN = #{sendYn}
-						</if>
-						<if test="stDate != null and stDate != ''">
-						AND    OC.REG_DT <![CDATA[>=]]> STR_TO_DATE(REPLACE(#{stDate},'-','') , '%Y%m%d%H%i%s')
-						</if>
-						<if test="edDate != null and edDate != ''">
-						AND    OC.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') , '%Y%m%d%H%i%s'), INTERVAL 1 DAY)
-						</if>
-						AND    OCD.CHG_STAT IN ('G685_30','G685_31') -- 회수요청 상품검수중
-						<if test="siteCd != null and siteCd != ''">
-						AND    O.SITE_CD = #{siteCd}
-						</if>
-						AND    G.SELF_GOODS_YN = 'Y' -- 자사상품만
-						AND    OCD.DEL_YN      = 'N'
-					) A
-				ORDER BY A.DELV_GB_NM, A.ORD_NO DESC, A.ORD_DTL_NO
+		        SELECT A.*
+		        FROM (
+		            SELECT DISTINCT 
+		                   '배송'                     AS DELV_GB_NM  -- 지시구분명
+		                 , OD.INVOICE_SEND_YN                 AS SEND_YN     -- 전송여부
+		                 , O.SITE_CD                                         -- 사이트코드
+		                 , O.ORD_NO                                          -- 주문번호
+		                 , OD.ORD_DTL_NO                                     -- 주문상세번호
+		                 , OD.GOODS_CD                                       -- 상품코드
+		                 , G.GOODS_NM                                        -- 상품명
+		                 , DA.RECIP_NM                                       -- 수취인명
+		                 , DA.RECIP_PHNNO                                    -- 수취인휴대전화번호
+		                 , DA.RECIP_TELNO                                    -- 수취인전화번호
+		                 , DA.RECIP_ZIPCODE                                  -- 수취인우편번호
+		                 , DA.RECIP_BASE_ADDR                                -- 수취인기본주소
+		                 , DA.RECIP_DTL_ADDR                                 -- 수취인상세주소
+		                 , O.ORD_NM                                          -- 주문자명
+		                 , O.ORD_PHNNO                                       -- 주문자휴대전화번호
+		                 , O.ORD_TELNO                                       -- 주문자전화번호
+		                 , O.ORD_EMAIL                                       -- 주문자이메일
+		            FROM   TB_ORDER O
+		            JOIN  TB_ORDER_DETAIL OD      ON O.ORD_NO = OD.ORD_NO
+		            JOIN  TB_DELIVERY_ADDR DA     ON OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ AND OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
+		            JOIN  TB_GOODS G              ON OD.GOODS_CD      = G.GOODS_CD
+		            WHERE 1=1
+					<if test="delvGb != null and delvGb != ''">
+		            AND    'D' = #{delvGb} -- 배송지시
+					</if>
+					<if test="stDate != null and stDate != ''">
+		            AND    O.ORD_DT <![CDATA[>=]]> STR_TO_DATE(REPLACE(#{stDate},'-','') , '%Y%m%d%H%i%s')
+					</if>
+					<if test="edDate != null and edDate != ''">
+		            AND    O.ORD_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') , '%Y%m%d%H%i%s'), INTERVAL 1 DAY)
+					</if>
+					<if test="siteCd != null and siteCd != ''">
+		            AND    O.SITE_CD = #{siteCd}
+					</if>
+		            AND    OD.ORD_DTL_STAT = 'G013_50' -- 배송중
+					<if test="sendYn != null and sendYn != ''">
+		            AND    OD.INVOICE_SEND_YN = #{sendYn}
+					</if>
+		            AND    G.SELF_GOODS_YN = 'Y' -- 자사상품만
+		            UNION  ALL
+		            SELECT DISTINCT
+		                   '회수'                 AS DELV_GB_NM      -- 지시구분명
+		                 , OC.WD_INVOICE_SEND_YN AS SEND_YN         -- 전송여부
+		                 , O.SITE_CD                                -- 사이트코드
+		                 , O.ORD_NO                                 -- 주문번호
+		                 , OCD.ORD_DTL_NO                           -- 주문상세번호
+		                 , OD.GOODS_CD                              -- 상품코드
+		                 , G.GOODS_NM                               -- 상품명
+		                 , D.RTN_LOC_NM          AS RECIP_NM        -- 수취인명
+		                 , NULL                  AS RECIP_PHNNO     -- 수취인휴대전화번호
+		                 , D.RTN_LOC_TELNO       AS RECIP_TELNO     -- 수취인전화번호
+		                 , D.RTN_LOC_ZIPCODE     AS RECIP_POST_NO   -- 수취인우편번호
+		                 , D.RTN_LOC_BASE_ADDR   AS RECIP_BASE_ADDR -- 수취인주소
+		                 , D.RTN_LOC_DTL_ADDR    AS RECIP_DTL_ADDR  -- 수취인상세주소
+		                 , O.ORD_NM                                 -- 주문자명
+		                 , O.ORD_PHNNO                              -- 주문자휴대전화번호
+		                 , O.ORD_TELNO                              -- 주문자전화번호
+		                 , O.ORD_EMAIL                              -- 주문자이메일
+		            FROM   TB_ORDER_CHANGE OC
+		            JOIN   TB_ORDER_CHANGE_DETAIL OCD ON OC.ORD_CHG_SQ  = OCD.ORD_CHG_SQ
+		            JOIN   TB_ORDER_DETAIL OD         ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
+		            JOIN   TB_ORDER O                 ON OD.ORD_NO      = O.ORD_NO
+		            JOIN   TB_GOODS G                 ON OD.GOODS_CD     = G.GOODS_CD
+		            JOIN   TB_DELIVERY_LOC D          ON OD.DELV_LOC_CD = D.DELV_LOC_CD AND OD.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
+		            WHERE  1=1
+					<if test="delvGb != null and delvGb != ''">
+		            AND    'W' = #{delvGb} -- 회수지시
+					</if>
+		            AND    OC.CHG_GB IN ('G680_30','G680_40') -- 반품요청,교환요청
+					<if test="sendYn != null and sendYn != ''">
+		            AND    OC.WD_INVOICE_SEND_YN = #{sendYn}
+					</if>
+					<if test="stDate != null and stDate != ''">
+		            AND    OC.REG_DT <![CDATA[>=]]> STR_TO_DATE(REPLACE(#{stDate},'-','') , '%Y%m%d%H%i%s')
+					</if>
+					<if test="edDate != null and edDate != ''">
+		            AND    OC.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') , '%Y%m%d%H%i%s'), INTERVAL 1 DAY)
+					</if>
+		            AND    OCD.CHG_STAT IN ('G685_30','G685_31') -- 회수요청 상품검수중
+					<if test="siteCd != null and siteCd != ''">
+		            AND    O.SITE_CD = #{siteCd}
+					</if>
+		            AND    G.SELF_GOODS_YN = 'Y' -- 자사상품만
+		            AND    OCD.DEL_YN      = 'N'
+		        ) A
+		        ORDER  BY A.DELV_GB_NM
+		             , A.ORD_NO DESC
+		             , A.ORD_DTL_NO
 				<include refid="getListPagingCondition_sql"/>
 	</select>
 
@@ -1087,7 +1082,8 @@
 	<!-- 출고처지정 임시 테이블 삭제    -->
 	<delete id="deleteTbDeliveryLocTmp" parameterType="Delivery"  >
 		/*TsaDelivery.deleteTbDeliveryLocTmp*/
-		DELETE FROM TB_DELIVERY_LOC_TMP WHERE USE_GB = #{useGb}
+		DELETE FROM TB_DELIVERY_LOC_TMP 
+		WHERE  USE_GB = #{useGb}
 	</delete>
 
 	<!-- 출고처지정 임시테이블 등록  -->