From fdd3351a1354dba2abbf7d4007436a2ae27c2719 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 31 Jul 2023 21:31:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=BB=B4=E6=8A=A4=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=B3=BB=E7=BB=9F=E7=B9=81=E5=BF=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/impl/IoOrderServiceImpl.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 8b4c0bb26..36ad1104b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -318,21 +318,30 @@ public class IoOrderServiceImpl implements IoOrderService { //更新扫码单据详情 IoOrderDetailCodeEntity ioOrderDetailCodeEntity = ioOrderDetailCodeService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo()); - ioOrderDetailCodeEntity.setReCount(ioOrderDetailCodeEntity.getReCount() - reCount); - ioOrderDetailCodeService.update(ioOrderDetailCodeEntity); + + if (ioOrderDetailCodeEntity != null) { + ioOrderDetailCodeEntity.setReCount(ioOrderDetailCodeEntity.getReCount() - reCount); + ioOrderDetailCodeService.update(ioOrderDetailCodeEntity); + } //更新结果详情 IoOrderDetailResultEntity ioOrderDetailResultEntity = ioOrderDetailResultService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo()); - ioOrderDetailResultEntity.setReCount(ioOrderDetailResultEntity.getReCount() - reCount); - ioOrderDetailResultService.update(ioOrderDetailResultEntity); + if (ioOrderDetailResultEntity != null) { + ioOrderDetailResultEntity.setReCount(ioOrderDetailResultEntity.getReCount() - reCount); + ioOrderDetailResultService.update(ioOrderDetailResultEntity); + } + } else { int reCount = udiCalCountUtil.getActCount(ioCodeEntity.getNameCode()); //如果数量扣减之后为0，直接删除此条码 codeService.deleteById(ioCodeEntity.getId()); //更新扫码单据详情 IoOrderDetailCodeEntity ioOrderDetailCodeEntity = ioOrderDetailCodeService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo()); - ioOrderDetailCodeEntity.setReCount(ioOrderDetailCodeEntity.getReCount() - reCount); - ioOrderDetailCodeService.update(ioOrderDetailCodeEntity); + if (ioOrderDetailCodeEntity != null) { + ioOrderDetailCodeEntity.setReCount(ioOrderDetailCodeEntity.getReCount() - reCount); + ioOrderDetailCodeService.update(ioOrderDetailCodeEntity); + } + //更新结果详情 IoOrderDetailResultEntity ioOrderDetailResultEntity = ioOrderDetailResultService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo()); @@ -754,7 +763,7 @@ public class IoOrderServiceImpl implements IoOrderService { @Override public List filterOrderTrace(String billNo) { - IoOrderEntity order = orderDao.selectOne(new QueryWrapper().eq("billNo", billNo).in("status",5,7,10).in("dealStatus",2,3,4)); + IoOrderEntity order = orderDao.selectOne(new QueryWrapper().eq("billNo", billNo).in("status", 5, 7, 10).in("dealStatus", 2, 3, 4)); if (null == order) { return Collections.emptyList();