质量任务新增接口

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionTaskController.java

@@ -0,0 +1,127 @@
+package org.dromara.qms.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.qms.domain.vo.QcInspectionTaskVo;
+import org.dromara.qms.domain.bo.QcInspectionTaskBo;
+import org.dromara.qms.service.IQcInspectionTaskService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 检验任务处理
+ * 前端访问路由地址为:/qms/inspectionTask
+ *
+ * @author LionLi
+ * @date 2025-05-27
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/inspectionTask")
+public class QcInspectionTaskController extends BaseController {
+
+    private final IQcInspectionTaskService qcInspectionTaskService;
+
+    /**
+     * 查询检验任务处理列表
+     */
+    @SaCheckPermission("qms:inspectionTask:list")
+    @GetMapping("/list")
+    public TableDataInfo<QcInspectionTaskVo> list(QcInspectionTaskBo bo, PageQuery pageQuery) {
+        return qcInspectionTaskService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出检验任务处理列表
+     */
+    @SaCheckPermission("qms:inspectionTask:export")
+    @Log(title = "检验任务处理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(QcInspectionTaskBo bo, HttpServletResponse response) {
+        List<QcInspectionTaskVo> list = qcInspectionTaskService.queryList(bo);
+        ExcelUtil.exportExcel(list, "检验任务处理", QcInspectionTaskVo.class, response);
+    }
+
+    /**
+     * 获取检验任务处理详细信息
+     *
+     * @param taskId 主键
+     */
+    @SaCheckPermission("qms:inspectionTask:query")
+    @GetMapping("/{taskId}")
+    public R<QcInspectionTaskVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable String taskId) {
+        return R.ok(qcInspectionTaskService.queryById(taskId));
+    }
+
+    /**
+     * 新增检验任务处理
+     */
+    @SaCheckPermission("qms:inspectionTask:add")
+    @Log(title = "检验任务处理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody QcInspectionTaskBo bo) {
+        return toAjax(qcInspectionTaskService.insertByBo(bo));
+    }
+
+    /**
+     * 修改检验任务处理
+     */
+    @SaCheckPermission("qms:inspectionTask:edit")
+    @Log(title = "检验任务处理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody QcInspectionTaskBo bo) {
+        return toAjax(qcInspectionTaskService.updateByBo(bo));
+    }
+
+    /**
+     * 删除检验任务处理
+     *
+     * @param taskIds 主键串
+     */
+    @SaCheckPermission("qms:inspectionTask:remove")
+    @Log(title = "检验任务处理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{taskIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable String[] taskIds) {
+        return toAjax(qcInspectionTaskService.deleteWithValidByIds(List.of(taskIds), true));
+    }
+
+
+    /**
+     * 下拉框查询检验任务处理列表
+     */
+
+    @GetMapping("/getQcInspectionTaskList")
+    public R<List<QcInspectionTaskVo>> getQcInspectionTaskList(QcInspectionTaskBo bo) {
+        List<QcInspectionTaskVo> list = qcInspectionTaskService.queryList(bo);
+        return R.ok(list);
+    }
+
+    /**
+     * 上位机新增检验任务处理
+     */
+    @Log(title = "检验任务处理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/InspectionTaskByHMI")
+    public R<Void> addInspectionTaskByHMI(@Validated(AddGroup.class) @RequestBody QcInspectionTaskBo bo) {
+        return toAjax(qcInspectionTaskService.addInspectionTaskByHMI(bo));
+    }
+}

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionTask.java

