From 90802f81fb6619629368eda5f7460b4d0e6d5d3f Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 10 Jun 2025 17:02:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E8=B5=8B=E5=80=BC?= =?UTF-8?q?=E8=A7=84=E5=88=99id=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qs/serve/modules/oms/mapper/OmsSaleOrderMapper.java | 7 +++++++ .../oms/service/impl/OmsSaleOrderPart1ServiceImpl.java | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/mapper/OmsSaleOrderMapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/mapper/OmsSaleOrderMapper.java index d23f8a5..c63e621 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/mapper/OmsSaleOrderMapper.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/mapper/OmsSaleOrderMapper.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.oms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qs.serve.framework.base.model.dto.SimpleKeyValue; import com.qs.serve.modules.oms.entity.OmsSaleOrder; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.math.BigDecimal; @@ -24,5 +25,11 @@ public interface OmsSaleOrderMapper extends BaseMapper { @Select("SELECT oa_id as `value`,`name` as label,rate as value2 FROM `ext_expire_order_rate` where del_flag = 0 and oa_id = #{oaId} ") SimpleKeyValue getExpiredRateInfo(String oaId); + + @Select("SELECT brand_rule_id FROM `oms_sale_order` " + + " where order_sn = #{orderCode} and brand_rule_id is not null and brand_rule_id <> 0 " + + " order by id desc limit 1") + Long getBrandRuleIdByCode(@Param("orderCode") String orderCode); + } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java index daf21af..4793bcd 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java @@ -5,6 +5,7 @@ import com.qs.serve.framework.redis.RedisService; import com.qs.serve.framework.base.model.dto.SimpleKeyValue; import com.qs.serve.common.exception.Assert; import com.qs.serve.framework.redis.utils.CodeGenUtil; +import com.qs.serve.modules.oms.mapper.OmsSaleOrderMapper; import com.qs.serve.modules.sys.common.AuthContextUtils; import com.qs.serve.framework.base.util.CollectionUtil; import com.qs.serve.modules.bms.entity.BmsSupplier; @@ -52,6 +53,7 @@ public class OmsSaleOrderPart1ServiceImpl implements OmsSaleOrderPart1Service { private SalePlanMapper salePlanMapper; private SalePlanGoodsMapper salePlanGoodsMapper; + private OmsSaleOrderMapper omsSaleOrderMapper; private OmsSaleOrderService omsSaleOrderService; private OmsSaleOrderItemService omsSaleOrderItemService; @@ -74,9 +76,11 @@ public class OmsSaleOrderPart1ServiceImpl implements OmsSaleOrderPart1Service { @Override public OmsSaleOrder copyOrder(Long orderId) { OmsSaleOrder order = omsSaleOrderService.getById(orderId); + Long orgRuleId = omsSaleOrderMapper.getBrandRuleIdByCode(order.getOrderSn()); List orderItems = omsSaleOrderItemService.list(new LambdaQueryWrapper() .eq(OmsSaleOrderItem::getOrderId, orderId)); order.setId(null); + order.setBrandRuleId(orgRuleId); String orderPrefix = null; if (order.getOrderType().equals(0)) { orderPrefix = "";