diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/ReturnQualityOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/ReturnQualityOrderController.java
index 379a1018..ff3716e2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/ReturnQualityOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/ReturnQualityOrderController.java
@@ -42,11 +42,11 @@ public class ReturnQualityOrderController extends BaseController {
     }
 
     /**
-     * 查询来料品质管理品质单列表
+     * 查询退料品质管理品质单列表
      */
     @PostMapping("/qualityOrderList")
     @ResponseBody
-    public TableDataInfo iqcOrderList(QualityOrder qualityOrder)
+    public TableDataInfo returnOrderList(QualityOrder qualityOrder)
     {
         startPage();//
         List<QualityOrder> list = qualityOrderService.selectReturnQualityOrderList(qualityOrder);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityOrderMapper.java
index 049e9806..98194d11 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityOrderMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityOrderMapper.java
@@ -99,11 +99,24 @@ public interface QualityOrderMapper
     * 查询来料品质单*/
     public List<QualityOrder> selectIqcQualityOrderList(QualityOrder qualityOrder);
 
+    /*
+     * 查询未完成来料品质单*/
+    public List<QualityOrder> selectIqcQualityOrderListUndo(QualityOrder qualityOrder);
+
     /*
     * 查询生产品质单*/
     public List<QualityOrder> selectMakeQualityOrderList(QualityOrder qualityOrder);
 
+    /*
+     * 查询未完成生产品质单*/
+    public List<QualityOrder> selectMakeQualityOrderListUndo(QualityOrder qualityOrder);
+
     /*
      * 查询退料品质单*/
     public List<QualityOrder> selectReturnQualityOrderList(QualityOrder qualityOrder);
+
+    /*
+     * 查询未完成退料品质单*/
+    public List<QualityOrder> selectReturnQualityOrderListUndo(QualityOrder qualityOrder);
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityOrderService.java
index 51883aa3..53c81b4d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityOrderService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityOrderService.java
@@ -118,9 +118,10 @@ public interface IQualityOrderService
      */
     int updateMakeStartingQuality(QualityOrder qualityOrder);
 
+    //查询来料品质单列表
     List<QualityOrder> selectIqcQualityOrderList(QualityOrder qualityOrder);
 
-    //查询来料品质单列表
+    //查询生产品质单列表
     List<QualityOrder> selectMakeQualityOrderList(QualityOrder qualityOrder);
 
     /*
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderReportServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderReportServiceImpl.java
index e2029f73..62a456a4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderReportServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderReportServiceImpl.java
@@ -998,6 +998,7 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService
         refundsExchanges.setRelatedOrderCode(qualityReportVO.getQualityOrderCode());
         refundsExchanges.setInStorageCode(qualityReportVO.getInStorageCode());
         refundsExchanges.setQualityTime(qualityReportVO.getCheckoutCompletionTime());
+        refundsExchanges.setQualityRemark(qualityReportVO.getRemark());
         refundsExchanges.setMaterialTotal(1);
         refundsExchanges.setNumTotal(qualityReportVO.getProcessBadNum());
         refundsExchanges.setDeliveryInspectionTime(qualityReportVO.getDeliveryInspectionTime());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java
index 287c74b1..371dd893 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java
@@ -114,6 +114,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService
     public List<QualityOrder> selectIqcQualityOrderList(QualityOrder qualityOrder)
     {
         List<QualityOrder> qualityOrders = qualityOrderMapper.selectIqcQualityOrderList(qualityOrder);
+        /*品质状态为空查询时，默认查询部分品质和待品质*/
+        if(qualityOrder.getQualityStatus().isEmpty()){
+            qualityOrders = qualityOrderMapper.selectIqcQualityOrderListUndo(qualityOrder);
+        }
         return qualityOrders;
     }
 
@@ -122,6 +126,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService
     public List<QualityOrder> selectMakeQualityOrderList(QualityOrder qualityOrder)
     {
         List<QualityOrder> qualityOrders = qualityOrderMapper.selectMakeQualityOrderList(qualityOrder);
+        /*品质状态为空查询时，默认查询部分品质和待品质*/
+        if(qualityOrder.getQualityStatus().isEmpty()){
+            qualityOrders = qualityOrderMapper.selectMakeQualityOrderListUndo(qualityOrder);
+        }
         return qualityOrders;
     }
 
