Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.batch into develop

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

@@ -95,6 +95,7 @@ public class TsbDeliveryOrderRsltJob extends TsbAbstractJob<Delivery, Delivery,
 				succCnt++;
 			} catch(Exception e) {
 				failCnt++;
+				e.printStackTrace();
 			}
 			
 		}

src/main/java/com/style24/batch/biz/service/TsbDeliveryService.java

@@ -295,7 +295,7 @@ public class TsbDeliveryService {
 			orderDao.createOrderDetailHst(order);
 		}
 		
-		// 정산관련 등록 TB_ORDER_DETAIL_ITEM_HST  [G720_20] 판매-배송완료
+		// 정산관련 등록 TB_ORDER_DETAIL_ITEM_HST  [G720_20] 판매-배송중
 		if ("SHIPPING".equals(statGb)) {
 			Collection<Delivery> itemList = deliveryDao.getOrdDtlItemSq(data);
 			for(Delivery item : itemList) {
@@ -303,13 +303,10 @@ public class TsbDeliveryService {
 				ordItem.setRegNo(TsbConstants.REG_NO);
 				ordItem.setUpdNo(TsbConstants.REG_NO);
 				ordItem.setOrdDtlItemSq(item.getOrdDtlItemSq());
-				ordItem.setOrdDtlStat(OrdDtlItemStat.SALE_SHIPPING.value()); // [G720_20] 판매-배송완료
+				ordItem.setOrdDtlStat(OrdDtlItemStat.SALE_SHIPPING.value()); // [G720_20] 판매-배송중
 				orderDao.createOrderDetailItemHst(ordItem);
 			}
-
 		}
-		
-		
 	}
 	
 	/**

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

@@ -627,7 +627,7 @@
 			                   AND DELV_AR_GB  = 'N'
 			              )
 			    AND A.REG_DT >= DATE_ADD(DATE_FORMAT(STR_TO_DATE(NOW(), '%Y-%m-%d'),'%Y%m%d%H%i%S') , INTERVAL -1 DAY)   -- 테스트 임시 
-				 AND A.MALL_GB ='G011_20'   -- 테스트 임시 
+				 AND A.MALL_GB ='G011_10'   -- 테스트 임시 
 			 GROUP BY A.ORD_NO, B.ORD_EXCH_GB
 			
 			UNION ALL /* 교환  상품 */
@@ -676,7 +676,7 @@
 			                   AND DELV_AR_GB  = 'N'
 			              )
 			   AND (SELECT COUNT(*) FROM TB_GOODS_RES_SELL WHERE DELV_RES_DT > NOW() AND GOODS_CD = B.GOODS_CD) = 0
-			AND A.MALL_GB ='G011_20'     -- 테스트 임시 
+			AND A.MALL_GB ='G011_10'     -- 테스트 임시 
 			 GROUP BY A.ORD_NO, B.ORD_EXCH_GB
 
 			
@@ -1714,7 +1714,7 @@
 		/*TsbDelivery.getOrdDtlItemSq*/
 		SELECT  ORD_DTL_ITEM_SQ
 		  FROM TB_ORDER_DETAIL_ITEM 
-		WHERE ORD_DTL_NO = #{ordDtlNo}
+		WHERE ORD_DTL_NO = #{orderdtlno}
 		  AND PRODUCT_NO = #{productno}
 		  AND OPT_CD     = #{skucode}
 	</select>	

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

@@ -74,8 +74,10 @@
 			, B.OrderNo
 			, A.Qty
 			, A.ReasonCode
-		  FROM iSTYLE24_WmsIf.DBO.TB_IF_RecallExceptionItem A, iSTYLE24_WmsIf.DBO.TB_IF_RecallException B
+		  FROM iSTYLE24_WmsIf.DBO.TB_IF_RecallExceptionItem A, iSTYLE24_WmsIf.DBO.TB_IF_RecallException B, iSTYLE24_WmsIf.DBO.TB_IF_DeliveryOrderItem  C 
 		 WHERE A.RecallExceptionNo = B.RecallExceptionNo
+		   AND A.DeliveryOrderItemNo = C.DeliveryOrderItemNo 
+		   AND A.SKUCode  = C.SKUCode 
 		   AND A.IfStat = 0
 		   AND B.StatusCd = '대기'
 		   AND B.DateCreated > CONVERT(datetime,'20210620'+' 00:00:00') -- 임시임