[feat]品质管理:

制程工序
应付账款详情页面新增应付账款记录table
新增应付账款记录domain
新增应付账款记录service
新增应付账款记录serviceImpl
新增应付账款记录mapper
完成数据的填充，查询条件

ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java

@@ -0,0 +1,151 @@
+package com.ruoyi.quality.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.quality.domain.QualityManufacturingProcess;
+import com.ruoyi.quality.service.IQualityManufacturingProcessService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 品质管理制程工序Controller
+ * 
+ * @author 刘晓旭
+ * @date 2024-05-10
+ */
+@Controller
+@RequestMapping("/quality/manufacturingProcess")
+public class QualityManufacturingProcessController extends BaseController
+{
+    private String prefix = "quality/manufacturingProcess";
+
+    @Autowired
+    private IQualityManufacturingProcessService qualityManufacturingProcessService;
+
+    @RequiresPermissions("quality:manufacturingProcess:view")
+    @GetMapping()
+    public String manufacturingProcess()
+    {
+        return prefix + "/manufacturingProcess";
+    }
+
+    /**
+     * 查询品质管理制程工序列表
+     */
+    @RequiresPermissions("quality:manufacturingProcess:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(QualityManufacturingProcess qualityManufacturingProcess)
+    {
+        startPage();
+        List<QualityManufacturingProcess> list = qualityManufacturingProcessService.selectQualityManufacturingProcessList(qualityManufacturingProcess);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出品质管理制程工序列表
+     */
+    @RequiresPermissions("quality:manufacturingProcess:export")
+    @Log(title = "品质管理制程工序", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(QualityManufacturingProcess qualityManufacturingProcess)
+    {
+        List<QualityManufacturingProcess> list = qualityManufacturingProcessService.selectQualityManufacturingProcessList(qualityManufacturingProcess);
+        ExcelUtil<QualityManufacturingProcess> util = new ExcelUtil<QualityManufacturingProcess>(QualityManufacturingProcess.class);
+        return util.exportExcel(list, "品质管理制程工序数据");
+    }
+
+    /**
+     * 新增品质管理制程工序
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存品质管理制程工序
+     */
+    @RequiresPermissions("quality:manufacturingProcess:add")
+    @Log(title = "品质管理制程工序", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(QualityManufacturingProcess qualityManufacturingProcess)
+    {
+        return toAjax(qualityManufacturingProcessService.insertQualityManufacturingProcess(qualityManufacturingProcess));
+    }
+
+    /**
+     * 修改品质管理制程工序
+     */
+    @GetMapping("/edit/{manufacturingProcessAutoid}")
+    public String edit(@PathVariable("manufacturingProcessAutoid") Long manufacturingProcessAutoid, ModelMap mmap)
+    {
+        QualityManufacturingProcess qualityManufacturingProcess = qualityManufacturingProcessService.selectQualityManufacturingProcessById(manufacturingProcessAutoid);
+        mmap.put("qualityManufacturingProcess", qualityManufacturingProcess);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存品质管理制程工序
+     */
+    @RequiresPermissions("quality:manufacturingProcess:edit")
+    @Log(title = "品质管理制程工序", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(QualityManufacturingProcess qualityManufacturingProcess)
+    {
+        return toAjax(qualityManufacturingProcessService.updateQualityManufacturingProcess(qualityManufacturingProcess));
+    }
+
+    /**
+     * 删除品质管理制程工序
+     */
+    @RequiresPermissions("quality:manufacturingProcess:remove")
+    @Log(title = "品质管理制程工序", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(qualityManufacturingProcessService.deleteQualityManufacturingProcessByIds(ids));
+    }
+
+    /**
+     * 作废品质管理制程工序
+     */
+    @RequiresPermissions("quality:manufacturingProcess:cancel")
+    @Log(title = "品质管理制程工序", businessType = BusinessType.CANCEL)
+    @GetMapping( "/cancel/{id}")
+    @ResponseBody
+    public AjaxResult cancel(@PathVariable("id") Long id){
+        return toAjax(qualityManufacturingProcessService.cancelQualityManufacturingProcessById(id));
+    }
+
+    /**
+     * 恢复品质管理制程工序
+     */
+    @RequiresPermissions("quality:manufacturingProcess:restore")
+    @Log(title = "品质管理制程工序", businessType = BusinessType.RESTORE)
+    @GetMapping( "/restore/{id}")
+    @ResponseBody
+    public AjaxResult restore(@PathVariable("id")Long id)
+    {
+        return toAjax(qualityManufacturingProcessService.restoreQualityManufacturingProcessById(id));
+    }
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingProcess.java

@@ -0,0 +1,168 @@
+package com.ruoyi.quality.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 品质管理制程工序对象 quality_manufacturing_process
+ * 
+ * @author 刘晓旭
+ * @date 2024-05-10
+ */
+public class QualityManufacturingProcess extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 制程工序自增Id */
+    private Long manufacturingProcessAutoid;
+
+    /** 制程工序ID */
+    @Excel(name = "制程工序ID")
+    private String manufacturingProcessId;
+
+    /** 制程工序编号 */
+    @Excel(name = "制程工序编号")
+    private String manufacturingProcessCode;
+
+    /** 制程工序名称 */
+    @Excel(name = "制程工序名称")
+    private String manufacturingProcessName;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /** 设备型号 */
+    @Excel(name = "设备型号")
+    private String deviceModelCode;
+
+    /** 工序顺序 */
+    @Excel(name = "工序顺序")
+    private String processSequence;
+
+    /** 车间名称 */
+    @Excel(name = "车间名称")
+    private String workshopName;
+
+    /** 零件名称 */
+    @Excel(name = "零件名称")
+    private String modName;
+
+    /** 工序检验项目 */
+    @Excel(name = "工序检验项目")
+    private String processInspectionItem;
+
+    public void setManufacturingProcessAutoid(Long manufacturingProcessAutoid) 
+    {
+        this.manufacturingProcessAutoid = manufacturingProcessAutoid;
+    }
+
+    public Long getManufacturingProcessAutoid() 
+    {
+        return manufacturingProcessAutoid;
+    }
+    public void setManufacturingProcessId(String manufacturingProcessId) 
+    {
+        this.manufacturingProcessId = manufacturingProcessId;
+    }
+
+    public String getManufacturingProcessId() 
+    {
+        return manufacturingProcessId;
+    }
+    public void setManufacturingProcessCode(String manufacturingProcessCode) 
+    {
+        this.manufacturingProcessCode = manufacturingProcessCode;
+    }
+
+    public String getManufacturingProcessCode() 
+    {
+        return manufacturingProcessCode;
+    }
+    public void setManufacturingProcessName(String manufacturingProcessName) 
+    {
+        this.manufacturingProcessName = manufacturingProcessName;
+    }
+
+    public String getManufacturingProcessName() 
+    {
+        return manufacturingProcessName;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setDeviceModelCode(String deviceModelCode) 
+    {
+        this.deviceModelCode = deviceModelCode;
+    }
+
+    public String getDeviceModelCode() 
+    {
+        return deviceModelCode;
+    }
+    public void setProcessSequence(String processSequence) 
+    {
+        this.processSequence = processSequence;
+    }
+
+    public String getProcessSequence() 
+    {
+        return processSequence;
+    }
+    public void setWorkshopName(String workshopName) 
+    {
+        this.workshopName = workshopName;
+    }
+
+    public String getWorkshopName() 
+    {
+        return workshopName;
+    }
+    public void setModName(String modName) 
+    {
+        this.modName = modName;
+    }
+
+    public String getModName() 
+    {
+        return modName;
+    }
+    public void setProcessInspectionItem(String processInspectionItem) 
+    {
+        this.processInspectionItem = processInspectionItem;
+    }
+
+    public String getProcessInspectionItem() 
+    {
+        return processInspectionItem;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("manufacturingProcessAutoid", getManufacturingProcessAutoid())
+            .append("manufacturingProcessId", getManufacturingProcessId())
+            .append("manufacturingProcessCode", getManufacturingProcessCode())
+            .append("manufacturingProcessName", getManufacturingProcessName())
+            .append("deviceName", getDeviceName())
+            .append("deviceModelCode", getDeviceModelCode())
+            .append("processSequence", getProcessSequence())
+            .append("workshopName", getWorkshopName())
+            .append("modName", getModName())
+            .append("processInspectionItem", getProcessInspectionItem())
+            .append("remark", getRemark())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java

@@ -0,0 +1,77 @@
+package com.ruoyi.quality.mapper;
+
+import java.util.List;
+import com.ruoyi.quality.domain.QualityManufacturingProcess;
+
+/**
+ * 品质管理制程工序Mapper接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-05-10
+ */
+public interface QualityManufacturingProcessMapper 
+{
+    /**
+     * 查询品质管理制程工序
+     * 
+     * @param manufacturingProcessAutoid 品质管理制程工序ID
+     * @return 品质管理制程工序
+     */
+    public QualityManufacturingProcess selectQualityManufacturingProcessById(Long manufacturingProcessAutoid);
+
+    /**
+     * 查询品质管理制程工序列表
+     * 
+     * @param qualityManufacturingProcess 品质管理制程工序
+     * @return 品质管理制程工序集合
+     */
+    public List<QualityManufacturingProcess> selectQualityManufacturingProcessList(QualityManufacturingProcess qualityManufacturingProcess);
+
+    /**
+     * 新增品质管理制程工序
+     * 
+     * @param qualityManufacturingProcess 品质管理制程工序
+     * @return 结果
+     */
+    public int insertQualityManufacturingProcess(QualityManufacturingProcess qualityManufacturingProcess);
+
+    /**
+     * 修改品质管理制程工序
+     * 
+     * @param qualityManufacturingProcess 品质管理制程工序
+     * @return 结果
+     */
+    public int updateQualityManufacturingProcess(QualityManufacturingProcess qualityManufacturingProcess);
+
+    /**
+     * 删除品质管理制程工序
+     * 
+     * @param manufacturingProcessAutoid 品质管理制程工序ID
+     * @return 结果
+     */
+    public int deleteQualityManufacturingProcessById(Long manufacturingProcessAutoid);
+
+    /**
+     * 批量删除品质管理制程工序
+     * 
+     * @param manufacturingProcessAutoids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteQualityManufacturingProcessByIds(String[] manufacturingProcessAutoids);
+
+    /**
+     * 作废品质管理制程工序
+     *
+     * @param manufacturingProcessAutoid 品质管理制程工序ID
+     * @return 结果
+     */
+    public int cancelQualityManufacturingProcessById(Long manufacturingProcessAutoid);
+
+    /**
+     * 恢复品质管理制程工序
+     *
+     * @param manufacturingProcessAutoid 品质管理制程工序ID
+     * @return 结果
+     */
+    public int restoreQualityManufacturingProcessById(Long manufacturingProcessAutoid);
+}

ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java

@@ -0,0 +1,75 @@
+package com.ruoyi.quality.service;
+
+import java.util.List;
+import com.ruoyi.quality.domain.QualityManufacturingProcess;
+
+/**
+ * 品质管理制程工序Service接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-05-10
+ */
+public interface IQualityManufacturingProcessService 
+{
+    /**
+     * 查询品质管理制程工序
+     * 
+     * @param manufacturingProcessAutoid 品质管理制程工序ID
+     * @return 品质管理制程工序
+     */
+    public QualityManufacturingProcess selectQualityManufacturingProcessById(Long manufacturingProcessAutoid);
+
+    /**
+     * 查询品质管理制程工序列表
+     * 
+     * @param qualityManufacturingProcess 品质管理制程工序
+     * @return 品质管理制程工序集合
+     */
+    public List<QualityManufacturingProcess> selectQualityManufacturingProcessList(QualityManufacturingProcess qualityManufacturingProcess);
+
+    /**
+     * 新增品质管理制程工序
+     * 
+     * @param qualityManufacturingProcess 品质管理制程工序
+     * @return 结果
+     */
+    public int insertQualityManufacturingProcess(QualityManufacturingProcess qualityManufacturingProcess);
+
+    /**
+     * 修改品质管理制程工序
+     * 
+     * @param qualityManufacturingProcess 品质管理制程工序
+     * @return 结果
+     */
+    public int updateQualityManufacturingProcess(QualityManufacturingProcess qualityManufacturingProcess);
+
+    /**
+     * 批量删除品质管理制程工序
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteQualityManufacturingProcessByIds(String ids);
+
+    /**
+     * 删除品质管理制程工序信息
+     * 
+     * @param manufacturingProcessAutoid 品质管理制程工序ID
+     * @return 结果
+     */
+    public int deleteQualityManufacturingProcessById(Long manufacturingProcessAutoid);
+
+    /**
+     * 作废品质管理制程工序
+     * @param manufacturingProcessAutoid 品质管理制程工序ID
+     * @return
+     */
+    int cancelQualityManufacturingProcessById(Long manufacturingProcessAutoid);
+
+    /**
+     * 恢复品质管理制程工序
+     * @param manufacturingProcessAutoid 品质管理制程工序ID
+     * @return
+     */
+    int restoreQualityManufacturingProcessById(Long manufacturingProcessAutoid);
+}

ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java

@@ -0,0 +1,126 @@
+package com.ruoyi.quality.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.quality.mapper.QualityManufacturingProcessMapper;
+import com.ruoyi.quality.domain.QualityManufacturingProcess;
+import com.ruoyi.quality.service.IQualityManufacturingProcessService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 品质管理制程工序Service业务层处理
+ * 
+ * @author 刘晓旭
+ * @date 2024-05-10
+ */
+@Service
+public class QualityManufacturingProcessServiceImpl implements IQualityManufacturingProcessService 
+{
+    @Autowired
+    private QualityManufacturingProcessMapper qualityManufacturingProcessMapper;
+
+    /**
+     * 查询品质管理制程工序
+     * 
+     * @param manufacturingProcessAutoid 品质管理制程工序ID
+     * @return 品质管理制程工序
+     */
+    @Override
+    public QualityManufacturingProcess selectQualityManufacturingProcessById(Long manufacturingProcessAutoid)
+    {
+        return qualityManufacturingProcessMapper.selectQualityManufacturingProcessById(manufacturingProcessAutoid);
+    }
+
+    /**
+     * 查询品质管理制程工序列表
+     * 
+     * @param qualityManufacturingProcess 品质管理制程工序
+     * @return 品质管理制程工序
+     */
+    @Override
+    public List<QualityManufacturingProcess> selectQualityManufacturingProcessList(QualityManufacturingProcess qualityManufacturingProcess)
+    {
+        return qualityManufacturingProcessMapper.selectQualityManufacturingProcessList(qualityManufacturingProcess);
+    }
+
+    /**
+     * 新增品质管理制程工序
+     * 
+     * @param qualityManufacturingProcess 品质管理制程工序
+     * @return 结果
+     */
+    @Override
+    public int insertQualityManufacturingProcess(QualityManufacturingProcess qualityManufacturingProcess)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        qualityManufacturingProcess.setCreateBy(loginName);
+        qualityManufacturingProcess.setCreateTime(DateUtils.getNowDate());
+        return qualityManufacturingProcessMapper.insertQualityManufacturingProcess(qualityManufacturingProcess);
+    }
+
+    /**
+     * 修改品质管理制程工序
+     * 
+     * @param qualityManufacturingProcess 品质管理制程工序
+     * @return 结果
+     */
+    @Override
+    public int updateQualityManufacturingProcess(QualityManufacturingProcess qualityManufacturingProcess)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        qualityManufacturingProcess.setUpdateBy(loginName);
+        qualityManufacturingProcess.setUpdateTime(DateUtils.getNowDate());
+        return qualityManufacturingProcessMapper.updateQualityManufacturingProcess(qualityManufacturingProcess);
+    }
+
+    /**
+     * 删除品质管理制程工序对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteQualityManufacturingProcessByIds(String ids)
+    {
+        return qualityManufacturingProcessMapper.deleteQualityManufacturingProcessByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除品质管理制程工序信息
+     * 
+     * @param manufacturingProcessAutoid 品质管理制程工序ID
+     * @return 结果
+     */
+    @Override
+    public int deleteQualityManufacturingProcessById(Long manufacturingProcessAutoid)
+    {
+        return qualityManufacturingProcessMapper.deleteQualityManufacturingProcessById(manufacturingProcessAutoid);
+    }
+
+    /**
+     * 作废品质管理制程工序
+     *
+     * @param manufacturingProcessAutoid 品质管理制程工序ID
+     * @return 结果
+     */
+    @Override
+    public int cancelQualityManufacturingProcessById(Long manufacturingProcessAutoid)
+    {
+        return qualityManufacturingProcessMapper.cancelQualityManufacturingProcessById(manufacturingProcessAutoid);
+    }
+
+    /**
+     * 恢复品质管理制程工序信息
+     *
+     * @param manufacturingProcessAutoid 品质管理制程工序ID
+     * @return 结果
+     */
+    @Override
+    public int restoreQualityManufacturingProcessById(Long manufacturingProcessAutoid)
+    {
+        return qualityManufacturingProcessMapper.restoreQualityManufacturingProcessById(manufacturingProcessAutoid);
+    }
+}

ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml

@@ -0,0 +1,122 @@
+<?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="com.ruoyi.quality.mapper.QualityManufacturingProcessMapper">
+    
+    <resultMap type="QualityManufacturingProcess" id="QualityManufacturingProcessResult">
+        <result property="manufacturingProcessAutoid"    column="manufacturing_process_autoid"    />
+        <result property="manufacturingProcessId"    column="manufacturing_process_id"    />
+        <result property="manufacturingProcessCode"    column="manufacturing_process_code"    />
+        <result property="manufacturingProcessName"    column="manufacturing_process_name"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="deviceModelCode"    column="device_model_code"    />
+        <result property="processSequence"    column="process_sequence"    />
+        <result property="workshopName"    column="workshop_name"    />
+        <result property="modName"    column="mod_name"    />
+        <result property="processInspectionItem"    column="process_inspection_item"    />
+        <result property="remark"    column="remark"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectQualityManufacturingProcessVo">
+        select manufacturing_process_autoid, manufacturing_process_id, manufacturing_process_code, manufacturing_process_name, device_name, device_model_code, process_sequence, workshop_name, mod_name, process_inspection_item, remark, create_by, create_time, update_by, update_time from quality_manufacturing_process
+    </sql>
+
+    <select id="selectQualityManufacturingProcessList" parameterType="QualityManufacturingProcess" resultMap="QualityManufacturingProcessResult">
+        <include refid="selectQualityManufacturingProcessVo"/>
+        <where>  
+            <if test="manufacturingProcessId != null  and manufacturingProcessId != ''"> and manufacturing_process_id = #{manufacturingProcessId}</if>
+            <if test="manufacturingProcessCode != null  and manufacturingProcessCode != ''"> and manufacturing_process_code = #{manufacturingProcessCode}</if>
+            <if test="manufacturingProcessName != null  and manufacturingProcessName != ''"> and manufacturing_process_name = #{manufacturingProcessName}</if>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="deviceModelCode != null  and deviceModelCode != ''"> and device_model_code = #{deviceModelCode}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectQualityManufacturingProcessById" parameterType="Long" resultMap="QualityManufacturingProcessResult">
+        <include refid="selectQualityManufacturingProcessVo"/>
+        where manufacturing_process_autoid = #{manufacturingProcessAutoid}
+    </select>
+        
+    <insert id="insertQualityManufacturingProcess" parameterType="QualityManufacturingProcess" useGeneratedKeys="true" keyProperty="manufacturingProcessAutoid">
+        insert into quality_manufacturing_process
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="manufacturingProcessId != null">manufacturing_process_id,</if>
+            <if test="manufacturingProcessCode != null">manufacturing_process_code,</if>
+            <if test="manufacturingProcessName != null">manufacturing_process_name,</if>
+            <if test="deviceName != null">device_name,</if>
+            <if test="deviceModelCode != null">device_model_code,</if>
+            <if test="processSequence != null">process_sequence,</if>
+            <if test="workshopName != null">workshop_name,</if>
+            <if test="modName != null">mod_name,</if>
+            <if test="processInspectionItem != null">process_inspection_item,</if>
+            <if test="remark != null">remark,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="manufacturingProcessId != null">#{manufacturingProcessId},</if>
+            <if test="manufacturingProcessCode != null">#{manufacturingProcessCode},</if>
+            <if test="manufacturingProcessName != null">#{manufacturingProcessName},</if>
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="deviceModelCode != null">#{deviceModelCode},</if>
+            <if test="processSequence != null">#{processSequence},</if>
+            <if test="workshopName != null">#{workshopName},</if>
+            <if test="modName != null">#{modName},</if>
+            <if test="processInspectionItem != null">#{processInspectionItem},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateQualityManufacturingProcess" parameterType="QualityManufacturingProcess">
+        update quality_manufacturing_process
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="manufacturingProcessId != null">manufacturing_process_id = #{manufacturingProcessId},</if>
+            <if test="manufacturingProcessCode != null">manufacturing_process_code = #{manufacturingProcessCode},</if>
+            <if test="manufacturingProcessName != null">manufacturing_process_name = #{manufacturingProcessName},</if>
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="deviceModelCode != null">device_model_code = #{deviceModelCode},</if>
+            <if test="processSequence != null">process_sequence = #{processSequence},</if>
+            <if test="workshopName != null">workshop_name = #{workshopName},</if>
+            <if test="modName != null">mod_name = #{modName},</if>
+            <if test="processInspectionItem != null">process_inspection_item = #{processInspectionItem},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where manufacturing_process_autoid = #{manufacturingProcessAutoid}
+    </update>
+
+    <delete id="deleteQualityManufacturingProcessById" parameterType="Long">
+        delete from quality_manufacturing_process where manufacturing_process_autoid = #{manufacturingProcessAutoid}
+    </delete>
+
+    <delete id="deleteQualityManufacturingProcessByIds" parameterType="String">
+        delete from quality_manufacturing_process where manufacturing_process_autoid in 
+        <foreach item="manufacturingProcessAutoid" collection="array" open="(" separator="," close=")">
+            #{manufacturingProcessAutoid}
+        </foreach>
+    </delete>
+
+    <update id="cancelQualityManufacturingProcessById" parameterType="Long">
+        update quality_manufacturing_process set del_flag = '1' where manufacturing_process_autoid = #{manufacturingProcessAutoid}
+    </update>
+
+    <update id="restoreQualityManufacturingProcessById" parameterType="Long">
+        update quality_manufacturing_process set del_flag = '0' where manufacturing_process_autoid = #{manufacturingProcessAutoid}
+    </update>
+
+</mapper>

ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/add.html

@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增品质管理制程工序')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-manufacturingProcess-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">制程工序编号：</label>
+                <div class="col-sm-8">
+                    <input name="manufacturingProcessCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">制程工序名称：</label>
+                <div class="col-sm-8">
+                    <select name="manufacturingProcessName" class="form-control m-b" th:with="type=${@dict.getType('manufacturing_process_name')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设备名称：</label>
+                <div class="col-sm-8">
+                    <input name="deviceName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设备型号：</label>
+                <div class="col-sm-8">
+                    <input name="deviceModelCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工序顺序：</label>
+                <div class="col-sm-8">
+                    <input name="processSequence" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">车间名称：</label>
+                <div class="col-sm-8">
+                    <input name="workshopName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">零件名称：</label>
+                <div class="col-sm-8">
+                    <input name="modName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工序检验项目：</label>
+                <div class="col-sm-8">
+                    <input name="processInspectionItem" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "quality/manufacturingProcess"
+        $("#form-manufacturingProcess-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-manufacturingProcess-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/edit.html

@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改品质管理制程工序')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-manufacturingProcess-edit" th:object="${qualityManufacturingProcess}">
+            <input name="manufacturingProcessAutoid" th:field="*{manufacturingProcessAutoid}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">制程工序编号：</label>
+                <div class="col-sm-8">
+                    <input name="manufacturingProcessCode" th:field="*{manufacturingProcessCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">制程工序名称：</label>
+                <div class="col-sm-8">
+                    <select name="manufacturingProcessName" class="form-control m-b" th:with="type=${@dict.getType('manufacturing_process_name')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{manufacturingProcessName}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设备名称：</label>
+                <div class="col-sm-8">
+                    <input name="deviceName" th:field="*{deviceName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设备型号：</label>
+                <div class="col-sm-8">
+                    <input name="deviceModelCode" th:field="*{deviceModelCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工序顺序：</label>
+                <div class="col-sm-8">
+                    <input name="processSequence" th:field="*{processSequence}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">车间名称：</label>
+                <div class="col-sm-8">
+                    <input name="workshopName" th:field="*{workshopName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">零件名称：</label>
+                <div class="col-sm-8">
+                    <input name="modName" th:field="*{modName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工序检验项目：</label>
+                <div class="col-sm-8">
+                    <input name="processInspectionItem" th:field="*{processInspectionItem}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "quality/manufacturingProcess";
+        $("#form-manufacturingProcess-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-manufacturingProcess-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html

@@ -0,0 +1,170 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('品质管理制程工序列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>制程工序ID：</label>
+                                <input type="text" name="manufacturingProcessId"/>
+                            </li>
+                            <li>
+                                <label>制程工序编号：</label>
+                                <input type="text" name="manufacturingProcessCode"/>
+                            </li>
+                            <li>
+                                <label>制程工序名称：</label>
+                                <select name="manufacturingProcessName" th:with="type=${@dict.getType('manufacturing_process_name')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>设备名称：</label>
+                                <input type="text" name="deviceName"/>
+                            </li>
+                            <li>
+                                <label>设备型号：</label>
+                                <input type="text" name="deviceModelCode"/>
+                            </li>
+                            <li class="select-time">
+                                <label>录入时间：</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="quality:manufacturingProcess:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="quality:manufacturingProcess:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('quality:manufacturingProcess:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('quality:manufacturingProcess:remove')}]];
+        var cancelFlag = [[${@permission.hasPermi('quality:manufacturingProcess:cancel')}]];
+        var restoreFlag = [[${@permission.hasPermi('quality:manufacturingProcess:restore')}]];
+        var manufacturingProcessNameDatas = [[${@dict.getType('manufacturing_process_name')}]];
+        var prefix = ctx + "quality/manufacturingProcess";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                cancelUrl: prefix + "/cancel/{id}",
+                restoreUrl: prefix + "/restore/{id}",
+                exportUrl: prefix + "/export",
+                modalName: "品质管理制程工序",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    title: '制程工序自增Id',
+                    field: 'manufacturingProcessAutoid',
+                    visible: false
+                },
+                {
+                    title: '制程工序ID',
+                    field: 'manufacturingProcessId',
+                },
+                {
+                    title: '制程工序编号',
+                    field: 'manufacturingProcessCode',
+                },
+                {
+                    title: '制程工序名称',
+                    field: 'manufacturingProcessName',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(manufacturingProcessNameDatas, value);
+                    }
+                },
+                {
+                    title: '设备名称',
+                    field: 'deviceName',
+                },
+                {
+                    title: '设备型号',
+                    field: 'deviceModelCode',
+                },
+                {
+                    title: '工序顺序',
+                    field: 'processSequence',
+                },
+                {
+                    title: '车间名称',
+                    field: 'workshopName',
+                },
+                {
+                    title: '零件名称',
+                    field: 'modName',
+                },
+                {
+                    title: '工序检验项目',
+                    field: 'processInspectionItem',
+                },
+                {
+                    title: '备注',
+                    field: 'remark',
+                },
+                {
+                    title: '录入人',
+                    field: 'createBy',
+                },
+                {
+                    title: '录入时间',
+                    field: 'createTime',
+                },
+                {
+                    title: '更新人',
+                    field: 'updateBy',
+                },
+                {
+                    title: '上次更新时间',
+                    field: 'updateTime',
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.manufacturingProcessAutoid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.manufacturingProcessAutoid + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                        if(row.delFlag == '0'){
+                            actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
+                        }else{
+                            actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
+                        }
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>