From 1a0caf4017b792916c651e9096f5ffa55750579f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sun, 7 Apr 2024 20:55:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E5=A2=9E=E5=8A=A0=E5=AD=90=E8=8A=82=E7=82=B9=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/DQBomImportService.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java index ed56e85d..b069bae8 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java @@ -132,11 +132,19 @@ public class DQBomImportService { if (oldParent != null) { if (!parent.getMaterialUnit().equals(oldParent.getMaterialUnit()) || !parent.getMaterialTexture().equals(oldParent.getMaterialTexture())) { - throw new NflgBusinessException(STATE.InconsistentDataError, ""); + throw new NflgBusinessException(STATE.InconsistentDataError, "物料信息不一致"); } + List cc = children.stream().filter(c -> c.getParentRowId().equals(parent.getRowId())) .map(BomNewDQbomChildEntity::getMaterialNo) .collect(Collectors.toList()); + List oc = dQBomChildService.lambdaQuery().eq(BomNewDQbomChildEntity::getParentRowId, oldParent.getRowId()) + .list() + .stream().map(BomNewDQbomChildEntity::getMaterialNo).collect(Collectors.toList()); + if (cc.size() != oc.size()) { + throw new NflgBusinessException(STATE.InconsistentDataError, "子级节点数量不一致"); + } + List ps = parents.stream().filter(p -> cc.contains(p.getMaterialNo())) .collect(Collectors.toList()); for (BomNewDQbomParentEntity p : ps) {