diff --git a/klp-generator/src/main/resources/generator.yml b/klp-generator/src/main/resources/generator.yml index 872dbed3..9ab947be 100644 --- a/klp-generator/src/main/resources/generator.yml +++ b/klp-generator/src/main/resources/generator.yml @@ -3,7 +3,7 @@ gen: # 作者 author: klp # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.klp.system + packageName: com.klp # 自动去除表前缀,默认是false autoRemovePre: false # 表前缀(生成类名不会包含表前缀,多个用逗号分隔) diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpAuxiliaryConsumeController.java b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpAuxiliaryConsumeController.java new file mode 100644 index 00000000..71770087 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpAuxiliaryConsumeController.java @@ -0,0 +1,99 @@ +package com.klp.mes.eqp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.mes.eqp.domain.vo.EqpAuxiliaryConsumeVo; +import com.klp.mes.eqp.domain.bo.EqpAuxiliaryConsumeBo; +import com.klp.mes.eqp.service.IEqpAuxiliaryConsumeService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 公辅消耗记录 + * + * @author klp + * @date 2026-04-29 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/eqp/auxiliaryConsume") +public class EqpAuxiliaryConsumeController extends BaseController { + + private final IEqpAuxiliaryConsumeService iEqpAuxiliaryConsumeService; + + /** + * 查询公辅消耗记录列表 + */ + @GetMapping("/list") + public TableDataInfo list(EqpAuxiliaryConsumeBo bo, PageQuery pageQuery) { + return iEqpAuxiliaryConsumeService.queryPageList(bo, pageQuery); + } + + /** + * 导出公辅消耗记录列表 + */ + @Log(title = "公辅消耗记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqpAuxiliaryConsumeBo bo, HttpServletResponse response) { + List list = iEqpAuxiliaryConsumeService.queryList(bo); + ExcelUtil.exportExcel(list, "公辅消耗记录", EqpAuxiliaryConsumeVo.class, response); + } + + /** + * 获取公辅消耗记录详细信息 + * + * @param consumeId 主键 + */ + @GetMapping("/{consumeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long consumeId) { + return R.ok(iEqpAuxiliaryConsumeService.queryById(consumeId)); + } + + /** + * 新增公辅消耗记录 + */ + @Log(title = "公辅消耗记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqpAuxiliaryConsumeBo bo) { + return toAjax(iEqpAuxiliaryConsumeService.insertByBo(bo)); + } + + /** + * 修改公辅消耗记录 + */ + @Log(title = "公辅消耗记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqpAuxiliaryConsumeBo bo) { + return toAjax(iEqpAuxiliaryConsumeService.updateByBo(bo)); + } + + /** + * 删除公辅消耗记录 + * + * @param consumeIds 主键串 + */ + @Log(title = "公辅消耗记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{consumeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] consumeIds) { + return toAjax(iEqpAuxiliaryConsumeService.deleteWithValidByIds(Arrays.asList(consumeIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpAuxiliaryTypeController.java b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpAuxiliaryTypeController.java new file mode 100644 index 00000000..75123b26 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpAuxiliaryTypeController.java @@ -0,0 +1,99 @@ +package com.klp.mes.eqp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.mes.eqp.domain.vo.EqpAuxiliaryTypeVo; +import com.klp.mes.eqp.domain.bo.EqpAuxiliaryTypeBo; +import com.klp.mes.eqp.service.IEqpAuxiliaryTypeService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 公辅类型 + * + * @author klp + * @date 2026-04-29 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/eqp/auxiliaryType") +public class EqpAuxiliaryTypeController extends BaseController { + + private final IEqpAuxiliaryTypeService iEqpAuxiliaryTypeService; + + /** + * 查询公辅类型列表 + */ + @GetMapping("/list") + public TableDataInfo list(EqpAuxiliaryTypeBo bo, PageQuery pageQuery) { + return iEqpAuxiliaryTypeService.queryPageList(bo, pageQuery); + } + + /** + * 导出公辅类型列表 + */ + @Log(title = "公辅类型", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EqpAuxiliaryTypeBo bo, HttpServletResponse response) { + List list = iEqpAuxiliaryTypeService.queryList(bo); + ExcelUtil.exportExcel(list, "公辅类型", EqpAuxiliaryTypeVo.class, response); + } + + /** + * 获取公辅类型详细信息 + * + * @param typeId 主键 + */ + @GetMapping("/{typeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long typeId) { + return R.ok(iEqpAuxiliaryTypeService.queryById(typeId)); + } + + /** + * 新增公辅类型 + */ + @Log(title = "公辅类型", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EqpAuxiliaryTypeBo bo) { + return toAjax(iEqpAuxiliaryTypeService.insertByBo(bo)); + } + + /** + * 修改公辅类型 + */ + @Log(title = "公辅类型", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EqpAuxiliaryTypeBo bo) { + return toAjax(iEqpAuxiliaryTypeService.updateByBo(bo)); + } + + /** + * 删除公辅类型 + * + * @param typeIds 主键串 + */ + @Log(title = "公辅类型", businessType = BusinessType.DELETE) + @DeleteMapping("/{typeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] typeIds) { + return toAjax(iEqpAuxiliaryTypeService.deleteWithValidByIds(Arrays.asList(typeIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpAuxiliaryConsume.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpAuxiliaryConsume.java new file mode 100644 index 00000000..33857532 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpAuxiliaryConsume.java @@ -0,0 +1,52 @@ +package com.klp.mes.eqp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 公辅消耗记录对象 eqp_auxiliary_consume + * + * @author klp + * @date 2026-04-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eqp_auxiliary_consume") +public class EqpAuxiliaryConsume extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 消耗记录ID + */ + @TableId(value = "consume_id") + private Long consumeId; + /** + * 记录日期 + */ + private Date recordDate; + /** + * 公辅类型ID(关联ems_auxiliary_type) + */ + private Long typeId; + /** + * 消耗量 + */ + private BigDecimal consume; + /** + * 删除标志(0=存在 2=删除) + */ + @TableLogic + private String delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpAuxiliaryType.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpAuxiliaryType.java new file mode 100644 index 00000000..5a74f64d --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpAuxiliaryType.java @@ -0,0 +1,45 @@ +package com.klp.mes.eqp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 公辅类型对象 eqp_auxiliary_type + * + * @author klp + * @date 2026-04-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("eqp_auxiliary_type") +public class EqpAuxiliaryType extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 公辅类型ID + */ + @TableId(value = "type_id") + private Long typeId; + /** + * 公辅类型名称 + */ + private String typeName; + /** + * 产线名称 + */ + private String lineName; + /** + * 删除标志(0=存在 2=删除) + */ + @TableLogic + private String delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpAuxiliaryConsumeBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpAuxiliaryConsumeBo.java new file mode 100644 index 00000000..b61c1cc3 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpAuxiliaryConsumeBo.java @@ -0,0 +1,49 @@ +package com.klp.mes.eqp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 公辅消耗记录业务对象 eqp_auxiliary_consume + * + * @author klp + * @date 2026-04-29 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class EqpAuxiliaryConsumeBo extends BaseEntity { + + /** + * 消耗记录ID + */ + private Long consumeId; + + /** + * 记录日期 + */ + private Date recordDate; + + /** + * 公辅类型ID(关联ems_auxiliary_type) + */ + private Long typeId; + + /** + * 消耗量 + */ + private BigDecimal consume; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpAuxiliaryTypeBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpAuxiliaryTypeBo.java new file mode 100644 index 00000000..92724888 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpAuxiliaryTypeBo.java @@ -0,0 +1,41 @@ +package com.klp.mes.eqp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 公辅类型业务对象 eqp_auxiliary_type + * + * @author klp + * @date 2026-04-29 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class EqpAuxiliaryTypeBo extends BaseEntity { + + /** + * 公辅类型ID + */ + private Long typeId; + + /** + * 公辅类型名称 + */ + private String typeName; + + /** + * 产线名称 + */ + private String lineName; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpAuxiliaryConsumeVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpAuxiliaryConsumeVo.java new file mode 100644 index 00000000..a28b9a6c --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpAuxiliaryConsumeVo.java @@ -0,0 +1,57 @@ +package com.klp.mes.eqp.domain.vo; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 公辅消耗记录视图对象 eqp_auxiliary_consume + * + * @author klp + * @date 2026-04-29 + */ +@Data +@ExcelIgnoreUnannotated +public class EqpAuxiliaryConsumeVo { + + private static final long serialVersionUID = 1L; + + /** + * 消耗记录ID + */ + @ExcelProperty(value = "消耗记录ID") + private Long consumeId; + + /** + * 记录日期 + */ + @ExcelProperty(value = "记录日期") + private Date recordDate; + + /** + * 公辅类型ID(关联ems_auxiliary_type) + */ + @ExcelProperty(value = "公辅类型ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "关=联ems_auxiliary_type") + private Long typeId; + + /** + * 消耗量 + */ + @ExcelProperty(value = "消耗量") + private BigDecimal consume; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpAuxiliaryTypeVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpAuxiliaryTypeVo.java new file mode 100644 index 00000000..39c13b41 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpAuxiliaryTypeVo.java @@ -0,0 +1,47 @@ +package com.klp.mes.eqp.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 公辅类型视图对象 eqp_auxiliary_type + * + * @author klp + * @date 2026-04-29 + */ +@Data +@ExcelIgnoreUnannotated +public class EqpAuxiliaryTypeVo { + + private static final long serialVersionUID = 1L; + + /** + * 公辅类型ID + */ + @ExcelProperty(value = "公辅类型ID") + private Long typeId; + + /** + * 公辅类型名称 + */ + @ExcelProperty(value = "公辅类型名称") + private String typeName; + + /** + * 产线名称 + */ + @ExcelProperty(value = "产线名称") + private String lineName; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpAuxiliaryConsumeMapper.java b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpAuxiliaryConsumeMapper.java new file mode 100644 index 00000000..ca96d371 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpAuxiliaryConsumeMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.eqp.mapper; + +import com.klp.mes.eqp.domain.EqpAuxiliaryConsume; +import com.klp.mes.eqp.domain.vo.EqpAuxiliaryConsumeVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 公辅消耗记录Mapper接口 + * + * @author klp + * @date 2026-04-29 + */ +public interface EqpAuxiliaryConsumeMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpAuxiliaryTypeMapper.java b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpAuxiliaryTypeMapper.java new file mode 100644 index 00000000..01a8b0bd --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpAuxiliaryTypeMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.eqp.mapper; + +import com.klp.mes.eqp.domain.EqpAuxiliaryType; +import com.klp.mes.eqp.domain.vo.EqpAuxiliaryTypeVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 公辅类型Mapper接口 + * + * @author klp + * @date 2026-04-29 + */ +public interface EqpAuxiliaryTypeMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpAuxiliaryConsumeService.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpAuxiliaryConsumeService.java new file mode 100644 index 00000000..f6f24259 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpAuxiliaryConsumeService.java @@ -0,0 +1,49 @@ +package com.klp.mes.eqp.service; + +import com.klp.mes.eqp.domain.EqpAuxiliaryConsume; +import com.klp.mes.eqp.domain.vo.EqpAuxiliaryConsumeVo; +import com.klp.mes.eqp.domain.bo.EqpAuxiliaryConsumeBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 公辅消耗记录Service接口 + * + * @author klp + * @date 2026-04-29 + */ +public interface IEqpAuxiliaryConsumeService { + + /** + * 查询公辅消耗记录 + */ + EqpAuxiliaryConsumeVo queryById(Long consumeId); + + /** + * 查询公辅消耗记录列表 + */ + TableDataInfo queryPageList(EqpAuxiliaryConsumeBo bo, PageQuery pageQuery); + + /** + * 查询公辅消耗记录列表 + */ + List queryList(EqpAuxiliaryConsumeBo bo); + + /** + * 新增公辅消耗记录 + */ + Boolean insertByBo(EqpAuxiliaryConsumeBo bo); + + /** + * 修改公辅消耗记录 + */ + Boolean updateByBo(EqpAuxiliaryConsumeBo bo); + + /** + * 校验并批量删除公辅消耗记录信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpAuxiliaryTypeService.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpAuxiliaryTypeService.java new file mode 100644 index 00000000..d8bc20d7 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpAuxiliaryTypeService.java @@ -0,0 +1,49 @@ +package com.klp.mes.eqp.service; + +import com.klp.mes.eqp.domain.EqpAuxiliaryType; +import com.klp.mes.eqp.domain.vo.EqpAuxiliaryTypeVo; +import com.klp.mes.eqp.domain.bo.EqpAuxiliaryTypeBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 公辅类型Service接口 + * + * @author klp + * @date 2026-04-29 + */ +public interface IEqpAuxiliaryTypeService { + + /** + * 查询公辅类型 + */ + EqpAuxiliaryTypeVo queryById(Long typeId); + + /** + * 查询公辅类型列表 + */ + TableDataInfo queryPageList(EqpAuxiliaryTypeBo bo, PageQuery pageQuery); + + /** + * 查询公辅类型列表 + */ + List queryList(EqpAuxiliaryTypeBo bo); + + /** + * 新增公辅类型 + */ + Boolean insertByBo(EqpAuxiliaryTypeBo bo); + + /** + * 修改公辅类型 + */ + Boolean updateByBo(EqpAuxiliaryTypeBo bo); + + /** + * 校验并批量删除公辅类型信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryConsumeServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryConsumeServiceImpl.java new file mode 100644 index 00000000..f7df9991 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryConsumeServiceImpl.java @@ -0,0 +1,110 @@ +package com.klp.mes.eqp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.mes.eqp.domain.bo.EqpAuxiliaryConsumeBo; +import com.klp.mes.eqp.domain.vo.EqpAuxiliaryConsumeVo; +import com.klp.mes.eqp.domain.EqpAuxiliaryConsume; +import com.klp.mes.eqp.mapper.EqpAuxiliaryConsumeMapper; +import com.klp.mes.eqp.service.IEqpAuxiliaryConsumeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 公辅消耗记录Service业务层处理 + * + * @author klp + * @date 2026-04-29 + */ +@RequiredArgsConstructor +@Service +public class EqpAuxiliaryConsumeServiceImpl implements IEqpAuxiliaryConsumeService { + + private final EqpAuxiliaryConsumeMapper baseMapper; + + /** + * 查询公辅消耗记录 + */ + @Override + public EqpAuxiliaryConsumeVo queryById(Long consumeId){ + return baseMapper.selectVoById(consumeId); + } + + /** + * 查询公辅消耗记录列表 + */ + @Override + public TableDataInfo queryPageList(EqpAuxiliaryConsumeBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询公辅消耗记录列表 + */ + @Override + public List queryList(EqpAuxiliaryConsumeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqpAuxiliaryConsumeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getRecordDate() != null, EqpAuxiliaryConsume::getRecordDate, bo.getRecordDate()); + lqw.eq(bo.getTypeId() != null, EqpAuxiliaryConsume::getTypeId, bo.getTypeId()); + lqw.eq(bo.getConsume() != null, EqpAuxiliaryConsume::getConsume, bo.getConsume()); + return lqw; + } + + /** + * 新增公辅消耗记录 + */ + @Override + public Boolean insertByBo(EqpAuxiliaryConsumeBo bo) { + EqpAuxiliaryConsume add = BeanUtil.toBean(bo, EqpAuxiliaryConsume.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setConsumeId(add.getConsumeId()); + } + return flag; + } + + /** + * 修改公辅消耗记录 + */ + @Override + public Boolean updateByBo(EqpAuxiliaryConsumeBo bo) { + EqpAuxiliaryConsume update = BeanUtil.toBean(bo, EqpAuxiliaryConsume.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqpAuxiliaryConsume entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除公辅消耗记录 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryTypeServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryTypeServiceImpl.java new file mode 100644 index 00000000..430811a0 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryTypeServiceImpl.java @@ -0,0 +1,110 @@ +package com.klp.mes.eqp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.mes.eqp.domain.bo.EqpAuxiliaryTypeBo; +import com.klp.mes.eqp.domain.vo.EqpAuxiliaryTypeVo; +import com.klp.mes.eqp.domain.EqpAuxiliaryType; +import com.klp.mes.eqp.mapper.EqpAuxiliaryTypeMapper; +import com.klp.mes.eqp.service.IEqpAuxiliaryTypeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 公辅类型Service业务层处理 + * + * @author klp + * @date 2026-04-29 + */ +@RequiredArgsConstructor +@Service +public class EqpAuxiliaryTypeServiceImpl implements IEqpAuxiliaryTypeService { + + private final EqpAuxiliaryTypeMapper baseMapper; + + /** + * 查询公辅类型 + */ + @Override + public EqpAuxiliaryTypeVo queryById(Long typeId){ + return baseMapper.selectVoById(typeId); + } + + /** + * 查询公辅类型列表 + */ + @Override + public TableDataInfo queryPageList(EqpAuxiliaryTypeBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询公辅类型列表 + */ + @Override + public List queryList(EqpAuxiliaryTypeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EqpAuxiliaryTypeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getTypeName()), EqpAuxiliaryType::getTypeName, bo.getTypeName()); + lqw.like(StringUtils.isNotBlank(bo.getLineName()), EqpAuxiliaryType::getLineName, bo.getLineName()); + return lqw; + } + + /** + * 新增公辅类型 + */ + @Override + public Boolean insertByBo(EqpAuxiliaryTypeBo bo) { + EqpAuxiliaryType add = BeanUtil.toBean(bo, EqpAuxiliaryType.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTypeId(add.getTypeId()); + } + return flag; + } + + /** + * 修改公辅类型 + */ + @Override + public Boolean updateByBo(EqpAuxiliaryTypeBo bo) { + EqpAuxiliaryType update = BeanUtil.toBean(bo, EqpAuxiliaryType.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EqpAuxiliaryType entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除公辅类型 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpAuxiliaryConsumeMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpAuxiliaryConsumeMapper.xml new file mode 100644 index 00000000..b3cba302 --- /dev/null +++ b/klp-mes/src/main/resources/mapper/eqp/EqpAuxiliaryConsumeMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpAuxiliaryTypeMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpAuxiliaryTypeMapper.xml new file mode 100644 index 00000000..b652ae42 --- /dev/null +++ b/klp-mes/src/main/resources/mapper/eqp/EqpAuxiliaryTypeMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + +