From 36d7cd6ee355d62acca528aed7376096b645f15e Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 28 Jul 2022 16:55:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=A5=E9=87=8D=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=BC=9A=E6=8A=8A=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=BC=96=E7=A0=81=E6=9B=BF=E6=8D=A2=E6=88=90?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=BC=96?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/basic/BussinessLocalTypeController.java | 2 +- .../glxp/api/admin/controller/inout/WareHouseController.java | 3 +++ .../src/main/java/com/glxp/api/admin/req/ListPageRequest.java | 1 + .../com/glxp/api/admin/req/inout/WarehouseQueryRequest.java | 1 + .../service/basic/impl/BussinessLocalTypeServiceImpl.java | 4 ++++ .../resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml | 3 ++- .../main/resources/mybatis/mapper/basic/BussinessTypeDao.xml | 3 ++- 7 files changed, 14 insertions(+), 3 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java index 57f2c5b2..f738e8a5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java @@ -209,7 +209,7 @@ public class BussinessLocalTypeController { } if (bussinessTypeEntity != null) { bussinessTypeEntity.setAction("ST" + CustomUtil.getId()); - BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getAction()); + BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findByAction(bussinessTypeEntity.getAction()); if (bussinessLocalTypeEntity != null) { ResultVOUtils.error(999, "业务类型已存在！"); } else { 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 a654bf24..7eb6bf86 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 @@ -228,6 +228,9 @@ public class WareHouseController { @AuthRuleAnnotation("") @GetMapping("admin/warehouse/inout/findErrorByOrderId") public BaseResponse findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest) { + if (StrUtil.isEmpty(warehouseQueryRequest.getOrderId())) { + return ResultVOUtils.error(500, "单据号不能为空!"); + } List warehousetempList = codesTempService.findByOrderId(warehouseQueryRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(warehousetempList); diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/ListPageRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/ListPageRequest.java index fc9e7e5d..94643729 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/ListPageRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/ListPageRequest.java @@ -1,6 +1,7 @@ package com.glxp.api.admin.req; import lombok.Data; +import reactor.util.annotation.NonNull; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java index 920a6ca0..d8d80200 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java @@ -6,6 +6,7 @@ import lombok.Data; @Data public class WarehouseQueryRequest extends ListPageRequest { + private String corpOrderId; private String code; private String udi; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java index 5da34b32..ac98691b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.admin.service.basic.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.basic.BussinessLocalTypeDao; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; @@ -122,6 +123,9 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService @Override public BussinessLocalTypeEntity findByAction(String action) { + if(StrUtil.isEmpty(action)){ + return null; + } BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest(); bussinessLocalTypeFilterRequest.setAction(action); List data = bussinessLocalTypeDao.filterAllList(bussinessLocalTypeFilterRequest); diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml index ae54325d..1c3da925 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -21,7 +21,7 @@ AND spUse =#{spUse} - + order by updateTime desc @@ -95,6 +95,7 @@ group by basic_bussiness_type.action +