From d238ecb502f0f4d470230a15783b57bf9fedb266 Mon Sep 17 00:00:00 2001 From: zch Date: Wed, 5 Mar 2025 21:22:49 +0800 Subject: [PATCH] =?UTF-8?q?add(mes):=20=E6=B7=BB=E5=8A=A0=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=8A=95=E5=85=A5=E5=92=8C=E4=BA=A7=E5=87=BA=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增生产投入扫描信息相关实体、控制器、服务和映射器 - 新增生产产出扫描信息相关实体、控制器、服务和映射器 - 实现了生产投入和产出扫描信息的增删改查功能 - 添加了生产投入和产出扫描信息的导出功能 --- .../ProdInputScanInfoController.java | 117 +++++++++++++++ .../ProdOutputScanInfoController.java | 117 +++++++++++++++ .../controller/ProdShiftChangeController.java | 117 +++++++++++++++ .../dromara/mes/domain/ProdInputScanInfo.java | 76 ++++++++++ .../mes/domain/ProdOutputScanInfo.java | 71 +++++++++ .../dromara/mes/domain/ProdShiftChange.java | 69 +++++++++ .../mes/domain/bo/ProdInputScanInfoBo.java | 74 +++++++++ .../mes/domain/bo/ProdOutputScanInfoBo.java | 69 +++++++++ .../mes/domain/bo/ProdShiftChangeBo.java | 66 ++++++++ .../mes/domain/vo/ProdInputScanInfoVo.java | 92 ++++++++++++ .../mes/domain/vo/ProdOutputScanInfoVo.java | 83 ++++++++++ .../mes/domain/vo/ProdShiftChangeVo.java | 78 ++++++++++ .../mes/mapper/ProdInputScanInfoMapper.java | 15 ++ .../mes/mapper/ProdOutputScanInfoMapper.java | 15 ++ .../mes/mapper/ProdShiftChangeMapper.java | 15 ++ .../service/IProdInputScanInfoService.java | 69 +++++++++ .../service/IProdOutputScanInfoService.java | 69 +++++++++ .../mes/service/IProdShiftChangeService.java | 69 +++++++++ .../impl/ProdInputScanInfoServiceImpl.java | 140 +++++++++++++++++ .../impl/ProdOutputScanInfoServiceImpl.java | 139 +++++++++++++++++ .../impl/ProdShiftChangeServiceImpl.java | 142 ++++++++++++++++++ .../mapper/mes/ProdInputScanInfoMapper.xml | 7 + .../mapper/mes/ProdOutputScanInfoMapper.xml | 7 + .../mapper/mes/ProdShiftChangeMapper.xml | 7 + 24 files changed, 1723 insertions(+) create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdInputScanInfoController.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdOutputScanInfoController.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdShiftChangeController.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdInputScanInfo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdOutputScanInfo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdShiftChange.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdInputScanInfoBo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdOutputScanInfoBo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdShiftChangeBo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdInputScanInfoVo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdOutputScanInfoVo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdShiftChangeVo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdInputScanInfoMapper.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdOutputScanInfoMapper.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdShiftChangeMapper.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdInputScanInfoService.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdOutputScanInfoService.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdShiftChangeService.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdInputScanInfoServiceImpl.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdOutputScanInfoServiceImpl.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdShiftChangeServiceImpl.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdInputScanInfoMapper.xml create mode 100644 ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdOutputScanInfoMapper.xml create mode 100644 ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdShiftChangeMapper.xml diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdInputScanInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdInputScanInfoController.java new file mode 100644 index 0000000..00faf6b --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdInputScanInfoController.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.ProdInputScanInfoVo; +import org.dromara.mes.domain.bo.ProdInputScanInfoBo; +import org.dromara.mes.service.IProdInputScanInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 生产投入扫描信息 + * 前端访问路由地址为:/mes/prodInputScanInfo + * + * @author zch + * @date 2025-03-05 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/prodInputScanInfo") +public class ProdInputScanInfoController extends BaseController { + + private final IProdInputScanInfoService prodInputScanInfoService; + + /** + * 查询生产投入扫描信息列表 + */ + @SaCheckPermission("mes:prodInputScanInfo:list") + @GetMapping("/list") + public TableDataInfo list(ProdInputScanInfoBo bo, PageQuery pageQuery) { + return prodInputScanInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出生产投入扫描信息列表 + */ + @SaCheckPermission("mes:prodInputScanInfo:export") + @Log(title = "生产投入扫描信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ProdInputScanInfoBo bo, HttpServletResponse response) { + List list = prodInputScanInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "生产投入扫描信息", ProdInputScanInfoVo.class, response); + } + + /** + * 获取生产投入扫描信息详细信息 + * + * @param prodInputScanInfoId 主键 + */ + @SaCheckPermission("mes:prodInputScanInfo:query") + @GetMapping("/{prodInputScanInfoId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long prodInputScanInfoId) { + return R.ok(prodInputScanInfoService.queryById(prodInputScanInfoId)); + } + + /** + * 新增生产投入扫描信息 + */ + @SaCheckPermission("mes:prodInputScanInfo:add") + @Log(title = "生产投入扫描信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ProdInputScanInfoBo bo) { + return toAjax(prodInputScanInfoService.insertByBo(bo)); + } + + /** + * 修改生产投入扫描信息 + */ + @SaCheckPermission("mes:prodInputScanInfo:edit") + @Log(title = "生产投入扫描信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ProdInputScanInfoBo bo) { + return toAjax(prodInputScanInfoService.updateByBo(bo)); + } + + /** + * 删除生产投入扫描信息 + * + * @param prodInputScanInfoIds 主键串 + */ + @SaCheckPermission("mes:prodInputScanInfo:remove") + @Log(title = "生产投入扫描信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{prodInputScanInfoIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] prodInputScanInfoIds) { + return toAjax(prodInputScanInfoService.deleteWithValidByIds(List.of(prodInputScanInfoIds), true)); + } + + + /** + * 下拉框查询生产投入扫描信息列表 + */ + + @GetMapping("/getProdInputScanInfoList") + public R> getProdInputScanInfoList(ProdInputScanInfoBo bo) { + List list = prodInputScanInfoService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdOutputScanInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdOutputScanInfoController.java new file mode 100644 index 0000000..156b800 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdOutputScanInfoController.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.ProdOutputScanInfoVo; +import org.dromara.mes.domain.bo.ProdOutputScanInfoBo; +import org.dromara.mes.service.IProdOutputScanInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 生产产出扫描信息 + * 前端访问路由地址为:/mes/prodOutputScanInfo + * + * @author LionLi + * @date 2025-03-05 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/prodOutputScanInfo") +public class ProdOutputScanInfoController extends BaseController { + + private final IProdOutputScanInfoService prodOutputScanInfoService; + + /** + * 查询生产产出扫描信息列表 + */ + @SaCheckPermission("mes:prodOutputScanInfo:list") + @GetMapping("/list") + public TableDataInfo list(ProdOutputScanInfoBo bo, PageQuery pageQuery) { + return prodOutputScanInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出生产产出扫描信息列表 + */ + @SaCheckPermission("mes:prodOutputScanInfo:export") + @Log(title = "生产产出扫描信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ProdOutputScanInfoBo bo, HttpServletResponse response) { + List list = prodOutputScanInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "生产产出扫描信息", ProdOutputScanInfoVo.class, response); + } + + /** + * 获取生产产出扫描信息详细信息 + * + * @param prodOutputScanInfoId 主键 + */ + @SaCheckPermission("mes:prodOutputScanInfo:query") + @GetMapping("/{prodOutputScanInfoId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long prodOutputScanInfoId) { + return R.ok(prodOutputScanInfoService.queryById(prodOutputScanInfoId)); + } + + /** + * 新增生产产出扫描信息 + */ + @SaCheckPermission("mes:prodOutputScanInfo:add") + @Log(title = "生产产出扫描信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ProdOutputScanInfoBo bo) { + return toAjax(prodOutputScanInfoService.insertByBo(bo)); + } + + /** + * 修改生产产出扫描信息 + */ + @SaCheckPermission("mes:prodOutputScanInfo:edit") + @Log(title = "生产产出扫描信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ProdOutputScanInfoBo bo) { + return toAjax(prodOutputScanInfoService.updateByBo(bo)); + } + + /** + * 删除生产产出扫描信息 + * + * @param prodOutputScanInfoIds 主键串 + */ + @SaCheckPermission("mes:prodOutputScanInfo:remove") + @Log(title = "生产产出扫描信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{prodOutputScanInfoIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] prodOutputScanInfoIds) { + return toAjax(prodOutputScanInfoService.deleteWithValidByIds(List.of(prodOutputScanInfoIds), true)); + } + + + /** + * 下拉框查询生产产出扫描信息列表 + */ + + @GetMapping("/getProdOutputScanInfoList") + public R> getProdOutputScanInfoList(ProdOutputScanInfoBo bo) { + List list = prodOutputScanInfoService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdShiftChangeController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdShiftChangeController.java new file mode 100644 index 0000000..4897591 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdShiftChangeController.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.ProdShiftChangeVo; +import org.dromara.mes.domain.bo.ProdShiftChangeBo; +import org.dromara.mes.service.IProdShiftChangeService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 交接班信息 + * 前端访问路由地址为:/mes/prodShiftChange + * + * @author zch + * @date 2025-03-05 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/prodShiftChange") +public class ProdShiftChangeController extends BaseController { + + private final IProdShiftChangeService prodShiftChangeService; + + /** + * 查询交接班信息列表 + */ + @SaCheckPermission("mes:prodShiftChange:list") + @GetMapping("/list") + public TableDataInfo list(ProdShiftChangeBo bo, PageQuery pageQuery) { + return prodShiftChangeService.queryPageList(bo, pageQuery); + } + + /** + * 导出交接班信息列表 + */ + @SaCheckPermission("mes:prodShiftChange:export") + @Log(title = "交接班信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ProdShiftChangeBo bo, HttpServletResponse response) { + List list = prodShiftChangeService.queryList(bo); + ExcelUtil.exportExcel(list, "交接班信息", ProdShiftChangeVo.class, response); + } + + /** + * 获取交接班信息详细信息 + * + * @param shiftChangeId 主键 + */ + @SaCheckPermission("mes:prodShiftChange:query") + @GetMapping("/{shiftChangeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long shiftChangeId) { + return R.ok(prodShiftChangeService.queryById(shiftChangeId)); + } + + /** + * 新增交接班信息 + */ + @SaCheckPermission("mes:prodShiftChange:add") + @Log(title = "交接班信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ProdShiftChangeBo bo) { + return toAjax(prodShiftChangeService.insertByBo(bo)); + } + + /** + * 修改交接班信息 + */ + @SaCheckPermission("mes:prodShiftChange:edit") + @Log(title = "交接班信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ProdShiftChangeBo bo) { + return toAjax(prodShiftChangeService.updateByBo(bo)); + } + + /** + * 删除交接班信息 + * + * @param shiftChangeIds 主键串 + */ + @SaCheckPermission("mes:prodShiftChange:remove") + @Log(title = "交接班信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{shiftChangeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] shiftChangeIds) { + return toAjax(prodShiftChangeService.deleteWithValidByIds(List.of(shiftChangeIds), true)); + } + + + /** + * 下拉框查询交接班信息列表 + */ + + @GetMapping("/getProdShiftChangeList") + public R> getProdShiftChangeList(ProdShiftChangeBo bo) { + List list = prodShiftChangeService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdInputScanInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdInputScanInfo.java new file mode 100644 index 0000000..610ddac --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdInputScanInfo.java @@ -0,0 +1,76 @@ +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_input_scan_info + * + * @author zch + * @date 2025-03-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("prod_input_scan_info") +public class ProdInputScanInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "prod_input_scan_info_id", type = IdType.AUTO) + private Long prodInputScanInfoId; + + /** + * 工序ID + */ + private Long processId; + + /** + * 机台ID + */ + private Long machineId; + + /** + * 硫化条码 + */ + private String vulcanizedBarcode; + + /** + * 胎胚条码 + */ + private String embryoBarcode; + + /** + * 生产工具 + */ + private Long toolId; + + /** + * 物料ID + */ + private Long materielId; + + /** + * 扫描结果 + */ + private String scanResult; + + /** + * 记录人名称 + */ + private String userName; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdOutputScanInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdOutputScanInfo.java new file mode 100644 index 0000000..ff7d2b6 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdOutputScanInfo.java @@ -0,0 +1,71 @@ +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_output_scan_info + * + * @author LionLi + * @date 2025-03-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("prod_output_scan_info") +public class ProdOutputScanInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "prod_output_scan_info_id", type = IdType.AUTO) + private Long prodOutputScanInfoId; + + /** + * 工序ID + */ + private Long processId; + + /** + * 机台ID + */ + private Long machineId; + + /** + * 胎胚条码 + */ + private String embryoBarcode; + + /** + * 工装ID + */ + private Long toolingId; + + /** + * 物料ID + */ + private Long materielId; + + /** + * 扫描结果 + */ + private String scanResult; + + /** + * 记录人名称 + */ + private String userName; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdShiftChange.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdShiftChange.java new file mode 100644 index 0000000..8b33d4c --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdShiftChange.java @@ -0,0 +1,69 @@ +package org.dromara.mes.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; +import java.util.Date; + +/** + * 交接班信息对象 prod_shift_change + * + * @author zch + * @date 2025-03-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("prod_shift_change") +public class ProdShiftChange extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "shift_change_id", type = IdType.AUTO) + private Long shiftChangeId; + + /** + * 接班时间 + */ + private Date shiftChangeTime; + + /** + * 机台ID + */ + private Long machineId; + + /** + * 班次ID + */ + private Long shiftId; + + /** + * 班组ID + */ + private Long classTeamId; + + /** + * 接班人ID + */ + private Long userId; + + /** + * 接班人名称 + */ + private String userName; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdInputScanInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdInputScanInfoBo.java new file mode 100644 index 0000000..624a5c6 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdInputScanInfoBo.java @@ -0,0 +1,74 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.ProdInputScanInfo; +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_input_scan_info + * + * @author zch + * @date 2025-03-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ProdInputScanInfo.class, reverseConvertGenerate = false) +public class ProdInputScanInfoBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long prodInputScanInfoId; + + /** + * 工序ID + */ + private Long processId; + + /** + * 机台ID + */ + private Long machineId; + + /** + * 硫化条码 + */ + private String vulcanizedBarcode; + + /** + * 胎胚条码 + */ + private String embryoBarcode; + + /** + * 生产工具 + */ + private Long toolId; + + /** + * 物料ID + */ + private Long materielId; + + /** + * 扫描结果 + */ + private String scanResult; + + /** + * 记录人名称 + */ + private String userName; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdOutputScanInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdOutputScanInfoBo.java new file mode 100644 index 0000000..4df7878 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdOutputScanInfoBo.java @@ -0,0 +1,69 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.ProdOutputScanInfo; +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_output_scan_info + * + * @author LionLi + * @date 2025-03-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ProdOutputScanInfo.class, reverseConvertGenerate = false) +public class ProdOutputScanInfoBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long prodOutputScanInfoId; + + /** + * 工序ID + */ + private Long processId; + + /** + * 机台ID + */ + private Long machineId; + + /** + * 胎胚条码 + */ + private String embryoBarcode; + + /** + * 工装ID + */ + private Long toolingId; + + /** + * 物料ID + */ + private Long materielId; + + /** + * 扫描结果 + */ + private String scanResult; + + /** + * 记录人名称 + */ + private String userName; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdShiftChangeBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdShiftChangeBo.java new file mode 100644 index 0000000..727e7df --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdShiftChangeBo.java @@ -0,0 +1,66 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.ProdShiftChange; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 交接班信息业务对象 prod_shift_change + * + * @author zch + * @date 2025-03-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ProdShiftChange.class, reverseConvertGenerate = false) +public class ProdShiftChangeBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long shiftChangeId; + + /** + * 接班时间 + */ + private Date shiftChangeTime; + + /** + * 机台ID + */ + private Long machineId; + + /** + * 班次ID + */ + private Long shiftId; + + /** + * 班组ID + */ + private Long classTeamId; + + /** + * 接班人ID + */ + private Long userId; + + /** + * 接班人名称 + */ + private String userName; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdInputScanInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdInputScanInfoVo.java new file mode 100644 index 0000000..02c9ab7 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdInputScanInfoVo.java @@ -0,0 +1,92 @@ +package org.dromara.mes.domain.vo; + +import org.dromara.mes.domain.ProdInputScanInfo; +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_input_scan_info + * + * @author zch + * @date 2025-03-05 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ProdInputScanInfo.class) +public class ProdInputScanInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long prodInputScanInfoId; + + /** + * 工序ID + */ + @ExcelProperty(value = "工序ID") + private Long processId; + + /** + * 机台ID + */ + @ExcelProperty(value = "机台ID") + private Long machineId; + + /** + * 硫化条码 + */ + @ExcelProperty(value = "硫化条码") + private String vulcanizedBarcode; + + /** + * 胎胚条码 + */ + @ExcelProperty(value = "胎胚条码") + private String embryoBarcode; + + /** + * 生产工具 + */ + @ExcelProperty(value = "生产工具") + private Long toolId; + + /** + * 物料ID + */ + @ExcelProperty(value = "物料ID") + private Long materielId; + + /** + * 扫描结果 + */ + @ExcelProperty(value = "扫描结果") + private String scanResult; + + /** + * 记录人名称 + */ + @ExcelProperty(value = "记录人名称") + private String userName; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdOutputScanInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdOutputScanInfoVo.java new file mode 100644 index 0000000..f398000 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdOutputScanInfoVo.java @@ -0,0 +1,83 @@ +package org.dromara.mes.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mes.domain.ProdOutputScanInfo; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 生产产出扫描信息视图对象 prod_output_scan_info + * + * @author LionLi + * @date 2025-03-05 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ProdOutputScanInfo.class) +public class ProdOutputScanInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long prodOutputScanInfoId; + + /** + * 工序ID + */ + @ExcelProperty(value = "工序ID") + private Long processId; + + /** + * 机台ID + */ + @ExcelProperty(value = "机台ID") + private Long machineId; + + /** + * 胎胚条码 + */ + @ExcelProperty(value = "胎胚条码") + private String embryoBarcode; + + /** + * 工装ID + */ + @ExcelProperty(value = "工装ID") + private Long toolingId; + + /** + * 物料ID + */ + @ExcelProperty(value = "物料ID") + private Long materielId; + + /** + * 扫描结果 + */ + @ExcelProperty(value = "扫描结果") + private String scanResult; + + /** + * 记录人名称 + */ + @ExcelProperty(value = "记录人名称") + private String userName; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdShiftChangeVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdShiftChangeVo.java new file mode 100644 index 0000000..4977457 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdShiftChangeVo.java @@ -0,0 +1,78 @@ +package org.dromara.mes.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mes.domain.ProdShiftChange; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 交接班信息视图对象 prod_shift_change + * + * @author zch + * @date 2025-03-05 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ProdShiftChange.class) +public class ProdShiftChangeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long shiftChangeId; + + /** + * 接班时间 + */ + @ExcelProperty(value = "接班时间") + private Date shiftChangeTime; + + /** + * 机台ID + */ + @ExcelProperty(value = "机台ID") + private Long machineId; + + /** + * 班次ID + */ + @ExcelProperty(value = "班次ID") + private Long shiftId; + + /** + * 班组ID + */ + @ExcelProperty(value = "班组ID") + private Long classTeamId; + + /** + * 接班人ID + */ + @ExcelProperty(value = "接班人ID") + private Long userId; + + /** + * 接班人名称 + */ + @ExcelProperty(value = "接班人名称") + private String userName; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdInputScanInfoMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdInputScanInfoMapper.java new file mode 100644 index 0000000..c98c4c6 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdInputScanInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.ProdInputScanInfo; +import org.dromara.mes.domain.vo.ProdInputScanInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 生产投入扫描信息Mapper接口 + * + * @author zch + * @date 2025-03-05 + */ +public interface ProdInputScanInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdOutputScanInfoMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdOutputScanInfoMapper.java new file mode 100644 index 0000000..3f3a115 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdOutputScanInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.ProdOutputScanInfo; +import org.dromara.mes.domain.vo.ProdOutputScanInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 生产产出扫描信息Mapper接口 + * + * @author LionLi + * @date 2025-03-05 + */ +public interface ProdOutputScanInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdShiftChangeMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdShiftChangeMapper.java new file mode 100644 index 0000000..ee23f53 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdShiftChangeMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.ProdShiftChange; +import org.dromara.mes.domain.vo.ProdShiftChangeVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 交接班信息Mapper接口 + * + * @author zch + * @date 2025-03-05 + */ +public interface ProdShiftChangeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdInputScanInfoService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdInputScanInfoService.java new file mode 100644 index 0000000..3e0d8cd --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdInputScanInfoService.java @@ -0,0 +1,69 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.ProdInputScanInfo; +import org.dromara.mes.domain.vo.ProdInputScanInfoVo; +import org.dromara.mes.domain.bo.ProdInputScanInfoBo; +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 zch + * @date 2025-03-05 + */ +public interface IProdInputScanInfoService { + + /** + * 查询生产投入扫描信息 + * + * @param prodInputScanInfoId 主键 + * @return 生产投入扫描信息 + */ + ProdInputScanInfoVo queryById(Long prodInputScanInfoId); + + /** + * 分页查询生产投入扫描信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 生产投入扫描信息分页列表 + */ + TableDataInfo queryPageList(ProdInputScanInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的生产投入扫描信息列表 + * + * @param bo 查询条件 + * @return 生产投入扫描信息列表 + */ + List queryList(ProdInputScanInfoBo bo); + + /** + * 新增生产投入扫描信息 + * + * @param bo 生产投入扫描信息 + * @return 是否新增成功 + */ + Boolean insertByBo(ProdInputScanInfoBo bo); + + /** + * 修改生产投入扫描信息 + * + * @param bo 生产投入扫描信息 + * @return 是否修改成功 + */ + Boolean updateByBo(ProdInputScanInfoBo 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/IProdOutputScanInfoService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdOutputScanInfoService.java new file mode 100644 index 0000000..d66a3d5 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdOutputScanInfoService.java @@ -0,0 +1,69 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.ProdOutputScanInfo; +import org.dromara.mes.domain.vo.ProdOutputScanInfoVo; +import org.dromara.mes.domain.bo.ProdOutputScanInfoBo; +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-03-05 + */ +public interface IProdOutputScanInfoService { + + /** + * 查询生产产出扫描信息 + * + * @param prodOutputScanInfoId 主键 + * @return 生产产出扫描信息 + */ + ProdOutputScanInfoVo queryById(Long prodOutputScanInfoId); + + /** + * 分页查询生产产出扫描信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 生产产出扫描信息分页列表 + */ + TableDataInfo queryPageList(ProdOutputScanInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的生产产出扫描信息列表 + * + * @param bo 查询条件 + * @return 生产产出扫描信息列表 + */ + List queryList(ProdOutputScanInfoBo bo); + + /** + * 新增生产产出扫描信息 + * + * @param bo 生产产出扫描信息 + * @return 是否新增成功 + */ + Boolean insertByBo(ProdOutputScanInfoBo bo); + + /** + * 修改生产产出扫描信息 + * + * @param bo 生产产出扫描信息 + * @return 是否修改成功 + */ + Boolean updateByBo(ProdOutputScanInfoBo 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/IProdShiftChangeService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdShiftChangeService.java new file mode 100644 index 0000000..39a1f14 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdShiftChangeService.java @@ -0,0 +1,69 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.ProdShiftChange; +import org.dromara.mes.domain.vo.ProdShiftChangeVo; +import org.dromara.mes.domain.bo.ProdShiftChangeBo; +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 zch + * @date 2025-03-05 + */ +public interface IProdShiftChangeService { + + /** + * 查询交接班信息 + * + * @param shiftChangeId 主键 + * @return 交接班信息 + */ + ProdShiftChangeVo queryById(Long shiftChangeId); + + /** + * 分页查询交接班信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 交接班信息分页列表 + */ + TableDataInfo queryPageList(ProdShiftChangeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的交接班信息列表 + * + * @param bo 查询条件 + * @return 交接班信息列表 + */ + List queryList(ProdShiftChangeBo bo); + + /** + * 新增交接班信息 + * + * @param bo 交接班信息 + * @return 是否新增成功 + */ + Boolean insertByBo(ProdShiftChangeBo bo); + + /** + * 修改交接班信息 + * + * @param bo 交接班信息 + * @return 是否修改成功 + */ + Boolean updateByBo(ProdShiftChangeBo 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/ProdInputScanInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdInputScanInfoServiceImpl.java new file mode 100644 index 0000000..35b47bd --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdInputScanInfoServiceImpl.java @@ -0,0 +1,140 @@ +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.ProdInputScanInfoBo; +import org.dromara.mes.domain.vo.ProdInputScanInfoVo; +import org.dromara.mes.domain.ProdInputScanInfo; +import org.dromara.mes.mapper.ProdInputScanInfoMapper; +import org.dromara.mes.service.IProdInputScanInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 生产投入扫描信息Service业务层处理 + * + * @author zch + * @date 2025-03-05 + */ +@RequiredArgsConstructor +@Service +public class ProdInputScanInfoServiceImpl implements IProdInputScanInfoService { + + private final ProdInputScanInfoMapper baseMapper; + + /** + * 查询生产投入扫描信息 + * + * @param prodInputScanInfoId 主键 + * @return 生产投入扫描信息 + */ + @Override + public ProdInputScanInfoVo queryById(Long prodInputScanInfoId){ + return baseMapper.selectVoById(prodInputScanInfoId); + } + + /** + * 分页查询生产投入扫描信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 生产投入扫描信息分页列表 + */ + @Override + public TableDataInfo queryPageList(ProdInputScanInfoBo 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(ProdInputScanInfoBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ProdInputScanInfoBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdInputScanInfo.class) + .selectAll(ProdInputScanInfo.class) + .eq(bo.getProdInputScanInfoId() != null, ProdInputScanInfo::getProdInputScanInfoId, bo.getProdInputScanInfoId()) + .eq(bo.getProcessId() != null, ProdInputScanInfo::getProcessId, bo.getProcessId()) + .eq(bo.getMachineId() != null, ProdInputScanInfo::getMachineId, bo.getMachineId()) + .eq(StringUtils.isNotBlank(bo.getVulcanizedBarcode()), ProdInputScanInfo::getVulcanizedBarcode, bo.getVulcanizedBarcode()) + .eq(StringUtils.isNotBlank(bo.getEmbryoBarcode()), ProdInputScanInfo::getEmbryoBarcode, bo.getEmbryoBarcode()) + .eq(bo.getToolId() != null, ProdInputScanInfo::getToolId, bo.getToolId()) + .eq(bo.getMaterielId() != null, ProdInputScanInfo::getMaterielId, bo.getMaterielId()) + .eq(StringUtils.isNotBlank(bo.getScanResult()), ProdInputScanInfo::getScanResult, bo.getScanResult()) + .like(StringUtils.isNotBlank(bo.getUserName()), ProdInputScanInfo::getUserName, bo.getUserName()) + .orderByDesc(ProdInputScanInfo::getCreateTime); + return lqw; + } + + /** + * 新增生产投入扫描信息 + * + * @param bo 生产投入扫描信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ProdInputScanInfoBo bo) { + ProdInputScanInfo add = MapstructUtils.convert(bo, ProdInputScanInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setProdInputScanInfoId(add.getProdInputScanInfoId()); + } + return flag; + } + + /** + * 修改生产投入扫描信息 + * + * @param bo 生产投入扫描信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ProdInputScanInfoBo bo) { + ProdInputScanInfo update = MapstructUtils.convert(bo, ProdInputScanInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ProdInputScanInfo 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/ProdOutputScanInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdOutputScanInfoServiceImpl.java new file mode 100644 index 0000000..864b16c --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdOutputScanInfoServiceImpl.java @@ -0,0 +1,139 @@ +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.ProdOutputScanInfoBo; +import org.dromara.mes.domain.vo.ProdOutputScanInfoVo; +import org.dromara.mes.domain.ProdOutputScanInfo; +import org.dromara.mes.mapper.ProdOutputScanInfoMapper; +import org.dromara.mes.service.IProdOutputScanInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 生产产出扫描信息Service业务层处理 + * + * @author LionLi + * @date 2025-03-05 + */ +@RequiredArgsConstructor +@Service +public class ProdOutputScanInfoServiceImpl implements IProdOutputScanInfoService { + + private final ProdOutputScanInfoMapper baseMapper; + + /** + * 查询生产产出扫描信息 + * + * @param prodOutputScanInfoId 主键 + * @return 生产产出扫描信息 + */ + @Override + public ProdOutputScanInfoVo queryById(Long prodOutputScanInfoId){ + return baseMapper.selectVoById(prodOutputScanInfoId); + } + + /** + * 分页查询生产产出扫描信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 生产产出扫描信息分页列表 + */ + @Override + public TableDataInfo queryPageList(ProdOutputScanInfoBo 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(ProdOutputScanInfoBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ProdOutputScanInfoBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdOutputScanInfo.class) + .selectAll(ProdOutputScanInfo.class) + .eq(bo.getProdOutputScanInfoId() != null, ProdOutputScanInfo::getProdOutputScanInfoId, bo.getProdOutputScanInfoId()) + .eq(bo.getProcessId() != null, ProdOutputScanInfo::getProcessId, bo.getProcessId()) + .eq(bo.getMachineId() != null, ProdOutputScanInfo::getMachineId, bo.getMachineId()) + .eq(StringUtils.isNotBlank(bo.getEmbryoBarcode()), ProdOutputScanInfo::getEmbryoBarcode, bo.getEmbryoBarcode()) + .eq(bo.getToolingId() != null, ProdOutputScanInfo::getToolingId, bo.getToolingId()) + .eq(bo.getMaterielId() != null, ProdOutputScanInfo::getMaterielId, bo.getMaterielId()) + .eq(StringUtils.isNotBlank(bo.getScanResult()), ProdOutputScanInfo::getScanResult, bo.getScanResult()) + .like(StringUtils.isNotBlank(bo.getUserName()), ProdOutputScanInfo::getUserName, bo.getUserName()) + .orderByDesc(ProdOutputScanInfo::getCreateTime); + return lqw; + } + + /** + * 新增生产产出扫描信息 + * + * @param bo 生产产出扫描信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ProdOutputScanInfoBo bo) { + ProdOutputScanInfo add = MapstructUtils.convert(bo, ProdOutputScanInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setProdOutputScanInfoId(add.getProdOutputScanInfoId()); + } + return flag; + } + + /** + * 修改生产产出扫描信息 + * + * @param bo 生产产出扫描信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ProdOutputScanInfoBo bo) { + ProdOutputScanInfo update = MapstructUtils.convert(bo, ProdOutputScanInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ProdOutputScanInfo 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/ProdShiftChangeServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdShiftChangeServiceImpl.java new file mode 100644 index 0000000..fe6e878 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdShiftChangeServiceImpl.java @@ -0,0 +1,142 @@ +package org.dromara.mes.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mes.domain.ProdShiftChange; +import org.dromara.mes.domain.bo.ProdShiftChangeBo; +import org.dromara.mes.domain.vo.ProdShiftChangeVo; +import org.dromara.mes.mapper.ProdShiftChangeMapper; +import org.dromara.mes.service.IProdShiftChangeService; +import org.dromara.system.api.RemoteUserService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 交接班信息Service业务层处理 + * + * @author zch + * @date 2025-03-05 + */ +@RequiredArgsConstructor +@Service +public class ProdShiftChangeServiceImpl implements IProdShiftChangeService { + + private final ProdShiftChangeMapper baseMapper; + + private final RemoteUserService remoteUserService;//dubbo远程调用用户服务获取用户信息 + + /** + * 查询交接班信息 + * + * @param shiftChangeId 主键 + * @return 交接班信息 + */ + @Override + public ProdShiftChangeVo queryById(Long shiftChangeId){ + ProdShiftChangeVo prodShiftChangeVo = baseMapper.selectVoById(shiftChangeId); + return prodShiftChangeVo; + } + + /** + * 分页查询交接班信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 交接班信息分页列表 + */ + @Override + public TableDataInfo queryPageList(ProdShiftChangeBo 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(ProdShiftChangeBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ProdShiftChangeBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdShiftChange.class) + .selectAll(ProdShiftChange.class) + .eq(bo.getShiftChangeId() != null, ProdShiftChange::getShiftChangeId, bo.getShiftChangeId()) + .eq(bo.getShiftChangeTime() != null, ProdShiftChange::getShiftChangeTime, bo.getShiftChangeTime()) + .eq(bo.getMachineId() != null, ProdShiftChange::getMachineId, bo.getMachineId()) + .eq(bo.getShiftId() != null, ProdShiftChange::getShiftId, bo.getShiftId()) + .eq(bo.getClassTeamId() != null, ProdShiftChange::getClassTeamId, bo.getClassTeamId()) + .eq(bo.getUserId() != null, ProdShiftChange::getUserId, bo.getUserId()) + .like(StringUtils.isNotBlank(bo.getUserName()), ProdShiftChange::getUserName, bo.getUserName()) + .orderByDesc(ProdShiftChange::getCreateTime); + return lqw; + } + + /** + * 新增交接班信息 + * + * @param bo 交接班信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ProdShiftChangeBo bo) { + ProdShiftChange add = MapstructUtils.convert(bo, ProdShiftChange.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setShiftChangeId(add.getShiftChangeId()); + } + return flag; + } + + /** + * 修改交接班信息 + * + * @param bo 交接班信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ProdShiftChangeBo bo) { + ProdShiftChange update = MapstructUtils.convert(bo, ProdShiftChange.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ProdShiftChange 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/ProdInputScanInfoMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdInputScanInfoMapper.xml new file mode 100644 index 0000000..162ce94 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdInputScanInfoMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdOutputScanInfoMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdOutputScanInfoMapper.xml new file mode 100644 index 0000000..0e56ba3 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdOutputScanInfoMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdShiftChangeMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdShiftChangeMapper.xml new file mode 100644 index 0000000..b4438ab --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdShiftChangeMapper.xml @@ -0,0 +1,7 @@ + + + + +