From 7cf8f8fc1abca63423c1fb4618363f8a9d283f9d Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期二, 04 十一月 2025 14:56:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
index 2edce48..71c28d2 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
@@ -75,7 +75,16 @@
</if>
</where>
- order by id desc
+ order by
+ <if test="orderBy == null ">
+ id desc
+ </if>
+ <if test="orderBy == 'desc'">
+ ${field} desc
+ </if>
+ <if test="orderBy == 'asc'">
+ ${field}
+ </if>
limit #{offset},#{pageSize}
;
</select>
@@ -133,4 +142,14 @@
<update id="updateProductStateById">
update product set state = #{state} where id = #{id}
</update>
+
+ <select id="getGlassThickness">
+ select sum(REPLACE(JSON_UNQUOTE(JSON_EXTRACT(separation, '$.thickness')),'mm',''))
+ from product_detail as a
+ where a.prod_id = #{productId}
+ and a.id <= (select b.id
+ from product_detail as b
+ where b.prod_id = #{productId} and b.glass_sort = #{technologyNumber})
+
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0