From e9f8d23f55f64903d834308f9f167aaf3195c20d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 30 七月 2025 09:10:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 4322a81..ee11ca0 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -110,7 +110,7 @@
sd.`order` as o
left join mm.finished_goods_inventory as fgi
on o.order_id = fgi.order_id
- where date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
+ where date(o.create_time) between #{startDate} and #{endDate}
<if test="orderType!= null and orderType != ''">
and o.create_order = #{orderType}
@@ -415,4 +415,25 @@
and a.layout_id = #{layoutId}
and a.sort = #{sort}
</select>
+
+
+ <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>
+
+ <select id="selectOrderFile">
+ select * from sd.order_file
+ where order_id = #{orderId} and order_number = #{orderNumber}
+
+ </select>
+
+ <select id="selectOrderFileList">
+ select * from sd.order_file
+ where order_id = #{orderId}
+
+ </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>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0