From 6bbcdd0d1beeca74251f63ea42b9ee8349e97902 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 15 七月 2025 10:19:54 +0800
Subject: [PATCH] 优化在制品查询速度

---
 north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml b/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml
index ec4be7e..0317798 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml
@@ -8,6 +8,7 @@
         <result column="order_id" property="orderId"/>
         <result column="production_id" property="productionId"/>
         <result column="splitting_status" property="splittingStatus"/>
+        <result column="founder" property="founder"/>
         <result column="create_time" property="createTime"/>
         <!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
             <result column="batch" property="order.batch"/>
@@ -16,6 +17,7 @@
             <result column="area" property="order.area"/>
             <result column="creator" property="order.creator"/>
         <result column="customer_name" property="order.customerName"/>
+        <result column="processing_note" property="order.processingNote"/>
 <!--        <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">-->
 <!--            <result column="product_id" property="productId"/>-->
 <!--            <result column="product_name" property="productName"/>-->
@@ -26,6 +28,7 @@
 <!--            <result column="bend_radius" property="bendRadius"/>-->
 <!--            <result column="processing_note" property="processingNote"/>-->
             <result column="gross_area" property="orderDetail.grossArea"/>
+
 <!--        </association>-->
 
     </resultMap>
@@ -39,11 +42,12 @@
         o.area as gross_area,
         o.quantity as quantity,
         o.creator,
-        o.customer_name
+        o.customer_name,
+        o.processing_note
         from sd.order_detail  as od
         left join `order` as o
         on o.order_id=od.order_id
-        where o.production_order!=2 and o.order_review=2
+        where o.production_order!=2 and o.order_review=2 and o.create_order>0
 
         <if test="orderGlassDetail.orderId != null and orderGlassDetail.orderId != ''">
             and o.order_id regexp #{orderGlassDetail.orderId}
@@ -60,6 +64,9 @@
         </if>
         <if test="orderGlassDetail.order.customerName != null and orderGlassDetail.order.customerName!= ''">
             and o.customer_name regexp #{orderGlassDetail.order.customerName}
+        </if>
+        <if test="orderGlassDetail.order.processingNote != null and orderGlassDetail.order.processingNote!= ''">
+            and o.processing_note regexp #{orderGlassDetail.order.processingNote}
         </if>
 
         <if test="orderGlassDetail.createTime != ''">
@@ -78,6 +85,7 @@
         o.order_id,
         od.order_number,
         ogd.production_id,
+        ogd.founder,
         o.batch,
         o.project,
         o.order_type,
@@ -85,7 +93,8 @@
         (od.quantity) as quantity,
         o.creator,
         od.id,
-        o.customer_name
+        o.customer_name,
+        o.processing_note
         from sd.order_glass_detail  as ogd
         left join  order_detail as od
         on od.order_id=ogd.order_id
@@ -93,7 +102,7 @@
         left join `order` as o
         on o.order_id=ogd.order_id
         where ogd.production_id IS NOT NULL
-
+        and o.order_review>0
         <if test="orderGlassDetail.orderId != null and orderGlassDetail.orderId != ''">
             and o.order_id regexp #{orderGlassDetail.orderId}
         </if>
@@ -111,6 +120,9 @@
         </if>
         <if test="orderGlassDetail.order.customerName != null and orderGlassDetail.order.customerName!= ''">
             and o.customer_name regexp #{orderGlassDetail.order.customerName}
+        </if>
+        <if test="orderGlassDetail.order.processingNote != null and orderGlassDetail.order.processingNote!= ''">
+            and o.processing_note regexp #{orderGlassDetail.order.processingNote}
         </if>
 
         <if test="orderGlassDetail.createTime != ''">
@@ -130,7 +142,7 @@
         from sd.order_detail as od
         left join sd.order as o
         on od.order_id =o.order_id
-        where od.order_id = #{orderId} and o.production_order!=2
+        where FIND_IN_SET(od.order_id,#{orderId})    and o.production_order!=2
         <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
             and od.order_id regexp #{orderDetail.orderId}
         </if>

--
Gitblit v1.8.0