From bb9d25322affbcb77ccd70cd873f67840cf9e32d Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 4 Mar 2025 16:26:51 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9C=BA=E5=8F=B0=E5=85=B3=E8=81=94?= =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=92=8C=E5=B7=A5=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProdBaseMachineProcessController.java | 117 +++++++++++++++ .../mes/domain/ProdBaseMachineInfo.java | 9 ++ .../mes/domain/ProdBaseMachineProcess.java | 46 ++++++ .../mes/domain/bo/ProdBaseMachineInfoBo.java | 9 ++ .../domain/bo/ProdBaseMachineProcessBo.java | 36 +++++ .../mes/domain/vo/ProdBaseMachineInfoVo.java | 15 +- .../domain/vo/ProdBaseMachineProcessVo.java | 44 ++++++ .../mapper/ProdBaseMachineProcessMapper.java | 15 ++ .../IProdBaseMachineProcessService.java | 69 +++++++++ .../impl/ProdBaseMachineInfoServiceImpl.java | 65 ++++++--- .../ProdBaseMachineProcessServiceImpl.java | 133 ++++++++++++++++++ .../mes/ProdBaseMachineProcessMapper.xml | 7 + 12 files changed, 543 insertions(+), 22 deletions(-) create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseMachineProcessController.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineProcess.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineProcessBo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineProcessVo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseMachineProcessMapper.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseMachineProcessService.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseMachineProcessServiceImpl.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseMachineProcessMapper.xml diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseMachineProcessController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseMachineProcessController.java new file mode 100644 index 00000000..8a1b7a74 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseMachineProcessController.java @@ -0,0 +1,117 @@ +package org.dromara.mes.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mes.domain.vo.ProdBaseMachineProcessVo; +import org.dromara.mes.domain.bo.ProdBaseMachineProcessBo; +import org.dromara.mes.service.IProdBaseMachineProcessService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 机台关联工序 + * 前端访问路由地址为:/mes/baseMachineProcess + * + * @author Yinq + * @date 2025-03-04 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/baseMachineProcess") +public class ProdBaseMachineProcessController extends BaseController { + + private final IProdBaseMachineProcessService prodBaseMachineProcessService; + + /** + * 查询机台关联工序列表 + */ + @SaCheckPermission("mes:baseMachineProcess:list") + @GetMapping("/list") + public TableDataInfo list(ProdBaseMachineProcessBo bo, PageQuery pageQuery) { + return prodBaseMachineProcessService.queryPageList(bo, pageQuery); + } + + /** + * 导出机台关联工序列表 + */ + @SaCheckPermission("mes:baseMachineProcess:export") + @Log(title = "机台关联工序", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ProdBaseMachineProcessBo bo, HttpServletResponse response) { + List list = prodBaseMachineProcessService.queryList(bo); + ExcelUtil.exportExcel(list, "机台关联工序", ProdBaseMachineProcessVo.class, response); + } + + /** + * 获取机台关联工序详细信息 + * + * @param machineId 主键 + */ + @SaCheckPermission("mes:baseMachineProcess:query") + @GetMapping("/{machineId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long machineId) { + return R.ok(prodBaseMachineProcessService.queryById(machineId)); + } + + /** + * 新增机台关联工序 + */ + @SaCheckPermission("mes:baseMachineProcess:add") + @Log(title = "机台关联工序", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ProdBaseMachineProcessBo bo) { + return toAjax(prodBaseMachineProcessService.insertByBo(bo)); + } + + /** + * 修改机台关联工序 + */ + @SaCheckPermission("mes:baseMachineProcess:edit") + @Log(title = "机台关联工序", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ProdBaseMachineProcessBo bo) { + return toAjax(prodBaseMachineProcessService.updateByBo(bo)); + } + + /** + * 删除机台关联工序 + * + * @param machineIds 主键串 + */ + @SaCheckPermission("mes:baseMachineProcess:remove") + @Log(title = "机台关联工序", businessType = BusinessType.DELETE) + @DeleteMapping("/{machineIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] machineIds) { + return toAjax(prodBaseMachineProcessService.deleteWithValidByIds(List.of(machineIds), true)); + } + + + /** + * 下拉框查询机台关联工序列表 + */ + + @GetMapping("/getProdBaseMachineProcessList") + public R> getProdBaseMachineProcessList(ProdBaseMachineProcessBo bo) { + List list = prodBaseMachineProcessService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java index cb218511..257c3201 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java @@ -72,5 +72,14 @@ public class ProdBaseMachineInfo extends TenantEntity { */ private String remark; + /** + * 车间ID + */ + private Long workshopId; + /** + * 车间名称 + */ + @TableField(exist = false) + private String workshopName; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineProcess.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineProcess.java new file mode 100644 index 00000000..3d7a58f8 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineProcess.java @@ -0,0 +1,46 @@ +package org.dromara.mes.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.util.Date; + +/** + * 机台关联工序对象 prod_base_machine_process + * + * @author Yinq + * @date 2025-03-04 + */ +@Data +@TableName("prod_base_machine_process") +public class ProdBaseMachineProcess extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 机台ID + */ + private Long machineId; + + /** + * 工序ID + */ + private Long processId; + + /** + * 更新者 + */ + @TableField(exist = false) + private Long updateBy; + + /** + * 更新时间 + */ + @TableField(exist = false) + private Date updateTime; + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineInfoBo.java index 73c76b2f..8e323cd7 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineInfoBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineInfoBo.java @@ -8,6 +8,9 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import org.dromara.mes.domain.ProdBaseMachineProcess; + +import java.util.List; /** * 机台信息业务对象 prod_base_machine_info @@ -77,4 +80,10 @@ public class ProdBaseMachineInfoBo extends BaseEntity { */ private Long processId; + /** + * 车间ID + */ + private Long workshopId; + + private List baseMachineProcessList; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineProcessBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineProcessBo.java new file mode 100644 index 00000000..4d16bfe2 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineProcessBo.java @@ -0,0 +1,36 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.ProdBaseMachineProcess; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 机台关联工序业务对象 prod_base_machine_process + * + * @author Yinq + * @date 2025-03-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ProdBaseMachineProcess.class, reverseConvertGenerate = false) +public class ProdBaseMachineProcessBo extends BaseEntity { + + /** + * 机台ID + */ + @NotNull(message = "机台ID不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long machineId; + + /** + * 工序ID + */ + @NotNull(message = "工序ID不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long processId; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineInfoVo.java index abc767a9..35d21f52 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineInfoVo.java @@ -7,11 +7,12 @@ 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.ProdBaseMachineProcess; import java.io.Serial; import java.io.Serializable; import java.util.Date; - +import java.util.List; /** @@ -125,5 +126,17 @@ public class ProdBaseMachineInfoVo implements Serializable { @ExcelProperty(value = "更新时间") private Date updateTime; + /** + * 车间ID + */ + private Long workshopId; + + /** + * 车间名称 + */ + @ExcelProperty(value = "车间名称") + private String workshopName; + + private List baseMachineProcessList; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineProcessVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineProcessVo.java new file mode 100644 index 00000000..2a97ca08 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineProcessVo.java @@ -0,0 +1,44 @@ +package org.dromara.mes.domain.vo; + +import org.dromara.mes.domain.ProdBaseMachineProcess; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 机台关联工序视图对象 prod_base_machine_process + * + * @author Yinq + * @date 2025-03-04 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ProdBaseMachineProcess.class) +public class ProdBaseMachineProcessVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 机台ID + */ + @ExcelProperty(value = "机台ID") + private Long machineId; + + /** + * 工序ID + */ + @ExcelProperty(value = "工序ID") + private Long processId; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseMachineProcessMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseMachineProcessMapper.java new file mode 100644 index 00000000..0250bd6d --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseMachineProcessMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.ProdBaseMachineProcess; +import org.dromara.mes.domain.vo.ProdBaseMachineProcessVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 机台关联工序Mapper接口 + * + * @author Yinq + * @date 2025-03-04 + */ +public interface ProdBaseMachineProcessMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseMachineProcessService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseMachineProcessService.java new file mode 100644 index 00000000..720b9648 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseMachineProcessService.java @@ -0,0 +1,69 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.ProdBaseMachineProcess; +import org.dromara.mes.domain.vo.ProdBaseMachineProcessVo; +import org.dromara.mes.domain.bo.ProdBaseMachineProcessBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 机台关联工序Service接口 + * + * @author Yinq + * @date 2025-03-04 + */ +public interface IProdBaseMachineProcessService { + + /** + * 查询机台关联工序 + * + * @param machineId 主键 + * @return 机台关联工序 + */ + ProdBaseMachineProcessVo queryById(Long machineId); + + /** + * 分页查询机台关联工序列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 机台关联工序分页列表 + */ + TableDataInfo queryPageList(ProdBaseMachineProcessBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的机台关联工序列表 + * + * @param bo 查询条件 + * @return 机台关联工序列表 + */ + List queryList(ProdBaseMachineProcessBo bo); + + /** + * 新增机台关联工序 + * + * @param bo 机台关联工序 + * @return 是否新增成功 + */ + Boolean insertByBo(ProdBaseMachineProcessBo bo); + + /** + * 修改机台关联工序 + * + * @param bo 机台关联工序 + * @return 是否修改成功 + */ + Boolean updateByBo(ProdBaseMachineProcessBo bo); + + /** + * 校验并批量删除机台关联工序信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseMachineInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseMachineInfoServiceImpl.java index 893cc162..76caeb3e 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseMachineInfoServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseMachineInfoServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.mes.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -10,12 +11,13 @@ 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.ProdBaseProcessInfo; -import org.dromara.mes.domain.ProdBaseStationInfo; +import org.dromara.mes.domain.*; +import org.dromara.mes.domain.bo.ProdBaseMouldInfoBo; +import org.dromara.mes.domain.vo.ProdBaseMouldInfoVo; +import org.dromara.mes.mapper.ProdBaseMachineProcessMapper; import org.springframework.stereotype.Service; import org.dromara.mes.domain.bo.ProdBaseMachineInfoBo; import org.dromara.mes.domain.vo.ProdBaseMachineInfoVo; -import org.dromara.mes.domain.ProdBaseMachineInfo; import org.dromara.mes.mapper.ProdBaseMachineInfoMapper; import org.dromara.mes.service.IProdBaseMachineInfoService; @@ -35,6 +37,8 @@ public class ProdBaseMachineInfoServiceImpl implements IProdBaseMachineInfoServi private final ProdBaseMachineInfoMapper baseMapper; + private final ProdBaseMachineProcessMapper prodBaseMachineProcessMapper; + /** * 查询机台信息 * @@ -42,8 +46,19 @@ public class ProdBaseMachineInfoServiceImpl implements IProdBaseMachineInfoServi * @return 机台信息 */ @Override - public ProdBaseMachineInfoVo queryById(Long machineId){ - return baseMapper.selectVoById(machineId); + public ProdBaseMachineInfoVo queryById(Long machineId) { + ProdBaseMachineInfoBo bo = new ProdBaseMachineInfoBo(); + bo.setMachineId(machineId); + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + ProdBaseMachineInfoVo prodBaseMachineInfoVo = baseMapper.selectVoOne(lqw); + //机台关联工序 + MPJLambdaWrapper lqwRelation = JoinWrappers.lambda(ProdBaseMachineProcess.class) + .selectAll(ProdBaseMachineProcess.class) + .eq(bo.getMachineId() != null, ProdBaseMachineProcess::getMachineId, bo.getMachineId()) + .orderByAsc(ProdBaseMachineProcess::getCreateTime); + List prodBaseMachineProcesses = prodBaseMachineProcessMapper.selectList(lqwRelation); + prodBaseMachineInfoVo.setBaseMachineProcessList(prodBaseMachineProcesses); + return prodBaseMachineInfoVo; } /** @@ -75,20 +90,19 @@ public class ProdBaseMachineInfoServiceImpl implements IProdBaseMachineInfoServi private MPJLambdaWrapper buildQueryWrapper(ProdBaseMachineInfoBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdBaseMachineInfo.class) - .selectAll(ProdBaseMachineInfo.class) - .leftJoin(ProdBaseStationInfo.class, ProdBaseStationInfo::getMachineId, ProdBaseMachineInfo::getMachineId) - .leftJoin(ProdBaseProcessInfo.class, ProdBaseProcessInfo::getProcessId, ProdBaseStationInfo::getProcessId) - .eq(bo.getMachineId() != null, ProdBaseMachineInfo::getMachineId, bo.getMachineId()) - .like(StringUtils.isNotBlank(bo.getMachineCode()), ProdBaseMachineInfo::getMachineCode, bo.getMachineCode()) - .like(StringUtils.isNotBlank(bo.getMachineName()), ProdBaseMachineInfo::getMachineName, bo.getMachineName()) - .eq(StringUtils.isNotBlank(bo.getAssetNumber()), ProdBaseMachineInfo::getAssetNumber, bo.getAssetNumber()) - .eq(StringUtils.isNotBlank(bo.getMachineLocation()), ProdBaseMachineInfo::getMachineLocation, bo.getMachineLocation()) - .eq(StringUtils.isNotBlank(bo.getMachineType()), ProdBaseMachineInfo::getMachineType, bo.getMachineType()) - .eq(StringUtils.isNotBlank(bo.getMachineSpec()), ProdBaseMachineInfo::getMachineSpec, bo.getMachineSpec()) - .eq(StringUtils.isNotBlank(bo.getSupplierId()), ProdBaseMachineInfo::getSupplierId, bo.getSupplierId()) - .eq(StringUtils.isNotBlank(bo.getMachineStatus()), ProdBaseMachineInfo::getMachineStatus, bo.getMachineStatus()) - .eq(StringUtils.isNotNull(bo.getProcessId()), ProdBaseProcessInfo::getProcessId, bo.getProcessId()) - .orderByAsc(ProdBaseMachineInfo::getCreateTime); + .selectAll(ProdBaseMachineInfo.class) + .select(ProdBaseWorkshopInfo::getWorkshopName) + .leftJoin(ProdBaseWorkshopInfo.class, ProdBaseWorkshopInfo::getWorkshopId, ProdBaseMachineInfo::getWorkshopId) + .eq(bo.getMachineId() != null, ProdBaseMachineInfo::getMachineId, bo.getMachineId()) + .like(StringUtils.isNotBlank(bo.getMachineCode()), ProdBaseMachineInfo::getMachineCode, bo.getMachineCode()) + .like(StringUtils.isNotBlank(bo.getMachineName()), ProdBaseMachineInfo::getMachineName, bo.getMachineName()) + .eq(StringUtils.isNotBlank(bo.getMachineLocation()), ProdBaseMachineInfo::getMachineLocation, bo.getMachineLocation()) + .eq(StringUtils.isNotBlank(bo.getMachineType()), ProdBaseMachineInfo::getMachineType, bo.getMachineType()) + .eq(StringUtils.isNotBlank(bo.getMachineSpec()), ProdBaseMachineInfo::getMachineSpec, bo.getMachineSpec()) + .eq(StringUtils.isNotBlank(bo.getSupplierId()), ProdBaseMachineInfo::getSupplierId, bo.getSupplierId()) + .eq(StringUtils.isNotBlank(bo.getMachineStatus()), ProdBaseMachineInfo::getMachineStatus, bo.getMachineStatus()) + .eq(StringUtils.isNotNull(bo.getWorkshopId()), ProdBaseMachineInfo::getWorkshopId, bo.getWorkshopId()) + .orderByAsc(ProdBaseMachineInfo::getCreateTime); return lqw; } @@ -119,13 +133,22 @@ public class ProdBaseMachineInfoServiceImpl implements IProdBaseMachineInfoServi public Boolean updateByBo(ProdBaseMachineInfoBo bo) { ProdBaseMachineInfo update = MapstructUtils.convert(bo, ProdBaseMachineInfo.class); validEntityBeforeSave(update); + List baseMachineProcessList = bo.getBaseMachineProcessList(); + if (baseMachineProcessList.size() > 0) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotNull(bo.getMachineId()), ProdBaseMachineProcess::getMachineId, bo.getMachineId()); + prodBaseMachineProcessMapper.delete(lqw); + for (ProdBaseMachineProcess relation : baseMachineProcessList) { + prodBaseMachineProcessMapper.insert(relation); + } + } return baseMapper.updateById(update) > 0; } /** * 保存前的数据校验 */ - private void validEntityBeforeSave(ProdBaseMachineInfo entity){ + private void validEntityBeforeSave(ProdBaseMachineInfo entity) { //TODO 做一些数据校验,如唯一约束 if (StringUtils.isNotBlank(entity.getMachineCode())) { ProdBaseMachineInfoBo query = new ProdBaseMachineInfoBo(); @@ -148,7 +171,7 @@ public class ProdBaseMachineInfoServiceImpl implements IProdBaseMachineInfoServi */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0; diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseMachineProcessServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseMachineProcessServiceImpl.java new file mode 100644 index 00000000..7351d93a --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseMachineProcessServiceImpl.java @@ -0,0 +1,133 @@ +package org.dromara.mes.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +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.springframework.stereotype.Service; +import org.dromara.mes.domain.bo.ProdBaseMachineProcessBo; +import org.dromara.mes.domain.vo.ProdBaseMachineProcessVo; +import org.dromara.mes.domain.ProdBaseMachineProcess; +import org.dromara.mes.mapper.ProdBaseMachineProcessMapper; +import org.dromara.mes.service.IProdBaseMachineProcessService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 机台关联工序Service业务层处理 + * + * @author Yinq + * @date 2025-03-04 + */ +@RequiredArgsConstructor +@Service +public class ProdBaseMachineProcessServiceImpl implements IProdBaseMachineProcessService { + + private final ProdBaseMachineProcessMapper baseMapper; + + /** + * 查询机台关联工序 + * + * @param machineId 主键 + * @return 机台关联工序 + */ + @Override + public ProdBaseMachineProcessVo queryById(Long machineId){ + return baseMapper.selectVoById(machineId); + } + + /** + * 分页查询机台关联工序列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 机台关联工序分页列表 + */ + @Override + public TableDataInfo queryPageList(ProdBaseMachineProcessBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的机台关联工序列表 + * + * @param bo 查询条件 + * @return 机台关联工序列表 + */ + @Override + public List queryList(ProdBaseMachineProcessBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ProdBaseMachineProcessBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdBaseMachineProcess.class) + .selectAll(ProdBaseMachineProcess.class) + .eq(bo.getMachineId() != null, ProdBaseMachineProcess::getMachineId, bo.getMachineId()) + .eq(bo.getProcessId() != null, ProdBaseMachineProcess::getProcessId, bo.getProcessId()) + .orderByDesc(ProdBaseMachineProcess::getCreateTime); + return lqw; + } + + /** + * 新增机台关联工序 + * + * @param bo 机台关联工序 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ProdBaseMachineProcessBo bo) { + ProdBaseMachineProcess add = MapstructUtils.convert(bo, ProdBaseMachineProcess.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setMachineId(add.getMachineId()); + } + return flag; + } + + /** + * 修改机台关联工序 + * + * @param bo 机台关联工序 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ProdBaseMachineProcessBo bo) { + ProdBaseMachineProcess update = MapstructUtils.convert(bo, ProdBaseMachineProcess.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ProdBaseMachineProcess entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除机台关联工序信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseMachineProcessMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseMachineProcessMapper.xml new file mode 100644 index 00000000..0379ea4e --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseMachineProcessMapper.xml @@ -0,0 +1,7 @@ + + + + +