DeXun/industry
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
hdka
2025-08-11 17:27:40 +08:00
parent 9ccfb01df2
commit b2db4e735d
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
industry-system/src/main/java/com/industry/work/service/impl/IndustryMaterialServiceImpl.java
View File

@@ -784,12 +784,6 @@ public class IndustryMaterialServiceImpl implements IIndustryMaterialService {
// 首先查看是否有该批次的料 // 首先查看是否有该批次的料
if (Objects.nonNull(industryMaterialVos) && !industryMaterialVos.isEmpty()) { 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) { for (IndustryMaterialVo materialVo : industryMaterialVos) {
materialVo.setState(1L); materialVo.setState(1L);
updateIndustryMaterial(materialVo); updateIndustryMaterial(materialVo);

4
industry-system/src/main/java/com/industry/work/service/impl/IndustryStepServiceImpl.java
View File

@@ -448,6 +448,7 @@ public class IndustryStepServiceImpl implements IIndustryStepService {
for (IndustryMaterialVo success : successList) { for (IndustryMaterialVo success : successList) {
System.out.println(success);
// 进入这里说明工艺没问题接下里根据工艺表创建道次 // 进入这里说明工艺没问题接下里根据工艺表创建道次
// 判断当前是粗轧还是精轧 // 判断当前是粗轧还是精轧
IndustryTechnology industryTechnology = new IndustryTechnology(); IndustryTechnology industryTechnology = new IndustryTechnology();
@@ -491,9 +492,10 @@ public class IndustryStepServiceImpl implements IIndustryStepService {
List<IndustryTechnologyVo> industryTechnologyVos = industryTechnologyService.selectIndustryTechnologyList(industryTechnology); List<IndustryTechnologyVo> industryTechnologyVos = industryTechnologyService.selectIndustryTechnologyList(industryTechnology);
// 添加特判 当工艺表为空时通知前端无此工艺不可进入轧制页面 // 添加特判 当工艺表为空时通知前端无此工艺不可进入轧制页面
System.out.println("生成道次");
// 也就是说这里不管下面的物料是否为此工艺也按照此工艺生成道次只不过不需要操作 // 也就是说这里不管下面的物料是否为此工艺也按照此工艺生成道次只不过不需要操作
for (IndustryTechnologyVo industryTechnologyVo : industryTechnologyVos) { for (IndustryTechnologyVo industryTechnologyVo : industryTechnologyVos) {
System.out.println(industryTechnologyVo);
IndustryStep industryStep = getIndustryStep(industryMaterial, success, industryTechnologyVo); IndustryStep industryStep = getIndustryStep(industryMaterial, success, industryTechnologyVo);
insertIndustryStep(industryStep); insertIndustryStep(industryStep);
} }