From 5bac5e9dee16c4ab51345c3d6d4ce0d3baaf4b7f Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 20 Jun 2023 15:31:25 +0800 Subject: [PATCH] =?UTF-8?q?UDI=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=8EUDIMS=E5=90=8C=E6=AD=A5=E8=BF=87=E6=9D=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E8=BF=9B=E8=A1=8C=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/inout/IoCheckInoutService.java | 49 +++++++++++-------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 3fb3626d..80c3f8f0 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -304,33 +304,40 @@ public class IoCheckInoutService { return; } if (orderEntity.getFromType() != ConstantStatus.FROM_COPY - && orderEntity.getFromType() != ConstantStatus.FROM_CHANGE) { + && orderEntity.getFromType() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType() != ConstantStatus.FROM_UDIMS) { orderDetailBizService.deleteByOrderId(orderEntity.getBillNo()); } - orderDetailResultService.deleteByOrderId(orderEntity.getBillNo()); - if (!orderDetailBizService.isExit(orderEntity.getBillNo())) { + + if (orderEntity.getFromType() != ConstantStatus.FROM_UDISP && orderEntity.getFromType() != ConstantStatus.FROM_UDIMS) { + if (orderEntity.getFromType() != ConstantStatus.FROM_COPY + && orderEntity.getFromType() != ConstantStatus.FROM_CHANGE) { + orderDetailBizService.deleteByOrderId(orderEntity.getBillNo()); + } + orderDetailResultService.deleteByOrderId(orderEntity.getBillNo()); + if (!orderDetailBizService.isExit(orderEntity.getBillNo())) { + orderDetailCodeEntities.forEach(orderDetailCodeEntity -> + { + //生成业务单据 + IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity(); + BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailBizEntity); + orderDetailBizEntity.setCount(orderDetailCodeEntity.getReCount()); + orderDetailBizEntity.setId(null); + orderDetailBizService.insert(orderDetailBizEntity); + }); + } orderDetailCodeEntities.forEach(orderDetailCodeEntity -> { - //生成业务单据 - IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity(); - BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailBizEntity); - orderDetailBizEntity.setCount(orderDetailCodeEntity.getReCount()); - orderDetailBizEntity.setId(null); - orderDetailBizService.insert(orderDetailBizEntity); - }); + //生成单据结果 + IoOrderDetailResultEntity orderDetailResultEntity = new IoOrderDetailResultEntity(); + BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailResultEntity); + orderDetailResultEntity.setCount(orderDetailCodeEntity.getReCount()); + orderDetailResultEntity.setReCount(orderDetailCodeEntity.getReCount()); + orderDetailResultEntity.setId(null); + orderDetailResultService.insert(orderDetailResultEntity); + }); } - orderDetailCodeEntities.forEach(orderDetailCodeEntity -> - { - //生成单据结果 - IoOrderDetailResultEntity orderDetailResultEntity = new IoOrderDetailResultEntity(); - BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailResultEntity); - orderDetailResultEntity.setCount(orderDetailCodeEntity.getReCount()); - orderDetailResultEntity.setReCount(orderDetailCodeEntity.getReCount()); - orderDetailResultEntity.setId(null); - orderDetailResultService.insert(orderDetailResultEntity); - - }); + //临时表转正式表 List codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo());