From edc227277159601c5cb86829f1c5ce14cf7903a4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 24 九月 2024 10:12:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 7a9049e..e95fd1f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml
@@ -17,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"/>-->
@@ -27,6 +28,7 @@
<!-- <result column="bend_radius" property="bendRadius"/>-->
<!-- <result column="processing_note" property="processingNote"/>-->
<result column="gross_area" property="orderDetail.grossArea"/>
+
<!-- </association>-->
</resultMap>
@@ -40,7 +42,8 @@
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
@@ -61,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 != ''">
@@ -87,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
@@ -95,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>
@@ -113,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 != ''">
@@ -132,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