Merge remote-tracking branch 'origin/jsh77b' into style

src/main/java/com/style24/core/biz/service/TscWmsService.java

@@ -163,7 +163,7 @@ public class TscWmsService {
 				uData.setExceptionDesc(delvDesc);
 
 				if ("Y".equals(chkYn)) {
-					uData.setOrdDtlNo(null);
+					//uData.setOrdDtlNo(null);
 				}
 
 				wmsDao.updateWmsIfDeliveryOrderItemCancel(uData);

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

@@ -5620,7 +5620,7 @@
 				AND    ODEI.REASON_CD IN ('재고부족')
 				AND    ODE.COMPLTED_YN = 'N'
 				UNION  ALL
-				SELECT OREI.ORDER_DTL_NO 
+				SELECT OREI.ORDER_DTL_NO AS ORD_DTL_NO
 				     , OREI.REASON_CD
 				     , OREI.EXCEPTION_QTY
 				FROM   TB_ORDER_RECALL_EXCEPTION ORE

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

@@ -79,7 +79,7 @@
 			 WHERE A.DeliveryOrderNo = B.DeliveryOrderNo 
 			   AND A.OrderNo  = #{ordNo} 
 			   AND B.OrderDtlNo IS NULL
-   	    
+			   AND B.GiftYn = 'N'
 		 ]]>      
    </select>