From b2db4e735df5b6ebfec5473c072092a8121d8481 Mon Sep 17 00:00:00 2001 From: hdka <823267011@qq.com> Date: Mon, 11 Aug 2025 17:27:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/service/impl/IndustryMaterialServiceImpl.java | 6 ------ .../industry/work/service/impl/IndustryStepServiceImpl.java | 4 +++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/industry-system/src/main/java/com/industry/work/service/impl/IndustryMaterialServiceImpl.java b/industry-system/src/main/java/com/industry/work/service/impl/IndustryMaterialServiceImpl.java index 7d918f4e..45adf528 100644 --- a/industry-system/src/main/java/com/industry/work/service/impl/IndustryMaterialServiceImpl.java +++ b/industry-system/src/main/java/com/industry/work/service/impl/IndustryMaterialServiceImpl.java @@ -784,12 +784,6 @@ public class IndustryMaterialServiceImpl implements IIndustryMaterialService { // 首先查看是否有该批次的料 if (Objects.nonNull(industryMaterialVos) && !industryMaterialVos.isEmpty()) { // 检测他们的工艺是否相同 -// IndustryMaterialVo firstIndustryMaterial = industryMaterialVos.get(0); -// for (IndustryMaterialVo materialVo : industryMaterialVos) { -// if (!Objects.equals(firstIndustryMaterial.getTechnology(), materialVo.getTechnology())) { -// return null; -// } -// } for (IndustryMaterialVo materialVo : industryMaterialVos) { materialVo.setState(1L); updateIndustryMaterial(materialVo); diff --git a/industry-system/src/main/java/com/industry/work/service/impl/IndustryStepServiceImpl.java b/industry-system/src/main/java/com/industry/work/service/impl/IndustryStepServiceImpl.java index ba85be8c..280ba2b7 100644 --- a/industry-system/src/main/java/com/industry/work/service/impl/IndustryStepServiceImpl.java +++ b/industry-system/src/main/java/com/industry/work/service/impl/IndustryStepServiceImpl.java @@ -448,6 +448,7 @@ public class IndustryStepServiceImpl implements IIndustryStepService { for (IndustryMaterialVo success : successList) { + System.out.println(success); // 进入这里说明工艺没问题接下里根据工艺表创建道次 // 判断当前是粗轧还是精轧 IndustryTechnology industryTechnology = new IndustryTechnology(); @@ -491,9 +492,10 @@ public class IndustryStepServiceImpl implements IIndustryStepService { List industryTechnologyVos = industryTechnologyService.selectIndustryTechnologyList(industryTechnology); // 添加特判 当工艺表为空时通知前端无此工艺不可进入轧制页面 - + System.out.println("生成道次"); // 也就是说这里不管下面的物料是否为此工艺也按照此工艺生成道次只不过不需要操作 for (IndustryTechnologyVo industryTechnologyVo : industryTechnologyVos) { + System.out.println(industryTechnologyVo); IndustryStep industryStep = getIndustryStep(industryMaterial, success, industryTechnologyVo); insertIndustryStep(industryStep); }