From 3f0bffd21a64040d42a561858b173e73dca5a938 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 29 Jul 2024 16:38:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=B9=E6=98=8E=E7=BB=86=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E4=BE=9B=E5=BA=94=E5=95=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/inout/IoAddInoutService.java | 4 +++ .../thrsys/impl/ThrInvOrderServiceImpl.java | 29 +++++++++++++++---- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index d3023eccd..0babce182 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -357,6 +357,8 @@ public class IoAddInoutService { newBizList.add(orderDetailBizEntity); } } + } else { + newBizList.add(bizEntity); } } else if (StrUtil.isEmpty(bizEntity.getBatchNo())) { List invProductEntities = invProductService.selectByRelId(bizEntity.getBindRlFk(), bizEntity.getSupId(), null, orderEntity.getInvCode()); @@ -380,6 +382,8 @@ public class IoAddInoutService { newBizList.add(orderDetailBizEntity); } } + } else { + newBizList.add(bizEntity); } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java index b91a4fe84..8962550c4 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java @@ -1512,7 +1512,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { if (CollUtil.isNotEmpty(udiRlSupEntitys)) { for (UdiRlSupEntity udiRlSupEntity : udiRlSupEntitys) { Integer count1 = invProductService.selectExitCount(thrInvOrder.getInvCode(), Long.parseLong(udiRlSupEntity.getCustomerId()), Long.parseLong(udiRlSupEntity.getUdiRlIdFk())); - if (IntUtil.value(count1 > 0)) { + if (IntUtil.value(count1) > 0) { thrInvOrderDetail.setSupId(udiRlSupEntity.getCustomerId()); if (udiRlSupEntity.getPrice() == null) thrInvOrderDetail.setPrice(BigDecimal.ZERO); @@ -1574,11 +1574,28 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { BeanUtils.copyProperties(item, thrInvOrderDetail); thrInvOrderDetail.setOrderIdFk(billNo); thrInvOrderDetail.setRelId(sk.getRelId()); - thrInvOrderDetail.setSupId(sk.getSupId() + ""); - UdiRlSupEntity udiRlSupEntity = udiRlSupService.findByUdiRlIdUnitFk(thrInvOrderDetail.getRelId() + "", thrInvOrderDetail.getSupId()); - if (udiRlSupEntity != null && udiRlSupEntity.getPrice() != null) { - thrInvOrderDetail.setPrice(udiRlSupEntity.getPrice()); - } + List udiRlSupEntitys = udiRlSupService.findByUdiRlId(sk.getRelId()); + if (CollUtil.isNotEmpty(udiRlSupEntitys)) { + for (UdiRlSupEntity udiRlSupEntity : udiRlSupEntitys) { + Integer count1 = invProductService.selectExitCount(thrInvOrder.getInvCode(), Long.parseLong(udiRlSupEntity.getCustomerId()), Long.parseLong(udiRlSupEntity.getUdiRlIdFk())); + if (IntUtil.value(count1) > 0) { + thrInvOrderDetail.setSupId(udiRlSupEntity.getCustomerId()); + if (udiRlSupEntity.getPrice() == null) + thrInvOrderDetail.setPrice(BigDecimal.ZERO); + else + thrInvOrderDetail.setPrice(udiRlSupEntity.getPrice()); + } + } + if (thrInvOrderDetail.getSupId() == null) { + thrInvOrderDetail.setSupId(udiRlSupEntitys.get(0).getCustomerId()); + if (udiRlSupEntitys.get(0).getPrice() == null) + thrInvOrderDetail.setPrice(BigDecimal.ZERO); + else + thrInvOrderDetail.setPrice(udiRlSupEntitys.get(0).getPrice()); + } + + } else + exmsg.append(thrCode + "供应商未关联"); Integer skCount = sk.getCount(); if (skCount != null && skCount > 0) { thrInvOrderDetail.setReCount(String.valueOf(skCount * finalCount));