@@ -130,6 +138,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService
     @Override
     public List<QualityOrder> selectReturnQualityOrderList(QualityOrder qualityOrder){
         List<QualityOrder> qualityOrders = qualityOrderMapper.selectReturnQualityOrderList(qualityOrder);
+        /*品质状态为空查询时，默认查询部分品质和待品质*/
+        if(qualityOrder.getQualityStatus().isEmpty()){
+            qualityOrders = qualityOrderMapper.selectReturnQualityOrderListUndo(qualityOrder);
+        }
         return qualityOrders;
     }
 
diff --git a/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml
index 2a48969d..b8701b5f 100644
--- a/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml
@@ -114,6 +114,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by create_time desc
     </select>
 
+    <select id="selectMakeQualityOrderListUndo" parameterType="QualityOrder" resultMap="QualityOrderResult">
+        <include refid="selectQualityOrderVo"/>
+        <where>
+            <if test="qualityOrderCode != null  and qualityOrderCode != ''"> and quality_order_code like concat('%', #{qualityOrderCode}, '%')</if>
+            <if test="inStorageCode != null  and inStorageCode != ''"> and in_storage_code like concat('%', #{inStorageCode}, '%')</if>
+            <if test="materialNo != null  and materialNo != ''"> and material_no like concat('%', #{materialNo}, '%')</if>
+            <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
+            <if test="relatedOrderCode != null  and relatedOrderCode != ''"> and related_order_code like concat('%', #{relatedOrderCode}, '%')</if>
+            <if test="qualityStatus != null  and qualityStatus != ''"> and quality_status = #{qualityStatus}</if>
+            <if test="qualityStorageStatus != null  and qualityStorageStatus != ''"> and quality_storage_status = #{qualityStorageStatus}</if>
+            <if test="qualityEmployee != null  and qualityEmployee != ''"> and quality_employee = #{qualityEmployee}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and Date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            and quality_order_type = '1'
+            and (quality_status = '0' or quality_status = '1')
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectIqcQualityOrderListUndo" parameterType="QualityOrder" resultMap="QualityOrderResult">
+        <include refid="selectQualityOrderVo"/>
+        <where>
+            <if test="qualityOrderCode != null  and qualityOrderCode != ''"> and quality_order_code like concat('%', #{qualityOrderCode}, '%')</if>
+            <if test="inStorageCode != null  and inStorageCode != ''"> and in_storage_code like concat('%', #{inStorageCode}, '%')</if>
+            <if test="materialNo != null  and materialNo != ''"> and material_no like concat('%', #{materialNo}, '%')</if>
+            <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
+            <if test="relatedOrderCode != null  and relatedOrderCode != ''"> and related_order_code like concat('%', #{relatedOrderCode}, '%')</if>
+            <if test="qualityStatus != null  and qualityStatus != ''"> and quality_status = #{qualityStatus}</if>
+            <if test="qualityStorageStatus != null  and qualityStorageStatus != ''"> and quality_storage_status = #{qualityStorageStatus}</if>
+            <if test="qualityEmployee != null  and qualityEmployee != ''"> and quality_employee = #{qualityEmployee}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and Date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            and (quality_order_type = '0' or quality_order_type = '2')
+            and (quality_status = '0' or quality_status = '1')
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectReturnQualityOrderListUndo" parameterType="QualityOrder" resultMap="QualityOrderResult">
+        <include refid="selectQualityOrderVo"/>
+        <where>
+            <if test="qualityOrderCode != null  and qualityOrderCode != ''"> and quality_order_code like concat('%', #{qualityOrderCode}, '%')</if>
+            <if test="inStorageCode != null  and inStorageCode != ''"> and in_storage_code like concat('%', #{inStorageCode}, '%')</if>
+            <if test="materialNo != null  and materialNo != ''"> and material_no like concat('%', #{materialNo}, '%')</if>
+            <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
+            <if test="relatedOrderCode != null  and relatedOrderCode != ''"> and related_order_code like concat('%', #{relatedOrderCode}, '%')</if>
+            <if test="qualityStatus != null  and qualityStatus != ''"> and quality_status = #{qualityStatus}</if>
+            <if test="qualityStorageStatus != null  and qualityStorageStatus != ''"> and quality_storage_status = #{qualityStorageStatus}</if>
+            <if test="qualityEmployee != null  and qualityEmployee != ''"> and quality_employee = #{qualityEmployee}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and Date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            and (quality_order_type = '4'or quality_order_type = '5'or quality_order_type = '6' or quality_order_type = '7')
+            and (quality_status = '0' or quality_status = '1')
+        </where>
+        order by create_time desc
+    </select>
+
     <select id="selectQualityOrderById" parameterType="Long" resultMap="QualityOrderResult">
         <include refid="selectQualityOrderVo"/>
         where quality_order_id = #{qualityOrderId}