Przeglądaj źródła

09.02 cj 송장수신 as-is 제거

tsit05 4 lat temu
rodzic
commit
0056c78edc

+ 5 - 1
src/main/java/com/style24/batch/biz/job/delivery/TsbCjWithdrawInvoiceJob.java

@@ -57,8 +57,12 @@ public class TsbCjWithdrawInvoiceJob extends TsbAbstractJob<Collection<Delivery>
 		for(Delivery data : invcRcpList) {
 			try {
 			
+				
 			// 2. wms  회수요청 테이블에 등록!
-			wmsDeliveryService.updateWmsRecallInvoice(data);
+				data.setOrdChgSq(Integer.parseInt(data.getCjOrdChgSq()));
+				data.setOrdNo(Integer.parseInt(data.getCjOrdNo()));
+				
+				wmsDeliveryService.updateWmsRecallInvoice(data);
 			
 			// 3. mall tb_order_change 테이블  update 
 			deliveryService.updateTbOrderChaneInvoc(data);

+ 4 - 0
src/main/java/com/style24/persistence/domain/Delivery.java

@@ -159,6 +159,10 @@ public class Delivery extends TscBaseDomain {
 	private String goodsNm;
 	private String chgerBaseAddr;
 	
+	private String cjOrdChgSq;
+	private String cjOrdNo;
+	
+	
 	private Integer recallexceptionno;
 	private Integer recallexceptionitemno;
 	private Integer recallexceptionmemono;

+ 13 - 11
src/main/java/com/style24/persistence/mybatis/cj/TsbCjDelivery.xml

@@ -7,17 +7,19 @@
 	<select id="getCjWdInvoiceList" resultType="Delivery">
 		/*TsbWmsDelivery.getCjWdInvoiceList*/
 		SELECT 
-		      INVC_NO     AS RECALLINVOICENO
-		      , SUBSTR(CUST_USE_NO, INSTR(CUST_USE_NO,'-')+1, LENGTH(CUST_USE_NO)) AS ORD_CHG_SQ
-		      , SUBSTR(CUST_USE_NO, 0,INSTR(CUST_USE_NO,'-')-1) AS ORD_NO
-		      , TO_DATE(SCAN_YMD||SCAN_HOUR,'YYYYMMDDHH24MISS')   AS DELIVERY_DT
-		      , CUST_USE_NO
-		  FROM V_TRACE_ISTYLE020
-		 WHERE CUST_ID = '0010046850'  -- 고객번호 
-		   AND RCPT_DV = '02' -- 반품 
-		   AND EAI_PRGS_ST = '01' 
-		   AND CRG_ST      = '01' 
-		 GROUP BY INVC_NO, TO_DATE(SCAN_YMD||SCAN_HOUR,'YYYYMMDDHH24MISS'), CUST_USE_NO
+		        A.INVC_NO     AS RECALLINVOICENO
+		      , SUBSTR(A.CUST_USE_NO, INSTR(A.CUST_USE_NO,'-')+1, LENGTH(A.CUST_USE_NO)) AS CJ_ORD_CHG_SQ
+		      , SUBSTR(A.CUST_USE_NO, 0,INSTR(A.CUST_USE_NO,'-')-1) AS CJ_ORD_NO
+		      , TO_DATE(A.SCAN_YMD||A.SCAN_HOUR,'YYYYMMDDHH24MISS')   AS DELIVERY_DT
+		      , A.CUST_USE_NO
+		  FROM V_TRACE_ISTYLE020 A, V_RCPT_ISTYLE010 B
+		 WHERE A.CUST_ID = B.CUST_ID
+       AND A.CUST_USE_NO = B.CUST_USE_NO
+       AND A.CUST_ID = '0010046850'  -- 고객번호 
+		   AND A.RCPT_DV = '02' -- 반품 
+		   AND A.EAI_PRGS_ST = '01' 
+		   AND A.CRG_ST      = '01' 
+		 GROUP BY A.INVC_NO, TO_DATE(A.SCAN_YMD||A.SCAN_HOUR,'YYYYMMDDHH24MISS'), A.CUST_USE_NO
 	</select>
 	
 	<!-- cj 회수 상태 조회    -->	

+ 5 - 4
src/main/java/com/style24/persistence/mybatis/shop/TsbDelivery.xml

@@ -1221,7 +1221,7 @@
 		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품
 		   AND E.CHANGEABLE_YN  = 'Y' -- 교환가능여부
 		   AND G.MALL_GB        = 'G011_10' -- 자사몰 
-		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 0 DAY) 
+		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
 
 		
 		UNION ALL 
@@ -1276,7 +1276,7 @@
 		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품 
 		   AND E.RETURNABLE_YN  = 'Y' -- 반품가능여부 
 		   AND G.MALL_GB        = 'G011_20' -- 제휴몰 
-		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 0 DAY) 
+		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
 
 		
 		UNION ALL 
@@ -1331,7 +1331,7 @@
 		   AND E.SELF_GOODS_YN  = 'Y' -- 자사상품
 		   AND E.CHANGEABLE_YN  = 'Y' -- 교환가능여부
 		   AND G.MALL_GB        = 'G011_20' -- 제휴몰 		
-		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 0 DAY) 
+		   AND a.REG_DT  >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-08-31','-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
 
 		) A ORDER BY OrderExceptionNo
 	</select>	
@@ -1417,7 +1417,8 @@
 			   AND A.INVOICE_NO != ''
 			   AND A.ORD_DTL_STAT  = 'G013_50'--  배송중
 			   AND NOT EXISTS (SELECT 1 FROM TB_ORDER_DETAIL_INVOICE B WHERE A.ORD_NO = B.ORD_NO AND A.ORD_DTL_NO = B.ORD_DTL_NO AND A.INVOICE_NO = B.INVOICE_NO AND B.SWT_TRC_SEND_YN ='Y')
-			 GROUP BY A.INVOICE_NO, A.SHIP_COMP_CD   
+			   AND A.REG_DT >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-09-01','-',''), '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
+			 GROUP BY A.INVOICE_NO, A.SHIP_COMP_CD
 			   
 			UNION ALL