From 93e717be635cc00e3c93b75e9eaadb6f49412aeb Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 19 Apr 2023 10:49:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=9B=B8=E5=85=B3bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/inout/IoCodeTempController.java | 7 +++++-- .../com/glxp/api/entity/basic/BasicBusTypePreEntity.java | 2 +- .../service/inout/impl/IoOrderDetailBizServiceImpl.java | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 0d66b901..84c51c04 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1035,6 +1035,9 @@ public class IoCodeTempController extends BaseController { public BaseResponse deleteCodesTempById(@RequestParam("id") Integer id) { IoCodeTempEntity codeTempEntity = codeTempService.selectById(id); + if (codeTempEntity == null) { + return ResultVOUtils.error(506, "UDI码异常，未录入！"); + } IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId()); if (codeTempEntity.getMyCount() > 1) { codeTempEntity.setCount(codeTempEntity.getMyCount() - 1); @@ -1060,8 +1063,8 @@ public class IoCodeTempController extends BaseController { } - boolean r1 = orderDetailBizService.isExit(orderDetailCodeEntity.getOrderIdFk()); - boolean r2 = ioOrderDetailCodeService.isExit(orderDetailCodeEntity.getOrderIdFk()); + boolean r1 = orderDetailBizService.isExit(orderEntity.getBillNo()); + boolean r2 = ioOrderDetailCodeService.isExit(orderEntity.getBillNo()); if (!r1 && !r2) { orderService.deleteByBillNo(orderDetailCodeEntity.getOrderIdFk()); } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java index f3fa7bd1..67375786 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java @@ -126,7 +126,7 @@ public class BasicBusTypePreEntity { // 创建单模式：1：送货至入库单模式；2.向上级补单模式；3.预验收/寄售转入库单模式 @TableField(value = "createType") - private Integer createType; + private int createType; /** diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 9d0a6eb3..e9aa1485 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -73,6 +73,8 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { @Override public boolean isExit(String billNo) { + if (billNo == null) + return false; return ioOrderDetailBizDao.exists(new QueryWrapper().eq("orderIdFk", billNo)); }