From ef8bdfcd681704accc31b450153c73a624175f00 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 2 Jun 2022 18:13:17 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86ID=E5=92=8C=E4=BB=93=E5=BA=93=E5=8F=B7?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/inout/impl/CodesServiceImpl.java | 4 +++- .../service/inout/impl/OrderServiceImpl.java | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesServiceImpl.java index 6b3642d..56f8e09 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesServiceImpl.java @@ -181,7 +181,7 @@ public class CodesServiceImpl implements CodesService { //删除码详情 codesDao.deleteByOrderIdAndCode(warehouseEntity.getOrderId(), warehouseEntity.getCode()); - if (order.getStatus().equals(ConstantStatus.ORDER_STATUS_PROCESS)) { + if (order.getStatus().equals(ConstantStatus.ORDER_STATUS_SUCCESS)) { //查询库存详情 FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); filterInvProductDetailRequest.setOriginCode(codesReplaceRequest.getCode()); @@ -202,6 +202,8 @@ public class CodesServiceImpl implements CodesService { //查询原库存详情和新的库存详情 FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest(); filterInvProductRequest.setRelIdFk(invProductDetailEntity.getProductIdFk()); + filterInvProductRequest.setSupId(invProductDetailEntity.getSupId()); + filterInvProductRequest.setInvStorageCode(invProductDetailEntity.getInvStorageCode()); if (StrUtil.isBlank(invProductDetailEntity.getBatchNo())) { filterInvProductRequest.setBatchNo("empty"); } else { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index 4eb2842..72df361 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -380,7 +380,7 @@ public class OrderServiceImpl implements OrderService { OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); orderFilterRequest.setId(id); OrderEntity orderEntity = orderDao.findOne(orderFilterRequest); - if (orderEntity.getStatus().equals(ConstantStatus.ORDER_STATUS_PROCESS)) { + if (orderEntity.getStatus().equals(ConstantStatus.ORDER_STATUS_SUCCESS)) { //查询库存详情 FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); filterInvProductDetailRequest.setOrderIdFk(id); @@ -389,10 +389,11 @@ public class OrderServiceImpl implements OrderService { List invProductList = new ArrayList<>(invProductDetailMap.keySet().size()); - for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) { FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest(); filterInvProductRequest.setRelIdFk(invProductDetailEntity.getProductIdFk()); + filterInvProductRequest.setSupId(invProductDetailEntity.getSupId()); + filterInvProductRequest.setInvStorageCode(invProductDetailEntity.getInvStorageCode()); if (StrUtil.isBlank(invProductDetailEntity.getBatchNo())) { filterInvProductRequest.setBatchNo("empty"); } else { @@ -445,6 +446,16 @@ public class OrderServiceImpl implements OrderService { try { orderDao.deleteById(id); orderDetailDao.deleteByOrderId(id); + + //查询业务单据 + StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); + stockOrderFilterRequest.setBillNo(orderEntity.getErpFk()); + StockOrderEntity stockOrderEntity = stockOrderDao.findOne(stockOrderFilterRequest); + //删除业务单据详情 + stockOrderDetailDao.deleteByOrderIdFk(stockOrderEntity.getId()); + //删除业务单据 + stockOrderDao.deleteById(stockOrderEntity.getId()); + //删除码 codesDao.deleteByOrderId(id); } catch (Exception e) { throw new RuntimeException("删除单据失败");