[fix]品质管理:

退换货
新增退换货不合格Mapper
新增退换货不合格Mapper.xml
新增退换货不合格Service
新增退换货不合格ServiceImpl

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.ruoyi.erp.domain.ErpMaterialVo;
 import com.ruoyi.erp.service.IErpMaterialService;
+import com.ruoyi.quality.domain.QualityOrderReport;
 import com.ruoyi.quality.domain.VO.CheckoutMaterialVO;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -138,4 +139,5 @@ public class QualityRefundsExchangesController extends BaseController
         return getDataTable(erpMaterialVos);
     }
 
+
 }

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

@@ -0,0 +1,157 @@
+package com.ruoyi.quality.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_refunds_exchanges_unqualified
+ * 
+ * @author 刘晓旭
+ * @date 2024-05-24
+ */
+public class QualityRefundsExchangesUnqualified extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 退换货不合格分类Id */
+    private Long refundsExchangesUnqualifiedId;
+
+    /** 退换货单号 */
+    @Excel(name = "退换货单号")
+    private String refundsExchangesCode;
+
+    /** 料号 */
+    @Excel(name = "料号")
+    private String materialNo;
+
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    /** 制程工序不良分类 */
+    @Excel(name = "制程工序不良分类")
+    private String processBadClassification;
+
+    /** 制程工序不良等级 */
+    @Excel(name = "制程工序不良等级")
+    private String processBadGrade;
+
+    /** 制程工序不良数量 */
+    @Excel(name = "制程工序不良数量")
+    private Integer processBadNum;
+
+    /** 不合格报告url */
+    @Excel(name = "不合格报告url")
+    private String unqualifiedReportUrl;
+
+    /** 检验完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "检验完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date inspectionTime;
+
+    public void setRefundsExchangesUnqualifiedId(Long refundsExchangesUnqualifiedId) 
+    {
+        this.refundsExchangesUnqualifiedId = refundsExchangesUnqualifiedId;
+    }
+
+    public Long getRefundsExchangesUnqualifiedId() 
+    {
+        return refundsExchangesUnqualifiedId;
+    }
+    public void setRefundsExchangesCode(String refundsExchangesCode) 
+    {
+        this.refundsExchangesCode = refundsExchangesCode;
+    }
+
+    public String getRefundsExchangesCode() 
+    {
+        return refundsExchangesCode;
+    }
+    public void setMaterialNo(String materialNo) 
+    {
+        this.materialNo = materialNo;
+    }
+
+    public String getMaterialNo() 
+    {
+        return materialNo;
+    }
+    public void setMaterialName(String materialName) 
+    {
+        this.materialName = materialName;
+    }
+
+    public String getMaterialName() 
+    {
+        return materialName;
+    }
+    public void setProcessBadClassification(String processBadClassification) 
+    {
+        this.processBadClassification = processBadClassification;
+    }
+
+    public String getProcessBadClassification() 
+    {
+        return processBadClassification;
+    }
+    public void setProcessBadGrade(String processBadGrade) 
+    {
+        this.processBadGrade = processBadGrade;
+    }
+
+    public String getProcessBadGrade() 
+    {
+        return processBadGrade;
+    }
+    public void setProcessBadNum(Integer processBadNum) 
+    {
+        this.processBadNum = processBadNum;
+    }
+
+    public Integer getProcessBadNum() 
+    {
+        return processBadNum;
+    }
+    public void setUnqualifiedReportUrl(String unqualifiedReportUrl) 
+    {
+        this.unqualifiedReportUrl = unqualifiedReportUrl;
+    }
+
+    public String getUnqualifiedReportUrl() 
+    {
+        return unqualifiedReportUrl;
+    }
+    public void setInspectionTime(Date inspectionTime) 
+    {
+        this.inspectionTime = inspectionTime;
+    }
+
+    public Date getInspectionTime() 
+    {
+        return inspectionTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("refundsExchangesUnqualifiedId", getRefundsExchangesUnqualifiedId())
+            .append("refundsExchangesCode", getRefundsExchangesCode())
+            .append("materialNo", getMaterialNo())
+            .append("materialName", getMaterialName())
+            .append("processBadClassification", getProcessBadClassification())
+            .append("processBadGrade", getProcessBadGrade())
+            .append("processBadNum", getProcessBadNum())
+            .append("unqualifiedReportUrl", getUnqualifiedReportUrl())
+            .append("inspectionTime", getInspectionTime())
+            .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/QualityRefundsExchangesUnqualifiedMapper.java

@@ -0,0 +1,77 @@
+package com.ruoyi.quality.mapper;
+
+import java.util.List;
+import com.ruoyi.quality.domain.QualityRefundsExchangesUnqualified;
+
+/**
+ * 品质管理退换货不合格分类Mapper接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-05-24
+ */
+public interface QualityRefundsExchangesUnqualifiedMapper 
+{
+    /**
+     * 查询品质管理退换货不合格分类
+     * 
+     * @param refundsExchangesUnqualifiedId 品质管理退换货不合格分类ID
+     * @return 品质管理退换货不合格分类
+     */
+    public QualityRefundsExchangesUnqualified selectQualityRefundsExchangesUnqualifiedById(Long refundsExchangesUnqualifiedId);
+
+    /**
+     * 查询品质管理退换货不合格分类列表
+     * 
+     * @param qualityRefundsExchangesUnqualified 品质管理退换货不合格分类
+     * @return 品质管理退换货不合格分类集合
+     */
+    public List<QualityRefundsExchangesUnqualified> selectQualityRefundsExchangesUnqualifiedList(QualityRefundsExchangesUnqualified qualityRefundsExchangesUnqualified);
+
+    /**
+     * 新增品质管理退换货不合格分类
+     * 
+     * @param qualityRefundsExchangesUnqualified 品质管理退换货不合格分类
+     * @return 结果
+     */
+    public int insertQualityRefundsExchangesUnqualified(QualityRefundsExchangesUnqualified qualityRefundsExchangesUnqualified);
+
+    /**
+     * 修改品质管理退换货不合格分类
+     * 
+     * @param qualityRefundsExchangesUnqualified 品质管理退换货不合格分类
+     * @return 结果
+     */
+    public int updateQualityRefundsExchangesUnqualified(QualityRefundsExchangesUnqualified qualityRefundsExchangesUnqualified);
+
+    /**
+     * 删除品质管理退换货不合格分类
+     * 
+     * @param refundsExchangesUnqualifiedId 品质管理退换货不合格分类ID
+     * @return 结果
+     */
+    public int deleteQualityRefundsExchangesUnqualifiedById(Long refundsExchangesUnqualifiedId);
+
+    /**
+     * 批量删除品质管理退换货不合格分类
+     * 
+     * @param refundsExchangesUnqualifiedIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteQualityRefundsExchangesUnqualifiedByIds(String[] refundsExchangesUnqualifiedIds);
+
+    /**
+     * 作废品质管理退换货不合格分类
+     *
+     * @param refundsExchangesUnqualifiedId 品质管理退换货不合格分类ID
+     * @return 结果
+     */
+    public int cancelQualityRefundsExchangesUnqualifiedById(Long refundsExchangesUnqualifiedId);
+
+    /**
+     * 恢复品质管理退换货不合格分类
+     *
+     * @param refundsExchangesUnqualifiedId 品质管理退换货不合格分类ID
+     * @return 结果
+     */
+    public int restoreQualityRefundsExchangesUnqualifiedById(Long refundsExchangesUnqualifiedId);
+}

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

@@ -0,0 +1,75 @@
+package com.ruoyi.quality.service;
+
+import java.util.List;
+import com.ruoyi.quality.domain.QualityRefundsExchangesUnqualified;
+
+/**
+ * 品质管理退换货不合格分类Service接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-05-24
+ */
+public interface IQualityRefundsExchangesUnqualifiedService 
+{
+    /**
+     * 查询品质管理退换货不合格分类
+     * 
+     * @param refundsExchangesUnqualifiedId 品质管理退换货不合格分类ID
+     * @return 品质管理退换货不合格分类
+     */
+    public QualityRefundsExchangesUnqualified selectQualityRefundsExchangesUnqualifiedById(Long refundsExchangesUnqualifiedId);
+
+    /**
+     * 查询品质管理退换货不合格分类列表
+     * 
+     * @param qualityRefundsExchangesUnqualified 品质管理退换货不合格分类
+     * @return 品质管理退换货不合格分类集合
+     */
+    public List<QualityRefundsExchangesUnqualified> selectQualityRefundsExchangesUnqualifiedList(QualityRefundsExchangesUnqualified qualityRefundsExchangesUnqualified);
+
+    /**
+     * 新增品质管理退换货不合格分类
+     * 
+     * @param qualityRefundsExchangesUnqualified 品质管理退换货不合格分类
+     * @return 结果
+     */
+    public int insertQualityRefundsExchangesUnqualified(QualityRefundsExchangesUnqualified qualityRefundsExchangesUnqualified);
+
+    /**
+     * 修改品质管理退换货不合格分类
+     * 
+     * @param qualityRefundsExchangesUnqualified 品质管理退换货不合格分类
+     * @return 结果
+     */
+    public int updateQualityRefundsExchangesUnqualified(QualityRefundsExchangesUnqualified qualityRefundsExchangesUnqualified);
+
+    /**
+     * 批量删除品质管理退换货不合格分类
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteQualityRefundsExchangesUnqualifiedByIds(String ids);
+
+    /**
+     * 删除品质管理退换货不合格分类信息
+     * 
+     * @param refundsExchangesUnqualifiedId 品质管理退换货不合格分类ID
+     * @return 结果
+     */
+    public int deleteQualityRefundsExchangesUnqualifiedById(Long refundsExchangesUnqualifiedId);
+
+    /**
+     * 作废品质管理退换货不合格分类
+     * @param refundsExchangesUnqualifiedId 品质管理退换货不合格分类ID
+     * @return
+     */
+    int cancelQualityRefundsExchangesUnqualifiedById(Long refundsExchangesUnqualifiedId);
+
+    /**
+     * 恢复品质管理退换货不合格分类
+     * @param refundsExchangesUnqualifiedId 品质管理退换货不合格分类ID
+     * @return
+     */
+    int restoreQualityRefundsExchangesUnqualifiedById(Long refundsExchangesUnqualifiedId);
+}

ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityRefundsExchangesUnqualifiedServiceImpl.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.QualityRefundsExchangesUnqualifiedMapper;
+import com.ruoyi.quality.domain.QualityRefundsExchangesUnqualified;
+import com.ruoyi.quality.service.IQualityRefundsExchangesUnqualifiedService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 品质管理退换货不合格分类Service业务层处理
+ * 
+ * @author 刘晓旭
+ * @date 2024-05-24
+ */
+@Service
+public class QualityRefundsExchangesUnqualifiedServiceImpl implements IQualityRefundsExchangesUnqualifiedService 
+{
+    @Autowired
+    private QualityRefundsExchangesUnqualifiedMapper qualityRefundsExchangesUnqualifiedMapper;
+
+    /**
+     * 查询品质管理退换货不合格分类
+     * 
+     * @param refundsExchangesUnqualifiedId 品质管理退换货不合格分类ID
+     * @return 品质管理退换货不合格分类
+     */
+    @Override
+    public QualityRefundsExchangesUnqualified selectQualityRefundsExchangesUnqualifiedById(Long refundsExchangesUnqualifiedId)
+    {
+        return qualityRefundsExchangesUnqualifiedMapper.selectQualityRefundsExchangesUnqualifiedById(refundsExchangesUnqualifiedId);
+    }
+
+    /**
+     * 查询品质管理退换货不合格分类列表
+     * 
+     * @param qualityRefundsExchangesUnqualified 品质管理退换货不合格分类
+     * @return 品质管理退换货不合格分类
+     */
+    @Override
+    public List<QualityRefundsExchangesUnqualified> selectQualityRefundsExchangesUnqualifiedList(QualityRefundsExchangesUnqualified qualityRefundsExchangesUnqualified)
+    {
+        return qualityRefundsExchangesUnqualifiedMapper.selectQualityRefundsExchangesUnqualifiedList(qualityRefundsExchangesUnqualified);
+    }
+
+    /**
+     * 新增品质管理退换货不合格分类
+     * 
+     * @param qualityRefundsExchangesUnqualified 品质管理退换货不合格分类
+     * @return 结果
+     */
+    @Override
+    public int insertQualityRefundsExchangesUnqualified(QualityRefundsExchangesUnqualified qualityRefundsExchangesUnqualified)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        qualityRefundsExchangesUnqualified.setCreateBy(loginName);
+        qualityRefundsExchangesUnqualified.setCreateTime(DateUtils.getNowDate());
+        return qualityRefundsExchangesUnqualifiedMapper.insertQualityRefundsExchangesUnqualified(qualityRefundsExchangesUnqualified);
+    }
+
+    /**
+     * 修改品质管理退换货不合格分类
+     * 
+     * @param qualityRefundsExchangesUnqualified 品质管理退换货不合格分类
+     * @return 结果
+     */
+    @Override
+    public int updateQualityRefundsExchangesUnqualified(QualityRefundsExchangesUnqualified qualityRefundsExchangesUnqualified)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        qualityRefundsExchangesUnqualified.setUpdateBy(loginName);
+        qualityRefundsExchangesUnqualified.setUpdateTime(DateUtils.getNowDate());
+        return qualityRefundsExchangesUnqualifiedMapper.updateQualityRefundsExchangesUnqualified(qualityRefundsExchangesUnqualified);
+    }
+
+    /**
+     * 删除品质管理退换货不合格分类对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteQualityRefundsExchangesUnqualifiedByIds(String ids)
+    {
+        return qualityRefundsExchangesUnqualifiedMapper.deleteQualityRefundsExchangesUnqualifiedByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除品质管理退换货不合格分类信息
+     * 
+     * @param refundsExchangesUnqualifiedId 品质管理退换货不合格分类ID
+     * @return 结果
+     */
+    @Override
+    public int deleteQualityRefundsExchangesUnqualifiedById(Long refundsExchangesUnqualifiedId)
+    {
+        return qualityRefundsExchangesUnqualifiedMapper.deleteQualityRefundsExchangesUnqualifiedById(refundsExchangesUnqualifiedId);
+    }
+
+    /**
+     * 作废品质管理退换货不合格分类
+     *
+     * @param refundsExchangesUnqualifiedId 品质管理退换货不合格分类ID
+     * @return 结果
+     */
+    @Override
+    public int cancelQualityRefundsExchangesUnqualifiedById(Long refundsExchangesUnqualifiedId)
+    {
+        return qualityRefundsExchangesUnqualifiedMapper.cancelQualityRefundsExchangesUnqualifiedById(refundsExchangesUnqualifiedId);
+    }
+
+    /**
+     * 恢复品质管理退换货不合格分类信息
+     *
+     * @param refundsExchangesUnqualifiedId 品质管理退换货不合格分类ID
+     * @return 结果
+     */
+    @Override
+    public int restoreQualityRefundsExchangesUnqualifiedById(Long refundsExchangesUnqualifiedId)
+    {
+        return qualityRefundsExchangesUnqualifiedMapper.restoreQualityRefundsExchangesUnqualifiedById(refundsExchangesUnqualifiedId);
+    }
+}

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

@@ -0,0 +1,112 @@
+<?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.QualityRefundsExchangesUnqualifiedMapper">
+    
+    <resultMap type="QualityRefundsExchangesUnqualified" id="QualityRefundsExchangesUnqualifiedResult">
+        <result property="refundsExchangesUnqualifiedId"    column="refunds_exchanges_unqualified_id"    />
+        <result property="refundsExchangesCode"    column="refunds_exchanges_code"    />
+        <result property="materialNo"    column="material_no"    />
+        <result property="materialName"    column="material_name"    />
+        <result property="processBadClassification"    column="process_bad_classification"    />
+        <result property="processBadGrade"    column="process_bad_grade"    />
+        <result property="processBadNum"    column="process_bad_num"    />
+        <result property="unqualifiedReportUrl"    column="unqualified_report_url"    />
+        <result property="inspectionTime"    column="inspection_time"    />
+        <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="selectQualityRefundsExchangesUnqualifiedVo">
+        select refunds_exchanges_unqualified_id, refunds_exchanges_code, material_no, material_name, process_bad_classification, process_bad_grade, process_bad_num, unqualified_report_url, inspection_time, remark, create_by, create_time, update_by, update_time from quality_refunds_exchanges_unqualified
+    </sql>
+
+    <select id="selectQualityRefundsExchangesUnqualifiedList" parameterType="QualityRefundsExchangesUnqualified" resultMap="QualityRefundsExchangesUnqualifiedResult">
+        <include refid="selectQualityRefundsExchangesUnqualifiedVo"/>
+        <where>  
+        </where>
+    </select>
+    
+    <select id="selectQualityRefundsExchangesUnqualifiedById" parameterType="Long" resultMap="QualityRefundsExchangesUnqualifiedResult">
+        <include refid="selectQualityRefundsExchangesUnqualifiedVo"/>
+        where refunds_exchanges_unqualified_id = #{refundsExchangesUnqualifiedId}
+    </select>
+        
+    <insert id="insertQualityRefundsExchangesUnqualified" parameterType="QualityRefundsExchangesUnqualified" useGeneratedKeys="true" keyProperty="refundsExchangesUnqualifiedId">
+        insert into quality_refunds_exchanges_unqualified
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="refundsExchangesCode != null">refunds_exchanges_code,</if>
+            <if test="materialNo != null">material_no,</if>
+            <if test="materialName != null">material_name,</if>
+            <if test="processBadClassification != null">process_bad_classification,</if>
+            <if test="processBadGrade != null">process_bad_grade,</if>
+            <if test="processBadNum != null">process_bad_num,</if>
+            <if test="unqualifiedReportUrl != null">unqualified_report_url,</if>
+            <if test="inspectionTime != null">inspection_time,</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="refundsExchangesCode != null">#{refundsExchangesCode},</if>
+            <if test="materialNo != null">#{materialNo},</if>
+            <if test="materialName != null">#{materialName},</if>
+            <if test="processBadClassification != null">#{processBadClassification},</if>
+            <if test="processBadGrade != null">#{processBadGrade},</if>
+            <if test="processBadNum != null">#{processBadNum},</if>
+            <if test="unqualifiedReportUrl != null">#{unqualifiedReportUrl},</if>
+            <if test="inspectionTime != null">#{inspectionTime},</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="updateQualityRefundsExchangesUnqualified" parameterType="QualityRefundsExchangesUnqualified">
+        update quality_refunds_exchanges_unqualified
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="refundsExchangesCode != null">refunds_exchanges_code = #{refundsExchangesCode},</if>
+            <if test="materialNo != null">material_no = #{materialNo},</if>
+            <if test="materialName != null">material_name = #{materialName},</if>
+            <if test="processBadClassification != null">process_bad_classification = #{processBadClassification},</if>
+            <if test="processBadGrade != null">process_bad_grade = #{processBadGrade},</if>
+            <if test="processBadNum != null">process_bad_num = #{processBadNum},</if>
+            <if test="unqualifiedReportUrl != null">unqualified_report_url = #{unqualifiedReportUrl},</if>
+            <if test="inspectionTime != null">inspection_time = #{inspectionTime},</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 refunds_exchanges_unqualified_id = #{refundsExchangesUnqualifiedId}
+    </update>
+
+    <delete id="deleteQualityRefundsExchangesUnqualifiedById" parameterType="Long">
+        delete from quality_refunds_exchanges_unqualified where refunds_exchanges_unqualified_id = #{refundsExchangesUnqualifiedId}
+    </delete>
+
+    <delete id="deleteQualityRefundsExchangesUnqualifiedByIds" parameterType="String">
+        delete from quality_refunds_exchanges_unqualified where refunds_exchanges_unqualified_id in 
+        <foreach item="refundsExchangesUnqualifiedId" collection="array" open="(" separator="," close=")">
+            #{refundsExchangesUnqualifiedId}
+        </foreach>
+    </delete>
+
+    <update id="cancelQualityRefundsExchangesUnqualifiedById" parameterType="Long">
+        update quality_refunds_exchanges_unqualified set del_flag = '1' where refunds_exchanges_unqualified_id = #{refundsExchangesUnqualifiedId}
+    </update>
+
+    <update id="restoreQualityRefundsExchangesUnqualifiedById" parameterType="Long">
+        update quality_refunds_exchanges_unqualified set del_flag = '0' where refunds_exchanges_unqualified_id = #{refundsExchangesUnqualifiedId}
+    </update>
+
+</mapper>

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

