마이페이지 부분취소 임시 커밋

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

@@ -2148,6 +2148,7 @@ public class TscOrderChangeService {
 	 * @since 2021. 04. 21
 	 */
 	@SuppressWarnings("unchecked")
+	@Transactional("shopTxnManager")
 	public GagaMap orderCancelPreInfo(OrderChange orderChange) {
 		GagaMap result = new GagaMap();
 

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

@@ -1,22 +1,21 @@
 package com.style24.core.biz.service;
 
-import com.style24.core.biz.dao.TscWmsDao;
-import com.style24.core.biz.dao.TscDeliveryDao;
-import com.style24.core.support.env.TscConstants;
-import com.style24.persistence.domain.WmsDelivery;
-import com.style24.persistence.domain.Order;
-import com.style24.persistence.domain.ErpStock;
-
-import com.style24.core.biz.service.TscErpService;
-
-import lombok.extern.slf4j.Slf4j;
-
 import java.util.ArrayList;
 import java.util.Collection;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.style24.core.biz.dao.TscDeliveryDao;
+import com.style24.core.biz.dao.TscWmsDao;
+import com.style24.core.support.env.TscConstants;
+import com.style24.persistence.domain.ErpStock;
+import com.style24.persistence.domain.Order;
+import com.style24.persistence.domain.WmsDelivery;
+
+import lombok.extern.slf4j.Slf4j;
+
 
 /**
  * Wms Service
@@ -134,6 +133,7 @@ public class TscWmsService {
 	 * @author moon
 	 * @since 2021. 03. 16
 	 */
+	@Transactional("wmsTxnManager")
 	public void updateWmsCancel(Collection<Order> ordCancelList) {
 		// 주문번호, 주문상세번호, 변경수량 
 		// ordNo, ordDtlNo , chgQty
@@ -176,5 +176,7 @@ public class TscWmsService {
 			// 사은품 취소
 			wmsDao.updateWmsIfDeliveryOrderGiftCancel(sData);
 		}
+		
+		int i = 100/0;
 	}
 }

src/main/java/com/style24/persistence/domain/WmsDelivery.java

@@ -1,8 +1,5 @@
 package com.style24.persistence.domain;
 
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.style24.persistence.TscBaseDomain;
 
 import lombok.Data;
@@ -21,7 +18,7 @@ public class WmsDelivery extends TscBaseDomain {
 	private Integer ordNo;
 	private Integer ordDtlNo;
 	private Integer ordDtlItemSq;
-	private Integer optCd;
+	private String optCd;
 	
 	private String skuCode;
 	private String stockLoc;

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

@@ -130,7 +130,7 @@
 	<!-- WMS 배송 사은품 취소  -->
 	<update id="updateWmsIfDeliveryOrderGiftCancel" parameterType="WmsDelivery">
 		/* TscWmsDelivery.updateWmsIfDeliveryOrderGiftCancel */
-		UPDATE istyle24_Wmsif.dbo.TB_IF_DeliveryOrderItem A SET 
+		UPDATE istyle24_Wmsif.dbo.TB_IF_DeliveryOrderItem SET 
 			  StatusCd = '60'
 			, IsCancel = 1
 		WHERE DeliveryOrderNo = ( SELECT MAX(A.DeliveryOrderNo) AS DeliveryOrderNo