From 9216b1741f38fc59c89aacba8c22783e13089a2f Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 25 Jul 2025 14:26:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9B=9B=E5=BC=A0=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qc/controller/WmsCheckItemController.java | 106 +++++++++++++++++ .../qc/controller/WmsCheckTaskController.java | 106 +++++++++++++++++ .../WmsCheckTaskItemController.java | 106 +++++++++++++++++ .../controller/WmsCommonDefectController.java | 106 +++++++++++++++++ .../com/klp/mes/qc/domain/WmsCheckItem.java | 41 +++++++ .../com/klp/mes/qc/domain/WmsCheckTask.java | 41 +++++++ .../klp/mes/qc/domain/WmsCheckTaskItem.java | 49 ++++++++ .../klp/mes/qc/domain/WmsCommonDefect.java | 41 +++++++ .../klp/mes/qc/domain/bo/WmsCheckItemBo.java | 36 ++++++ .../klp/mes/qc/domain/bo/WmsCheckTaskBo.java | 36 ++++++ .../mes/qc/domain/bo/WmsCheckTaskItemBo.java | 46 ++++++++ .../mes/qc/domain/bo/WmsCommonDefectBo.java | 36 ++++++ .../klp/mes/qc/domain/vo/WmsCheckItemVo.java | 41 +++++++ .../mes/qc/domain/vo/WmsCheckTaskItemVo.java | 53 +++++++++ .../klp/mes/qc/domain/vo/WmsCheckTaskVo.java | 41 +++++++ .../mes/qc/domain/vo/WmsCommonDefectVo.java | 41 +++++++ .../klp/mes/qc/mapper/WmsCheckItemMapper.java | 15 +++ .../mes/qc/mapper/WmsCheckTaskItemMapper.java | 15 +++ .../klp/mes/qc/mapper/WmsCheckTaskMapper.java | 15 +++ .../mes/qc/mapper/WmsCommonDefectMapper.java | 15 +++ .../mes/qc/service/IWmsCheckItemService.java | 49 ++++++++ .../qc/service/IWmsCheckTaskItemService.java | 49 ++++++++ .../mes/qc/service/IWmsCheckTaskService.java | 49 ++++++++ .../qc/service/IWmsCommonDefectService.java | 49 ++++++++ .../service/impl/WmsCheckItemServiceImpl.java | 109 +++++++++++++++++ .../impl/WmsCheckTaskItemServiceImpl.java | 110 ++++++++++++++++++ .../service/impl/WmsCheckTaskServiceImpl.java | 109 +++++++++++++++++ .../impl/WmsCommonDefectServiceImpl.java | 109 +++++++++++++++++ .../mapper/qc/WmsCheckItemMapper.xml | 19 +++ .../mapper/qc/WmsCheckTaskItemMapper.xml | 21 ++++ .../mapper/qc/WmsCheckTaskMapper.xml | 19 +++ .../mapper/qc/WmsCommonDefectMapper.xml | 19 +++ 32 files changed, 1697 insertions(+) create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskController.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskItemController.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCommonDefectController.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTask.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskItem.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCommonDefect.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskItemBo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCommonDefectBo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskItemVo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCommonDefectVo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckItemMapper.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskItemMapper.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCommonDefectMapper.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckItemService.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskItemService.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskService.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCommonDefectService.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskItemServiceImpl.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCommonDefectServiceImpl.java create mode 100644 klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml create mode 100644 klp-mes/src/main/resources/mapper/qc/WmsCheckTaskItemMapper.xml create mode 100644 klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml create mode 100644 klp-mes/src/main/resources/mapper/qc/WmsCommonDefectMapper.xml diff --git a/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java new file mode 100644 index 00000000..cc2289b4 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java @@ -0,0 +1,106 @@ +package com.klp.mes.qc.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.mes.qc.domain.vo.WmsCheckItemVo; +import com.klp.mes.qc.domain.bo.WmsCheckItemBo; +import com.klp.mes.qc.service.IWmsCheckItemService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 检查项 + * + * @author Joshi + * @date 2025-07-25 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/qc/checkItem") +public class WmsCheckItemController extends BaseController { + + private final IWmsCheckItemService iWmsCheckItemService; + + /** + * 查询检查项列表 + */ + @SaCheckPermission("qc:checkItem:list") + @GetMapping("/list") + public TableDataInfo list(WmsCheckItemBo bo, PageQuery pageQuery) { + return iWmsCheckItemService.queryPageList(bo, pageQuery); + } + + /** + * 导出检查项列表 + */ + @SaCheckPermission("qc:checkItem:export") + @Log(title = "检查项", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsCheckItemBo bo, HttpServletResponse response) { + List list = iWmsCheckItemService.queryList(bo); + ExcelUtil.exportExcel(list, "检查项", WmsCheckItemVo.class, response); + } + + /** + * 获取检查项详细信息 + * + * @param itemId 主键 + */ + @SaCheckPermission("qc:checkItem:query") + @GetMapping("/{itemId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long itemId) { + return R.ok(iWmsCheckItemService.queryById(itemId)); + } + + /** + * 新增检查项 + */ + @SaCheckPermission("qc:checkItem:add") + @Log(title = "检查项", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsCheckItemBo bo) { + return toAjax(iWmsCheckItemService.insertByBo(bo)); + } + + /** + * 修改检查项 + */ + @SaCheckPermission("qc:checkItem:edit") + @Log(title = "检查项", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsCheckItemBo bo) { + return toAjax(iWmsCheckItemService.updateByBo(bo)); + } + + /** + * 删除检查项 + * + * @param itemIds 主键串 + */ + @SaCheckPermission("qc:checkItem:remove") + @Log(title = "检查项", businessType = BusinessType.DELETE) + @DeleteMapping("/{itemIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] itemIds) { + return toAjax(iWmsCheckItemService.deleteWithValidByIds(Arrays.asList(itemIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskController.java new file mode 100644 index 00000000..bd10d238 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskController.java @@ -0,0 +1,106 @@ +package com.klp.mes.qc.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.mes.qc.domain.vo.WmsCheckTaskVo; +import com.klp.mes.qc.domain.bo.WmsCheckTaskBo; +import com.klp.mes.qc.service.IWmsCheckTaskService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 检查任务 + * + * @author Joshi + * @date 2025-07-25 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/qc/checkTask") +public class WmsCheckTaskController extends BaseController { + + private final IWmsCheckTaskService iWmsCheckTaskService; + + /** + * 查询检查任务列表 + */ + @SaCheckPermission("qc:checkTask:list") + @GetMapping("/list") + public TableDataInfo list(WmsCheckTaskBo bo, PageQuery pageQuery) { + return iWmsCheckTaskService.queryPageList(bo, pageQuery); + } + + /** + * 导出检查任务列表 + */ + @SaCheckPermission("qc:checkTask:export") + @Log(title = "检查任务", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsCheckTaskBo bo, HttpServletResponse response) { + List list = iWmsCheckTaskService.queryList(bo); + ExcelUtil.exportExcel(list, "检查任务", WmsCheckTaskVo.class, response); + } + + /** + * 获取检查任务详细信息 + * + * @param taskId 主键 + */ + @SaCheckPermission("qc:checkTask:query") + @GetMapping("/{taskId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long taskId) { + return R.ok(iWmsCheckTaskService.queryById(taskId)); + } + + /** + * 新增检查任务 + */ + @SaCheckPermission("qc:checkTask:add") + @Log(title = "检查任务", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsCheckTaskBo bo) { + return toAjax(iWmsCheckTaskService.insertByBo(bo)); + } + + /** + * 修改检查任务 + */ + @SaCheckPermission("qc:checkTask:edit") + @Log(title = "检查任务", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsCheckTaskBo bo) { + return toAjax(iWmsCheckTaskService.updateByBo(bo)); + } + + /** + * 删除检查任务 + * + * @param taskIds 主键串 + */ + @SaCheckPermission("qc:checkTask:remove") + @Log(title = "检查任务", businessType = BusinessType.DELETE) + @DeleteMapping("/{taskIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] taskIds) { + return toAjax(iWmsCheckTaskService.deleteWithValidByIds(Arrays.asList(taskIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskItemController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskItemController.java new file mode 100644 index 00000000..67d0dcb7 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskItemController.java @@ -0,0 +1,106 @@ +package com.klp.mes.qc.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.mes.qc.domain.vo.WmsCheckTaskItemVo; +import com.klp.mes.qc.domain.bo.WmsCheckTaskItemBo; +import com.klp.mes.qc.service.IWmsCheckTaskItemService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 检查任务与检查项关联 + * + * @author Joshi + * @date 2025-07-25 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/qc/checkTaskItem") +public class WmsCheckTaskItemController extends BaseController { + + private final IWmsCheckTaskItemService iWmsCheckTaskItemService; + + /** + * 查询检查任务与检查项关联列表 + */ + @SaCheckPermission("qc:checkTaskItem:list") + @GetMapping("/list") + public TableDataInfo list(WmsCheckTaskItemBo bo, PageQuery pageQuery) { + return iWmsCheckTaskItemService.queryPageList(bo, pageQuery); + } + + /** + * 导出检查任务与检查项关联列表 + */ + @SaCheckPermission("qc:checkTaskItem:export") + @Log(title = "检查任务与检查项关联", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsCheckTaskItemBo bo, HttpServletResponse response) { + List list = iWmsCheckTaskItemService.queryList(bo); + ExcelUtil.exportExcel(list, "检查任务与检查项关联", WmsCheckTaskItemVo.class, response); + } + + /** + * 获取检查任务与检查项关联详细信息 + * + * @param itemId 主键 + */ + @SaCheckPermission("qc:checkTaskItem:query") + @GetMapping("/{itemId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long itemId) { + return R.ok(iWmsCheckTaskItemService.queryById(itemId)); + } + + /** + * 新增检查任务与检查项关联 + */ + @SaCheckPermission("qc:checkTaskItem:add") + @Log(title = "检查任务与检查项关联", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsCheckTaskItemBo bo) { + return toAjax(iWmsCheckTaskItemService.insertByBo(bo)); + } + + /** + * 修改检查任务与检查项关联 + */ + @SaCheckPermission("qc:checkTaskItem:edit") + @Log(title = "检查任务与检查项关联", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsCheckTaskItemBo bo) { + return toAjax(iWmsCheckTaskItemService.updateByBo(bo)); + } + + /** + * 删除检查任务与检查项关联 + * + * @param itemIds 主键串 + */ + @SaCheckPermission("qc:checkTaskItem:remove") + @Log(title = "检查任务与检查项关联", businessType = BusinessType.DELETE) + @DeleteMapping("/{itemIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] itemIds) { + return toAjax(iWmsCheckTaskItemService.deleteWithValidByIds(Arrays.asList(itemIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCommonDefectController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCommonDefectController.java new file mode 100644 index 00000000..a8a4997f --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCommonDefectController.java @@ -0,0 +1,106 @@ +package com.klp.mes.qc.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.mes.qc.domain.vo.WmsCommonDefectVo; +import com.klp.mes.qc.domain.bo.WmsCommonDefectBo; +import com.klp.mes.qc.service.IWmsCommonDefectService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 常见缺陷 + * + * @author Joshi + * @date 2025-07-25 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/qc/commonDefect") +public class WmsCommonDefectController extends BaseController { + + private final IWmsCommonDefectService iWmsCommonDefectService; + + /** + * 查询常见缺陷列表 + */ + @SaCheckPermission("qc:commonDefect:list") + @GetMapping("/list") + public TableDataInfo list(WmsCommonDefectBo bo, PageQuery pageQuery) { + return iWmsCommonDefectService.queryPageList(bo, pageQuery); + } + + /** + * 导出常见缺陷列表 + */ + @SaCheckPermission("qc:commonDefect:export") + @Log(title = "常见缺陷", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsCommonDefectBo bo, HttpServletResponse response) { + List list = iWmsCommonDefectService.queryList(bo); + ExcelUtil.exportExcel(list, "常见缺陷", WmsCommonDefectVo.class, response); + } + + /** + * 获取常见缺陷详细信息 + * + * @param defectId 主键 + */ + @SaCheckPermission("qc:commonDefect:query") + @GetMapping("/{defectId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long defectId) { + return R.ok(iWmsCommonDefectService.queryById(defectId)); + } + + /** + * 新增常见缺陷 + */ + @SaCheckPermission("qc:commonDefect:add") + @Log(title = "常见缺陷", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsCommonDefectBo bo) { + return toAjax(iWmsCommonDefectService.insertByBo(bo)); + } + + /** + * 修改常见缺陷 + */ + @SaCheckPermission("qc:commonDefect:edit") + @Log(title = "常见缺陷", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsCommonDefectBo bo) { + return toAjax(iWmsCommonDefectService.updateByBo(bo)); + } + + /** + * 删除常见缺陷 + * + * @param defectIds 主键串 + */ + @SaCheckPermission("qc:commonDefect:remove") + @Log(title = "常见缺陷", businessType = BusinessType.DELETE) + @DeleteMapping("/{defectIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] defectIds) { + return toAjax(iWmsCommonDefectService.deleteWithValidByIds(Arrays.asList(defectIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java new file mode 100644 index 00000000..812ae3e5 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java @@ -0,0 +1,41 @@ +package com.klp.mes.qc.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 检查项对象 wms_check_item + * + * @author Joshi + * @date 2025-07-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_check_item") +public class WmsCheckItem extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键 + */ + @TableId(value = "item_id") + private Long itemId; + /** + * 检查项名称 + */ + private String itemName; + /** + * 逻辑删除标识：0=正常，1=已删 + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTask.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTask.java new file mode 100644 index 00000000..1e41920b --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTask.java @@ -0,0 +1,41 @@ +package com.klp.mes.qc.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 检查任务对象 wms_check_task + * + * @author Joshi + * @date 2025-07-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_check_task") +public class WmsCheckTask extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键 + */ + @TableId(value = "task_id") + private Long taskId; + /** + * 任务名称 + */ + private String taskName; + /** + * 逻辑删除标识：0=正常，1=已删 + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskItem.java new file mode 100644 index 00000000..7f29c7a3 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskItem.java @@ -0,0 +1,49 @@ +package com.klp.mes.qc.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 检查任务与检查项关联对象 wms_check_task_item + * + * @author Joshi + * @date 2025-07-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_check_task_item") +public class WmsCheckTaskItem extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键 + */ + @TableId(value = "item_id") + private Long itemId; + /** + * 检查任务ID + */ + private Long checkTaskId; + /** + * 检查项ID + */ + private Long checkItemId; + /** + * 状态：0=禁用，1=启用 + */ + private Integer status; + /** + * 逻辑删除标识：0=正常，1=已删 + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCommonDefect.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCommonDefect.java new file mode 100644 index 00000000..1dca74b8 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCommonDefect.java @@ -0,0 +1,41 @@ +package com.klp.mes.qc.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 常见缺陷对象 wms_common_defect + * + * @author Joshi + * @date 2025-07-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_common_defect") +public class WmsCommonDefect extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键 + */ + @TableId(value = "defect_id") + private Long defectId; + /** + * 缺陷名称 + */ + private String defectName; + /** + * 逻辑删除标识：0=正常，1=已删 + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java new file mode 100644 index 00000000..b2d7d04b --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java @@ -0,0 +1,36 @@ +package com.klp.mes.qc.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 检查项业务对象 wms_check_item + * + * @author Joshi + * @date 2025-07-25 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsCheckItemBo extends BaseEntity { + + /** + * 主键 + */ + private Long itemId; + + /** + * 检查项名称 + */ + private String itemName; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java new file mode 100644 index 00000000..1e36f967 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java @@ -0,0 +1,36 @@ +package com.klp.mes.qc.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 检查任务业务对象 wms_check_task + * + * @author Joshi + * @date 2025-07-25 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsCheckTaskBo extends BaseEntity { + + /** + * 主键 + */ + private Long taskId; + + /** + * 任务名称 + */ + private String taskName; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskItemBo.java new file mode 100644 index 00000000..272be2ae --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskItemBo.java @@ -0,0 +1,46 @@ +package com.klp.mes.qc.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 检查任务与检查项关联业务对象 wms_check_task_item + * + * @author Joshi + * @date 2025-07-25 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsCheckTaskItemBo extends BaseEntity { + + /** + * 主键 + */ + private Long itemId; + + /** + * 检查任务ID + */ + private Long checkTaskId; + + /** + * 检查项ID + */ + private Long checkItemId; + + /** + * 状态：0=禁用，1=启用 + */ + private Integer status; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCommonDefectBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCommonDefectBo.java new file mode 100644 index 00000000..81fbadaa --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCommonDefectBo.java @@ -0,0 +1,36 @@ +package com.klp.mes.qc.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 常见缺陷业务对象 wms_common_defect + * + * @author Joshi + * @date 2025-07-25 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsCommonDefectBo extends BaseEntity { + + /** + * 主键 + */ + private Long defectId; + + /** + * 缺陷名称 + */ + private String defectName; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java new file mode 100644 index 00000000..fe857520 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java @@ -0,0 +1,41 @@ +package com.klp.mes.qc.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 检查项视图对象 wms_check_item + * + * @author Joshi + * @date 2025-07-25 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsCheckItemVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long itemId; + + /** + * 检查项名称 + */ + @ExcelProperty(value = "检查项名称") + private String itemName; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskItemVo.java new file mode 100644 index 00000000..de5c6283 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskItemVo.java @@ -0,0 +1,53 @@ +package com.klp.mes.qc.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 检查任务与检查项关联视图对象 wms_check_task_item + * + * @author Joshi + * @date 2025-07-25 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsCheckTaskItemVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long itemId; + + /** + * 检查任务ID + */ + @ExcelProperty(value = "检查任务ID") + private Long checkTaskId; + + /** + * 检查项ID + */ + @ExcelProperty(value = "检查项ID") + private Long checkItemId; + + /** + * 状态：0=禁用，1=启用 + */ + @ExcelProperty(value = "状态：0=禁用，1=启用") + private Integer status; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java new file mode 100644 index 00000000..5de1ccf8 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java @@ -0,0 +1,41 @@ +package com.klp.mes.qc.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 检查任务视图对象 wms_check_task + * + * @author Joshi + * @date 2025-07-25 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsCheckTaskVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long taskId; + + /** + * 任务名称 + */ + @ExcelProperty(value = "任务名称") + private String taskName; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCommonDefectVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCommonDefectVo.java new file mode 100644 index 00000000..389213ed --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCommonDefectVo.java @@ -0,0 +1,41 @@ +package com.klp.mes.qc.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 常见缺陷视图对象 wms_common_defect + * + * @author Joshi + * @date 2025-07-25 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsCommonDefectVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long defectId; + + /** + * 缺陷名称 + */ + @ExcelProperty(value = "缺陷名称") + private String defectName; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckItemMapper.java b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckItemMapper.java new file mode 100644 index 00000000..de8bc9a4 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckItemMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.qc.mapper; + +import com.klp.mes.qc.domain.WmsCheckItem; +import com.klp.mes.qc.domain.vo.WmsCheckItemVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 检查项Mapper接口 + * + * @author Joshi + * @date 2025-07-25 + */ +public interface WmsCheckItemMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskItemMapper.java b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskItemMapper.java new file mode 100644 index 00000000..71c1dc65 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskItemMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.qc.mapper; + +import com.klp.mes.qc.domain.WmsCheckTaskItem; +import com.klp.mes.qc.domain.vo.WmsCheckTaskItemVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 检查任务与检查项关联Mapper接口 + * + * @author Joshi + * @date 2025-07-25 + */ +public interface WmsCheckTaskItemMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java new file mode 100644 index 00000000..db2957f2 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.qc.mapper; + +import com.klp.mes.qc.domain.WmsCheckTask; +import com.klp.mes.qc.domain.vo.WmsCheckTaskVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 检查任务Mapper接口 + * + * @author Joshi + * @date 2025-07-25 + */ +public interface WmsCheckTaskMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCommonDefectMapper.java b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCommonDefectMapper.java new file mode 100644 index 00000000..4d4efd08 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCommonDefectMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.qc.mapper; + +import com.klp.mes.qc.domain.WmsCommonDefect; +import com.klp.mes.qc.domain.vo.WmsCommonDefectVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 常见缺陷Mapper接口 + * + * @author Joshi + * @date 2025-07-25 + */ +public interface WmsCommonDefectMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckItemService.java b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckItemService.java new file mode 100644 index 00000000..fde82ca2 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckItemService.java @@ -0,0 +1,49 @@ +package com.klp.mes.qc.service; + +import com.klp.mes.qc.domain.WmsCheckItem; +import com.klp.mes.qc.domain.vo.WmsCheckItemVo; +import com.klp.mes.qc.domain.bo.WmsCheckItemBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 检查项Service接口 + * + * @author Joshi + * @date 2025-07-25 + */ +public interface IWmsCheckItemService { + + /** + * 查询检查项 + */ + WmsCheckItemVo queryById(Long itemId); + + /** + * 查询检查项列表 + */ + TableDataInfo queryPageList(WmsCheckItemBo bo, PageQuery pageQuery); + + /** + * 查询检查项列表 + */ + List queryList(WmsCheckItemBo bo); + + /** + * 新增检查项 + */ + Boolean insertByBo(WmsCheckItemBo bo); + + /** + * 修改检查项 + */ + Boolean updateByBo(WmsCheckItemBo bo); + + /** + * 校验并批量删除检查项信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskItemService.java b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskItemService.java new file mode 100644 index 00000000..a5e092f5 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskItemService.java @@ -0,0 +1,49 @@ +package com.klp.mes.qc.service; + +import com.klp.mes.qc.domain.WmsCheckTaskItem; +import com.klp.mes.qc.domain.vo.WmsCheckTaskItemVo; +import com.klp.mes.qc.domain.bo.WmsCheckTaskItemBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 检查任务与检查项关联Service接口 + * + * @author Joshi + * @date 2025-07-25 + */ +public interface IWmsCheckTaskItemService { + + /** + * 查询检查任务与检查项关联 + */ + WmsCheckTaskItemVo queryById(Long itemId); + + /** + * 查询检查任务与检查项关联列表 + */ + TableDataInfo queryPageList(WmsCheckTaskItemBo bo, PageQuery pageQuery); + + /** + * 查询检查任务与检查项关联列表 + */ + List queryList(WmsCheckTaskItemBo bo); + + /** + * 新增检查任务与检查项关联 + */ + Boolean insertByBo(WmsCheckTaskItemBo bo); + + /** + * 修改检查任务与检查项关联 + */ + Boolean updateByBo(WmsCheckTaskItemBo bo); + + /** + * 校验并批量删除检查任务与检查项关联信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskService.java b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskService.java new file mode 100644 index 00000000..6ae89eb1 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskService.java @@ -0,0 +1,49 @@ +package com.klp.mes.qc.service; + +import com.klp.mes.qc.domain.WmsCheckTask; +import com.klp.mes.qc.domain.vo.WmsCheckTaskVo; +import com.klp.mes.qc.domain.bo.WmsCheckTaskBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 检查任务Service接口 + * + * @author Joshi + * @date 2025-07-25 + */ +public interface IWmsCheckTaskService { + + /** + * 查询检查任务 + */ + WmsCheckTaskVo queryById(Long taskId); + + /** + * 查询检查任务列表 + */ + TableDataInfo queryPageList(WmsCheckTaskBo bo, PageQuery pageQuery); + + /** + * 查询检查任务列表 + */ + List queryList(WmsCheckTaskBo bo); + + /** + * 新增检查任务 + */ + Boolean insertByBo(WmsCheckTaskBo bo); + + /** + * 修改检查任务 + */ + Boolean updateByBo(WmsCheckTaskBo bo); + + /** + * 校验并批量删除检查任务信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCommonDefectService.java b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCommonDefectService.java new file mode 100644 index 00000000..abf3f2ab --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCommonDefectService.java @@ -0,0 +1,49 @@ +package com.klp.mes.qc.service; + +import com.klp.mes.qc.domain.WmsCommonDefect; +import com.klp.mes.qc.domain.vo.WmsCommonDefectVo; +import com.klp.mes.qc.domain.bo.WmsCommonDefectBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 常见缺陷Service接口 + * + * @author Joshi + * @date 2025-07-25 + */ +public interface IWmsCommonDefectService { + + /** + * 查询常见缺陷 + */ + WmsCommonDefectVo queryById(Long defectId); + + /** + * 查询常见缺陷列表 + */ + TableDataInfo queryPageList(WmsCommonDefectBo bo, PageQuery pageQuery); + + /** + * 查询常见缺陷列表 + */ + List queryList(WmsCommonDefectBo bo); + + /** + * 新增常见缺陷 + */ + Boolean insertByBo(WmsCommonDefectBo bo); + + /** + * 修改常见缺陷 + */ + Boolean updateByBo(WmsCommonDefectBo bo); + + /** + * 校验并批量删除常见缺陷信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java new file mode 100644 index 00000000..83e8f88f --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java @@ -0,0 +1,109 @@ +package com.klp.mes.qc.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.mes.qc.domain.bo.WmsCheckItemBo; +import com.klp.mes.qc.domain.vo.WmsCheckItemVo; +import com.klp.mes.qc.domain.WmsCheckItem; +import com.klp.mes.qc.mapper.WmsCheckItemMapper; +import com.klp.mes.qc.service.IWmsCheckItemService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 检查项Service业务层处理 + * + * @author Joshi + * @date 2025-07-25 + */ +@RequiredArgsConstructor +@Service +public class WmsCheckItemServiceImpl implements IWmsCheckItemService { + + private final WmsCheckItemMapper baseMapper; + + /** + * 查询检查项 + */ + @Override + public WmsCheckItemVo queryById(Long itemId){ + return baseMapper.selectVoById(itemId); + } + + /** + * 查询检查项列表 + */ + @Override + public TableDataInfo queryPageList(WmsCheckItemBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询检查项列表 + */ + @Override + public List queryList(WmsCheckItemBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsCheckItemBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getItemName()), WmsCheckItem::getItemName, bo.getItemName()); + return lqw; + } + + /** + * 新增检查项 + */ + @Override + public Boolean insertByBo(WmsCheckItemBo bo) { + WmsCheckItem add = BeanUtil.toBean(bo, WmsCheckItem.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setItemId(add.getItemId()); + } + return flag; + } + + /** + * 修改检查项 + */ + @Override + public Boolean updateByBo(WmsCheckItemBo bo) { + WmsCheckItem update = BeanUtil.toBean(bo, WmsCheckItem.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsCheckItem entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除检查项 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskItemServiceImpl.java new file mode 100644 index 00000000..f37858ca --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskItemServiceImpl.java @@ -0,0 +1,110 @@ +package com.klp.mes.qc.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.mes.qc.domain.bo.WmsCheckTaskItemBo; +import com.klp.mes.qc.domain.vo.WmsCheckTaskItemVo; +import com.klp.mes.qc.domain.WmsCheckTaskItem; +import com.klp.mes.qc.mapper.WmsCheckTaskItemMapper; +import com.klp.mes.qc.service.IWmsCheckTaskItemService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 检查任务与检查项关联Service业务层处理 + * + * @author Joshi + * @date 2025-07-25 + */ +@RequiredArgsConstructor +@Service +public class WmsCheckTaskItemServiceImpl implements IWmsCheckTaskItemService { + + private final WmsCheckTaskItemMapper baseMapper; + + /** + * 查询检查任务与检查项关联 + */ + @Override + public WmsCheckTaskItemVo queryById(Long itemId){ + return baseMapper.selectVoById(itemId); + } + + /** + * 查询检查任务与检查项关联列表 + */ + @Override + public TableDataInfo queryPageList(WmsCheckTaskItemBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询检查任务与检查项关联列表 + */ + @Override + public List queryList(WmsCheckTaskItemBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsCheckTaskItemBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getCheckTaskId() != null, WmsCheckTaskItem::getCheckTaskId, bo.getCheckTaskId()); + lqw.eq(bo.getCheckItemId() != null, WmsCheckTaskItem::getCheckItemId, bo.getCheckItemId()); + lqw.eq(bo.getStatus() != null, WmsCheckTaskItem::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增检查任务与检查项关联 + */ + @Override + public Boolean insertByBo(WmsCheckTaskItemBo bo) { + WmsCheckTaskItem add = BeanUtil.toBean(bo, WmsCheckTaskItem.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setItemId(add.getItemId()); + } + return flag; + } + + /** + * 修改检查任务与检查项关联 + */ + @Override + public Boolean updateByBo(WmsCheckTaskItemBo bo) { + WmsCheckTaskItem update = BeanUtil.toBean(bo, WmsCheckTaskItem.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsCheckTaskItem entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除检查任务与检查项关联 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java new file mode 100644 index 00000000..4cc65285 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java @@ -0,0 +1,109 @@ +package com.klp.mes.qc.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.mes.qc.domain.bo.WmsCheckTaskBo; +import com.klp.mes.qc.domain.vo.WmsCheckTaskVo; +import com.klp.mes.qc.domain.WmsCheckTask; +import com.klp.mes.qc.mapper.WmsCheckTaskMapper; +import com.klp.mes.qc.service.IWmsCheckTaskService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 检查任务Service业务层处理 + * + * @author Joshi + * @date 2025-07-25 + */ +@RequiredArgsConstructor +@Service +public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService { + + private final WmsCheckTaskMapper baseMapper; + + /** + * 查询检查任务 + */ + @Override + public WmsCheckTaskVo queryById(Long taskId){ + return baseMapper.selectVoById(taskId); + } + + /** + * 查询检查任务列表 + */ + @Override + public TableDataInfo queryPageList(WmsCheckTaskBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询检查任务列表 + */ + @Override + public List queryList(WmsCheckTaskBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsCheckTaskBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getTaskName()), WmsCheckTask::getTaskName, bo.getTaskName()); + return lqw; + } + + /** + * 新增检查任务 + */ + @Override + public Boolean insertByBo(WmsCheckTaskBo bo) { + WmsCheckTask add = BeanUtil.toBean(bo, WmsCheckTask.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTaskId(add.getTaskId()); + } + return flag; + } + + /** + * 修改检查任务 + */ + @Override + public Boolean updateByBo(WmsCheckTaskBo bo) { + WmsCheckTask update = BeanUtil.toBean(bo, WmsCheckTask.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsCheckTask entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除检查任务 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCommonDefectServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCommonDefectServiceImpl.java new file mode 100644 index 00000000..547ba182 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCommonDefectServiceImpl.java @@ -0,0 +1,109 @@ +package com.klp.mes.qc.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.mes.qc.domain.bo.WmsCommonDefectBo; +import com.klp.mes.qc.domain.vo.WmsCommonDefectVo; +import com.klp.mes.qc.domain.WmsCommonDefect; +import com.klp.mes.qc.mapper.WmsCommonDefectMapper; +import com.klp.mes.qc.service.IWmsCommonDefectService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 常见缺陷Service业务层处理 + * + * @author Joshi + * @date 2025-07-25 + */ +@RequiredArgsConstructor +@Service +public class WmsCommonDefectServiceImpl implements IWmsCommonDefectService { + + private final WmsCommonDefectMapper baseMapper; + + /** + * 查询常见缺陷 + */ + @Override + public WmsCommonDefectVo queryById(Long defectId){ + return baseMapper.selectVoById(defectId); + } + + /** + * 查询常见缺陷列表 + */ + @Override + public TableDataInfo queryPageList(WmsCommonDefectBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询常见缺陷列表 + */ + @Override + public List queryList(WmsCommonDefectBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsCommonDefectBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getDefectName()), WmsCommonDefect::getDefectName, bo.getDefectName()); + return lqw; + } + + /** + * 新增常见缺陷 + */ + @Override + public Boolean insertByBo(WmsCommonDefectBo bo) { + WmsCommonDefect add = BeanUtil.toBean(bo, WmsCommonDefect.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setDefectId(add.getDefectId()); + } + return flag; + } + + /** + * 修改常见缺陷 + */ + @Override + public Boolean updateByBo(WmsCommonDefectBo bo) { + WmsCommonDefect update = BeanUtil.toBean(bo, WmsCommonDefect.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsCommonDefect entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除常见缺陷 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml new file mode 100644 index 00000000..e4a88d38 --- /dev/null +++ b/klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskItemMapper.xml new file mode 100644 index 00000000..790ac0cc --- /dev/null +++ b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskItemMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml new file mode 100644 index 00000000..f03b3c5b --- /dev/null +++ b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/qc/WmsCommonDefectMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCommonDefectMapper.xml new file mode 100644 index 00000000..810eea3c --- /dev/null +++ b/klp-mes/src/main/resources/mapper/qc/WmsCommonDefectMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + +