Просмотр исходного кода

WMS 배송/회수 정보 수정 임시 커밋

card007 4 лет назад
Родитель
Сommit
b07e970247

+ 21 - 2
src/main/java/com/style24/core/biz/dao/TscWmsDao.java

@@ -5,8 +5,8 @@ import java.util.Collection;
 import org.springframework.stereotype.Repository;
 
 import com.style24.core.support.annotation.WmsDs;
-import com.style24.persistence.domain.WmsDelivery;
 import com.style24.persistence.domain.Order;
+import com.style24.persistence.domain.WmsDelivery;
 
 /**
  * Wms연동 Dao
@@ -141,5 +141,24 @@ public interface TscWmsDao {
 	 * @since 2021. 06. 30
 	 */	
 	int updateWmsRecallChangeAddr(Order order);
-	
+
+	/**
+	 * WMS 배송메모 변경
+	 *
+	 * @param Order
+	 * @return int
+	 * @author card007
+	 * @since 2021. 10. 21
+	 */
+	int updateWmsDeliveryMemo(Order order);
+
+	/**
+	 * WMS 회수메모 변경
+	 *
+	 * @param Order
+	 * @return int
+	 * @author card007
+	 * @since 2021. 10. 21
+	 */
+	int updateWmsRecallChangeMemo(Order order);
 }

+ 4 - 0
src/main/java/com/style24/core/biz/service/TscOrderService.java

@@ -80,6 +80,9 @@ public class TscOrderService {
 	@Autowired
 	private TscOrderRefundService orderRefundService;
 	
+	@Autowired
+	private TscWmsService coreWmsService;
+	
 	private static final String siteNm = "STYLE24";
 	
 	@Autowired
@@ -632,6 +635,7 @@ public class TscOrderService {
 	@Transactional("shopTxnManager")
 	public void updateOrderAddr(Order order) {
 		orderDao.updateOrderAddr(order);
+		coreWmsService.updateWmsDeliveryChangeAddr(order);
 	}
 	
 	/**

+ 26 - 3
src/main/java/com/style24/core/biz/service/TscWmsService.java

@@ -221,7 +221,6 @@ public class TscWmsService {
 	 */
 	@Transactional("wmsTxnManager")
 	public void updateWmsDeliveryChangeAddr(Order order) {
-
 		wmsDao.updateWmsDeliveryChangeAddr(order);
 	}
 	
@@ -233,8 +232,32 @@ public class TscWmsService {
 	 */
 	@Transactional("wmsTxnManager")
 	public void updateWmsRecallChangeAddr(Order order) {
-
 		wmsDao.updateWmsRecallChangeAddr(order);
 	}
-	
+
+	/**
+	 * WMS 배송메모 변경
+	 * 
+	 * @param Order
+	 * @return int
+	 * @author card007
+	 * @since 2021. 10. 21
+	 */
+	@Transactional("wmsTxnManager")
+	public void updateWmsDeliveryMemo(Order order) {
+		wmsDao.updateWmsDeliveryMemo(order);
+	}
+
+	/**
+	 * WMS 회수 주소변경
+	 * 
+	 * @param Order
+	 * @return int
+	 * @author card007
+	 * @since 2021. 10. 21
+	 */
+	@Transactional("wmsTxnManager")
+	public void updateWmsRecallChangeMemo(Order order) {
+		wmsDao.updateWmsRecallChangeMemo(order);
+	}
 }

+ 23 - 4
src/main/java/com/style24/persistence/mybatis/wms/TscWmsDelivery.xml

@@ -212,11 +212,10 @@
 		, DeliveryAddr2      = #{recipDtlAddr}
 		, IsChangeAddress    = 1
 		, DeliveryMemo       = #{delvMemo}
-		SELECT * FROM istyle24_Wmsif.dbo.TB_IF_DeliveryOrder 
 		WHERE OrderNo  = #{ordNo}
 		  AND IsCancel = 0
 	</update>
-		
+
 	<!-- WMS 회수 주소변경  -->
 	<update id="updateWmsRecallChangeAddr" parameterType="Order">
 		/* TscWmsDelivery.updateWmsRecallChangeAddr */
@@ -224,12 +223,32 @@
 		  DeliveryPostalCode = #{chgerZipcode}
 		, DeliveryAddr1      = #{chgerBaseAddr}
 		, DeliveryAddr2      = #{chgerDtlAddr}
-		, chgerRtnMemo       = #{chgDelvMemo}
+		, chgerRtnMemo       = #{chgerRtnMemo}
 		, DateCSMemoUpdated  = GETDATE() 
 		WHERE OrderExceptionNo = #{ordChgSq}
 		  AND OrderNo   = #{ordNo}
 		  AND IsDeleted = 0
 	</update>
-			
+
+	<!-- WMS 배송메모 변경  -->
+	<update id="updateWmsDeliveryMemo" parameterType="Order">
+		/* TscWmsDelivery.updateWmsDeliveryMemo */
+		UPDATE istyle24_Wmsif.dbo.TB_IF_DeliveryOrder
+		   SET IsChangeAddress = 1
+		     , DeliveryMemo = #{delvMemo}
+		 WHERE OrderNo  = #{ordNo}
+		   AND IsCancel = 0
+	</update>
+
+	<!-- WMS 회수메모 변경  -->
+	<update id="updateWmsRecallChangeMemo" parameterType="Order">
+		/* TscWmsDelivery.updateWmsRecallChangeMemo */
+		UPDATE istyle24_Wmsif.dbo.TB_IF_RecallDelivery
+		   SET chgerRtnMemo = #{chgerRtnMemo}
+			 , DateCSMemoUpdated = GETDATE()
+		 WHERE OrderExceptionNo = #{ordChgSq}
+		   AND OrderNo = #{ordNo}
+		   AND IsDeleted = 0
+	</update>
 </mapper>