From c4ef1e321c9047997f082c75b5cb9650df7c8680 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 7 Mar 2025 10:39:23 +0800
Subject: [PATCH] =?UTF-8?q?3/7=20order=E7=9B=B8=E5=85=B3=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=B4=A2=E5=BC=95=201.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/inout/IoOrderDao.xml       | 55 +++++++++----------
 src/main/resources/schemas/schema_v2.4.sql    |  8 +++
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index d9e889a61..368020c31 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -51,33 +51,34 @@
             INNER JOIN io_unit_maintain_platform a2 on io.action = a2.sourceAction AND io.fromCorp = a2.unitId
         </if>
         <where>
+            <if test="billNo != null and billNo != ''">
+                AND io.billNo like concat(#{billNo}, '%')
+            </if>
+            <if test="action != null and action != ''">
+                AND io.action = #{action}
+            </if>
+            <if test="invCode != null and invCode != ''">
+                AND io.invCode = #{invCode}
+            </if>
+            <if test="productType != null and productType != ''">
+                AND io.productType = #{productType}
+            </if>
             <if test="id != null and id != ''">
                 AND id = #{id}
             </if>
             <if test="updateUser != null and updateUser != ''">
                 AND io.updateUser = #{updateUser}
             </if>
-            <if test="productType != null and productType != ''">
-                AND io.productType = #{productType}
-            </if>
-
-
             <if test="corpName != null and corpName != ''">
                 AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like
                 concat('%', #{corpName}, '%')
             </if>
-            <if test="action != null and action != ''">
-                AND io.action = #{action}
-            </if>
             <if test="remark != null and remark != ''">
                 AND io.remark like concat('%', #{remark}, '%')
             </if>
             <if test="mainAction != null and mainAction != ''">
                 AND io.mainAction = #{mainAction}
             </if>
-            <if test="billNo != null and billNo != ''">
-                AND io.billNo like concat('%', #{billNo}, '%')
-            </if>
             <if test="corpOrderId != null and corpOrderId != ''">
                 AND io.corpOrderId = #{corpOrderId}
             </if>
@@ -102,9 +103,6 @@
             <if test="deptCode != null and deptCode != ''">
                 AND io.deptCode = #{deptCode}
             </if>
-            <if test="invCode != null and invCode != ''">
-                AND io.invCode = #{invCode}
-            </if>
             <if test="busType != null">
                 AND io.busType = #{busType}
             </if>
@@ -280,6 +278,12 @@
         ) As partCount
         from io_order as io
         <where>
+            <if test="billNo != null and billNo != ''">
+                AND billNo like concat(#{billNo}, '%')
+            </if>
+            <if test="action != null and action != ''">
+                AND action = #{action}
+            </if>
             <if test="id != null and id != ''">
                 AND id = #{id}
             </if>
@@ -287,15 +291,9 @@
                 AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like
                 concat('%', #{corpName}, '%')
             </if>
-            <if test="action != null and action != ''">
-                AND action = #{action}
-            </if>
             <if test="mainAction != null and mainAction != ''">
                 AND mainAction = #{mainAction}
             </if>
-            <if test="billNo != null and billNo != ''">
-                AND billNo like concat('%', #{billNo}, '%')
-            </if>
             <if test="corpOrderId != null and corpOrderId != ''">
                 AND corpOrderId = #{corpOrderId}
             </if>
@@ -414,14 +412,15 @@
         from io_order
         <where>
             <if test="billNo != null and billNo != ''">
-                AND billNo like concat('%', #{billNo}, '%')
-            </if>
-            <if test="id != null and id != ''">
-                AND id = #{id}
+                AND billNo like concat( #{billNo}, '%')
             </if>
             <if test="action != null and action != ''">
                 AND action = #{action}
             </if>
+            <if test="id != null and id != ''">
+                AND id = #{id}
+            </if>
+
             <if test="mainAction != null and mainAction != ''">
                 AND mainAction = #{mainAction}
             </if>
@@ -502,6 +501,9 @@
         left join io_order_upload_log ioul on io.billNo = ioul.billNo
         <where>
             io.dealStatus = 3
+            <if test="billNo != null and billNo != ''">
+                AND io.billNo like concat(#{billNo}, '%')
+            </if>
             <if test="billType != null and billType != ''">
                 AND action = #{billType}
             </if>
@@ -511,9 +513,6 @@
                     #{item}
                 </foreach>
             </if>
-            <if test="billNo != null and billNo != ''">
-                AND io.billNo like concat('%', #{billNo}, '%')
-            </if>
             <if test="invCode != null and invCode != ''">
                 AND invCode = #{invCode}
             </if>
@@ -641,7 +640,7 @@
                 or io.outSickInfo like concat('%', #{unionRemark}, '%'))
             </if>
             <if test="billNo != null and billNo != ''">
-                AND io.billNo like concat('%', #{billNo}, '%')
+                AND io.billNo like concat( #{billNo}, '%')
             </if>
             <if test="corpOrderId != null and corpOrderId != ''">
                 AND io.corpOrderId = #{corpOrderId}
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 56947aa1c..4c5c77e8d 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -5267,3 +5267,11 @@ ALTER TABLE rel_code_batch
 CALL Pro_Temp_ColumnWork('basic_corp', 'aliEntId',
                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''阿里供应商ID''',
                        1);
+
+CALL Modify_index('io_order', 'action,invCode', 'idex_order_query', 'BTREE');
+CALL Modify_index('io_order', 'mainAction', 'idex_order_query_mainAction', 'BTREE');
+call Modify_UNIQUE_index('io_code', 'code', 'idex_code_query', 'BTREE');
+call Modify_UNIQUE_index('io_code_temp', 'code', 'idex_code_temp_query', 'BTREE');
+CALL Modify_index('io_order_detail_code', 'orderIdFk', 'idex_query_orderIdFk', 'BTREE');
+CALL Modify_index('io_order_detail_biz', 'orderIdFk', 'idex_query_orderIdFk', 'BTREE');
+