From 7b3f63f85d64af9713cf3a012199baef07c26a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 12 May 2023 17:11:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=BA=93=E5=AD=98=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inv/impl/InvPlaceOrderServiceImpl.java | 2 +- .../service/inv/impl/InvPlaceServiceImpl.java | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java index 37b909ada..d59bbaa82 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java @@ -189,7 +189,7 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService { InvPlaceOrderEntity orderEntity = new InvPlaceOrderEntity(); orderEntity.setId(IdUtil.getSnowflakeNextId()); orderEntity.setRecordId(recordId); - orderEntity.setType(1); + orderEntity.setType(3); // orderEntity.setOrderId(addInvPlaceOrderRequest.getOrderId()); orderEntity.setCreateUser(userId); orderEntity.setCreateTime(new Date()); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java index d6b34aa12..8269df22d 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java @@ -510,6 +510,9 @@ public class InvPlaceServiceImpl implements InvPlaceService { ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); InvPreInProductDetailEntity invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew); count = invPreInProductDetailEntity.getInCount(); + if (invPreInProductDetailEntity == null) { + return "该产品库存不足！"; + } } else { count = invPreInProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode()); } @@ -535,6 +538,9 @@ public class InvPlaceServiceImpl implements InvPlaceService { ew.eq("code", bindInvSpaceRequest.getCode()); ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); InvPreProductDetailEntity invPreProductDetailEntity = invPreProductDetailDao.selectOne(ew); + if (invPreProductDetailEntity == null) { + return "该产品库存不足！"; + } count = invPreProductDetailEntity.getInCount(); } else { count = invPreProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode()); @@ -562,6 +568,9 @@ public class InvPlaceServiceImpl implements InvPlaceService { ew.eq("code", bindInvSpaceRequest.getCode()); ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); InvProductDetailEntity invProductDetailEntity = invProductDetailDao.selectOne(ew); + if (invProductDetailEntity == null) { + return "该产品库存不足！"; + } count = invProductDetailEntity.getInCount(); } else { count = invProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode()); @@ -729,7 +738,7 @@ public class InvPlaceServiceImpl implements InvPlaceService { ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); ew.last("limit 1"); invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew); - if (invPreInProductDetailEntity != null && invPreInProductDetailEntity.getInCount() == 0 && invPreInProductDetailEntity.getOutCount() == 0 + if (invPreInProductDetailEntity != null && invPreInProductDetailEntity.getInCount() == 0 && (invPreInProductDetailEntity.getOutCount() == null || invPreInProductDetailEntity.getOutCount() == 0) && invPreInProductDetailEntity.getCount() == 0 && invPreInProductDetailEntity.getReCount() == 0) { invPreInProductDetailDao.deleteById(invPreInProductDetailEntity); } @@ -767,7 +776,7 @@ public class InvPlaceServiceImpl implements InvPlaceService { ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); ew.last("limit 1"); invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew); - if (invPreInProductDetailEntity != null && invPreInProductDetailEntity.getInCount() == 0 && invPreInProductDetailEntity.getOutCount() == 0 + if (invPreInProductDetailEntity != null && invPreInProductDetailEntity.getInCount() == 0 && (invPreInProductDetailEntity.getOutCount() == null || invPreInProductDetailEntity.getOutCount() == 0) && invPreInProductDetailEntity.getCount() == 0 && invPreInProductDetailEntity.getReCount() == 0) { invPreInProductDetailDao.deleteById(invPreInProductDetailEntity); } @@ -832,7 +841,7 @@ public class InvPlaceServiceImpl implements InvPlaceService { ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); ew.last("limit 1"); invPreProductDetailEntity = invPreProductDetailDao.selectOne(ew); - if (invPreProductDetailEntity != null && invPreProductDetailEntity.getInCount() == 0 && invPreProductDetailEntity.getOutCount() == 0 + if (invPreProductDetailEntity != null && invPreProductDetailEntity.getInCount() == 0 && (invPreProductDetailEntity.getOutCount() == null || invPreProductDetailEntity.getOutCount() == 0) && invPreProductDetailEntity.getCount() == 0 && invPreProductDetailEntity.getReCount() == 0) { invPreProductDetailDao.deleteById(invPreProductDetailEntity); } @@ -900,7 +909,7 @@ public class InvPlaceServiceImpl implements InvPlaceService { ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); ew.last("limit 1"); invProductDetailEntity = invProductDetailDao.selectOne(ew); - if (invProductDetailEntity != null && invProductDetailEntity.getInCount() == 0 && invProductDetailEntity.getOutCount() == 0 + if (invProductDetailEntity != null && invProductDetailEntity.getInCount() == 0 && (invProductDetailEntity.getOutCount() == null || invProductDetailEntity.getOutCount() == 0) && invProductDetailEntity.getCount() == 0 && invProductDetailEntity.getReCount() == 0) { invProductDetailDao.deleteById(invProductDetailEntity); }