@@ -214,11 +214,14 @@
         }
 
 
-        /*检验报告*/
+        /*品质报告*/
-        function checkoutReport(materialNo){
+        function qualityReport(materialNo, supplierCode) {
-            var makeNo = $('#makeNo').val(); //获取生产编号下拉框元素
+            var queryParams = new URLSearchParams();
-            var url = ctx + 'quality/manufacturingCheckout/checkoutReport/' + materialNo+'/'+makeNo;
+            queryParams.append('materialNo', materialNo);
-            $.modal.open("制程检验报告",url);
+            queryParams.append('supplierCode', encodeURIComponent(supplierCode));
+
+            var url = ctx + 'quality/qualityOrder/qualityReport?' + queryParams.toString();
+            $.modal.open("品质报告", url);
         }
 
     </script>

ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/qualityOrderReport.html

@@ -0,0 +1,258 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改品质管理退换货报告')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-qualityOrderReport-edit" th:object="${QualityRefundsExchangesUnqualified}">
+        <input name="materialNo" th:field="*{materialNo}" type="hidden">
+        <div class="container">
+        <!--不合格数-->
+            <div class="col-sm-12">
+        <div class="row">
+            <div class="col-sm-12 d-flex align-items-center">
+                <span style="font-weight: bold; font-family: Arial, sans-serif; font-size: 15px;">不合格数</span>
+                <a class="btn btn-success ml-auto" onclick="addUnqualified()">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-unqualified-table"></table>
+            </div>
+        </div>
+            </div>
+
+        </div>
+
+        <!--其他字段-->
+        <div class="form-group">
+            <label class="col-sm-4 control-label">检验完成时间：</label>
+            <div class="col-sm-8">
+                <div class="input-group date">
+                    <input name="inspectionTime" th:value="${#dates.format(QualityRefundsExchangesUnqualified.inspectionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-4 control-label">备注：</label>
+            <div class="col-sm-8">
+                <textarea name="remark" th:field="*{remark}" class="form-control" type="text"></textarea>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<th:block th:include="include :: bootstrap-table-editable-js"/>
+<script th:inline="javascript">
+
+    var processBadClassificationDatas = [[${@dict.getType('process_bad_classification')}]];
+    var processBadGradeDatas = [[${@dict.getType('process_bad_grade')}]];
+    var $table = $("#bootstrap-unqualified-table");
+    var prefix = ctx + "quality/qualityOrder";
+    $("#form-qualityOrderReport-edit").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        // 获取表单数据
+        const qualityReportData = $("#form-qualityOrderReport-edit").serializeArray().reduce((obj, item) => {
+            obj[item.name] = item.value;
+            return obj;
+        }, {});
+        // 获取bootstrap-table的数据，这里假设你使用bootstrap-table的API获取所有数据
+        var table = $('#bootstrap-unqualified-table').bootstrapTable('getData');
+        // 检查表格数据是否为空
+        if (table.length===0){
+            $.modal.alertWarning("请至少添加一条不合格数再保存!");
+            return;
+        }
+        console.log(JSON.stringify(table));
+        // 将表数据转换成与qualityReportData格式一致的数组
+        var unqualifiedDataList = table.map(function(item) {
+            // 根据实际字段名调整
+            return {
+                "processBadClassification": item.processBadClassification,
+                "processBadGrade": item.processBadGrade,
+                "processBadNum": item.processBadNum,
+                "unqualifiedReportUrl": item.unqualifiedReportUrl
+                // ...其他字段
+            };
+        });
+
+        const combinedData = Object.assign({}, qualityReportData, { unqualifiedDataList: unqualifiedDataList });
+        // 合并表单数据和表格数据
+        // const combinedData = Object.assign({}, ...complaintNoticeData.array(item => ({ [item.name]: item.value })), ...materialData);
+        console.log(combinedData)
+        // 使用 JSON.stringify() 序列化数据
+        const jsonData = JSON.stringify(combinedData);
+        // 发送 AJAX 请求到后端接口
+        $.operate.saveJson(prefix + "/qualityReport", jsonData);
+    }
+
+    $("input[name='inspectionTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+
+
+    //添加不合格数
+    function addUnqualified() {
+        // 生成一个简单的唯一标识，这里使用时间戳作为示例
+        var uniqueId = new Date().getTime();
+        // 创建一个新行数据模板，这里仅为示例，具体根据表格列来定义
+        var newRow = {
+            qualityOrderReportId:uniqueId,
+            processBadClassification: "",
+            processBadGrade: "",
+            processBadNum: "",
+            unqualifiedReportUrl: ""
+        };
+
+        // 使用Bootstrap Table的API插入新行
+        $('#bootstrap-unqualified-table').bootstrapTable('append', newRow);
+
+    }
+    //收款凭证table列表
+    $(function() {
+        var options = {
+            id:"bootstrap-unqualified-table",
+            modalName: "收款凭证",
+            showColumns: false,
+            pagination: false,
+            showToggle: false,
+            showRefresh:false,
+            showSearch:false,
+            singleSelect:true,
+            columns: [{
+                checkbox: false
+            },
+                {
+                    title: '品质报告单id',
+                    field: 'qualityOrderReportId',
+                    visible: false
+                },
+
+                {title: '不良分类',field: 'processBadClassification',
+                    formatter:function (value, row, index) {
+                        return processBadClassificationFormatter(value,row,index);
+                    }
+                },
+
+                {title: '不良等级',field: 'processBadGrade',
+                    formatter:function (value, row, index) {
+                        return processBadGradeFormatter(value,row,index);
+                    }
+                },
+                {
+                    title: '数量',
+                    field: 'processBadNum',
+                    editable:{
+                        type: 'text',
+                        mode:'inline',
+                        validate: function (v) {
+                            if (!v) return '数量不能为空';
+                            if (isNaN(v)) return '数量必须是数字';
+                            var processBadNum = parseInt(v);
+                            if (processBadNum <= 0) return '数量必须是正整数';
+                        }
+                    }
+                },
+                {
+                    title: '报告',
+                    field: 'unqualifiedReportUrl',
+                    editable: {
+                        mode:'inline',
+                        type: 'text', // 表示该列可以被编辑为文本
+                    },
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeRow(\'' + row.qualityOrderReportId + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                        return actions.join('');
+                    }
+                }
+            ]
+        };
+        $.table.init(options);
+    });
+
+
+    // 逻辑删除不合格数前端的一行数据
+    function removeRow(qualityOrderReportId){
+        console.log(qualityOrderReportId);
+        // 直接使用 receivablesRecordsId 值进行删除操作
+        $("#bootstrap-unqualified-table").bootstrapTable('remove', {
+            field: 'qualityOrderReportId',
+            values: qualityOrderReportId
+        });
+    }
+
+
+    // 列中获取不良分类的下拉改变数据
+    function onProcessBadClassification(selectElement, rowIndex) {
+        var processBadClassificationValue = $(selectElement).val();
+        var tableData = $table.bootstrapTable('getData');
+        var newRow = tableData[rowIndex]; // 获取当前行数据
+        // 重新渲染成本小类的设备名称列
+        // 更新行数据
+        newRow.processBadClassification = processBadClassificationValue;
+        $table.bootstrapTable('updateRow', {index: rowIndex, row: newRow});
+    }
+
+    // 自定义不良分类的格式化函数
+    function processBadClassificationFormatter(value, row, index) {
+        var selectHtml = '<select class="form-control" onchange="onProcessBadClassification(this, ' + index + ')">';
+
+        // 添加默认选项
+        selectHtml += '<option value=""' + (value === undefined || value === '' ? ' selected' : '') + '>所有</option>';
+
+        processBadClassificationDatas.forEach(function (child) {
+            selectHtml += '<option value="' + child.dictValue + '"' + (value === child.dictValue ? ' selected' : '') + '>' + child.dictLabel + '</option>';
+        });
+
+        selectHtml += '</select>';
+        return selectHtml;
+    }
+
+
+
+    // 列中获取不良等级的下拉改变数据
+    function onProcessBadGrade(selectElement, rowIndex) {
+        var processBadGradeValue = $(selectElement).val();
+        var tableData = $table.bootstrapTable('getData');
+        var newRow = tableData[rowIndex]; // 获取当前行数据
+        // 重新渲染成本小类的设备名称列
+        // 更新行数据
+        newRow.processBadGrade = processBadGradeValue;
+        $table.bootstrapTable('updateRow', {index: rowIndex, row: newRow});
+    }
+
+    // 自定义不良等级的格式化函数
+    function processBadGradeFormatter(value, row, index) {
+        var selectHtml = '<select class="form-control" onchange="onProcessBadGrade(this, ' + index + ')">';
+
+        // 添加默认选项
+        selectHtml += '<option value=""' + (value === undefined || value === '' ? ' selected' : '') + '>所有</option>';
+
+        processBadGradeDatas.forEach(function (child) {
+            selectHtml += '<option value="' + child.dictValue + '"' + (value === child.dictValue ? ' selected' : '') + '>' + child.dictLabel + '</option>';
+        });
+
+        selectHtml += '</select>';
+        return selectHtml;
+    }
+
+</script>
+</body>
+</html>