From ece90b7d35add92f8cda8fd625ae13a695532e7d Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Wed, 3 Jun 2026 13:43:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug#1615=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cf/imes/module/executor/enums/ErrorCodeConstants.java | 2 +- .../cf/imes/module/executor/service/plan/PlanServiceImpl.java | 2 +- .../src/main/resources/message_errorcode_cht.properties | 4 +++- .../src/main/resources/message_errorcode_en.properties | 4 +++- .../src/main/resources/message_errorcode_zh.properties | 4 +++- 5 files changed, 11 insertions(+), 5 deletions(-) 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 ecdca8ca8..6d5bdf371 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 @@ -13,7 +13,7 @@ public class ErrorCodeConstants { // ========== 订单开料排单 public static final ErrorCode PLAN_NOT_EXISTS = new ErrorCode(1_003_107_000, "订单开料排单不存在"); - public static final ErrorCode PLAN_NOT_ALLOW_DELETE = new ErrorCode(1_003_107_001, "排单号：{}，已开料不予许删除"); + public static final ErrorCode PLAN_NOT_ALLOW_DELETE = new ErrorCode(1_003_107_001, "plan.not.allow.delete"); public static final ErrorCode PLAN_PLATE_IS_ALL_CUT = new ErrorCode(1_003_107_006, "排单号：{} 的板材已全部开料，禁止删除！"); public static final ErrorCode PLAN_NOT_DATA_EXISTS = new ErrorCode(1_003_107_007, "排单号：{} 不存在，无法进行操作，请检查排单数据"); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index b61eec1a4..45a5119bc 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java @@ -276,7 +276,7 @@ public class PlanServiceImpl implements PlanService { // 获取排单下的订单号集合 planDOS.forEach(f -> { if (f.getStatus().equals(PlanStatusEnum.OPENING.getStatus()) || f.getStatus().equals(PlanStatusEnum.OPENED.getStatus())) { - throw new ServiceException(PLAN_NOT_ALLOW_DELETE, f.getId()); + throw new ServiceException(PLAN_NOT_ALLOW_DELETE, String.valueOf(f.getId())); } }); 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 e3d0d9849..cb906b495 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 @@ -98,4 +98,6 @@ order.already.packaged=該訂單已打包完成，無法操作 parts.pack.num.not.enough=配件可打包數量不足，請重繪後再次打包 parts.pack.item.source.not.exist=配件打包數據异常，請重繪後再次打包 parts.heapsplit.num.not.enough=配件可分堆數量不足，請重繪後再次分堆 -parts.heapsplit.item.source.not.exist=配件分堆數據异常，請重繪後再次分堆 \ No newline at end of file +parts.heapsplit.item.source.not.exist=配件分堆數據异常，請重繪後再次分堆 + +plan.not.allow.delete=排單號：{0}已開料無法刪除 \ No newline at end of file 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 86039f097..756840e71 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 @@ -98,4 +98,6 @@ order.already.packaged=The order has been packaged and cannot be processed parts.pack.num.not.enough=The number of accessories that can be packaged is insufficient. Please refresh and pack again parts.pack.item.source.not.exist=Abnormal accessory packaging data, please refresh and package again parts.heapsplit.num.not.enough=The number of accessories that can be stacked is insufficient. Please refresh and stack again -parts.heapsplit.item.source.not.exist=Abnormal accessory stacking data, please refresh and stack again \ No newline at end of file +parts.heapsplit.item.source.not.exist=Abnormal accessory stacking data, please refresh and stack again + +plan.not.allow.delete=Plan number: {0} has been cut and cannot be deleted \ No newline at end of file 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 ac8631f5a..1fcb3dbf0 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 @@ -98,4 +98,6 @@ order.already.packaged=该订单已打包完成，无法操作 parts.pack.num.not.enough=配件可打包数量不足，请刷新后再次打包 parts.pack.item.source.not.exist=配件打包数据异常，请刷新后再次打包 parts.heapsplit.num.not.enough=配件可分堆数量不足，请刷新后再次分堆 -parts.heapsplit.item.source.not.exist=配件分堆数据异常，请刷新后再次分堆 \ No newline at end of file +parts.heapsplit.item.source.not.exist=配件分堆数据异常，请刷新后再次分堆 + +plan.not.allow.delete=排单号：{0}已开料无法删除 \ No newline at end of file