From 0de518e40feeb2fa1641ead90848545cc0c6a065 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 20 Oct 2022 18:15:22 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=88=9B=E5=BB=BA=E9=BB=98=E8=AE=A4=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E7=A0=81=E4=BB=8E1000=E5=BC=80=E5=A7=8B=E9=97=AE?= =?UTF-8?q?=E9=A2=98=202.=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=BB=BA=E5=9E=9B=E8=A7=84=E5=88=99=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/udi/admin/controller/basic/StackRulesController.java | 2 +- .../glxp/udi/admin/service/inventory/InvWarehouseService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/udi/admin/controller/basic/StackRulesController.java b/src/main/java/com/glxp/udi/admin/controller/basic/StackRulesController.java index 9962e91..682f89d 100644 --- a/src/main/java/com/glxp/udi/admin/controller/basic/StackRulesController.java +++ b/src/main/java/com/glxp/udi/admin/controller/basic/StackRulesController.java @@ -104,7 +104,7 @@ public class StackRulesController { } Long count = stackRulesService.countEnableRules(deleteRequest.getCustomerId()); if (count == 1) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "至少保留一条规则"); + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "至少保留一条启用规则"); } stackRulesService.delete(deleteRequest.getId()); return ResultVOUtils.success(); diff --git a/src/main/java/com/glxp/udi/admin/service/inventory/InvWarehouseService.java b/src/main/java/com/glxp/udi/admin/service/inventory/InvWarehouseService.java index b7913e8..da9bc43 100644 --- a/src/main/java/com/glxp/udi/admin/service/inventory/InvWarehouseService.java +++ b/src/main/java/com/glxp/udi/admin/service/inventory/InvWarehouseService.java @@ -150,7 +150,7 @@ public class InvWarehouseService { //查询数据库仓库中已经的最大仓库码 String maxCode = invWarehouseDao.selectMaxCode(filterInvWarehouseRequest); Integer code; - if (StrUtil.isNotBlank(maxCode)) { + if (StrUtil.isBlank(maxCode)) { code = 1000; //无仓库时，编码从1000开始 } else { code = Integer.parseInt(maxCode) + 1;