diff --git a/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml
index 5aeab1f6..f59aae89 100644
--- a/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml
@@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and quality_storage_status = #{qualityStorageStatus}
and quality_employee = #{qualityEmployee}
and Date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}
- and (quality_order_type = '3' or quality_order_type = '4'or quality_order_type = '5'or quality_order_type = '6')
+ and (quality_order_type = '4'or quality_order_type = '5'or quality_order_type = '6' or quality_order_type = '7')
order by create_time desc
diff --git a/ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnQualityOrder.html b/ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnQualityOrder.html
index 0a3f1d7c..a7516d6a 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnQualityOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnQualityOrder.html
@@ -103,10 +103,10 @@
return $.table.selectDictLabel(qualityStatusDatas, value);
}
},
- {
- title: '入库单号',
- field: 'inStorageCode',
- },
+ // {
+ // title: '入库单号',
+ // field: 'inStorageCode',
+ // },
{
title: '关联订单号',
field: 'relatedOrderCode',