06.04

src/main/java/com/style24/batch/biz/task/TsbDeliveryTask.java

@@ -104,27 +104,27 @@ public class TsbDeliveryTask {
 	}
 
 	/**
-	 * WMS 출고결과 수신
+	 * WMS 송장번호 수신  
 	 *
 	 * @throws Exception
 	 */
-	@Scheduled(cron = "${cron.delivery.wms.outgoing.result.receive}")
+	@Scheduled(cron = "${cron.delivery.wms.invoice.receive}")
 	//@Scheduled(fixedDelay = 3500000)
 	@Async
-	public void wmsOutgoingResultReceiveJob() throws Exception {
-		deliveryOrderRsltJob.run("cron.delivery.wms.outgoing.result.receive");
+	public void wmsInvoiceReceiveJob() throws Exception {
+		tsbInvoiceNoRcvJob.run("cron.delivery.wms.invoice.receive");
 	}
-
+	
 	/**
-	 * WMS 송장번호 수신  
+	 * WMS 출고결과 수신
 	 *
 	 * @throws Exception
 	 */
-	@Scheduled(cron = "${cron.delivery.wms.invoice.receive}")
+	@Scheduled(cron = "${cron.delivery.wms.outgoing.result.receive}")
 	//@Scheduled(fixedDelay = 3500000)
 	@Async
-	public void wmsInvoiceReceiveJob() throws Exception {
-		tsbInvoiceNoRcvJob.run("cron.delivery.wms.invoice.receive");
+	public void wmsOutgoingResultReceiveJob() throws Exception {
+		deliveryOrderRsltJob.run("cron.delivery.wms.outgoing.result.receive");
 	}
 
 	/**

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

@@ -576,7 +576,8 @@
 			   AND B.ORD_EXCH_GB   = 'O'       -- 주문
 			   AND A.ORD_DT >= DATE_ADD(DATE_FORMAT(CONCAT(STR_TO_DATE(NOW(), '%Y-%m-%d'),' 10:00:00'),'%Y%m%d%H%i%S') , INTERVAL -1 DAY)
 			   AND NOT EXISTS (SELECT '1' FROM TB_GOODS_RES_SELL WHERE GOODS_CD = B.GOODS_CD AND USE_YN ='Y') 
-			 --   AND A.REG_NO = 100025
+			   AND A.REG_DT >= DATE_ADD(DATE_FORMAT(STR_TO_DATE(NOW(), '%Y-%m-%d'),'%Y%m%d%H%i%S') , INTERVAL 0 DAY) 
+			--   AND A.REG_NO = 100025
 			 GROUP BY A.ORD_NO
 			
 			UNION ALL /* 교환  상품 */
@@ -590,10 +591,10 @@
 			 WHERE C.SELF_GOODS_YN = 'Y'       -- 자사 
 			   AND B.ORD_DTL_STAT  = 'G013_20' -- 결제완료 
 			   AND B.ORD_EXCH_GB   = 'E'       -- 교환 
-			   AND D.CHG_STAT      IN ('G685_30','G685_31', 'G685_40')
+			   AND D.CHG_STAT      IN ('G685_20','G685_30','G685_31', 'G685_40')
 			   AND DATE_ADD(DATE_FORMAT(CONCAT(STR_TO_DATE(NOW(), '%Y-%m-%d'),' 10:00:00'),'%Y%m%d%H%i%S') , INTERVAL -1 DAY) 
 			       <= CASE WHEN E.WD_BF_SEND_YN = 'Y' THEN B.REG_DT ELSE D.COMPLETE_DT END
-			--    AND A.REG_NO = 100025
+			--     AND A.REG_NO = 100025
 			 GROUP BY A.ORD_NO
 			 
 			UNION ALL  
@@ -608,7 +609,7 @@
 			   AND D.DELV_RES_DT  <= NOW()
 			   AND DATE_ADD(DATE_FORMAT(CONCAT(STR_TO_DATE(NOW(), '%Y-%m-%d'),' 10:00:00'),'%Y%m%d%H%i%S') , INTERVAL -1 DAY)
 			       < CASE WHEN  A.ORD_DT < D.DELV_RES_DT THEN D.DELV_RES_DT ELSE A.ORD_DT END 
-			--    AND A.REG_NO = 100025    
+			--     AND A.REG_NO = 100025    
 			 GROUP BY A.ORD_NO
 			
 		) A
@@ -1092,7 +1093,7 @@
 		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품 
 		   AND E.RETURNABLE_YN  = 'Y' -- 반품가능여부 
 		   AND G.MALL_GB        = 'G011_10' -- 자사몰
-		--   and A.REG_NO = '100025'
+		   and A.REG_NO = '100025'
 		
 		UNION ALL 
 		
@@ -1140,7 +1141,7 @@
 		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품
 		   AND E.CHANGEABLE_YN  = 'Y' -- 교환가능여부
 		   AND G.MALL_GB        = 'G011_10' -- 자사몰 
-		--   and A.REG_NO = '100025'
+		   and A.REG_NO = '100025'
 		
 		UNION ALL 
 		
@@ -1190,7 +1191,7 @@
 		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품 
 		   AND E.RETURNABLE_YN  = 'Y' -- 반품가능여부 
 		   AND G.MALL_GB        = 'G011_20' -- 제휴몰 
-		--   and A.REG_NO = '100025'
+		   and A.REG_NO = '100025'
 		
 		UNION ALL 
 		
@@ -1240,7 +1241,7 @@
 		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품
 		   AND E.CHANGEABLE_YN  = 'Y' -- 교환가능여부
 		   AND G.MALL_GB        = 'G011_20' -- 제휴몰 		
-		--   and A.REG_NO = '100025'
+		   and A.REG_NO = '100025'
 		) A ORDER BY OrderExceptionNo
 	</select>