From dd3625c6e5c175dcf706f03e703c90f75bb2bd18 Mon Sep 17 00:00:00 2001 From: zch Date: Tue, 7 Jan 2025 11:08:06 +0800 Subject: [PATCH] =?UTF-8?q?add(hwmom-mes):=20=E6=96=B0=E5=A2=9E=E7=8F=AD?= =?UTF-8?q?=E7=BB=84=E4=BF=A1=E6=81=AF=E5=92=8C=E7=8F=AD=E6=AC=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加了班组信息(BaseClassTeamInfo)和班次信息(BaseShiftInfo)的实体类、业务对象类、控制器、Mapper接口和实现类、服务接口和实现类以及视图对象类 --- .../BaseClassTeamInfoController.java | 117 +++++++++++++ .../controller/BaseShiftInfoController.java | 118 +++++++++++++ .../dromara/mes/domain/BaseClassTeamInfo.java | 89 ++++++++++ .../org/dromara/mes/domain/BaseShiftInfo.java | 70 ++++++++ .../mes/domain/bo/BaseClassTeamInfoBo.java | 78 +++++++++ .../mes/domain/bo/BaseShiftInfoBo.java | 78 +++++++++ .../mes/domain/vo/BaseClassTeamInfoVo.java | 138 +++++++++++++++ .../mes/domain/vo/BaseShiftInfoVo.java | 126 ++++++++++++++ .../mes/mapper/BaseClassTeamInfoMapper.java | 15 ++ .../mes/mapper/BaseShiftInfoMapper.java | 15 ++ .../service/IBaseClassTeamInfoService.java | 70 ++++++++ .../mes/service/IBaseShiftInfoService.java | 72 ++++++++ .../impl/BaseClassTeamInfoServiceImpl.java | 158 ++++++++++++++++++ .../impl/BaseShiftInfoServiceImpl.java | 149 +++++++++++++++++ .../mapper/mes/BaseClassTeamInfoMapper.xml | 7 + .../mapper/mes/BaseShiftInfoMapper.xml | 7 + 16 files changed, 1307 insertions(+) create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseClassTeamInfoController.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseShiftInfoController.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseClassTeamInfo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseShiftInfo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseClassTeamInfoBo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseShiftInfoBo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseClassTeamInfoVo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseShiftInfoVo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseClassTeamInfoMapper.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseShiftInfoMapper.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseClassTeamInfoService.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseShiftInfoService.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseClassTeamInfoServiceImpl.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseShiftInfoServiceImpl.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseClassTeamInfoMapper.xml create mode 100644 ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseShiftInfoMapper.xml diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseClassTeamInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseClassTeamInfoController.java new file mode 100644 index 00000000..0be4424d --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseClassTeamInfoController.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.BaseClassTeamInfoVo; +import org.dromara.mes.domain.bo.BaseClassTeamInfoBo; +import org.dromara.mes.service.IBaseClassTeamInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + + + +/** + * 班组信息 + * 前端访问路由地址为:/mes/baseClassTeamInfo + * + * @author ZangCH + * @date 2025-01-06 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/baseClassTeamInfo") +public class BaseClassTeamInfoController extends BaseController { + + private final IBaseClassTeamInfoService baseClassTeamInfoService; + + /** + * 查询班组信息列表 + */ + @SaCheckPermission("mes:baseClassTeamInfo:list") + @GetMapping("/list") + public TableDataInfo list(BaseClassTeamInfoBo bo, PageQuery pageQuery) { + return baseClassTeamInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出班组信息列表 + */ + @SaCheckPermission("mes:baseClassTeamInfo:export") + @Log(title = "班组信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(BaseClassTeamInfoBo bo, HttpServletResponse response) { + List list = baseClassTeamInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "班组信息", BaseClassTeamInfoVo.class, response); + } + + /** + * 获取班组信息详细信息 + * + * @param classTeamId 主键 + */ + @SaCheckPermission("mes:baseClassTeamInfo:query") + @GetMapping("/{classTeamId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long classTeamId) { + return R.ok(baseClassTeamInfoService.queryById(classTeamId)); + } + + /** + * 新增班组信息 + */ + @SaCheckPermission("mes:baseClassTeamInfo:add") + @Log(title = "班组信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody BaseClassTeamInfoBo bo) { + return toAjax(baseClassTeamInfoService.insertByBo(bo)); + } + + /** + * 修改班组信息 + */ + @SaCheckPermission("mes:baseClassTeamInfo:edit") + @Log(title = "班组信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody BaseClassTeamInfoBo bo) { + return toAjax(baseClassTeamInfoService.updateByBo(bo)); + } + + /** + * 删除班组信息 + * + * @param classTeamIds 主键串 + */ + @SaCheckPermission("mes:baseClassTeamInfo:remove") + @Log(title = "班组信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{classTeamIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] classTeamIds) { + return toAjax(baseClassTeamInfoService.deleteWithValidByIds(List.of(classTeamIds), true)); + } + + /** + * 查询班组信息列表 + */ + @SaCheckPermission("mes:baseClassTeamInfo:list") + @GetMapping("/selectList") + public R>selectClassTeamList(BaseClassTeamInfoBo bo, PageQuery pageQuery) { + return R.ok(baseClassTeamInfoService.queryList(bo)); + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseShiftInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseShiftInfoController.java new file mode 100644 index 00000000..ea5cf861 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseShiftInfoController.java @@ -0,0 +1,118 @@ +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.BaseShiftInfoVo; +import org.dromara.mes.domain.bo.BaseShiftInfoBo; +import org.dromara.mes.service.IBaseShiftInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 班次信息 + * 前端访问路由地址为:/mes/BaseShiftInfo + * + * @author LionLi + * @date 2025-01-06 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/baseShiftInfo") +public class BaseShiftInfoController extends BaseController { + + private final IBaseShiftInfoService baseShiftInfoService; + + /** + * 查询班次信息列表 + */ + @SaCheckPermission("mes:baseShiftInfo:list") + @GetMapping("/list") + public TableDataInfo list(BaseShiftInfoBo bo, PageQuery pageQuery) { + return baseShiftInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出班次信息列表 + */ + @SaCheckPermission("mes:baseShiftInfo:export") + @Log(title = "班次信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(BaseShiftInfoBo bo, HttpServletResponse response) { + List list = baseShiftInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "班次信息", BaseShiftInfoVo.class, response); + } + + /** + * 获取班次信息详细信息 + * + * @param shiftId 主键 + */ + @SaCheckPermission("mes:baseShiftInfo:query") + @GetMapping("/{shiftId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long shiftId) { + return R.ok(baseShiftInfoService.queryById(shiftId)); + } + + /** + * 新增班次信息 + */ + @SaCheckPermission("mes:baseShiftInfo:add") + @Log(title = "班次信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody BaseShiftInfoBo bo) { + return toAjax(baseShiftInfoService.insertByBo(bo)); + } + + /** + * 修改班次信息 + */ + @SaCheckPermission("mes:baseShiftInfo:edit") + @Log(title = "班次信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody BaseShiftInfoBo bo) { + return toAjax(baseShiftInfoService.updateByBo(bo)); + } + + /** + * 删除班次信息 + * + * @param shiftIds 主键串 + */ + @SaCheckPermission("mes:baseShiftInfo:remove") + @Log(title = "班次信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{shiftIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] shiftIds) { + return toAjax(baseShiftInfoService.deleteWithValidByIds(List.of(shiftIds), true)); + } + + + /** + * 下拉框查询班次信息列表 + */ +/* @SaCheckPermission("mes:baseShiftInfo:list")*/ + @GetMapping("getBaseShiftInfoList") + public R> getBaseShiftInfolist(BaseShiftInfoBo bo) { + List list = baseShiftInfoService.queryList(bo); + return R.ok(list); + } + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseClassTeamInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseClassTeamInfo.java new file mode 100644 index 00000000..90d99205 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseClassTeamInfo.java @@ -0,0 +1,89 @@ +package org.dromara.mes.domain; + +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 班组信息对象 base_class_team_info + * + * @author ZangCH + * @date 2025-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("base_class_team_info") +public class BaseClassTeamInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "class_team_id", type = IdType.AUTO) + private Long classTeamId; + + /** + * 班组编号 + */ + private String teamCode; + + /** + * 班组名称 + */ + private String teamName; + + /** + * 班组负责人 + */ + private String teamHead; + + /** + * 班次ID + */ + private Long shiftId; + + /** + * 工序ID + */ + private Long processId; + + /** + * 工位ID + */ + private Long stationId; + + /** + * 设备ID + */ + private Long deviceId; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * BaseShiftInfo的班次名称 + */ + @TableField(exist = false) + private String shiftName; + + /** + * ProdBaseStationInfo工位名称 + */ + @TableField(exist = false) + private String stationName; + + + /** + * ProdBaseProcessInfo工序名称 + */ + @TableField(exist = false) + private String processName; +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseShiftInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseShiftInfo.java new file mode 100644 index 00000000..03471208 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseShiftInfo.java @@ -0,0 +1,70 @@ +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; + +/** + * 班次信息对象 base_shift_info + * + * @author LionLi + * @date 2025-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("base_shift_info") +public class BaseShiftInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "shift_id", type = IdType.ASSIGN_ID) + private Long shiftId; + + /** + * 班次编号 + */ + private String shiftCode; + + /** + * 班次名称 + */ + private String shiftName; + + /** + * 开始时间 + */ + private String startTime; + + /** + * 开始跨天标识（1是 0否） + */ + private String startCrossFlag; + + /** + * 结束时间 + */ + private String endTime; + + /** + * 结束跨天标识（1是 0否） + */ + private String endCrossFlag; + + /** + * 标准工作时长（秒） + */ + private Long workHour; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseClassTeamInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseClassTeamInfoBo.java new file mode 100644 index 00000000..48e6c010 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseClassTeamInfoBo.java @@ -0,0 +1,78 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.BaseClassTeamInfo; +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.*; + +/** + * 班组信息业务对象 base_class_team_info + * + * @author ZangCH + * @date 2025-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BaseClassTeamInfo.class, reverseConvertGenerate = false) +public class BaseClassTeamInfoBo extends BaseEntity { + + /** + * 主键标识 + */ +/* @NotNull(message = "主键标识不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private Long classTeamId; + + /** + * 班组编号 + */ + @NotBlank(message = "班组编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String teamCode; + + /** + * 班组名称 + */ + @NotBlank(message = "班组名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String teamName; + + /** + * 班组负责人 +/* */ +/* @NotBlank(message = "班组负责人不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private String teamHead; + + /** + * 班次ID + */ +/* @NotNull(message = "班次ID不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private Long shiftId; + + /** + * 工序ID + */ +/* @NotNull(message = "工序ID不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private Long processId; + + /** + * 工位ID + */ +/* @NotNull(message = "工位ID不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private Long stationId; + + /** + * 设备ID + */ +/* @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private Long deviceId; + + /** + * 激活标识（1是 0否） + */ +/* @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private String activeFlag; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseShiftInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseShiftInfoBo.java new file mode 100644 index 00000000..444b1be2 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseShiftInfoBo.java @@ -0,0 +1,78 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.BaseShiftInfo; +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.*; + +/** + * 班次信息业务对象 base_shift_info + * + * @author LionLi + * @date 2025-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BaseShiftInfo.class, reverseConvertGenerate = false) +public class BaseShiftInfoBo extends BaseEntity { + + /** + * 主键标识 + */ +/* @NotNull(message = "主键标识不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private Long shiftId; + + /** + * 班次编号 + */ + @NotBlank(message = "班次编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String shiftCode; + + /** + * 班次名称 + */ + @NotBlank(message = "班次名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String shiftName; + + /** + * 开始时间 + */ +/* @NotBlank(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private String startTime; + + /** + * 开始跨天标识（1是 0否） + */ +/* @NotBlank(message = "开始跨天标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private String startCrossFlag; + + /** + * 结束时间 + */ +/* @NotBlank(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private String endTime; + + /** + * 结束跨天标识（1是 0否） + */ +/* @NotBlank(message = "结束跨天标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private String endCrossFlag; + + /** + * 标准工作时长（秒） + */ +/* @NotNull(message = "标准工作时长（秒）不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private Long workHour; + + /** + * 激活标识（1是 0否） + */ +/* @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class })*/ + private String activeFlag; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseClassTeamInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseClassTeamInfoVo.java new file mode 100644 index 00000000..55e675a2 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseClassTeamInfoVo.java @@ -0,0 +1,138 @@ +package org.dromara.mes.domain.vo; + +import org.dromara.mes.domain.BaseClassTeamInfo; +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; + + +/** + * 班组信息视图对象 base_class_team_info + * + * @author ZangCH + * @date 2025-01-06 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BaseClassTeamInfo.class) +public class BaseClassTeamInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long classTeamId; + + /** + * 租户编号 + */ + @ExcelProperty(value = "租户编号") + private String tenantId; + + /** + * 班组编号 + */ + @ExcelProperty(value = "班组编号") + private String teamCode; + + /** + * 班组名称 + */ + @ExcelProperty(value = "班组名称") + private String teamName; + + /** + * 班组负责人 + */ + @ExcelProperty(value = "班组负责人") + private String teamHead; + + /** + * 班次ID + */ + @ExcelProperty(value = "班次ID") + private Long shiftId; + + /** + * 工序ID + */ + @ExcelProperty(value = "工序ID") + private Long processId; + + /** + * 工位ID + */ + @ExcelProperty(value = "工位ID") + private Long stationId; + + /** + * 设备ID + */ + @ExcelProperty(value = "设备ID") + private Long deviceId; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 创建部门 + */ + @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 shiftName; + + /** + * 工位名称 + */ + @ExcelProperty(value = "工位名称") + private String stationName; + + /** + * 工序名称 + */ + @ExcelProperty(value = "工序名称") + private String processName; +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseShiftInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseShiftInfoVo.java new file mode 100644 index 00000000..cbd0953c --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseShiftInfoVo.java @@ -0,0 +1,126 @@ +package org.dromara.mes.domain.vo; + +import org.dromara.mes.domain.BaseShiftInfo; +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; + + + +/** + * 班次信息视图对象 base_shift_info + * + * @author LionLi + * @date 2025-01-06 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BaseShiftInfo.class) +public class BaseShiftInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long shiftId; + + /** + * 租户编号 + */ + @ExcelProperty(value = "租户编号") + private String tenantId; + + /** + * 班次编号 + */ + @ExcelProperty(value = "班次编号") + private String shiftCode; + + /** + * 班次名称 + */ + @ExcelProperty(value = "班次名称") + private String shiftName; + + /** + * 开始时间 + */ + @ExcelProperty(value = "开始时间") + private String startTime; + + /** + * 开始跨天标识（1是 0否） + */ + @ExcelProperty(value = "开始跨天标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_start_cross_flag") + private String startCrossFlag; + + /** + * 结束时间 + */ + @ExcelProperty(value = "结束时间") + private String endTime; + + /** + * 结束跨天标识（1是 0否） + */ + @ExcelProperty(value = "结束跨天标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_end_cross_flag") + private String endCrossFlag; + + /** + * 标准工作时长（秒） + */ + @ExcelProperty(value = "标准工作时长", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "秒=") + private Long workHour; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 创建部门 + */ + @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; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseClassTeamInfoMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseClassTeamInfoMapper.java new file mode 100644 index 00000000..829e9eaf --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseClassTeamInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.BaseClassTeamInfo; +import org.dromara.mes.domain.vo.BaseClassTeamInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 班组信息Mapper接口 + * + * @author ZangCH + * @date 2025-01-06 + */ +public interface BaseClassTeamInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseShiftInfoMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseShiftInfoMapper.java new file mode 100644 index 00000000..6fab1016 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseShiftInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.BaseShiftInfo; +import org.dromara.mes.domain.vo.BaseShiftInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 班次信息Mapper接口 + * + * @author LionLi + * @date 2025-01-06 + */ +public interface BaseShiftInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseClassTeamInfoService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseClassTeamInfoService.java new file mode 100644 index 00000000..b28d9a25 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseClassTeamInfoService.java @@ -0,0 +1,70 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.BaseClassTeamInfo; +import org.dromara.mes.domain.vo.BaseClassTeamInfoVo; +import org.dromara.mes.domain.bo.BaseClassTeamInfoBo; +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 ZangCH + * @date 2025-01-06 + */ +public interface IBaseClassTeamInfoService { + + /** + * 查询班组信息 + * + * @param classTeamId 主键 + * @return 班组信息 + */ + BaseClassTeamInfoVo queryById(Long classTeamId); + + /** + * 分页查询班组信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 班组信息分页列表 + */ + TableDataInfo queryPageList(BaseClassTeamInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的班组信息列表 + * + * @param bo 查询条件 + * @return 班组信息列表 + */ + List queryList(BaseClassTeamInfoBo bo); + + /** + * 新增班组信息 + * + * @param bo 班组信息 + * @return 是否新增成功 + */ + Boolean insertByBo(BaseClassTeamInfoBo bo); + + /** + * 修改班组信息 + * + * @param bo 班组信息 + * @return 是否修改成功 + */ + Boolean updateByBo(BaseClassTeamInfoBo 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/IBaseShiftInfoService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseShiftInfoService.java new file mode 100644 index 00000000..9d0886b7 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IBaseShiftInfoService.java @@ -0,0 +1,72 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.BaseShiftInfo; +import org.dromara.mes.domain.vo.BaseShiftInfoVo; +import org.dromara.mes.domain.bo.BaseShiftInfoBo; +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 LionLi + * @date 2025-01-06 + */ +public interface IBaseShiftInfoService { + + /** + * 查询班次信息 + * + * @param shiftId 主键 + * @return 班次信息 + */ + BaseShiftInfoVo queryById(Long shiftId); + + /** + * 分页查询班次信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 班次信息分页列表 + */ + TableDataInfo queryPageList(BaseShiftInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的班次信息列表 + * + * @param bo 查询条件 + * @return 班次信息列表 + */ + List queryList(BaseShiftInfoBo bo); + + /** + * 新增班次信息 + * + * @param bo 班次信息 + * @return 是否新增成功 + */ + Boolean insertByBo(BaseShiftInfoBo bo); + + /** + * 修改班次信息 + * + * @param bo 班次信息 + * @return 是否修改成功 + */ + Boolean updateByBo(BaseShiftInfoBo 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/BaseClassTeamInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseClassTeamInfoServiceImpl.java new file mode 100644 index 00000000..0128cfdf --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseClassTeamInfoServiceImpl.java @@ -0,0 +1,158 @@ +package org.dromara.mes.service.impl; + +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +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 lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mes.domain.bo.BaseClassTeamInfoBo; +import org.dromara.mes.domain.vo.BaseClassTeamInfoVo; +import org.dromara.mes.domain.BaseClassTeamInfo; +import org.dromara.mes.mapper.BaseClassTeamInfoMapper; +import org.dromara.mes.service.IBaseClassTeamInfoService; + +import org.dromara.mes.domain.*; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 班组信息Service业务层处理 + * + * @author ZangCH + * @date 2025-01-06 + */ +@RequiredArgsConstructor +@Service +public class BaseClassTeamInfoServiceImpl implements IBaseClassTeamInfoService { + + private final BaseClassTeamInfoMapper baseMapper; + + /** + * 查询班组信息 + * + * @param classTeamId 主键 + * @return 班组信息 + */ + @Override + public BaseClassTeamInfoVo queryById(Long classTeamId){ + return baseMapper.selectVoById(classTeamId); + } + + /** + * 分页查询班组信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 班组信息分页列表 + */ + @Override + public TableDataInfo queryPageList(BaseClassTeamInfoBo bo, PageQuery pageQuery) { +/* LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result);*/ + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的班组信息列表 + * + * @param bo 查询条件 + * @return 班组信息列表 + */ + @Override + public List queryList(BaseClassTeamInfoBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(BaseClassTeamInfoBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(BaseClassTeamInfo.class) + .selectAll(BaseClassTeamInfo.class) + + // 关联查询班次名称 + .select(BaseShiftInfo::getShiftName) + .leftJoin(BaseShiftInfo.class, BaseShiftInfo::getShiftId, BaseClassTeamInfo::getShiftId) + // 关联查询工位名称 + .select(ProdBaseStationInfo::getStationName) + .leftJoin(ProdBaseStationInfo.class, ProdBaseStationInfo::getStationId, BaseClassTeamInfo::getStationId) + // 关联查询工序名称 + .select(ProdBaseProcessInfo::getProcessName) + .leftJoin(ProdBaseProcessInfo.class, ProdBaseProcessInfo::getProcessId, BaseClassTeamInfo::getProcessId) + + .eq(bo.getClassTeamId() != null, BaseClassTeamInfo::getClassTeamId, bo.getClassTeamId()) + .eq(StringUtils.isNotBlank(bo.getTeamCode()), BaseClassTeamInfo::getTeamCode, bo.getTeamCode()) + .like(StringUtils.isNotBlank(bo.getTeamName()), BaseClassTeamInfo::getTeamName, bo.getTeamName()) + .eq(StringUtils.isNotBlank(bo.getTeamHead()), BaseClassTeamInfo::getTeamHead, bo.getTeamHead()) + .eq(bo.getShiftId() != null, BaseClassTeamInfo::getShiftId, bo.getShiftId()) + .eq(bo.getProcessId() != null, BaseClassTeamInfo::getProcessId, bo.getProcessId()) + .eq(bo.getStationId() != null, BaseClassTeamInfo::getStationId, bo.getStationId()) + .eq(bo.getDeviceId() != null, BaseClassTeamInfo::getDeviceId, bo.getDeviceId()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseClassTeamInfo::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(BaseClassTeamInfo::getCreateTime); + return lqw; + + } + + /** + * 新增班组信息 + * + * @param bo 班组信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(BaseClassTeamInfoBo bo) { + BaseClassTeamInfo add = MapstructUtils.convert(bo, BaseClassTeamInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setClassTeamId(add.getClassTeamId()); + } + return flag; + } + + /** + * 修改班组信息 + * + * @param bo 班组信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BaseClassTeamInfoBo bo) { + BaseClassTeamInfo update = MapstructUtils.convert(bo, BaseClassTeamInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BaseClassTeamInfo 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/BaseShiftInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseShiftInfoServiceImpl.java new file mode 100644 index 00000000..cd0a182e --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseShiftInfoServiceImpl.java @@ -0,0 +1,149 @@ +package org.dromara.mes.service.impl; + +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.val; +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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mes.domain.bo.BaseShiftInfoBo; +import org.dromara.mes.domain.vo.BaseShiftInfoVo; +import org.dromara.mes.domain.BaseShiftInfo; +import org.dromara.mes.mapper.BaseShiftInfoMapper; +import org.dromara.mes.service.IBaseShiftInfoService; +import org.dromara.mes.domain.*; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 班次信息Service业务层处理 + * + * @author LionLi + * @date 2025-01-06 + */ +@RequiredArgsConstructor +@Service +public class BaseShiftInfoServiceImpl implements IBaseShiftInfoService { + + private final BaseShiftInfoMapper baseMapper; + + /** + * 查询班次信息 + * + * @param shiftId 主键 + * @return 班次信息 + */ + @Override + public BaseShiftInfoVo queryById(Long shiftId){ + return baseMapper.selectVoById(shiftId); + } + + /** + * 分页查询班次信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 班次信息分页列表 + */ + @Override + public TableDataInfo queryPageList(BaseShiftInfoBo 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(BaseShiftInfoBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(BaseShiftInfoBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(BaseShiftInfo.class) + .selectAll(BaseShiftInfo.class) +/* .leftJoin(BaseClassTeamInfo.class,BaseClassTeamInfo::getShiftId, BaseShiftInfo::getShiftId)*/ + .eq(bo.getShiftId() != null, BaseShiftInfo::getShiftId, bo.getShiftId()) + .eq(StringUtils.isNotBlank(bo.getShiftCode()), BaseShiftInfo::getShiftCode, bo.getShiftCode()) + .like(StringUtils.isNotBlank(bo.getShiftName()), BaseShiftInfo::getShiftName, bo.getShiftName()) + .eq(StringUtils.isNotBlank(bo.getStartTime()), BaseShiftInfo::getStartTime, bo.getStartTime()) + .eq(StringUtils.isNotBlank(bo.getStartCrossFlag()), BaseShiftInfo::getStartCrossFlag, bo.getStartCrossFlag()) + .eq(StringUtils.isNotBlank(bo.getEndTime()), BaseShiftInfo::getEndTime, bo.getEndTime()) + .eq(StringUtils.isNotBlank(bo.getEndCrossFlag()), BaseShiftInfo::getEndCrossFlag, bo.getEndCrossFlag()) + .eq(bo.getWorkHour() != null, BaseShiftInfo::getWorkHour, bo.getWorkHour()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseShiftInfo::getActiveFlag, bo.getActiveFlag()) + .eq(bo.getCreateDept() != null, BaseShiftInfo::getCreateDept, bo.getCreateDept()) + .eq(bo.getCreateBy() != null, BaseShiftInfo::getCreateBy, bo.getCreateBy()) + .eq(bo.getCreateTime() != null, BaseShiftInfo::getCreateTime, bo.getCreateTime()) + .eq(bo.getUpdateBy() != null, BaseShiftInfo::getUpdateBy, bo.getUpdateBy()) + .eq(bo.getUpdateTime() != null, BaseShiftInfo::getUpdateTime, bo.getUpdateTime()) + .orderByDesc(BaseShiftInfo::getCreateTime); + return lqw; + } + + /** + * 新增班次信息 + * + * @param bo 班次信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(BaseShiftInfoBo bo) { + BaseShiftInfo add = MapstructUtils.convert(bo, BaseShiftInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setShiftId(add.getShiftId()); + } + return flag; + } + + /** + * 修改班次信息 + * + * @param bo 班次信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BaseShiftInfoBo bo) { + BaseShiftInfo update = MapstructUtils.convert(bo, BaseShiftInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BaseShiftInfo 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/BaseClassTeamInfoMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseClassTeamInfoMapper.xml new file mode 100644 index 00000000..c50f5155 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseClassTeamInfoMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseShiftInfoMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseShiftInfoMapper.xml new file mode 100644 index 00000000..824f8dd3 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseShiftInfoMapper.xml @@ -0,0 +1,7 @@ + + + + +