diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java index 2b6457a..e469400 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java @@ -1306,8 +1306,8 @@ public class InstructionServiceImpl implements IInstructionService { return warn; } - // 订单号重复校验 - if (!isEmpty(order.getOrderId())) { + // 订单号重复校验(控制台入口跳过此校验,允许管理员更新单号) + if (!isFromConsole && !isEmpty(order.getOrderId())) { JDOrder existingByOrderId = jdOrderService.selectJDOrderByOrderId(order.getOrderId()); if (existingByOrderId != null) { // 如果是更新同一条记录(remark相同),则不提示重复 @@ -1321,8 +1321,8 @@ public class InstructionServiceImpl implements IInstructionService { } } - // 物流链接重复校验 - if (!isEmpty(order.getLogisticsLink())) { + // 物流链接重复校验(控制台入口跳过此校验,允许管理员更新物流链接) + if (!isFromConsole && !isEmpty(order.getLogisticsLink())) { JDOrder existingByLogistics = jdOrderService.selectJDOrderByLogisticsLink(order.getLogisticsLink()); if (existingByLogistics != null) { // 如果是更新同一条记录(remark相同),则不提示重复