From adb8260697b23fbaae51e4858c7df6fbfd7d36ad Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Thu, 25 Jun 2026 16:19:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug#1726=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/query/LambdaQueryWrapperX.java | 6 + .../executor/enums/ErrorCodeConstants.java | 1 + .../admin/order/OrderController.java | 10 +- .../executor/dal/mysql/order/OrderMapper.java | 24 +++ .../executor/service/order/OrderService.java | 14 +- .../service/order/OrderServiceImpl.java | 166 ++++++++++++++++-- .../message_errorcode_cht.properties | 1 + .../resources/message_errorcode_en.properties | 1 + .../resources/message_errorcode_zh.properties | 1 + 9 files changed, 199 insertions(+), 25 deletions(-) diff --git a/cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/mybatis/core/query/LambdaQueryWrapperX.java b/cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/mybatis/core/query/LambdaQueryWrapperX.java index 0e14081f1..134a2bf56 100644 --- a/cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/mybatis/core/query/LambdaQueryWrapperX.java +++ b/cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/mybatis/core/query/LambdaQueryWrapperX.java @@ -120,6 +120,12 @@ public class LambdaQueryWrapperX extends LambdaQueryWrapper { return this; } + @Override + public LambdaQueryWrapperX orderByAsc(SFunction column) { + super.orderByAsc(true, column); + return this; + } + @Override public LambdaQueryWrapperX last(String lastSql) { super.last(lastSql); diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java index 200016bea..0069522dc 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java +++ b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java @@ -39,6 +39,7 @@ public class ErrorCodeConstants { public static final ErrorCode ORDER_PLAN_ID_NOT_NULL = new ErrorCode(1_003_109_005, "订单或排单ID至少传入一个"); public static final ErrorCode ORDER_PLAN_ID_IS_ONE = new ErrorCode(1_003_109_006, "订单id与排单id与大板分类ID只能传一个"); public static final ErrorCode PARENT_ORDER_NOT_EXISTS = new ErrorCode(1_003_109_007, "parent.order.not.exists"); + public static final ErrorCode SUB_ORDER_CAN_NOT_CANCEL = new ErrorCode(1_003_109_008, "sub.order.can.not.cancel"); // ========== 订单板件 1_003_113_000 ========== public static final ErrorCode PLATE_NOT_EXISTS = new ErrorCode(1_003_113_000, "order.plate.not.exists"); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java index 701c76c45..b9c36561e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java @@ -1,6 +1,5 @@ package com.cf.imes.module.executor.controller.admin.order; -import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import com.cf.imes.framework.common.exception.ServiceException; @@ -19,7 +18,6 @@ import com.cf.imes.module.executor.controller.admin.order.vo.product.OrderBodyRe import com.cf.imes.module.executor.controller.admin.order.vo.product.OrderRoomBodyRespVO; import com.cf.imes.module.executor.controller.admin.orderParts.vo.OrderPartsRespVO; import com.cf.imes.module.executor.dal.dataobject.order.OrderDO; -import com.cf.imes.module.executor.dal.mysql.order.OrderMapper; import com.cf.imes.module.executor.enums.CategoryEnum; import com.cf.imes.module.executor.enums.OrderDeletedEnum; import com.cf.imes.module.executor.enums.OrderStatusEnum; @@ -57,7 +55,6 @@ import static com.cf.imes.framework.common.pojo.CommonResult.error; import static com.cf.imes.framework.common.pojo.CommonResult.success; import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.IMPORT; -import static com.cf.imes.module.executor.enums.EsIndexEnum.*; import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; import static com.cf.imes.module.executor.enums.ErrorCodeConstants.*; @@ -72,9 +69,6 @@ public class OrderController { @Resource private OrderService orderService; - @Resource - private OrderMapper orderMapper; - @Resource private LargeFilesUtils largeFilesUtils; @@ -168,7 +162,7 @@ public class OrderController { @Parameter(name = "orderId", description = "订单id", required = true, example = "1") @PreAuthorize("@ss.hasPermission('production:manager-list:nullify')") public CommonResult deleteOrder(@RequestParam("orderId") Long orderId) { - Integer index = orderService.updateOrderDel(orderId, OrderDeletedEnum.DELETED.getStatus()); + Integer index = orderService.invalidOrder(orderId); if (index == 0) { throw new ServiceException(ORDER_DELETED_ERR); } @@ -181,7 +175,7 @@ public class OrderController { @PreAuthorize("@ss.hasPermission('production:manager-list:backOrder')") public CommonResult restoreOrder(@RequestBody JSONObject jsonObject) { Long orderId = jsonObject.getLong("orderId"); - Integer index = orderService.updateOrderDel(orderId, OrderDeletedEnum.NOT_DELETED.getStatus()); + Integer index = orderService.restoreOrder(orderId); if (index == 0) { throw new ServiceException(ORDER_RESTORE_ERR); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java index 367ef0877..5db8c63ff 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.cf.imes.framework.common.enums.DeletedCodeEnum; import com.cf.imes.framework.common.enums.OrderPackageStatusEnum; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; @@ -103,6 +104,29 @@ public interface OrderMapper extends BaseMapperX { return selectPage(reqVO, query); } + /** + * 分页查询已作废订单 + * @param reqVO + * @return + */ + default PageResult selectDeletedPage(OrderPageReqVO reqVO) { + LambdaQueryWrapperX query = new LambdaQueryWrapperX() + .likeIfPresent(OrderDO::getId, reqVO.getId() == null ? null : reqVO.getId()) + .betweenIfPresent(OrderDO::getDeliveryDate, reqVO.getDeliveryDate()) + .betweenIfPresent(OrderDO::getOrderDate, reqVO.getOrderDate()) + .eqIfPresent(OrderDO::getStatus, reqVO.getStatus()) + .likeIfPresent(OrderDO::getCustomOrderNo, reqVO.getCustomOrderNo()) + .likeIfPresent(OrderDO::getDealer, reqVO.getDealer()) + .likeIfPresent(OrderDO::getAddress, reqVO.getAddress()) + .eqIfPresent(OrderDO::getDealerPhoneNumber, reqVO.getDealerPhoneNumber()) + .eqIfPresent(OrderDO::getDeleted, DeletedCodeEnum.DELETED.getStatus()) + .betweenIfPresent(OrderDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(OrderDO::getRootId) + .orderByAsc(OrderDO::getId); + + return selectPage(reqVO, query); + } + /** * 分页查询主单id（带子单过滤） * diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java index cf6e421e9..ba34bdc8c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java @@ -188,10 +188,20 @@ public interface OrderService { /** - * 修改订单是否删除 + * 作废订单 + * + * @param orderId + * @return */ - Integer updateOrderDel(Long orderId, Integer status); + Integer invalidOrder(Long orderId); + /** + * 还原订单 + * + * @param orderId + * @return + */ + Integer restoreOrder(Long orderId); /** * 作废中删除 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index 9b6dea2a2..8cd316b47 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -326,6 +326,12 @@ public class OrderServiceImpl implements OrderService { @Override public PageResult getMainOrderPage(OrderPageReqVO pageReqVO) { IPage page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + + // 删除展示平铺订单列表 + if (pageReqVO.getDeleted()) { + return orderMapper.selectDeletedPage(pageReqVO); + } + // 1. 查询主单ID分页 IPage pageResult = orderMapper.selectMainOrderIds(page, pageReqVO); Long pageResultTotal = pageResult.getTotal(); @@ -870,35 +876,165 @@ public class OrderServiceImpl implements OrderService { } @Override - public Integer updateOrderDel(Long orderId, Integer deleted) { - Integer index = deleted == 1 ? 0 : 1; + @Transactional(rollbackFor = Exception.class) + public Integer invalidOrder(Long orderId) { + Integer notDeletedStatus = OrderDeletedEnum.NOT_DELETED.getStatus(); + Integer deletedStatus = OrderDeletedEnum.DELETED.getStatus(); // 校验存在 - OrderDO orderDO = orderMapper.selectOrderOne(orderId, getUserOrganId(), index); - if (orderDO == null) + OrderDO orderDO = orderMapper.selectOrderOne(orderId, getUserOrganId(), notDeletedStatus); + if (orderDO == null) { throw new ServiceException(ORDER_NOT_EXISTS); + } + + // 是否主单 + boolean isMainOrder = Objects.equals(orderDO.getOrderType(), OrderTypeEnum.MAIN_ORDER.getStatus()); + if (isMainOrder) { + // 主单：查询所有子单 + List childOrders = orderMapper.selectList(new LambdaQueryWrapper() + .eq(OrderDO::getParentId, orderId) + .eq(OrderDO::getDeleted, notDeletedStatus)); + + if (CollUtil.isNotEmpty(childOrders)) { + // 作废：检查所有子单是否可作废 + boolean hasUncancellable = childOrders.stream().anyMatch(child -> + !Objects.equals(child.getStatus(), OrderStatusEnum.EMPTY.getStatus()) && + !Objects.equals(child.getStatus(), OrderStatusEnum.NEW_ORDER.getStatus())); + if (hasUncancellable) { + throw new ServiceException(SUB_ORDER_CAN_NOT_CANCEL); + } + + List allIds = new ArrayList<>(); + allIds.add(orderId); + childOrders.forEach(child -> allIds.add(child.getId())); + + // 批量作废主子单 + return orderMapper.update(new LambdaUpdateWrapper() + .in(OrderDO::getId, allIds) + .eq(OrderDO::getDeleted, notDeletedStatus) + .set(OrderDO::getDeleted, deletedStatus) + ); + } + } + // 状态排除 if (!Objects.equals(orderDO.getStatus(), OrderStatusEnum.EMPTY.getStatus()) && - !Objects.equals(orderDO.getStatus(), OrderStatusEnum.NEW_ORDER.getStatus())) + !Objects.equals(orderDO.getStatus(), OrderStatusEnum.NEW_ORDER.getStatus())) { throw new ServiceException(ORDER_CAN_NOT_CANCEL); - return orderMapper.updateOrderDeleted(orderId, deleted, getUserOrganId()); + } + return orderMapper.update(new LambdaUpdateWrapper() + .eq(OrderDO::getId, orderId) + .eq(OrderDO::getDeleted, notDeletedStatus) + .set(OrderDO::getDeleted, deletedStatus) + ); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Integer restoreOrder(Long orderId) { + Integer notDeletedStatus = OrderDeletedEnum.NOT_DELETED.getStatus(); + Integer deletedStatus = OrderDeletedEnum.DELETED.getStatus(); + Long organId = getUserOrganId(); + + OrderDO orderDO = orderMapper.selectOrderOne(orderId, organId, deletedStatus); + if (orderDO == null) { + throw new ServiceException(ORDER_NOT_EXISTS); + } + + boolean isMainOrder = Objects.equals(orderDO.getOrderType(), OrderTypeEnum.MAIN_ORDER.getStatus()); + if (isMainOrder) { + // 主单：查询所有已作废的子单，一起还原 + List deletedChildOrders = orderMapper.selectList(new LambdaQueryWrapper() + .eq(OrderDO::getParentId, orderId) + .eq(OrderDO::getOrganId, organId) + .eq(OrderDO::getDeleted, deletedStatus)); + + if (CollUtil.isNotEmpty(deletedChildOrders)) { + List allIds = new ArrayList<>(); + allIds.add(orderId); + deletedChildOrders.forEach(child -> allIds.add(child.getId())); + + return orderMapper.update(new LambdaUpdateWrapper() + .in(OrderDO::getId, allIds) + .eq(OrderDO::getOrganId, organId) + .eq(OrderDO::getDeleted, deletedStatus) + .set(OrderDO::getDeleted, notDeletedStatus) + ); + } + } else { + // 子单：还原自身 + 对应主单，不还原其他子单 + Long parentId = orderDO.getParentId(); + List restoreIds = new ArrayList<>(); + restoreIds.add(orderId); + restoreIds.add(parentId); + + return orderMapper.update(new LambdaUpdateWrapper() + .in(OrderDO::getId, restoreIds) + .eq(OrderDO::getOrganId, organId) + .eq(OrderDO::getDeleted, deletedStatus) + .set(OrderDO::getDeleted, notDeletedStatus) + ); + } + + // 主单无子单，直接还原 + return orderMapper.update(new LambdaUpdateWrapper() + .eq(OrderDO::getId, orderId) + .eq(OrderDO::getOrganId, organId) + .eq(OrderDO::getDeleted, deletedStatus) + .set(OrderDO::getDeleted, notDeletedStatus) + ); } @Override @Transactional(rollbackFor = Exception.class) public void realDeletedOrder(Long orderId) { - validateOrderExists(orderId, getUserOrganId(), OrderDeletedEnum.DELETED.getStatus()); + Long organId = getUserOrganId(); + Integer deletedStatus = OrderDeletedEnum.DELETED.getStatus(); + Integer notDeletedStatus = OrderDeletedEnum.NOT_DELETED.getStatus(); - // 作废 订单表，body，group，goods，parts，plate，raw_goods， - goodsMapper.deleteByOrderId(orderId, getUserOrganId()); - orderItemMapper.deleteByOrderId(orderId, getUserOrganId()); - orderBodyMapper.deleteByOrderId(orderId, getUserOrganId()); - orderGroupMapper.deleteByOrderId(orderId, getUserOrganId()); + OrderDO orderDO = orderMapper.selectOrderOne(orderId, organId, deletedStatus); + if (orderDO == null) { + throw new ServiceException(ORDER_NOT_EXISTS); + } - orderPartsMapper.deleteByOrderId(orderId, getUserOrganId()); - plateMapper.deleteByOrderId(orderId, getUserOrganId()); + boolean isMainOrder = Objects.equals(orderDO.getOrderType(), OrderTypeEnum.MAIN_ORDER.getStatus()); + if (isMainOrder) { + // 检查是否存在未作废的子单 + long activeChildCount = orderMapper.selectCount(new LambdaQueryWrapper() + .eq(OrderDO::getParentId, orderId) + .eq(OrderDO::getDeleted, notDeletedStatus)); - orderMapper.deleteOrder(orderId, getUserOrganId()); // 订单删除 + if (activeChildCount > 0) { + throw new ServiceException(SUB_ORDER_CAN_NOT_CANCEL); + } + // 主单：连同所有子单一起删除 + List childOrders = orderMapper.selectList(new LambdaQueryWrapper() + .eq(OrderDO::getParentId, orderId) + .eq(OrderDO::getDeleted, deletedStatus)); + + if (CollUtil.isNotEmpty(childOrders)) { + childOrders.forEach(child -> deleteOrderData(child.getId(), organId)); + } + return; + } + + deleteOrderData(orderId, organId); + } + + /** + * 删除订单数据 + * + * @param orderId + * @param organId + */ + private void deleteOrderData(Long orderId, Long organId) { + goodsMapper.deleteByOrderId(orderId, organId); + orderItemMapper.deleteByOrderId(orderId, organId); + orderBodyMapper.deleteByOrderId(orderId, organId); + orderGroupMapper.deleteByOrderId(orderId, organId); + orderPartsMapper.deleteByOrderId(orderId, organId); + plateMapper.deleteByOrderId(orderId, organId); + orderMapper.deleteOrder(orderId, organId); } /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_cht.properties b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_cht.properties index e2522f3b7..f5383e43b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_cht.properties +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_cht.properties @@ -17,6 +17,7 @@ be.kicked.out=您的賬號於 {0} 在別處登錄，已被迫下線。登錄IP order.not.exists=訂單不存在 parent.order.not.exists=上級訂單{0}不存在 order.can.not.cancel=訂單已進入生產狀態，無法作廢 +sub.order.can.not.cancel=訂單下存在已進入生產狀態的子單，無法作廢 order.plate.is.plan=目標訂單中存在已排單板件，請從排單中移除後再選擇刪除 order.check.customno.exists=自定義訂單號已存在，請刪除原訂單或修改自定義訂單號後再次操作 order.body.not.exists=當前櫃體不存在 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_en.properties b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_en.properties index 58aafccb0..f1d51f353 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_en.properties +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_en.properties @@ -17,6 +17,7 @@ be.kicked.out=Your account was logged in elsewhere at {0} and has been forced to order.not.exists=Order does not exist parent.order.not.exists=Parent order {0} does not exist order.can.not.cancel=Order has entered production and cannot be canceled +sub.order.can.not.cancel=There are sub-orders under the order that have entered the production state and cannot be invalidated order.plate.is.plan=Some plates in the target order have been scheduled. Please remove them before deletion order.check.customno.exists=The custom order number already exists. Please delete the original order or modify the custom order number and then operate again order.body.not.exists=Cabinet does not exist diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_zh.properties b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_zh.properties index 1620feaa2..c594bfb0e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_zh.properties +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_zh.properties @@ -17,6 +17,7 @@ be.kicked.out=您的账号于 {0} 在别处登录，已被迫下线。登录IP order.not.exists=订单不存在 parent.order.not.exists=上级订单{0}不存在 order.can.not.cancel=订单已进入生产状态，无法作废 +sub.order.can.not.cancel=订单下存在已进入生产状态的子单，无法作废 order.plate.is.plan=目标订单中存在已排单板件，请从排单中移除后再选择删除 order.check.customno.exists=自定义订单号已存在，请删除原订单或修改自定义订单号后再次操作 order.body.not.exists=当前柜体不存在