From 91b54fc007c9e82087738048d3b767c9645a6aec Mon Sep 17 00:00:00 2001 From: cl <418351270@qq.com> Date: 星期五, 06 九月 2024 09:45:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java index 28eccb6..43593d8 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java @@ -528,17 +528,19 @@ @Override public AjaxResult updateTighteningFormula(BsFormulaChildInfo bsFormulaChildInfo) { Boolean b = true; - BsFormulaChildInfo getMaterTwo = new BsFormulaChildInfo(); - getMaterTwo.setProcessesCode(bsFormulaChildInfo.getLocationCode()); - getMaterTwo.setOperationType("2"); - List<BsFormulaChildInfo> operationType = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(getMaterTwo); - List<String> collect = operationType.stream().map(BsFormulaChildInfo::getResults).collect(Collectors.toList()); - for (String s : collect) { - if(s.equals("")){ - return AjaxResult.error("鎵爜鏈畬鎴愶紝绂佹鎷х揣鎿嶄綔锛�"); + if(!"OP100".equals(bsFormulaChildInfo.getLocationCode())){ + BsFormulaChildInfo getMaterTwo = new BsFormulaChildInfo(); + getMaterTwo.setProductCode(bsFormulaChildInfo.getProductCode()); + getMaterTwo.setProcessesCode(bsFormulaChildInfo.getLocationCode()); + getMaterTwo.setOperationType("2"); + List<BsFormulaChildInfo> operationType = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(getMaterTwo); + List<String> collect = operationType.stream().map(BsFormulaChildInfo::getResults).collect(Collectors.toList()); + for (String s : collect) { + if(s.equals("")){ + return AjaxResult.error("鎵爜鏈畬鎴愶紝绂佹鎷х揣鎿嶄綔锛�"); + } } } - //娣诲姞鎷х揣鍙傛暟-鍙傛暟閲囬泦琛� DaParamCollection daParamCollection = new DaParamCollection(); daParamCollection.setParamCode(bsFormulaChildInfo.getParamCode()); -- Gitblit v1.9.3