From 21d58ed15bedd2911d88ebd0eb5f0dfd63020657 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 24 Feb 2025 11:25:49 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B7=BB=E5=8A=A0=E6=A8=A1=E5=85=B7?= =?UTF-8?q?=E6=8D=A2=E6=A8=A1=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProdMouldChangePlanController.java | 116 +++++++++++++ .../mes/domain/ProdMouldChangePlan.java | 78 +++++++++ .../mes/domain/bo/ProdMouldChangePlanBo.java | 85 ++++++++++ .../mes/domain/vo/ProdMouldChangePlanVo.java | 158 ++++++++++++++++++ .../mes/mapper/ProdMouldChangePlanMapper.java | 29 ++++ .../service/IProdMouldChangePlanService.java | 69 ++++++++ .../impl/ProdBaseMouldInfoServiceImpl.java | 2 +- .../impl/ProdMouldChangePlanServiceImpl.java | 141 ++++++++++++++++ .../mapper/mes/ProdMouldChangePlanMapper.xml | 55 ++++++ 9 files changed, 732 insertions(+), 1 deletion(-) create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMouldChangePlanController.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMouldChangePlan.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMouldChangePlanBo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMouldChangePlanVo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdMouldChangePlanMapper.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMouldChangePlanService.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMouldChangePlanServiceImpl.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMouldChangePlanMapper.xml diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMouldChangePlanController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMouldChangePlanController.java new file mode 100644 index 00000000..998c2796 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMouldChangePlanController.java @@ -0,0 +1,116 @@ +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.ProdMouldChangePlanVo; +import org.dromara.mes.domain.bo.ProdMouldChangePlanBo; +import org.dromara.mes.service.IProdMouldChangePlanService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 模具换模计划 + * 前端访问路由地址为:/mes/mouldChangePlan + * + * @author Yinq + * @date 2025-02-20 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mouldChangePlan") +public class ProdMouldChangePlanController extends BaseController { + + private final IProdMouldChangePlanService prodMouldChangePlanService; + + /** + * 查询模具换模计划列表 + */ + @SaCheckPermission("mes:mouldChangePlan:list") + @GetMapping("/list") + public TableDataInfo list(ProdMouldChangePlanBo bo, PageQuery pageQuery) { + return prodMouldChangePlanService.queryPageList(bo, pageQuery); + } + + /** + * 导出模具换模计划列表 + */ + @SaCheckPermission("mes:mouldChangePlan:export") + @Log(title = "模具换模计划", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ProdMouldChangePlanBo bo, HttpServletResponse response) { + List list = prodMouldChangePlanService.queryList(bo); + ExcelUtil.exportExcel(list, "模具换模计划", ProdMouldChangePlanVo.class, response); + } + + /** + * 获取模具换模计划详细信息 + * + * @param mouldChangePlanId 主键 + */ + @SaCheckPermission("mes:mouldChangePlan:query") + @GetMapping("/{mouldChangePlanId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long mouldChangePlanId) { + return R.ok(prodMouldChangePlanService.queryById(mouldChangePlanId)); + } + + /** + * 新增模具换模计划 + */ + @SaCheckPermission("mes:mouldChangePlan:add") + @Log(title = "模具换模计划", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ProdMouldChangePlanBo bo) { + return toAjax(prodMouldChangePlanService.insertByBo(bo)); + } + + /** + * 修改模具换模计划 + */ + @SaCheckPermission("mes:mouldChangePlan:edit") + @Log(title = "模具换模计划", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ProdMouldChangePlanBo bo) { + return toAjax(prodMouldChangePlanService.updateByBo(bo)); + } + + /** + * 删除模具换模计划 + * + * @param mouldChangePlanIds 主键串 + */ + @SaCheckPermission("mes:mouldChangePlan:remove") + @Log(title = "模具换模计划", businessType = BusinessType.DELETE) + @DeleteMapping("/{mouldChangePlanIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] mouldChangePlanIds) { + return toAjax(prodMouldChangePlanService.deleteWithValidByIds(List.of(mouldChangePlanIds), true)); + } + + + /** + * 下拉框查询模具换模计划列表 + */ + @GetMapping("/getProdMouldChangePlanList") + public R> getProdMouldChangePlanList(ProdMouldChangePlanBo bo) { + List list = prodMouldChangePlanService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMouldChangePlan.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMouldChangePlan.java new file mode 100644 index 00000000..0d4dd481 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMouldChangePlan.java @@ -0,0 +1,78 @@ +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.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 模具换模计划对象 prod_mould_change_plan + * + * @author Yinq + * @date 2025-02-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("prod_mould_change_plan") +public class ProdMouldChangePlan extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "mould_change_plan_id", type = IdType.AUTO) + private Long mouldChangePlanId; + + /** + * 生产计划ID + */ + private Long planId; + + /** + * 计划时间 + */ + private Date planDate; + + /** + * 班次ID + */ + private Long shiftId; + + /** + * 模具ID + */ + private Long mouldId; + + /** + * 物料ID;成品ID + */ + private Long materialId; + + /** + * 机台ID + */ + private Long machineId; + + /** + * 模号（L左模 R右模） + */ + private String modelCode; + + /** + * 计划状态（0未执行 1已执行） + */ + private String planStatus; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMouldChangePlanBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMouldChangePlanBo.java new file mode 100644 index 00000000..ec628e50 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMouldChangePlanBo.java @@ -0,0 +1,85 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.ProdMouldChangePlan; +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.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 模具换模计划业务对象 prod_mould_change_plan + * + * @author Yinq + * @date 2025-02-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ProdMouldChangePlan.class, reverseConvertGenerate = false) +public class ProdMouldChangePlanBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long mouldChangePlanId; + + /** + * 生产计划ID + */ + @NotNull(message = "生产计划ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long planId; + + /** + * 计划时间 + */ + @NotNull(message = "计划时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date planDate; + + /** + * 班次ID + */ + @NotNull(message = "班次ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long shiftId; + + /** + * 模具ID + */ + @NotNull(message = "模具ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long mouldId; + + /** + * 物料ID;成品ID + */ + @NotNull(message = "物料ID;成品ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long materialId; + + /** + * 机台ID + */ + @NotNull(message = "机台ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long machineId; + + /** + * 模号（L左模 R右模） + */ + @NotBlank(message = "模号（L左模 R右模）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String modelCode; + + /** + * 计划状态（0未执行 1已执行） + */ + private String planStatus; + + /** + * 备注 + */ + private String remark; + + private String materialName; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMouldChangePlanVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMouldChangePlanVo.java new file mode 100644 index 00000000..6e492442 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMouldChangePlanVo.java @@ -0,0 +1,158 @@ +package org.dromara.mes.domain.vo; + +import java.util.Date; +import org.dromara.mes.domain.ProdMouldChangePlan; +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; + + + +/** + * 模具换模计划视图对象 prod_mould_change_plan + * + * @author Yinq + * @date 2025-02-20 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ProdMouldChangePlan.class) +public class ProdMouldChangePlanVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long mouldChangePlanId; + + /** + * 租户编号 + */ + private String tenantId; + + /** + * 生产计划ID + */ + @ExcelProperty(value = "生产计划ID") + private Long planId; + + /** + * 计划时间 + */ + @ExcelProperty(value = "计划时间") + private Date planDate; + + /** + * 班次ID + */ + @ExcelProperty(value = "班次ID") + private Long shiftId; + + /** + * 模具ID + */ + @ExcelProperty(value = "模具ID") + private Long mouldId; + + /** + * 物料ID;成品ID + */ + @ExcelProperty(value = "物料ID;成品ID") + private Long materialId; + + /** + * 机台ID + */ + @ExcelProperty(value = "机台ID") + private Long machineId; + + /** + * 模号（L左模 R右模） + */ + @ExcelProperty(value = "模号", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_model_code") + private String modelCode; + + /** + * 计划状态（0未执行 1已执行） + */ + @ExcelProperty(value = "计划状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mould_plan_status") + private String planStatus; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 创建部门 + */ + @ExcelProperty(value = "创建部门") + private Long createDept; + + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private Long createBy; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @ExcelProperty(value = "更新人") + private Long updateBy; + + /** + * 更新时间 + */ + @ExcelProperty(value = "更新时间") + private Date updateTime; + + /** + * 计划编号 + */ + @ExcelProperty(value = "计划编号") + private String planCode; + + /** + * 班次名称 + */ + @ExcelProperty(value = "班次名称") + private String shiftName; + + /** + * 模具名称 + */ + @ExcelProperty(value = "模具名称") + private String mouldName; + + /** + * 物料名称 + */ + @ExcelProperty(value = "物料名称") + private String materialName; + + /** + * 机台名称 + */ + @ExcelProperty(value = "机台名称") + private String machineName; + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdMouldChangePlanMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdMouldChangePlanMapper.java new file mode 100644 index 00000000..98b5dbb5 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdMouldChangePlanMapper.java @@ -0,0 +1,29 @@ +package org.dromara.mes.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.mes.domain.ProdMouldChangePlan; +import org.dromara.mes.domain.vo.ProdMouldChangePlanVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 模具换模计划Mapper接口 + * + * @author Yinq + * @date 2025-02-20 + */ +public interface ProdMouldChangePlanMapper extends BaseMapperPlus { + + + /** + * 模具换模计划列表 + * @param page + * @param queryWrapper + * @return + */ + public Page selectProdMouldChangePlanList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMouldChangePlanService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMouldChangePlanService.java new file mode 100644 index 00000000..57e8aa43 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMouldChangePlanService.java @@ -0,0 +1,69 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.ProdMouldChangePlan; +import org.dromara.mes.domain.vo.ProdMouldChangePlanVo; +import org.dromara.mes.domain.bo.ProdMouldChangePlanBo; +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-02-20 + */ +public interface IProdMouldChangePlanService { + + /** + * 查询模具换模计划 + * + * @param mouldChangePlanId 主键 + * @return 模具换模计划 + */ + ProdMouldChangePlanVo queryById(Long mouldChangePlanId); + + /** + * 分页查询模具换模计划列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 模具换模计划分页列表 + */ + TableDataInfo queryPageList(ProdMouldChangePlanBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的模具换模计划列表 + * + * @param bo 查询条件 + * @return 模具换模计划列表 + */ + List queryList(ProdMouldChangePlanBo bo); + + /** + * 新增模具换模计划 + * + * @param bo 模具换模计划 + * @return 是否新增成功 + */ + Boolean insertByBo(ProdMouldChangePlanBo bo); + + /** + * 修改模具换模计划 + * + * @param bo 模具换模计划 + * @return 是否修改成功 + */ + Boolean updateByBo(ProdMouldChangePlanBo 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/ProdBaseMouldInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseMouldInfoServiceImpl.java index 11bbf9a6..8d0e8235 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseMouldInfoServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseMouldInfoServiceImpl.java @@ -94,7 +94,7 @@ public class ProdBaseMouldInfoServiceImpl implements IProdBaseMouldInfoService { .like(StringUtils.isNotBlank(bo.getMouldName()), ProdBaseMouldInfo::getMouldName, bo.getMouldName()) .eq(bo.getMachineId() != null, ProdBaseMouldInfo::getMachineId, bo.getMachineId()) .eq(bo.getUsedNum() != null, ProdBaseMouldInfo::getUsedNum, bo.getUsedNum()) - .orderByDesc(ProdBaseMouldInfo::getCreateTime); + .orderByAsc(ProdBaseMouldInfo::getCreateTime); return lqw; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMouldChangePlanServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMouldChangePlanServiceImpl.java new file mode 100644 index 00000000..a963b049 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMouldChangePlanServiceImpl.java @@ -0,0 +1,141 @@ +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 lombok.RequiredArgsConstructor; +import org.dromara.mes.domain.BaseMaterialInfo; +import org.springframework.stereotype.Service; +import org.dromara.mes.domain.bo.ProdMouldChangePlanBo; +import org.dromara.mes.domain.vo.ProdMouldChangePlanVo; +import org.dromara.mes.domain.ProdMouldChangePlan; +import org.dromara.mes.mapper.ProdMouldChangePlanMapper; +import org.dromara.mes.service.IProdMouldChangePlanService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 模具换模计划Service业务层处理 + * + * @author Yinq + * @date 2025-02-20 + */ +@RequiredArgsConstructor +@Service +public class ProdMouldChangePlanServiceImpl implements IProdMouldChangePlanService { + + private final ProdMouldChangePlanMapper baseMapper; + + /** + * 查询模具换模计划 + * + * @param mouldChangePlanId 主键 + * @return 模具换模计划 + */ + @Override + public ProdMouldChangePlanVo queryById(Long mouldChangePlanId) { + return baseMapper.selectVoById(mouldChangePlanId); + } + + /** + * 分页查询模具换模计划列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 模具换模计划分页列表 + */ + @Override + public TableDataInfo queryPageList(ProdMouldChangePlanBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectProdMouldChangePlanList(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的模具换模计划列表 + * + * @param bo 查询条件 + * @return 模具换模计划列表 + */ + @Override + public List queryList(ProdMouldChangePlanBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ProdMouldChangePlanBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdMouldChangePlan.class) + .selectAll(ProdMouldChangePlan.class) + .eq(bo.getMouldChangePlanId() != null, ProdMouldChangePlan::getMouldChangePlanId, bo.getMouldChangePlanId()) + .eq(bo.getPlanId() != null, ProdMouldChangePlan::getPlanId, bo.getPlanId()) + .eq(bo.getPlanDate() != null, ProdMouldChangePlan::getPlanDate, bo.getPlanDate()) + .eq(bo.getShiftId() != null, ProdMouldChangePlan::getShiftId, bo.getShiftId()) + .eq(bo.getMouldId() != null, ProdMouldChangePlan::getMouldId, bo.getMouldId()) + .eq(bo.getMaterialId() != null, ProdMouldChangePlan::getMaterialId, bo.getMaterialId()) + .eq(bo.getMachineId() != null, ProdMouldChangePlan::getMachineId, bo.getMachineId()) + .eq(StringUtils.isNotBlank(bo.getModelCode()), ProdMouldChangePlan::getModelCode, bo.getModelCode()) + .eq(StringUtils.isNotBlank(bo.getPlanStatus()), ProdMouldChangePlan::getPlanStatus, bo.getPlanStatus()) + .like(StringUtils.isNotBlank(bo.getMaterialName()), "bmi", BaseMaterialInfo::getMaterialName, bo.getMaterialName()) + .orderByAsc(ProdMouldChangePlan::getCreateTime); + return lqw; + } + + /** + * 新增模具换模计划 + * + * @param bo 模具换模计划 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ProdMouldChangePlanBo bo) { + ProdMouldChangePlan add = MapstructUtils.convert(bo, ProdMouldChangePlan.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setMouldChangePlanId(add.getMouldChangePlanId()); + } + return flag; + } + + /** + * 修改模具换模计划 + * + * @param bo 模具换模计划 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ProdMouldChangePlanBo bo) { + ProdMouldChangePlan update = MapstructUtils.convert(bo, ProdMouldChangePlan.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ProdMouldChangePlan 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/ProdMouldChangePlanMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMouldChangePlanMapper.xml new file mode 100644 index 00000000..975a9d72 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMouldChangePlanMapper.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +