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

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

@@ -5518,6 +5518,7 @@
 				ON     ODE.DELIVERY_EXCEPTION_SQ = ODEI.DELIVERY_EXCEPTION_SQ 
 				WHERE  1=1
 				AND    ODEI.REASON_CD IN ('재고부족')
+				AND    ODE.COMPLTED_YN = 'N'
 				UNION  ALL
 				SELECT OREI.ORDER_DTL_NO 
 				     , OREI.REASON_CD