From 4ee53f8b43e850d2b35d5b1eb979d7b0bc2fbcd4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 30 五月 2024 10:52:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 62570c7..b42f279 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -107,8 +107,8 @@
<if test="flowCard.orderId != null and flowCard.orderId != ''">
and a.order_id regexp #{flowCard.orderId}
</if>
- <if test="flowCard.productionId != null and flowCard.productionId != ''">
- and a.process_Id regexp #{flowCard.productionId}
+ <if test="flowCard.processId != null and flowCard.processId != ''">
+ and a.process_Id regexp #{flowCard.processId}
</if>
<if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
and c.product_id regexp #{flowCard.orderDetail.productId}
@@ -119,6 +119,15 @@
<if test="flowCard.order.project != null and flowCard.order.project!= ''">
and b.project regexp #{flowCard.order.project}
+ </if>
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '涓嶅彲鎺掔増'">
+ and a.layout_status regexp 0
+ </if>
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '鍙帓鐗�'">
+ and a.layout_status regexp 1
+ </if>
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '宸叉帓鐗�'">
+ and a.layout_status regexp 2
</if>
ORDER BY a.id desc
@@ -415,6 +424,7 @@
select * from sd.order where create_time between #{selectTime1} and #{selectTime2} and
position(#{orderId} in order_id ) and position(#{project} in project)
and processing_card=2
+ order by create_time desc
</select>
<select id="selectPrintMp">
@@ -425,8 +435,8 @@
o.project,
ogd.technology_number,
ogd.glass_address,
- od.quantity,
- ogd.total_area,
+ sum(od.quantity) as quantity,
+ sum(ogd.total_area) as total_area,
od.product_name,
ogd.glass_child,
fc.founder,
@@ -506,4 +516,32 @@
set fc.layout_status=1
where fc.process_id = #{processId}
</update>
+
+ <select id="getPrintLabel">
+ select c.customer_name,
+ c.order_id,
+ e.type_name,
+ b.remarks,
+ c.project,
+ a.child_width,
+ a.child_height,
+ sum(b.quantity) as quantity,
+ a.glass_child,
+ b.processing_note
+ from sd.order_glass_detail as a
+ left join sd.order_detail as b
+ on a.order_id = b.order_id
+ and a.order_number = b.order_number
+ left join sd.`order` as c
+ on c.order_id = a.order_id
+ left join flow_card as d
+ on d.order_id = a.order_id and d.order_number = a.order_number and
+ d.technology_number = a.technology_number
+ left join sd.product e
+ on e.id = b.product_id
+ where d.process_id = #{processId}
+ and d.technology_number = #{technologyNumber}
+ group by a.glass_child, a.child_width, a.child_height
+ order by d.technology_number
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0