CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
Leo
2025-11-24 18:55:02 +08:00
parent e7c991ed9c
commit 20861d270a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java
View File

@@ -1306,8 +1306,8 @@ public class InstructionServiceImpl implements IInstructionService {
return warn; return warn;
} }
// 订单号重复校验 // 订单号重复校验（控制台入口跳过此校验，允许管理员更新单号）
if (!isEmpty(order.getOrderId())) { if (!isFromConsole && !isEmpty(order.getOrderId())) {
JDOrder existingByOrderId = jdOrderService.selectJDOrderByOrderId(order.getOrderId()); JDOrder existingByOrderId = jdOrderService.selectJDOrderByOrderId(order.getOrderId());
if (existingByOrderId != null) { if (existingByOrderId != null) {
// 如果是更新同一条记录（remark相同），则不提示重复 // 如果是更新同一条记录（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()); JDOrder existingByLogistics = jdOrderService.selectJDOrderByLogisticsLink(order.getLogisticsLink());
if (existingByLogistics != null) { if (existingByLogistics != null) {
// 如果是更新同一条记录（remark相同），则不提示重复 // 如果是更新同一条记录（remark相同），则不提示重复