From 3636fd29d28b09307a3a78d20bf7a9be5b872adc Mon Sep 17 00:00:00 2001 From: Fancy <Fancy.fx@outlook.com> Date: 星期四, 11 七月 2024 17:18:40 +0800 Subject: [PATCH] save node logic change --- pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/process/ProcessSv.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/process/ProcessSv.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/process/ProcessSv.java index ea107fc..d51b920 100644 --- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/process/ProcessSv.java +++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/process/ProcessSv.java @@ -105,11 +105,11 @@ List<PrAssemblyPlan> onlinePlanList = planList.stream().filter(plan -> plan.getStatus() == PlanStatusEnum.NORMAL.getCode()).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(planList)) { if (planList.stream().anyMatch(plan -> plan.getInputNumber() > 0)) { //瀛樺湪浠诲姟宸茬粡鎶曞叆鐢熶骇 - if (!originProductionProcess.getProName().equals(process.getProName())) { + if (!originProductionProcess.getProId().equals(process.getProId())) { throw new RuntimeException("瀛樺湪宸茬粡鎶曞叆鐢熶骇缁戝畾鐨勪换鍔�,浜у搧涓嶈兘淇敼"); } //鑺傜偣id涓嶈兘鍒犻櫎 - if (!originProductionProcess.getNodes().stream().allMatch(node -> process.getNodes().stream().anyMatch(node::equals))) { + if (!originProductionProcess.getNodes().stream().allMatch(node -> process.getNodes().stream().anyMatch(newNode -> node.getId().equals(newNode.getId())))) { throw new RuntimeException("瀛樺湪宸茬粡鎶曞叆鐢熶骇缁戝畾鐨勪换鍔�,鑺傜偣涓嶈兘鍒犻櫎"); } } else if (CollectionUtils.isNotEmpty(onlinePlanList)) { -- Gitblit v1.8.0