@@ -0,0 +1,106 @@
+package org.dromara.qms.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 检验任务处理对象 qc_inspection_task
+ *
+ * @author LionLi
+ * @date 2025-05-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("qc_inspection_task")
+public class QcInspectionTask extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键标识
+     */
+    @TableId(value = "task_id")
+    private Long taskId;
+
+    /**
+     * 检验类型
+     */
+    private String category;
+
+    /**
+     * 任务编号
+     */
+    private String taskNo;
+
+    /**
+     * 任务描述
+     */
+    private String description;
+
+    /**
+     * 任务状态
+     */
+    private String status;
+
+    /**
+     * 生产车间
+     */
+    private String workCenter;
+
+    /**
+     * 工单编号
+     */
+    private String shopOrder;
+
+    /**
+     * 生产批次
+     */
+    private String sfc;
+
+    /**
+     * 工序编号
+     */
+    private String operation;
+
+    /**
+     * 工艺路线步骤标识
+     */
+    private String stepId;
+
+    /**
+     * 资源编号
+     */
+    private String resrce;
+
+    /**
+     * 任务结果
+     */
+    private String result;
+
+    /**
+     * PDA扫描字段，轮胎号或者流转卡。存质检物料扫描标识
+     */
+    private String qcMaterialCode;
+
+    /**
+     * 物料id
+     */
+    private Long materialId;
+
+    /**
+     * 预留字段
+     */
+    private String attr3;
+
+    /**
+     * 预留字段
+     */
+    private String attr4;
+
+
+}

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTaskBo.java

