From ba850eb92aacd74d36add2de7f7ec0a15f3aa216 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 25 Aug 2022 16:27:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E7=B3=BB=E7=BB=9F=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98=202.=E8=B0=83=E6=95=B4=E5=BE=80?= =?UTF-8?q?=E6=9D=A5=E5=8D=95=E4=BD=8D=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/admin/controller/basic/BasicThirdSysController.java | 2 +- .../api/admin/controller/inout/WareHouseController.java | 2 +- .../api/admin/entity/basic/BasicUnitMaintainEntity.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java index 8b5d31ce..6460dec2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java @@ -133,7 +133,7 @@ public class BasicThirdSysController { } - if (temp.getMainSys() && !temp.getEnabled()) { + if (basicThirdSysEntity.getMainSys() && !basicThirdSysEntity.getEnabled()) { return ResultVOUtils.error(500, "主系统必须启用"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index 44a8e90e..1c81e354 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -325,7 +325,7 @@ public class WareHouseController { return ResultVOUtils.error(500, "无效条码！批次号超出最大范围"); } - if (StrUtil.isEmpty(warehouseEntity.getSerialNo()) && StrUtil.isEmpty(warehouseEntity.getBatchNo())) { + if (StrUtil.isBlank(warehouseEntity.getSerialNo()) && StrUtil.isBlank(warehouseEntity.getBatchNo())) { return ResultVOUtils.error(500, "批次号不能为空！"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java index fb8e283d..b3224456 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java @@ -2,7 +2,7 @@ package com.glxp.api.admin.entity.basic; import lombok.Data; -import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotBlank; import java.util.Date; @Data @@ -11,14 +11,14 @@ public class BasicUnitMaintainEntity { private Integer id; private String erpId; - @NotEmpty(message = "往来单位名称不能为空！") + @NotBlank(message = "往来单位名称不能为空！") private String name; private String spell; private String addr; private String status; private String type; - @NotEmpty(message = "社会信用号不能为空！") + @NotBlank(message = "社会信用号不能为空！") private String creditNo; private String contact; private String mobile; From 1e9e3b4a0aa7b3faa5979e59b715a323cf484ded Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 25 Aug 2022 17:21:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E7=BC=96=E8=BE=91=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E9=87=8F=E5=B0=8F=E4=BA=8E1?= =?UTF-8?q?=E6=97=B6=E5=8F=AF=E4=BB=A5=E6=8F=90=E4=BA=A4=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/admin/controller/inout/WareHouseController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index 1c81e354..52c43f23 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -339,6 +339,10 @@ public class WareHouseController { } } + if (warehouseEntity.getCount() != null && warehouseEntity.getCount() <= 0) { + return ResultVOUtils.error(500, "数量不能小于0"); + } + boolean b = codesTempService.update(warehouseEntity); if (b)