From 444f9cc0cb1127bbb7856109165175131da4d014 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Wed, 2 Apr 2025 10:28:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E8=BE=B9=E6=9D=A1=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E8=A7=84=E5=88=99-=E5=AE=BD=E6=9C=80=E5=A4=A7=EF=BC=8C?= =?UTF-8?q?=E6=9C=80=E5=B0=8F=E5=80=BC=EF=BC=8C=E5=8F=96=E5=80=BC=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imes/module/system/enums/ErrorCodeConstants.java | 8 ++++++-- .../factory/service/impl/SealedgeServiceHandler.java | 10 +++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java index 78320bd7e..4d697cac1 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java @@ -387,11 +387,13 @@ public class ErrorCodeConstants { public static final ErrorCode PROCESS_CONFIG_USED_ALREADY = new ErrorCode(1_002_040_021, "当前加工分线配置在加工方案组中已使用，无法删除"); public static final ErrorCode OPTIMIZATION_CONFIG_USED_ALREADY = new ErrorCode(1_002_040_022, "当前数据处理配置在加工方案组中已使用，无法删除"); public static final ErrorCode SEALEDGE_CONFIG_NOT_EXISTS = new ErrorCode(1_002_040_023, "第 {} 条配置中,有字段值为空，请添加数据"); - public static final ErrorCode SEALEDGE_CONFIG_MIN_VALUE_DATA_ERROR = new ErrorCode(1_002_040_024, "第 {} 条配置中，宽最小值：{} 要大于0，请修改数据"); public static final ErrorCode SEALEDGE_CONFIG_MAX_VALUE_DATA_ERROR = new ErrorCode(1_002_040_025, "第 {} 条配置中，{} 要大于等于 {}，请修改数据"); public static final ErrorCode SEALEDGE_CONFIG_DATA_ERROR = new ErrorCode(1_002_040_026, "当前封边条配置有误，请重新检查后新增"); public static final ErrorCode THIS_CONFIG_NAME_IS_EXISTS = new ErrorCode(1_002_040_027, "当前配置的名称已存在，请重新命名"); - public static final ErrorCode DECIMAL_PLACES_MAX_TWO = new ErrorCode(1_002_040_028, "第 {} 条配置中，小数位数最大为 2 位，请进行修改"); + public static final ErrorCode DECIMAL_PLACES_MAX_TWO = new ErrorCode(1_002_040_028, "第 {} 条配置中，小数位数最大为 3 位，请进行修改"); + public static final ErrorCode SEALEDGE_CONFIG_MIN_VALUE_GREATER_THAN_ZERO = new ErrorCode(1_002_040_029, "第 {} 条配置中，宽最小值：{} 要大于0，请修改数据"); + public static final ErrorCode SEALEDGE_CONFIG_MAX_VALUE_GREATER_THAN_ZERO = new ErrorCode(1_002_040_030, "第 {} 条配置中，宽最大值：{} 要大于0，请修改数据"); + public static final ErrorCode SEALEDGE_CONFIG_VALUE_DATA_ERROR = new ErrorCode(1_002_040_031, "第 {} 条配置中，宽最大值 要大于 宽最小值，请修改数据"); @@ -411,6 +413,8 @@ public class ErrorCodeConstants { //=========== 资金管理 1-002-043-000 ============ public static final ErrorCode ORGAN_AMOUNT_NO_EXIST = new ErrorCode(1_002_043_001, "当前组织无资金管理"); + public static final ErrorCode INVOICE_NO_EXIST = new ErrorCode(1_002_043_002, "当前发票记录有误，请重新查看"); + public static final ErrorCode INVOICING_REJECT_REASON = new ErrorCode(1_002_043_003, "请填写拒绝开票原因"); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/SealedgeServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/SealedgeServiceHandler.java index 440de2d09..f1220aaa0 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/SealedgeServiceHandler.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/SealedgeServiceHandler.java @@ -87,7 +87,15 @@ public class SealedgeServiceHandler extends AbstractSystemConfigServiceHandler { if( widthMin2.compareTo(BigDecimal.ZERO) != 1 ){ - throw exception(SEALEDGE_CONFIG_MIN_VALUE_DATA_ERROR,(i+1),widthMin2.stripTrailingZeros().toPlainString()); + throw exception(SEALEDGE_CONFIG_MIN_VALUE_GREATER_THAN_ZERO,(i+1),widthMin2.stripTrailingZeros().toPlainString()); + } + + if( widthMax2.compareTo(BigDecimal.ZERO) != 1 ){ + throw exception(SEALEDGE_CONFIG_MAX_VALUE_GREATER_THAN_ZERO,(i+1),widthMax2.stripTrailingZeros().toPlainString()); + } + + if( widthMax2.compareTo(widthMin2) == -1 ){ + throw exception(SEALEDGE_CONFIG_VALUE_DATA_ERROR,(i+1)); } if( widthValue2.compareTo(widthMax2) == -1 ){