From 0daaeb174e75859e3bf969d4e9185fc14fda977d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 09 四月 2024 08:18:54 +0800
Subject: [PATCH] 删除前端打印
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 b59860f..3d6aeab 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -61,8 +61,8 @@
sum(c.compute_gross_area) as compute_gross_area,
a.founder,
c.processing_note,
- if(a.layout_status=0,"涓嶅彲鎺掔増",if(a.layout_status=1,"鍙帓鐗�","宸叉帓鐗�")) as layout_status
- from flow_card as a left join sd.`order` as b on a.order_Id=b.order_id
+ 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
left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number
where a.create_time between #{selectTime1} and #{selectTime2}
<if test="flowCard.orderId != null and flowCard.orderId != ''">
@@ -211,7 +211,7 @@
<update id="deleteFlowCardMp">
delete
from flow_card as fc
- where fc.process_id = #{processId}
+ where fc.production_id = left(#{processId},11)
</update>
<!-- 鍒嗘灦鏂板鏄庣粏鏌ヨ-->
@@ -390,17 +390,25 @@
select fc.order_id,
fc.process_id,
fc.order_number,
+ fc.technology_number,
fc.quantity,
round(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
od.product_name,
+ ogd.glass_child,
fc.founder,
- fc.splitFrame_time
+ date(fc.splitFrame_time) as splitFrame_time
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
fc.technology_number = ogd.technology_number
left join sd.order_detail as od on od.order_id = ogd.order_id and od.order_number = ogd.order_number
where fc.process_id = #{processId}
- GROUP BY fc.order_id, fc.process_id, fc.order_number
+ GROUP BY fc.order_id, fc.process_id, fc.order_number,fc.technology_number
+ order by fc.order_number,fc.technology_number
</select>
+
+ <delete id="deleteReportingWork">
+ delete from sd.order_process_detail
+ where left(process_id,11) = left(#{processId},11)
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0