From 1da4e70b2972e1ab77fa75ad0da529a006150ab5 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 29 十二月 2025 16:35:32 +0800
Subject: [PATCH] 提交 保存订单后不重置图片上传
---
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
index 6dee99b..e51e829 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -320,6 +320,10 @@
and a.order_number like concat('%',#{orderDetail.orderNumber},'%')
</if>
+ <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
+ and a.building_number like concat('%',#{orderDetail.buildingNumber},'%')
+ </if>
+
<if test="orderDetail.width != null and orderDetail.width != '' and model==0">
and a.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
</if>
@@ -476,6 +480,10 @@
<if test="orderDetail.orderNumber != null and orderDetail.orderNumber != ''">
and a.order_number like concat('%',#{orderDetail.orderNumber},'%')
+ </if>
+
+ <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
+ and a.building_number like concat('%',#{orderDetail.buildingNumber},'%')
</if>
<if test="orderDetail.width != null and orderDetail.width != ''">
@@ -1070,11 +1078,16 @@
group by od.product_id,pd.detail
</select>
- <delete id="deleteOrderFile" >
- delete from sd.order_file where order_id = #{orderId}
- </delete>
+ <select id="selectListWithFileById">
+ select od.*,sof.id as file_id
+ from sd.order_detail as od
+ left join sd.order_file as sof
+ on sof.order_id = od.order_id
+ and sof.order_number = od.order_number
+ where od.order_id = #{id}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0