Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

禅道bug#1615修复

Browse Source
This commit is contained in:
gaoqr
2026-06-03 13:43:01 +08:00
parent 36df7cd265
commit ece90b7d35
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java
+1 -1
View File
@@ -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_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_PLATE_IS_ALL_CUT = new ErrorCode(1_003_107_006, "排单号：{} 的板材已全部开料，禁止删除！");
public static final ErrorCode PLAN_NOT_DATA_EXISTS = new ErrorCode(1_003_107_007, "排单号：{} 不存在，无法进行操作，请检查排单数据"); public static final ErrorCode PLAN_NOT_DATA_EXISTS = new ErrorCode(1_003_107_007, "排单号：{} 不存在，无法进行操作，请检查排单数据");
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+1 -1
View File
@@ -276,7 +276,7 @@ public class PlanServiceImpl implements PlanService {
// 获取排单下的订单号集合 // 获取排单下的订单号集合
planDOS.forEach(f -> { planDOS.forEach(f -> {
if (f.getStatus().equals(PlanStatusEnum.OPENING.getStatus()) || f.getStatus().equals(PlanStatusEnum.OPENED.getStatus())) { 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()));
} }
}); });
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_cht.properties
+2
View File
@@ -99,3 +99,5 @@ parts.pack.num.not.enough=配件可打包數量不足，請重繪後再次打包
parts.pack.item.source.not.exist=配件打包數據异常，請重繪後再次打包 parts.pack.item.source.not.exist=配件打包數據异常，請重繪後再次打包
parts.heapsplit.num.not.enough=配件可分堆數量不足，請重繪後再次分堆 parts.heapsplit.num.not.enough=配件可分堆數量不足，請重繪後再次分堆
parts.heapsplit.item.source.not.exist=配件分堆數據异常，請重繪後再次分堆 parts.heapsplit.item.source.not.exist=配件分堆數據异常，請重繪後再次分堆
plan.not.allow.delete=排單號：{0}已開料無法刪除
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_en.properties
+2
View File
@@ -99,3 +99,5 @@ parts.pack.num.not.enough=The number of accessories that can be packaged is insu
parts.pack.item.source.not.exist=Abnormal accessory packaging data, please refresh and package 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.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 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
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_zh.properties
+2
View File
@@ -99,3 +99,5 @@ parts.pack.num.not.enough=配件可打包数量不足，请刷新后再次打包
parts.pack.item.source.not.exist=配件打包数据异常，请刷新后再次打包 parts.pack.item.source.not.exist=配件打包数据异常，请刷新后再次打包
parts.heapsplit.num.not.enough=配件可分堆数量不足，请刷新后再次分堆 parts.heapsplit.num.not.enough=配件可分堆数量不足，请刷新后再次分堆
parts.heapsplit.item.source.not.exist=配件分堆数据异常，请刷新后再次分堆 parts.heapsplit.item.source.not.exist=配件分堆数据异常，请刷新后再次分堆
plan.not.allow.delete=排单号：{0}已开料无法删除