Commit a6e11d2e authored by knight's avatar knight Committed by wux

bug 预装中订单修改货值权限

parent aaca4853
...@@ -103,6 +103,8 @@ import cn.iocoder.yudao.module.order.vo.orderConsignor.OrderConsignorBackVO; ...@@ -103,6 +103,8 @@ import cn.iocoder.yudao.module.order.vo.orderConsignor.OrderConsignorBackVO;
import cn.iocoder.yudao.module.order.vo.orderDeparture.OrderDepartureBackVO; import cn.iocoder.yudao.module.order.vo.orderDeparture.OrderDepartureBackVO;
import cn.iocoder.yudao.module.order.vo.orderException.OrderExceptionCreateReqVO; import cn.iocoder.yudao.module.order.vo.orderException.OrderExceptionCreateReqVO;
import cn.iocoder.yudao.module.order.vo.orderException.OrderExceptionDescVO; import cn.iocoder.yudao.module.order.vo.orderException.OrderExceptionDescVO;
import cn.iocoder.yudao.module.order.vo.orderItem.OrderItemBackVO;
import cn.iocoder.yudao.module.order.vo.orderItem.OrderItemBaseVO;
import cn.iocoder.yudao.module.order.vo.orderItem.OrderItemCreateReqVO; import cn.iocoder.yudao.module.order.vo.orderItem.OrderItemCreateReqVO;
import cn.iocoder.yudao.module.order.vo.orderItem.OrderItemInWarehouseVO; import cn.iocoder.yudao.module.order.vo.orderItem.OrderItemInWarehouseVO;
import cn.iocoder.yudao.module.order.vo.orderObjective.OrderObjectiveBackVO; import cn.iocoder.yudao.module.order.vo.orderObjective.OrderObjectiveBackVO;
...@@ -1829,13 +1831,24 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -1829,13 +1831,24 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (approvalTypeCheckEvent.getResult()) { if (approvalTypeCheckEvent.getResult()) {
throw exception(ORDER_IS_APPROVAL_IN_PROCESS); throw exception(ORDER_IS_APPROVAL_IN_PROCESS);
} }
// 获取修改前的货值
BigDecimal oldTotalWorth = updateReqVO.getCostVO().getTotalWorth();
// 获取修改后的货值
BigDecimal newTotalWorth = updateReqVO.getOrderItemVOList().stream().map(OrderItemBaseVO::getWorth).reduce(BigDecimal.ZERO , BigDecimal::add);
// 2025年1月15日 增加订单修改货值功能,预装后可单独修改货值 // 2025年1月15日 增加订单修改货值功能,预装后可单独修改货值
if (vo.getShipmentState() > 0 && !(vo.getShipmentState() == 304 || vo.getShipmentState() == 305) ) { if (vo.getShipmentState() > 0 && !(vo.getShipmentState() == 304 || vo.getShipmentState() == 305) ) {
throw exception(ORDER_SHIPMENT_NOT_UPDATE); throw exception(ORDER_SHIPMENT_NOT_UPDATE);
} }
// 正在预装中的订单不允许修改
BoxCheckOrderUpdateSchedulingEvent schedulingEvent = new BoxCheckOrderUpdateSchedulingEvent(vo.getOrderId()); // 2025年3月3日 knight 如果编辑订单不是修改货值操作则不允许修改
applicationContext.publishEvent(schedulingEvent); if (newTotalWorth.equals(oldTotalWorth)){
// 正在预装中的订单不允许修改
BoxCheckOrderUpdateSchedulingEvent schedulingEvent = new BoxCheckOrderUpdateSchedulingEvent(vo.getOrderId());
applicationContext.publishEvent(schedulingEvent);
}
// 获取功能开关 // 获取功能开关
List<DictDataRespDTO> dictList = dictDataApi.getDictDatas("part_function_switch"); List<DictDataRespDTO> dictList = dictDataApi.getDictDatas("part_function_switch");
// 智慧预装功能开关 // 智慧预装功能开关
......
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