From 803234a43a442baa3c432ad2dc0ea6b96367b719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Wed, 25 Dec 2024 19:46:32 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=20=E4=BF=AE=E6=94=B9=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=80=80=E6=96=99=E5=93=81=E8=B4=A8=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8mapper=E6=96=B9=E6=B3=95=EF=BC=8C=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B=E5=8F=82=E6=95=B0=EF=BC=9B?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E9=80=80=E6=96=99=E5=93=81=E8=B4=A8?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=8F=B7=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/quality/QualityOrderMapper.xml  | 2 +-
 .../quality/returnQualityOrder/returnQualityOrder.html    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

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"
             <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 = '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')
         </where>
         order by create_time desc
     </select>
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',