From acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 08:26:23 +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 | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 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 9bfaeb8..e95fd1f 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"/>
@@ -15,6 +16,8 @@
<result column="project" property="order.project"/>
<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"/>-->
@@ -25,6 +28,7 @@
<!-- <result column="bend_radius" property="bendRadius"/>-->
<!-- <result column="processing_note" property="processingNote"/>-->
<result column="gross_area" property="orderDetail.grossArea"/>
+
<!-- </association>-->
</resultMap>
@@ -37,7 +41,9 @@
o.order_type,
o.area as gross_area,
o.quantity as quantity,
- o.creator
+ o.creator,
+ o.customer_name,
+ o.processing_note
from sd.order_detail as od
left join `order` as o
on o.order_id=od.order_id
@@ -56,6 +62,12 @@
<if test="orderGlassDetail.order.orderType != null and orderGlassDetail.order.orderType!= ''">
and o.order_type regexp #{orderGlassDetail.order.orderType}
</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 != ''">
and DATE_FORMAT((o.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
@@ -73,13 +85,16 @@
o.order_id,
od.order_number,
ogd.production_id,
+ ogd.founder,
o.batch,
o.project,
o.order_type,
(od.gross_area) as gross_area,
(od.quantity) as quantity,
o.creator,
- od.id
+ od.id,
+ 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
@@ -87,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>
@@ -102,6 +117,12 @@
</if>
<if test="orderGlassDetail.order.orderType != null and orderGlassDetail.order.orderType!= ''">
and o.order_type regexp #{orderGlassDetail.order.orderType}
+ </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 != ''">
@@ -121,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>
@@ -182,4 +203,7 @@
set o.production_order=#{state}
where o.order_id = #{orderId}
</update>
+ <select id="selectProcessCard">
+ select processing_card from sd.`order` where order_id = #{orderId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0