@@ -0,0 +1,117 @@
+package org.dromara.qms.domain.bo;
+
+import org.dromara.qms.domain.QcInspectionTask;
+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.*;
+
+/**
+ * 检验任务处理业务对象 qc_inspection_task
+ *
+ * @author LionLi
+ * @date 2025-05-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = QcInspectionTask.class, reverseConvertGenerate = false)
+public class QcInspectionTaskBo extends BaseEntity {
+
+    /**
+     * 主键标识
+     */
+    private Long taskId;
+
+    /**
+     * 检验类型
+     */
+    @NotBlank(message = "检验类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String category;
+
+    /**
+     * 任务编号
+     */
+
+    private String taskNo;
+
+    /**
+     * 任务描述
+     */
+    @NotBlank(message = "任务描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String description;
+
+    /**
+     * 任务状态
+     */
+    @NotBlank(message = "任务状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 生产车间
+     */
+    @NotBlank(message = "生产车间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String workCenter;
+
+    /**
+     * 工单编号
+     */
+    @NotBlank(message = "工单编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String shopOrder;
+
+    /**
+     * 生产批次
+     */
+    @NotBlank(message = "生产批次不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sfc;
+
+    /**
+     * 工序编号
+     */
+    @NotBlank(message = "工序编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String operation;
+
+    /**
+     * 工艺路线步骤标识
+     */
+
+    private String stepId;
+
+    /**
+     * 资源编号
+     */
+    @NotBlank(message = "资源编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String resrce;
+
+    /**
+     * 任务结果
+     */
+
+    private String result;
+
+    /**
+     * PDA扫描字段，轮胎号或者流转卡。存质检物料扫描标识
+     */
+    @NotBlank(message = "PDA扫描字段，轮胎号或者流转卡。存质检物料扫描标识不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String qcMaterialCode;
+
+    /**
+     * 物料id
+     */
+    @NotNull(message = "物料id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long materialId;
+
+    /**
+     * 预留字段
+     */
+    private String attr3;
+
+    /**
+     * 预留字段
+     */
+    private String attr4;
+
+
+}

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionTaskVo.java

@@ -0,0 +1,123 @@
+package org.dromara.qms.domain.vo;
+
+import org.dromara.qms.domain.QcInspectionTask;
+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;
+
+
+
+/**
+ * 检验任务处理视图对象 qc_inspection_task
+ *
+ * @author LionLi
+ * @date 2025-05-27
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = QcInspectionTask.class)
+public class QcInspectionTaskVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 检验类型
+     */
+    @ExcelProperty(value = "检验类型")
+    private String category;
+
+    /**
+     * 任务编号
+     */
+    @ExcelProperty(value = "任务编号")
+    private String taskNo;
+
+    /**
+     * 任务描述
+     */
+    @ExcelProperty(value = "任务描述")
+    private String description;
+
+    /**
+     * 任务状态
+     */
+    @ExcelProperty(value = "任务状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "inspection_task_status")
+    private String status;
+
+    /**
+     * 生产车间
+     */
+    @ExcelProperty(value = "生产车间")
+    private String workCenter;
+
+    /**
+     * 工单编号
+     */
+    @ExcelProperty(value = "工单编号")
+    private String shopOrder;
+
+    /**
+     * 生产批次
+     */
+    @ExcelProperty(value = "生产批次")
+    private String sfc;
+
+    /**
+     * 工序编号
+     */
+    @ExcelProperty(value = "工序编号")
+    private String operation;
+
+    /**
+     * 工艺路线步骤标识
+     */
+    @ExcelProperty(value = "工艺路线步骤标识")
+    private String stepId;
+
+    /**
+     * 资源编号
+     */
+    @ExcelProperty(value = "资源编号")
+    private String resrce;
+
+    /**
+     * 任务结果
+     */
+    @ExcelProperty(value = "任务结果")
+    private String result;
+
+    /**
+     * PDA扫描字段，轮胎号或者流转卡。存质检物料扫描标识
+     */
+    @ExcelProperty(value = "PDA扫描字段，轮胎号或者流转卡。存质检物料扫描标识")
+    private String qcMaterialCode;
+
+    /**
+     * 物料id
+     */
+    @ExcelProperty(value = "物料id")
+    private Long materialId;
+
+    /**
+     * 预留字段
+     */
+    @ExcelProperty(value = "预留字段")
+    private String attr3;
+
+    /**
+     * 预留字段
+     */
+    @ExcelProperty(value = "预留字段")
+    private String attr4;
+
+
+}

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionTaskMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.qms.mapper;
+
+import org.dromara.qms.domain.QcInspectionTask;
+import org.dromara.qms.domain.vo.QcInspectionTaskVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 检验任务处理Mapper接口
+ *
+ * @author LionLi
+ * @date 2025-05-27
+ */
+public interface QcInspectionTaskMapper extends BaseMapperPlus<QcInspectionTask, QcInspectionTaskVo> {
+
+}

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionTaskService.java

@@ -0,0 +1,72 @@
+package org.dromara.qms.service;
+
+import org.dromara.qms.domain.QcInspectionTask;
+import org.dromara.qms.domain.vo.QcInspectionTaskVo;
+import org.dromara.qms.domain.bo.QcInspectionTaskBo;
+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-05-27
+ */
+public interface IQcInspectionTaskService {
+
+    /**
+     * 查询检验任务处理
+     *
+     * @param taskId 主键
+     * @return 检验任务处理
+     */
+    QcInspectionTaskVo queryById(String taskId);
+
+    /**
+     * 分页查询检验任务处理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 检验任务处理分页列表
+     */
+    TableDataInfo<QcInspectionTaskVo> queryPageList(QcInspectionTaskBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的检验任务处理列表
+     *
+     * @param bo 查询条件
+     * @return 检验任务处理列表
+     */
+    List<QcInspectionTaskVo> queryList(QcInspectionTaskBo bo);
+
+    /**
+     * 新增检验任务处理
+     *
+     * @param bo 检验任务处理
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(QcInspectionTaskBo bo);
+
+    /**
+     * 修改检验任务处理
+     *
+     * @param bo 检验任务处理
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(QcInspectionTaskBo bo);
+
+    /**
+     * 校验并批量删除检验任务处理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+
+    Boolean addInspectionTaskByHMI(QcInspectionTaskBo bo);
+}

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionTaskServiceImpl.java

@@ -0,0 +1,157 @@
+package org.dromara.qms.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.qms.domain.bo.QcInspectionTaskBo;
+import org.dromara.qms.domain.vo.QcInspectionTaskVo;
+import org.dromara.qms.domain.QcInspectionTask;
+import org.dromara.qms.mapper.QcInspectionTaskMapper;
+import org.dromara.qms.service.IQcInspectionTaskService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 检验任务处理Service业务层处理
+ *
+ * @author LionLi
+ * @date 2025-05-27
+ */
+@RequiredArgsConstructor
+@Service
+public class QcInspectionTaskServiceImpl implements IQcInspectionTaskService {
+
+    private final QcInspectionTaskMapper baseMapper;
+
+    /**
+     * 查询检验任务处理
+     *
+     * @param taskId 主键
+     * @return 检验任务处理
+     */
+    @Override
+    public QcInspectionTaskVo queryById(String taskId){
+        return baseMapper.selectVoById(taskId);
+    }
+
+    /**
+     * 分页查询检验任务处理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 检验任务处理分页列表
+     */
+    @Override
+    public TableDataInfo<QcInspectionTaskVo> queryPageList(QcInspectionTaskBo bo, PageQuery pageQuery) {
+        MPJLambdaWrapper<QcInspectionTask> lqw = buildQueryWrapper(bo);
+        Page<QcInspectionTaskVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的检验任务处理列表
+     *
+     * @param bo 查询条件
+     * @return 检验任务处理列表
+     */
+    @Override
+    public List<QcInspectionTaskVo> queryList(QcInspectionTaskBo bo) {
+        MPJLambdaWrapper<QcInspectionTask> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private MPJLambdaWrapper<QcInspectionTask> buildQueryWrapper(QcInspectionTaskBo bo) {
+        Map<String, Object> params = bo.getParams();
+        MPJLambdaWrapper<QcInspectionTask> lqw = JoinWrappers.lambda(QcInspectionTask.class)
+        .selectAll(QcInspectionTask.class)
+        .eq(StringUtils.isNotBlank(bo.getCategory()), QcInspectionTask::getCategory, bo.getCategory())
+        .eq(StringUtils.isNotBlank(bo.getTaskNo()), QcInspectionTask::getTaskNo, bo.getTaskNo())
+        .eq(StringUtils.isNotBlank(bo.getDescription()), QcInspectionTask::getDescription, bo.getDescription())
+        .eq(StringUtils.isNotBlank(bo.getStatus()), QcInspectionTask::getStatus, bo.getStatus())
+        .eq(StringUtils.isNotBlank(bo.getWorkCenter()), QcInspectionTask::getWorkCenter, bo.getWorkCenter())
+        .eq(StringUtils.isNotBlank(bo.getShopOrder()), QcInspectionTask::getShopOrder, bo.getShopOrder())
+        .eq(StringUtils.isNotBlank(bo.getSfc()), QcInspectionTask::getSfc, bo.getSfc())
+        .eq(StringUtils.isNotBlank(bo.getOperation()), QcInspectionTask::getOperation, bo.getOperation())
+        .eq(StringUtils.isNotBlank(bo.getStepId()), QcInspectionTask::getStepId, bo.getStepId())
+        .eq(StringUtils.isNotBlank(bo.getResrce()), QcInspectionTask::getResrce, bo.getResrce())
+        .eq(StringUtils.isNotBlank(bo.getResult()), QcInspectionTask::getResult, bo.getResult())
+        .eq(StringUtils.isNotBlank(bo.getQcMaterialCode()), QcInspectionTask::getQcMaterialCode, bo.getQcMaterialCode())
+        .eq(bo.getMaterialId() != null, QcInspectionTask::getMaterialId, bo.getMaterialId())
+        .eq(StringUtils.isNotBlank(bo.getAttr3()), QcInspectionTask::getAttr3, bo.getAttr3())
+        .eq(StringUtils.isNotBlank(bo.getAttr4()), QcInspectionTask::getAttr4, bo.getAttr4())
+        .orderByDesc(QcInspectionTask::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增检验任务处理
+     *
+     * @param bo 检验任务处理
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(QcInspectionTaskBo bo) {
+        QcInspectionTask add = MapstructUtils.convert(bo, QcInspectionTask.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setTaskId(add.getTaskId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改检验任务处理
+     *
+     * @param bo 检验任务处理
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(QcInspectionTaskBo bo) {
+        QcInspectionTask update = MapstructUtils.convert(bo, QcInspectionTask.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(QcInspectionTask entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除检验任务处理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    @Override
+    public Boolean addInspectionTaskByHMI(QcInspectionTaskBo bo) {
+        QcInspectionTask add = MapstructUtils.convert(bo, QcInspectionTask.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setTaskId(add.getTaskId());
+        }
+        return flag;
+    }
+}

ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionTaskMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.qms.mapper.QcInspectionTaskMapper">
+
+</mapper>