From 72671bbfdac9fcdbdcd7c67265fce4539a7ec365 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 05 七月 2024 18:19:51 +0800
Subject: [PATCH] 修改流程卡界面编号显示错误问题，将流程卡合并打印工艺流程显示合并产品相关，修改打印排序弹出打开方式
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 df699b9..2664d9f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -63,6 +63,7 @@
sum(c.compute_gross_area) as compute_gross_area,
a.founder,
c.processing_note,
+ b.customer_name,
if(a.layout_status=0,'涓嶅彲鎺掔増',if(a.layout_status=1,'鍙帓鐗�','宸叉帓鐗�')) as layout_status
from (select id,order_id,process_id,order_number, quantity,founder,layout_status,create_time from flow_card
group by process_Id,order_number) as a left join sd.`order` as b on a.order_Id=b.order_id
@@ -93,7 +94,9 @@
<if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '宸叉帓鐗�'">
and a.layout_status regexp 2
</if>
-
+ <if test="flowCard.order.customerName != null and flowCard.order.customerName!= ''">
+ and b.customer_name regexp #{flowCard.order.customerName}
+ </if>
group by a.process_Id
ORDER BY a.id desc
limit #{offset},#{pageSize};
@@ -507,7 +510,8 @@
round(ogd.total_area, 2) as total_area,
od.perimeter,
od.bend_radius,
- concat(od.processing_note,od.remarks) as remarks
+ concat(od.processing_note,od.remarks) as remarks,
+ od.other_columns
from flow_card as fc
left join sd.order_glass_detail as ogd
on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
--
Gitblit v1.8.0