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/target/classes/mapper/pp/Report.xml | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/target/classes/mapper/pp/Report.xml b/north-glass-erp/target/classes/mapper/pp/Report.xml
index 70dfae6..e984782 100644
--- a/north-glass-erp/target/classes/mapper/pp/Report.xml
+++ b/north-glass-erp/target/classes/mapper/pp/Report.xml
@@ -63,7 +63,11 @@
e.reportWorkQuantityCount,
e.broken_num,
round(ifnull(f.inventory,0)*a.area,2) as inventoryArea
+<<<<<<< HEAD
+=======
+
+>>>>>>> b27e80bcfaacc225fcf8d2f1617b98bdedb7edf7
from
flow_card as c
left join
@@ -96,8 +100,14 @@
) as e
on e.process_id = c.process_id
and e.technology_number = c.technology_number
+<<<<<<< HEAD
where a.order_id = #{orderId}
+=======
+
+ where a.order_id = #{orderId}
+
+>>>>>>> b27e80bcfaacc225fcf8d2f1617b98bdedb7edf7
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0