Commit f53a57b1 authored by 332784038@qq.com's avatar 332784038@qq.com

Merge branch 'master-fix' into dev

parents 28edface 233d870a
...@@ -52,6 +52,7 @@ import cn.iocoder.yudao.module.order.service.orderCargoControl.OrderCargoControl ...@@ -52,6 +52,7 @@ import cn.iocoder.yudao.module.order.service.orderCargoControl.OrderCargoControl
import cn.iocoder.yudao.module.order.service.orderLabel.OrderLabelService; import cn.iocoder.yudao.module.order.service.orderLabel.OrderLabelService;
import cn.iocoder.yudao.module.order.service.orderWarehouseIn.OrderWarehouseInService; import cn.iocoder.yudao.module.order.service.orderWarehouseIn.OrderWarehouseInService;
import cn.iocoder.yudao.module.order.service.orderWarehousePicture.OrderWarehousePictureService; import cn.iocoder.yudao.module.order.service.orderWarehousePicture.OrderWarehousePictureService;
import cn.iocoder.yudao.module.order.service.targetLog.TargetLogService;
import cn.iocoder.yudao.module.order.vo.approval.OrderApprovalCancelApplyReqVO; import cn.iocoder.yudao.module.order.vo.approval.OrderApprovalCancelApplyReqVO;
import cn.iocoder.yudao.module.order.vo.order.ApplyInfoVO; import cn.iocoder.yudao.module.order.vo.order.ApplyInfoVO;
import cn.iocoder.yudao.module.order.vo.order.CostVO; import cn.iocoder.yudao.module.order.vo.order.CostVO;
...@@ -86,6 +87,7 @@ import java.util.stream.Collectors; ...@@ -86,6 +87,7 @@ import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.order.enums.ErrorCodeConstants.*; import static cn.iocoder.yudao.module.order.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.order.enums.TargetLogEnum.SPLIT;
/** /**
* 订单拆单 Service 实现类 * 订单拆单 Service 实现类
...@@ -109,6 +111,8 @@ public class OrderSplitServiceImpl extends AbstractService<OrderSplitMapper, Ord ...@@ -109,6 +111,8 @@ public class OrderSplitServiceImpl extends AbstractService<OrderSplitMapper, Ord
@Resource @Resource
private OrderApprovalService orderApprovalService; private OrderApprovalService orderApprovalService;
@Resource
private TargetLogService targetLogService;
@Resource @Resource
private OrderService orderService; private OrderService orderService;
@Resource @Resource
...@@ -1086,7 +1090,8 @@ public class OrderSplitServiceImpl extends AbstractService<OrderSplitMapper, Ord ...@@ -1086,7 +1090,8 @@ public class OrderSplitServiceImpl extends AbstractService<OrderSplitMapper, Ord
null, 0, OrderApprovalTypeResultEnum.order_split_pass.getDesc(), false); null, 0, OrderApprovalTypeResultEnum.order_split_pass.getDesc(), false);
// 原订单的应收单归档删除 (这些应收都是未核销的,核销的是不能拆单的) // 原订单的应收单归档删除 (这些应收都是未核销的,核销的是不能拆单的)
// 拆单删除原单可能的业绩日志
targetLogService.addTargetLog(orderId, null, SPLIT);
// 判断是否为子拆单进行的再次拆单,如果是,其订单编号和订单id未变,则不用处理关联和互斥业务 // 判断是否为子拆单进行的再次拆单,如果是,其订单编号和订单id未变,则不用处理关联和互斥业务
if (orderNoAndSeq.length == 1) { if (orderNoAndSeq.length == 1) {
receivableService.deleteReceivableByOrderId(orderId); receivableService.deleteReceivableByOrderId(orderId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment