08.09

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

@@ -119,7 +119,7 @@ public class TsbDeliveryOrderJob extends TsbAbstractJob<Collection<Delivery>, Co
 				// 3. WMS의  주문단위 상품재고가 없을경우  매장재고 체크 후  주문단위 상품이 모두있을경우 해당 매장으로 출고처 지정  
 				// WMS 창고 출고처 지정 못한 주문건이 존재  매장 출고처 지정
 		
-				 if("Y".equals(ShopYn)) {
+				 if("Y".equals(ShopYn) && "N".equals(ordNoData.getGiftyn())) {
 					 
 					 Collection<Delivery> shopOrdDtlNoList = deliveryService.getOrderDtlNoList(ordNoData);
 					 

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

@@ -609,6 +609,7 @@
 	  SELECT DISTINCT ORD_NO, ORD_EXCH_GB, PG_GB
 		FROM (
 			SELECT A.ORD_NO, B.ORD_EXCH_GB, (SELECT MAX(PG_GB) FROM TB_PAYMENT WHERE ORD_NO= A.ORD_NO AND PAY_GB ='O') AS PG_GB /* 주문 상품 */
+			     , CASE WHEN (SELECT COUNT(*) FROM TB_ORD_FREEGIFT ODF WHERE ODF.ORD_NO = A.ORD_NO) > 0 THEN 'Y' ELSE 'N' END AS GIFT_YN 
 			  FROM TB_ORDER        A
 			  JOIN TB_ORDER_DETAIL B ON A.ORD_NO = B.ORD_NO 
 			  JOIN TB_GOODS        C ON B.GOODS_CD = C.GOODS_CD 
@@ -633,6 +634,7 @@
 			UNION ALL /* 교환  상품 */
 			
 			SELECT A.ORD_NO, B.ORD_EXCH_GB, (SELECT MAX(PG_GB) FROM TB_PAYMENT WHERE ORD_NO= A.ORD_NO AND PAY_GB ='O') AS PG_GB
+			    , 'N' AS GIFT_YN
 			  FROM TB_ORDER        A
 			  JOIN TB_ORDER_DETAIL B        ON A.ORD_NO = B.ORD_NO 
 			  JOIN TB_GOODS        C        ON B.GOODS_CD = C.GOODS_CD 
@@ -657,6 +659,7 @@
 			UNION ALL  
 			   
 			SELECT A.ORD_NO, B.ORD_EXCH_GB, (SELECT MAX(PG_GB) FROM TB_PAYMENT WHERE ORD_NO= A.ORD_NO AND PAY_GB ='O') AS PG_GB  -- 예약상품    
+			     , CASE WHEN (SELECT COUNT(*) FROM TB_ORD_FREEGIFT ODF WHERE ODF.ORD_NO = A.ORD_NO) > 0 THEN 'Y' ELSE 'N' END AS GIFT_YN 
 			  FROM TB_ORDER          A
 			  JOIN TB_ORDER_DETAIL   B ON A.ORD_NO = B.ORD_NO 
 			  JOIN TB_GOODS          C ON B.GOODS_CD = C.GOODS_CD