diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMachineTankDetailController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMachineTankDetailController.java new file mode 100644 index 00000000..7be6dd09 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMachineTankDetailController.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.ProdMachineTankDetailVo; +import org.dromara.mes.domain.bo.ProdMachineTankDetailBo; +import org.dromara.mes.service.IProdMachineTankDetailService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 机台料罐明细 + * 前端访问路由地址为:/mes/machineTankDetail + * + * @author Yinq + * @date 2026-02-21 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/machineTankDetail") +public class ProdMachineTankDetailController extends BaseController { + + private final IProdMachineTankDetailService prodMachineTankDetailService; + + /** + * 查询机台料罐明细列表 + */ + @SaCheckPermission("mes:machineTankDetail:list") + @GetMapping("/list") + public TableDataInfo list(ProdMachineTankDetailBo bo, PageQuery pageQuery) { + return prodMachineTankDetailService.queryPageList(bo, pageQuery); + } + + /** + * 导出机台料罐明细列表 + */ + @SaCheckPermission("mes:machineTankDetail:export") + @Log(title = "机台料罐明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ProdMachineTankDetailBo bo, HttpServletResponse response) { + List list = prodMachineTankDetailService.queryList(bo); + ExcelUtil.exportExcel(list, "机台料罐明细", ProdMachineTankDetailVo.class, response); + } + + /** + * 获取机台料罐明细详细信息 + * + * @param tankDetailId 主键 + */ + @SaCheckPermission("mes:machineTankDetail:query") + @GetMapping("/{tankDetailId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long tankDetailId) { + return R.ok(prodMachineTankDetailService.queryById(tankDetailId)); + } + + /** + * 新增机台料罐明细 + */ + @SaCheckPermission("mes:machineTankDetail:add") + @Log(title = "机台料罐明细", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ProdMachineTankDetailBo bo) { + return toAjax(prodMachineTankDetailService.insertByBo(bo)); + } + + /** + * 修改机台料罐明细 + */ + @SaCheckPermission("mes:machineTankDetail:edit") + @Log(title = "机台料罐明细", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ProdMachineTankDetailBo bo) { + return toAjax(prodMachineTankDetailService.updateByBo(bo)); + } + + /** + * 删除机台料罐明细 + * + * @param tankDetailIds 主键串 + */ + @SaCheckPermission("mes:machineTankDetail:remove") + @Log(title = "机台料罐明细", businessType = BusinessType.DELETE) + @DeleteMapping("/{tankDetailIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] tankDetailIds) { + return toAjax(prodMachineTankDetailService.deleteWithValidByIds(List.of(tankDetailIds), true)); + } + + + /** + * 下拉框查询机台料罐明细列表 + */ + + @GetMapping("/getProdMachineTankDetailList") + public R> getProdMachineTankDetailList(ProdMachineTankDetailBo bo) { + List list = prodMachineTankDetailService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMachineTankTypeController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMachineTankTypeController.java new file mode 100644 index 00000000..f676d693 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMachineTankTypeController.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.ProdMachineTankTypeVo; +import org.dromara.mes.domain.bo.ProdMachineTankTypeBo; +import org.dromara.mes.service.IProdMachineTankTypeService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 机台料罐类型 + * 前端访问路由地址为:/mes/machineTankType + * + * @author Yinq + * @date 2026-02-21 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/machineTankType") +public class ProdMachineTankTypeController extends BaseController { + + private final IProdMachineTankTypeService prodMachineTankTypeService; + + /** + * 查询机台料罐类型列表 + */ + @SaCheckPermission("mes:machineTankType:list") + @GetMapping("/list") + public TableDataInfo list(ProdMachineTankTypeBo bo, PageQuery pageQuery) { + return prodMachineTankTypeService.queryPageList(bo, pageQuery); + } + + /** + * 导出机台料罐类型列表 + */ + @SaCheckPermission("mes:machineTankType:export") + @Log(title = "机台料罐类型", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ProdMachineTankTypeBo bo, HttpServletResponse response) { + List list = prodMachineTankTypeService.queryList(bo); + ExcelUtil.exportExcel(list, "机台料罐类型", ProdMachineTankTypeVo.class, response); + } + + /** + * 获取机台料罐类型详细信息 + * + * @param tankTypeId 主键 + */ + @SaCheckPermission("mes:machineTankType:query") + @GetMapping("/{tankTypeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long tankTypeId) { + return R.ok(prodMachineTankTypeService.queryById(tankTypeId)); + } + + /** + * 新增机台料罐类型 + */ + @SaCheckPermission("mes:machineTankType:add") + @Log(title = "机台料罐类型", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ProdMachineTankTypeBo bo) { + return toAjax(prodMachineTankTypeService.insertByBo(bo)); + } + + /** + * 修改机台料罐类型 + */ + @SaCheckPermission("mes:machineTankType:edit") + @Log(title = "机台料罐类型", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ProdMachineTankTypeBo bo) { + return toAjax(prodMachineTankTypeService.updateByBo(bo)); + } + + /** + * 删除机台料罐类型 + * + * @param tankTypeIds 主键串 + */ + @SaCheckPermission("mes:machineTankType:remove") + @Log(title = "机台料罐类型", businessType = BusinessType.DELETE) + @DeleteMapping("/{tankTypeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] tankTypeIds) { + return toAjax(prodMachineTankTypeService.deleteWithValidByIds(List.of(tankTypeIds), true)); + } + + + /** + * 下拉框查询机台料罐类型列表 + */ + + @GetMapping("/getProdMachineTankTypeList") + public R> getProdMachineTankTypeList(ProdMachineTankTypeBo bo) { + List list = prodMachineTankTypeService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMachineTankDetail.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMachineTankDetail.java new file mode 100644 index 00000000..e252402c --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMachineTankDetail.java @@ -0,0 +1,107 @@ +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; + +/** + * 机台料罐明细对象 prod_machine_tank_detail + * + * @author Yinq + * @date 2026-02-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("prod_machine_tank_detail") +public class ProdMachineTankDetail extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 料罐明细ID + */ + @TableId(value = "tank_detail_id", type = IdType.AUTO) + private Long tankDetailId; + + /** + * 机台ID + */ + private String machineId; + + /** + * 料罐类型 + */ + private Long tankTypeId; + + /** + * 仓位序号 + */ + private Long wareNum; + + /** + * 物料ID + */ + private Long materialId; + + /** + * 料仓优先级 + */ + private Long materPriority; + + /** + * $column.columnComment + */ + private String materUsed; + + /** + * $column.columnComment + */ + private String mkindCode; + + /** + * 称重编号 + */ + private String weighNum; + + /** + * 最小称重限额 + */ + private Long weighLimitMin; + + /** + * 最大称重限额 + */ + private Long weighLimitMax; + + /** + * 状态(0正常1停用) + */ + private String status; + + /** + * 备注 + */ + private String remark; + + /** + * 仓库ID + */ + private Long workshopId; + + /** + * 工位ID + */ + private Long stationId; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMachineTankType.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMachineTankType.java new file mode 100644 index 00000000..4cb7a703 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMachineTankType.java @@ -0,0 +1,63 @@ +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; + +/** + * 机台料罐类型对象 prod_machine_tank_type + * + * @author Yinq + * @date 2026-02-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("prod_machine_tank_type") +public class ProdMachineTankType extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 类型ID + */ + @TableId(value = "tank_type_id", type = IdType.AUTO) + private Long tankTypeId; + + /** + * 机台ID + */ + private Long machineId; + + /** + * 机台名称（关联查询，非数据库字段） + */ + @TableField(exist = false) + private String machineName; + + /** + * 罐类型 + */ + private String tankType; + + /** + * 罐数量 + */ + private Long tankCount; + + /** + * 备注 + */ + private String remark; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMachineTankDetailBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMachineTankDetailBo.java new file mode 100644 index 00000000..c6a11817 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMachineTankDetailBo.java @@ -0,0 +1,103 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.ProdMachineTankDetail; +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_machine_tank_detail + * + * @author Yinq + * @date 2026-02-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ProdMachineTankDetail.class, reverseConvertGenerate = false) +public class ProdMachineTankDetailBo extends BaseEntity { + + /** + * 料罐明细ID + */ + private Long tankDetailId; + + /** + * 机台ID + */ + @NotBlank(message = "机台ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private String machineId; + + /** + * 料罐类型 + */ + @NotNull(message = "料罐类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long tankTypeId; + + /** + * 仓位序号 + */ + @NotNull(message = "仓位序号不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long wareNum; + + /** + * 物料ID + */ + @NotNull(message = "物料ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long materialId; + + /** + * 料仓优先级 + */ + private Long materPriority; + + /** + * $column.columnComment + */ + private String materUsed; + + /** + * $column.columnComment + */ + private String mkindCode; + + /** + * 称重编号 + */ + private String weighNum; + + /** + * 最小称重限额 + */ + private Long weighLimitMin; + + /** + * 最大称重限额 + */ + private Long weighLimitMax; + + /** + * 状态(0正常1停用) + */ + private String status; + + /** + * 备注 + */ + private String remark; + + /** + * 仓库ID + */ + private Long workshopId; + + /** + * 工位ID + */ + private Long stationId; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMachineTankTypeBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMachineTankTypeBo.java new file mode 100644 index 00000000..6936f577 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMachineTankTypeBo.java @@ -0,0 +1,57 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.ProdMachineTankType; +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_machine_tank_type + * + * @author Yinq + * @date 2026-02-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ProdMachineTankType.class, reverseConvertGenerate = false) +public class ProdMachineTankTypeBo extends BaseEntity { + + /** + * 类型ID + */ + private Long tankTypeId; + + /** + * 机台ID + */ + @NotNull(message = "机台ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long machineId; + + /** + * 机台名称（关联查询） + */ + private String machineName; + + /** + * 罐类型 + */ + @NotBlank(message = "罐类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String tankType; + + /** + * 罐数量 + */ + @NotNull(message = "罐数量不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long tankCount; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMachineTankDetailVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMachineTankDetailVo.java new file mode 100644 index 00000000..1ccd5414 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMachineTankDetailVo.java @@ -0,0 +1,125 @@ +package org.dromara.mes.domain.vo; + +import org.dromara.mes.domain.ProdMachineTankDetail; +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_machine_tank_detail + * + * @author Yinq + * @date 2026-02-21 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ProdMachineTankDetail.class) +public class ProdMachineTankDetailVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 料罐明细ID + */ + @ExcelProperty(value = "料罐明细ID") + private Long tankDetailId; + + /** + * 机台ID + */ + @ExcelProperty(value = "机台ID") + private String machineId; + + /** + * 料罐类型 + */ + @ExcelProperty(value = "料罐类型") + private Long tankTypeId; + + /** + * 仓位序号 + */ + @ExcelProperty(value = "仓位序号") + private Long wareNum; + + /** + * 物料ID + */ + @ExcelProperty(value = "物料ID") + private Long materialId; + + /** + * 料仓优先级 + */ + @ExcelProperty(value = "料仓优先级") + private Long materPriority; + + /** + * $column.columnComment + */ + @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "$column.readConverterExp()") + private String materUsed; + + /** + * $column.columnComment + */ + @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "$column.readConverterExp()") + private String mkindCode; + + /** + * 称重编号 + */ + @ExcelProperty(value = "称重编号") + private String weighNum; + + /** + * 最小称重限额 + */ + @ExcelProperty(value = "最小称重限额") + private Long weighLimitMin; + + /** + * 最大称重限额 + */ + @ExcelProperty(value = "最大称重限额") + private Long weighLimitMax; + + /** + * 状态(0正常1停用) + */ + @ExcelProperty(value = "状态(0正常1停用)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_show_hide") + private String status; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 仓库ID + */ + @ExcelProperty(value = "仓库ID") + private Long workshopId; + + /** + * 工位ID + */ + @ExcelProperty(value = "工位ID") + private Long stationId; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMachineTankTypeVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMachineTankTypeVo.java new file mode 100644 index 00000000..c1e5d906 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMachineTankTypeVo.java @@ -0,0 +1,68 @@ +package org.dromara.mes.domain.vo; + +import org.dromara.mes.domain.ProdMachineTankType; +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_machine_tank_type + * + * @author Yinq + * @date 2026-02-21 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ProdMachineTankType.class) +public class ProdMachineTankTypeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 类型ID + */ + @ExcelProperty(value = "类型ID") + private Long tankTypeId; + + /** + * 机台ID + */ + @ExcelProperty(value = "机台ID") + private Long machineId; + + /** + * 机台名称（关联查询） + */ + private String machineName; + + /** + * 罐类型 + */ + @ExcelProperty(value = "罐类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "tank_type") + private String tankType; + + /** + * 罐数量 + */ + @ExcelProperty(value = "罐数量") + private Long tankCount; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdMachineTankDetailMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdMachineTankDetailMapper.java new file mode 100644 index 00000000..e3bad5f7 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdMachineTankDetailMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.ProdMachineTankDetail; +import org.dromara.mes.domain.vo.ProdMachineTankDetailVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 机台料罐明细Mapper接口 + * + * @author Yinq + * @date 2026-02-21 + */ +public interface ProdMachineTankDetailMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdMachineTankTypeMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdMachineTankTypeMapper.java new file mode 100644 index 00000000..312aef72 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdMachineTankTypeMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.ProdMachineTankType; +import org.dromara.mes.domain.vo.ProdMachineTankTypeVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 机台料罐类型Mapper接口 + * + * @author Yinq + * @date 2026-02-21 + */ +public interface ProdMachineTankTypeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMachineTankDetailService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMachineTankDetailService.java new file mode 100644 index 00000000..191c3b75 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMachineTankDetailService.java @@ -0,0 +1,69 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.ProdMachineTankDetail; +import org.dromara.mes.domain.vo.ProdMachineTankDetailVo; +import org.dromara.mes.domain.bo.ProdMachineTankDetailBo; +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 2026-02-21 + */ +public interface IProdMachineTankDetailService { + + /** + * 查询机台料罐明细 + * + * @param tankDetailId 主键 + * @return 机台料罐明细 + */ + ProdMachineTankDetailVo queryById(Long tankDetailId); + + /** + * 分页查询机台料罐明细列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 机台料罐明细分页列表 + */ + TableDataInfo queryPageList(ProdMachineTankDetailBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的机台料罐明细列表 + * + * @param bo 查询条件 + * @return 机台料罐明细列表 + */ + List queryList(ProdMachineTankDetailBo bo); + + /** + * 新增机台料罐明细 + * + * @param bo 机台料罐明细 + * @return 是否新增成功 + */ + Boolean insertByBo(ProdMachineTankDetailBo bo); + + /** + * 修改机台料罐明细 + * + * @param bo 机台料罐明细 + * @return 是否修改成功 + */ + Boolean updateByBo(ProdMachineTankDetailBo 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/IProdMachineTankTypeService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMachineTankTypeService.java new file mode 100644 index 00000000..9b6e7281 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMachineTankTypeService.java @@ -0,0 +1,69 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.ProdMachineTankType; +import org.dromara.mes.domain.vo.ProdMachineTankTypeVo; +import org.dromara.mes.domain.bo.ProdMachineTankTypeBo; +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 2026-02-21 + */ +public interface IProdMachineTankTypeService { + + /** + * 查询机台料罐类型 + * + * @param tankTypeId 主键 + * @return 机台料罐类型 + */ + ProdMachineTankTypeVo queryById(Long tankTypeId); + + /** + * 分页查询机台料罐类型列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 机台料罐类型分页列表 + */ + TableDataInfo queryPageList(ProdMachineTankTypeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的机台料罐类型列表 + * + * @param bo 查询条件 + * @return 机台料罐类型列表 + */ + List queryList(ProdMachineTankTypeBo bo); + + /** + * 新增机台料罐类型 + * + * @param bo 机台料罐类型 + * @return 是否新增成功 + */ + Boolean insertByBo(ProdMachineTankTypeBo bo); + + /** + * 修改机台料罐类型 + * + * @param bo 机台料罐类型 + * @return 是否修改成功 + */ + Boolean updateByBo(ProdMachineTankTypeBo 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/ProdMachineTankDetailServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMachineTankDetailServiceImpl.java new file mode 100644 index 00000000..b62d883c --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMachineTankDetailServiceImpl.java @@ -0,0 +1,145 @@ +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.ProdMachineTankDetailBo; +import org.dromara.mes.domain.vo.ProdMachineTankDetailVo; +import org.dromara.mes.domain.ProdMachineTankDetail; +import org.dromara.mes.mapper.ProdMachineTankDetailMapper; +import org.dromara.mes.service.IProdMachineTankDetailService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 机台料罐明细Service业务层处理 + * + * @author Yinq + * @date 2026-02-21 + */ +@RequiredArgsConstructor +@Service +public class ProdMachineTankDetailServiceImpl implements IProdMachineTankDetailService { + + private final ProdMachineTankDetailMapper baseMapper; + + /** + * 查询机台料罐明细 + * + * @param tankDetailId 主键 + * @return 机台料罐明细 + */ + @Override + public ProdMachineTankDetailVo queryById(Long tankDetailId){ + return baseMapper.selectVoById(tankDetailId); + } + + /** + * 分页查询机台料罐明细列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 机台料罐明细分页列表 + */ + @Override + public TableDataInfo queryPageList(ProdMachineTankDetailBo 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(ProdMachineTankDetailBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ProdMachineTankDetailBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdMachineTankDetail.class) + .selectAll(ProdMachineTankDetail.class) + .eq(bo.getTankDetailId() != null, ProdMachineTankDetail::getTankDetailId, bo.getTankDetailId()) + .eq(StringUtils.isNotBlank(bo.getMachineId()), ProdMachineTankDetail::getMachineId, bo.getMachineId()) + .eq(bo.getTankTypeId() != null, ProdMachineTankDetail::getTankTypeId, bo.getTankTypeId()) + .eq(bo.getWareNum() != null, ProdMachineTankDetail::getWareNum, bo.getWareNum()) + .eq(bo.getMaterialId() != null, ProdMachineTankDetail::getMaterialId, bo.getMaterialId()) + .eq(bo.getMaterPriority() != null, ProdMachineTankDetail::getMaterPriority, bo.getMaterPriority()) + .eq(StringUtils.isNotBlank(bo.getMaterUsed()), ProdMachineTankDetail::getMaterUsed, bo.getMaterUsed()) + .eq(StringUtils.isNotBlank(bo.getMkindCode()), ProdMachineTankDetail::getMkindCode, bo.getMkindCode()) + .eq(StringUtils.isNotBlank(bo.getWeighNum()), ProdMachineTankDetail::getWeighNum, bo.getWeighNum()) + .eq(bo.getWeighLimitMin() != null, ProdMachineTankDetail::getWeighLimitMin, bo.getWeighLimitMin()) + .eq(bo.getWeighLimitMax() != null, ProdMachineTankDetail::getWeighLimitMax, bo.getWeighLimitMax()) + .eq(StringUtils.isNotBlank(bo.getStatus()), ProdMachineTankDetail::getStatus, bo.getStatus()) + .eq(bo.getWorkshopId() != null, ProdMachineTankDetail::getWorkshopId, bo.getWorkshopId()) + .eq(bo.getStationId() != null, ProdMachineTankDetail::getStationId, bo.getStationId()) + .orderByDesc(ProdMachineTankDetail::getCreateTime); + return lqw; + } + + /** + * 新增机台料罐明细 + * + * @param bo 机台料罐明细 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ProdMachineTankDetailBo bo) { + ProdMachineTankDetail add = MapstructUtils.convert(bo, ProdMachineTankDetail.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTankDetailId(add.getTankDetailId()); + } + return flag; + } + + /** + * 修改机台料罐明细 + * + * @param bo 机台料罐明细 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ProdMachineTankDetailBo bo) { + ProdMachineTankDetail update = MapstructUtils.convert(bo, ProdMachineTankDetail.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ProdMachineTankDetail 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/java/org/dromara/mes/service/impl/ProdMachineTankTypeServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMachineTankTypeServiceImpl.java new file mode 100644 index 00000000..8a4dfed5 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMachineTankTypeServiceImpl.java @@ -0,0 +1,138 @@ +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.ProdMachineTankTypeBo; +import org.dromara.mes.domain.vo.ProdMachineTankTypeVo; +import org.dromara.mes.domain.ProdBaseMachineInfo; +import org.dromara.mes.domain.ProdMachineTankType; +import org.dromara.mes.mapper.ProdMachineTankTypeMapper; +import org.dromara.mes.service.IProdMachineTankTypeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 机台料罐类型Service业务层处理 + * + * @author Yinq + * @date 2026-02-21 + */ +@RequiredArgsConstructor +@Service +public class ProdMachineTankTypeServiceImpl implements IProdMachineTankTypeService { + + private final ProdMachineTankTypeMapper baseMapper; + + /** + * 查询机台料罐类型 + * + * @param tankTypeId 主键 + * @return 机台料罐类型 + */ + @Override + public ProdMachineTankTypeVo queryById(Long tankTypeId){ + return baseMapper.selectVoById(tankTypeId); + } + + /** + * 分页查询机台料罐类型列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 机台料罐类型分页列表 + */ + @Override + public TableDataInfo queryPageList(ProdMachineTankTypeBo 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(ProdMachineTankTypeBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ProdMachineTankTypeBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdMachineTankType.class) + .selectAll(ProdMachineTankType.class) + .select(ProdBaseMachineInfo::getMachineName) + .leftJoin(ProdBaseMachineInfo.class, ProdBaseMachineInfo::getMachineId, ProdMachineTankType::getMachineId) + .eq(bo.getTankTypeId() != null, ProdMachineTankType::getTankTypeId, bo.getTankTypeId()) + .eq(bo.getMachineId() != null, ProdMachineTankType::getMachineId, bo.getMachineId()) + .eq(StringUtils.isNotBlank(bo.getTankType()), ProdMachineTankType::getTankType, bo.getTankType()) + .eq(bo.getTankCount() != null, ProdMachineTankType::getTankCount, bo.getTankCount()) + .orderByDesc(ProdMachineTankType::getCreateTime); + return lqw; + } + + /** + * 新增机台料罐类型 + * + * @param bo 机台料罐类型 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ProdMachineTankTypeBo bo) { + ProdMachineTankType add = MapstructUtils.convert(bo, ProdMachineTankType.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTankTypeId(add.getTankTypeId()); + } + return flag; + } + + /** + * 修改机台料罐类型 + * + * @param bo 机台料罐类型 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ProdMachineTankTypeBo bo) { + ProdMachineTankType update = MapstructUtils.convert(bo, ProdMachineTankType.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ProdMachineTankType 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/ProdMachineTankDetailMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMachineTankDetailMapper.xml new file mode 100644 index 00000000..dd4a2a5f --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMachineTankDetailMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMachineTankTypeMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMachineTankTypeMapper.xml new file mode 100644 index 00000000..78d57f0c --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMachineTankTypeMapper.xml @@ -0,0 +1,7 @@ + + + + +