From ddea4c447f217c2ae58aaf1c9e5149082c018554 Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 6 Jun 2025 13:05:49 +0800 Subject: [PATCH] =?UTF-8?q?update=20mes=E5=B7=A5=E8=89=BA=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF=E6=AD=A5=E9=AA=A4=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/mes/domain/ProdBaseRoute.java | 2 +- .../mes/domain/ProdBaseRouteMaterial.java | 4 +- .../mes/domain/ProdBaseRouteProcess.java | 119 ++++++++++++++ .../mes/domain/bo/ProdBaseRouteBo.java | 5 +- .../mes/domain/bo/ProdBaseRouteProcessBo.java | 113 +++++++++++++ .../mes/domain/vo/ProdBaseRouteProcessVo.java | 152 +++++++++++++++++- .../mes/domain/vo/ProdBaseRouteVo.java | 5 +- .../impl/ProdBaseRouteServiceImpl.java | 100 ++++++++---- 8 files changed, 466 insertions(+), 34 deletions(-) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRoute.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRoute.java index b8e7a1b..6fb18d7 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRoute.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRoute.java @@ -100,5 +100,5 @@ public class ProdBaseRoute extends TenantEntity { private Long batchSize; @TableField(exist = false) - List prodBaseRouteProcess;//映射字段 + List prodBaseRouteProcessList;//映射字段 } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRouteMaterial.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRouteMaterial.java index a026ee0..b6c9daa 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRouteMaterial.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRouteMaterial.java @@ -24,6 +24,7 @@ public class ProdBaseRouteMaterial extends TenantEntity { /** * 关联物料ID */ + @TableId(value = "route_material_id", type = IdType.AUTO) private Long routeMaterialId; /** @@ -46,5 +47,6 @@ public class ProdBaseRouteMaterial extends TenantEntity { */ private String remark; - + @TableField(exist = false) + private String materialName; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRouteProcess.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRouteProcess.java index 4030499..da6e129 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRouteProcess.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRouteProcess.java @@ -47,7 +47,126 @@ public class ProdBaseRouteProcess extends BaseEntity { */ private String remark; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + /** + * 委外标识（1自制 2委外） + */ + private String outsourcingFlag; + + /** + * 工序类型（1投料 2加工 3装配） + */ + private String operationType; + + /** + * 是否需要上料（0否 1是） + */ + private String needFeeding; + + /** + * 设备点检（0不需要 1需要） + */ + private String needEquipmentCheck; + + /** + * 实际产出率(%) + */ + private Long actualYieldRate; + + /** + * 领料方式（1领料单 2申请领料 3生产叫料） + */ + private String materialIssuance; + + /** + * 委外提前期(秒) + */ + private Long outsourcingLeadTime; + + /** + * 准备时间(秒) + */ + private Long setupTime; + + /** + * 加工时间(秒) + */ + private Long processingTime; + + /** + * 拆卸时间(秒) + */ + private Long teardownTime; + + /** + * 生产节拍(秒/件) + */ + private Long productionTakt; + + /** + * 质检方式（1免检 2自检 3质量检验） + */ + private String inspectionMethod; + + /** + * 质量检验规则ID + */ + private Long qualityRuleId; + + /** + * 关键工序（0否 1是） + */ + private String isKeyOperation; + + /** + * 下工序要求（0无要求 1完成 2质检通过） + */ + private String nextStepRequirement; + + /** + * 最后工序（0否 1是） + */ + private String isFinalStep; + + /** + * 生成流转卡任务（0否 1是） + */ + private String generatePrepareTask; + + /** + * 瓶颈工序（0否 1是） + */ + private String bottleneckFlag; + + /** + * 瓶颈设置（0人工 1自动） + */ + private String bottleneckSetting; + + /** + * 接续关系（ES结束到开始 SS开始到开始） + */ + private String successorRelation; + + /** + * 偏置时间(秒) + */ + private Long offsetTime; + + /** + * 技术附件 + */ + private String techAttachments; + + /** + * 质检员 + */ + private String inspectors; /** * 工序名称 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseRouteBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseRouteBo.java index fe076a7..6f106a0 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseRouteBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseRouteBo.java @@ -1,6 +1,7 @@ package org.dromara.mes.domain.bo; import org.dromara.mes.domain.ProdBaseRoute; +import org.dromara.mes.domain.ProdBaseRouteMaterial; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; @@ -95,6 +96,8 @@ public class ProdBaseRouteBo extends BaseEntity { */ private Long batchSize; - private List routeProcessBoList; + private List routeProcessList; + + private List prodBaseRouteMaterialList; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseRouteProcessBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseRouteProcessBo.java index dde8caa..65a8347 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseRouteProcessBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseRouteProcessBo.java @@ -47,5 +47,118 @@ public class ProdBaseRouteProcessBo extends BaseEntity { */ private String remark; + /** + * 委外标识（1自制 2委外） + */ + private String outsourcingFlag; + /** + * 工序类型（1投料 2加工 3装配） + */ + private String operationType; + + /** + * 是否需要上料（0否 1是） + */ + private String needFeeding; + + /** + * 设备点检（0不需要 1需要） + */ + private String needEquipmentCheck; + + /** + * 实际产出率(%) + */ + private Long actualYieldRate; + + /** + * 领料方式（1领料单 2申请领料 3生产叫料） + */ + private String materialIssuance; + + /** + * 委外提前期(秒) + */ + private Long outsourcingLeadTime; + + /** + * 准备时间(秒) + */ + private Long setupTime; + + /** + * 加工时间(秒) + */ + private Long processingTime; + + /** + * 拆卸时间(秒) + */ + private Long teardownTime; + + /** + * 生产节拍(秒/件) + */ + private Long productionTakt; + + /** + * 质检方式（1免检 2自检 3质量检验） + */ + private String inspectionMethod; + + /** + * 质量检验规则ID + */ + private Long qualityRuleId; + + /** + * 关键工序（0否 1是） + */ + private String isKeyOperation; + + /** + * 下工序要求（0无要求 1完成 2质检通过） + */ + private String nextStepRequirement; + + /** + * 最后工序（0否 1是） + */ + private String isFinalStep; + + /** + * 生成流转卡任务（0否 1是） + */ + private String generatePrepareTask; + + /** + * 瓶颈工序（0否 1是） + */ + private String bottleneckFlag; + + /** + * 瓶颈设置（0人工 1自动） + */ + private String bottleneckSetting; + + /** + * 接续关系（ES结束到开始 SS开始到开始） + */ + private String successorRelation; + + /** + * 偏置时间(秒) + */ + private Long offsetTime; + + /** + * 技术附件 + */ + private String techAttachments; + + /** + * 质检员 + */ + private String inspectors; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteProcessVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteProcessVo.java index d3a99b2..81da088 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteProcessVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteProcessVo.java @@ -58,9 +58,6 @@ public class ProdBaseRouteProcessVo implements Serializable { @ExcelProperty(value = "备注") private String remark; - - - /** * 工序名称 */ @@ -73,5 +70,154 @@ public class ProdBaseRouteProcessVo implements Serializable { @ExcelProperty(value = "工序类别", converter = ExcelDictConvert.class) private String processType; + /** + * 委外标识（1自制 2委外） + */ + @ExcelProperty(value = "委外标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_outsourcing_flag") + private String outsourcingFlag; + /** + * 工序类型（1投料 2加工 3装配） + */ + @ExcelProperty(value = "工序类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "process_type") + private String operationType; + + /** + * 是否需要上料（0否 1是） + */ + @ExcelProperty(value = "是否需要上料", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_need_feeding") + private String needFeeding; + + /** + * 设备点检（0不需要 1需要） + */ + @ExcelProperty(value = "设备点检", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_need_equipment_check") + private String needEquipmentCheck; + + /** + * 实际产出率(%) + */ + @ExcelProperty(value = "实际产出率(%)") + private Long actualYieldRate; + + /** + * 领料方式（1领料单 2申请领料 3生产叫料） + */ + @ExcelProperty(value = "领料方式", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_material_method") + private String materialIssuance; + + /** + * 委外提前期(秒) + */ + @ExcelProperty(value = "委外提前期(秒)") + private Long outsourcingLeadTime; + + /** + * 准备时间(秒) + */ + @ExcelProperty(value = "准备时间(秒)") + private Long setupTime; + + /** + * 加工时间(秒) + */ + @ExcelProperty(value = "加工时间(秒)") + private Long processingTime; + + /** + * 拆卸时间(秒) + */ + @ExcelProperty(value = "拆卸时间(秒)") + private Long teardownTime; + + /** + * 生产节拍(秒/件) + */ + @ExcelProperty(value = "生产节拍(秒/件)") + private Long productionTakt; + + /** + * 质检方式（1免检 2自检 3质量检验） + */ + @ExcelProperty(value = "质检方式", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_inspection_method") + private String inspectionMethod; + + /** + * 质量检验规则ID + */ + @ExcelProperty(value = "质量检验规则ID") + private Long qualityRuleId; + + /** + * 关键工序（0否 1是） + */ + @ExcelProperty(value = "关键工序", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_is_key_operation") + private String isKeyOperation; + + /** + * 下工序要求（0无要求 1完成 2质检通过） + */ + @ExcelProperty(value = "下工序要求", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_next_step_requirement") + private String nextStepRequirement; + + /** + * 最后工序（0否 1是） + */ + @ExcelProperty(value = "最后工序", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_is_final_step") + private String isFinalStep; + + /** + * 生成流转卡任务（0否 1是） + */ + @ExcelProperty(value = "生成流转卡任务", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "generate_prepare_task") + private String generatePrepareTask; + + /** + * 瓶颈工序（0否 1是） + */ + @ExcelProperty(value = "瓶颈工序", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_bottleneck_flag") + private String bottleneckFlag; + + /** + * 瓶颈设置（0人工 1自动） + */ + @ExcelProperty(value = "瓶颈设置", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_bottleneck_setting") + private String bottleneckSetting; + + /** + * 接续关系（ES结束到开始 SS开始到开始） + */ + @ExcelProperty(value = "接续关系", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_successor_relation") + private String successorRelation; + + /** + * 偏置时间(秒) + */ + @ExcelProperty(value = "偏置时间(秒)") + private Long offsetTime; + + /** + * 技术附件 + */ + @ExcelProperty(value = "技术附件") + private String techAttachments; + + /** + * 质检员 + */ + @ExcelProperty(value = "质检员") + private String inspectors; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteVo.java index 73197e1..92c5181 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteVo.java @@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.mes.domain.ProdBaseRouteMaterial; import java.io.Serial; import java.io.Serializable; @@ -158,7 +159,9 @@ public class ProdBaseRouteVo implements Serializable { * 工艺路线 */ @ExcelIgnore - private List routeProcessVoList; + private List routeProcessList; + @ExcelIgnore + private List prodBaseRouteMaterialList; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseRouteServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseRouteServiceImpl.java index 5217c40..c33a269 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseRouteServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseRouteServiceImpl.java @@ -1,7 +1,6 @@ package org.dromara.mes.service.impl; import cn.hutool.core.util.ObjectUtil; -import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -9,22 +8,22 @@ import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; -import org.dromara.mes.domain.ProdBaseRouteProcess; +import org.dromara.mes.domain.*; import org.dromara.mes.domain.bo.ProdBaseRouteProcessBo; import org.dromara.mes.domain.vo.ProdBaseRouteProcessVo; +import org.dromara.mes.mapper.ProdBaseRouteMaterialMapper; import org.dromara.mes.service.IProdBaseRouteProcessService; import org.springframework.stereotype.Service; import org.dromara.mes.domain.bo.ProdBaseRouteBo; import org.dromara.mes.domain.vo.ProdBaseRouteVo; -import org.dromara.mes.domain.ProdBaseRoute; import org.dromara.mes.mapper.ProdBaseRouteMapper; import org.dromara.mes.service.IProdBaseRouteService; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.stream.Collectors; /** * 工艺路线Service业务层处理 @@ -40,6 +39,8 @@ public class ProdBaseRouteServiceImpl implements IProdBaseRouteService { private final IProdBaseRouteProcessService routeProcessService; + private final ProdBaseRouteMaterialMapper routeMaterialMapper; + /** * 查询工艺路线 * @@ -47,13 +48,22 @@ public class ProdBaseRouteServiceImpl implements IProdBaseRouteService { * @return 工艺路线 */ @Override - public ProdBaseRouteVo queryById(Long routeId){ + public ProdBaseRouteVo queryById(Long routeId) { ProdBaseRouteVo prodBaseRouteVo = routeMapper.selectVoById(routeId); - // queryList方法查询工艺路线组陈（工艺步骤） + // queryList方法查询工艺路线组成（工艺步骤） ProdBaseRouteProcessBo prodBaseRouteProcessBo = new ProdBaseRouteProcessBo(); prodBaseRouteProcessBo.setRouteId(routeId); List routeProcessVoList = routeProcessService.queryList(prodBaseRouteProcessBo); - prodBaseRouteVo.setRouteProcessVoList(routeProcessVoList); + prodBaseRouteVo.setRouteProcessList(routeProcessVoList); + + // 关联物料 + MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdBaseRouteMaterial.class); + lqw.selectAll(ProdBaseRouteMaterial.class) + .select(BaseMaterialInfo::getMaterialName) + .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, ProdBaseRouteMaterial::getMaterialId) + .eq(ProdBaseRouteMaterial::getRouteId, routeId); + List prodBaseRouteMaterialList = routeMaterialMapper.selectList(lqw); + prodBaseRouteVo.setProdBaseRouteMaterialList(prodBaseRouteMaterialList); return prodBaseRouteVo; } @@ -87,12 +97,12 @@ public class ProdBaseRouteServiceImpl implements IProdBaseRouteService { private MPJLambdaWrapper buildQueryWrapper(ProdBaseRouteBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdBaseRoute.class) - .selectAll(ProdBaseRoute.class) - .eq(bo.getRouteId() != null, ProdBaseRoute::getRouteId, bo.getRouteId()) - .like(StringUtils.isNotBlank(bo.getRouteName()), ProdBaseRoute::getRouteName, bo.getRouteName()) - .eq(StringUtils.isNotBlank(bo.getRouteDesc()), ProdBaseRoute::getRouteDesc, bo.getRouteDesc()) - .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ProdBaseRoute::getActiveFlag, bo.getActiveFlag()) - .orderByAsc(ProdBaseRoute::getCreateTime); + .selectAll(ProdBaseRoute.class) + .eq(bo.getRouteId() != null, ProdBaseRoute::getRouteId, bo.getRouteId()) + .like(StringUtils.isNotBlank(bo.getRouteName()), ProdBaseRoute::getRouteName, bo.getRouteName()) + .eq(StringUtils.isNotBlank(bo.getRouteDesc()), ProdBaseRoute::getRouteDesc, bo.getRouteDesc()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ProdBaseRoute::getActiveFlag, bo.getActiveFlag()) + .orderByAsc(ProdBaseRoute::getCreateTime); return lqw; } @@ -111,7 +121,16 @@ public class ProdBaseRouteServiceImpl implements IProdBaseRouteService { insertProdBaseRouteProcess(bo); boolean flag = routeMapper.insert(add) > 0; if (flag) { + assert add != null; bo.setRouteId(add.getRouteId()); + // 插入关联物料 + List materialList = bo.getProdBaseRouteMaterialList(); + if (materialList != null && !materialList.isEmpty()) { + for (ProdBaseRouteMaterial material : materialList) { + material.setRouteId(add.getRouteId()); + routeMaterialMapper.insert(material); + } + } } return flag; } @@ -130,14 +149,44 @@ public class ProdBaseRouteServiceImpl implements IProdBaseRouteService { Long routeId = bo.getRouteId(); routeMapper.deleteProdBaseRouteProcessByRouteId(routeId); insertProdBaseRouteProcess(bo); + // 更新工艺路线关联物料 + List materialList = bo.getProdBaseRouteMaterialList(); + MPJLambdaWrapper lqwMaterial = JoinWrappers.lambda(ProdBaseRouteMaterial.class); + lqwMaterial.eq(ProdBaseRouteMaterial::getRouteId, bo.getRouteId()); + List dbMaterialList = routeMaterialMapper.selectList(lqwMaterial); + if (materialList != null && !materialList.isEmpty()) { + for (ProdBaseRouteMaterial material : materialList) { + material.setRouteId(bo.getRouteId()); + if (material.getRouteMaterialId() == null) { + routeMaterialMapper.insert(material); + } else { + routeMaterialMapper.updateById(material); + } + } + Set existingIds = materialList.stream() + .filter(m -> m.getRouteMaterialId() != null) + .map(ProdBaseRouteMaterial::getRouteMaterialId) + .collect(Collectors.toSet()); + List filteredIds = dbMaterialList.stream() + .filter(field -> !existingIds.contains(field.getRouteMaterialId())) + .toList(); + for (ProdBaseRouteMaterial material : filteredIds) { + routeMaterialMapper.deleteById(material.getRouteMaterialId()); + } + } else if (dbMaterialList != null && !dbMaterialList.isEmpty()) { + // 如果前端传空，全部删除 + for (ProdBaseRouteMaterial material : dbMaterialList) { + routeMaterialMapper.deleteById(material.getRouteMaterialId()); + } + } validEntityBeforeSave(update); - return updateResult > 0; + return updateResult > 0; } /** * 保存前的数据校验 */ - private void validEntityBeforeSave(ProdBaseRoute entity){ + private void validEntityBeforeSave(ProdBaseRoute entity) { //TODO 做一些数据校验,如唯一约束 } @@ -151,7 +200,7 @@ public class ProdBaseRouteServiceImpl implements IProdBaseRouteService { @Transactional @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } routeProcessService.deleteWithValidByIds(ids, isValid); @@ -160,31 +209,28 @@ public class ProdBaseRouteServiceImpl implements IProdBaseRouteService { /** * 插入工艺路线过程 + * * @param bo 包含工艺路线信息的业务对象 */ - public void insertProdBaseRouteProcess(ProdBaseRouteBo bo) - { + public void insertProdBaseRouteProcess(ProdBaseRouteBo bo) { // 获取工艺路线中的工艺步骤列表 - List prodBaseRouteProcessList = bo.getRouteProcessBoList(); + List prodBaseRouteProcessList = bo.getRouteProcessList(); // 获取工艺路线ID Long routeId = bo.getRouteId(); // 如果工艺步骤列表不为空 - if (ObjectUtil.isNotNull(prodBaseRouteProcessList)) - { + if (ObjectUtil.isNotNull(prodBaseRouteProcessList)) { // 创建一个新的工艺步骤列表 List list = new ArrayList(); // 遍历每一个工艺步骤 - for (ProdBaseRouteProcessBo prodBaseRouteProcess : prodBaseRouteProcessList) - { + for (ProdBaseRouteProcessBo prodBaseRouteProcess : prodBaseRouteProcessList) { // 设置工艺步骤的工艺路线ID prodBaseRouteProcess.setRouteId(routeId); // 将工艺步骤添加到新的列表中 list.add(prodBaseRouteProcess); } // 如果新的工艺步骤列表不为空 - if (!list.isEmpty()) - { + if (!list.isEmpty()) { // 批量插入工艺步骤到数据库 routeMapper.batchProdBaseRouteProcess(list); } @@ -193,6 +239,7 @@ public class ProdBaseRouteServiceImpl implements IProdBaseRouteService { /** * 根据工艺路线ID查询工位信息 + * * @param routeId * @return */ @@ -208,8 +255,7 @@ public class ProdBaseRouteServiceImpl implements IProdBaseRouteService { * @return 工艺路线 */ @Override - public ProdBaseRouteVo selectProdBaseRouteByRouteId(Long routeId) - { + public ProdBaseRouteVo selectProdBaseRouteByRouteId(Long routeId) { return routeMapper.selectProdBaseRouteByRouteId(routeId); } }