From 25cc86fd8a2fb3b2bb6b385cba0adaf89ff3dcdc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 十二月 2025 16:39:32 +0800
Subject: [PATCH] 流程卡进度打印部分代码
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
index ee11ca0..a7b5afd 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -39,7 +39,6 @@
`order` as a
where
year(a.create_time) = year(now())
- and a.id>400
</select>
<select id="selectOrderIdMin">
@@ -95,7 +94,8 @@
o.area = od.c,
o.perimeter= od.aa,
o.other_money = ifnull(c.money,0),
- o.other_remarks = (select group_concat( distinct edging_type) from order_detail where order_id = #{orderId} and edging_type is not null)
+ o.other_remarks = (select GROUP_CONCAT(DISTINCT edging_type)
+ from order_detail where order_id = #{orderId} and edging_type is not null)
where
o.order_id = #{orderId}
@@ -418,7 +418,7 @@
<insert id="saveOrderFile">
- insert into sd.order_file (order_id,order_number,file_name,file_data,create_time) values(#{orderId},#{orderNumber},#{fileName},#{dxfData},now())
+ insert into sd.order_file (order_id,order_number,file_name,file_data,file_json,create_time) values(#{orderId},#{orderNumber},#{fileName},#{dxfData},#{fileJson},now())
</insert>
<select id="selectOrderFile">
@@ -434,6 +434,19 @@
</select>
<update id="updateOrderFile">
- update sd.order_file set file_name=#{fileName},file_data=#{dxfData},create_time=now() where order_id=#{orderId} and order_number=#{orderNumber}
+ update sd.order_file set file_name=#{fileName},file_data=#{dxfData},file_json=#{fileJson},create_time=now() where order_id=#{orderId} and order_number=#{orderNumber}
</update>
+
+
+ <select id="selectProcessAttributeConfigOne">
+ select * from sd.process_attribute_config
+ where level=1
+
+ </select>
+
+ <select id="selectProcessAttributeConfigTow">
+ select * from sd.process_attribute_config
+ where level=2 and belong=#{belong}
+
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0