From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 dd28dd4..4976f9c 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
@@ -70,6 +70,9 @@
<if test="product.createTime != null and product.createTime != ''">
and date(a.create_time) like concat('%',#{product.createTime},'%')
</if>
+ <if test="product.remarks != null and product.remarks != ''">
+ and a.remarks like concat('%',#{product.remarks},'%')
+ </if>
</where>
order by id desc
@@ -112,14 +115,32 @@
<if test="product.createTime != null and product.createTime != ''">
and date(a.create_time) regexp #{product.createTime}
</if>
+ <if test="product.remarks != null and product.remarks != ''">
+ and a.remarks like concat('%',#{product.remarks},'%')
+ </if>
+ <if test="product.state != null">
+ and a.state = #{product.state}
+ </if>
+ <if test="product.productAbbreviation != null and product.productAbbreviation != ''">
+ and a.product_abbreviation like concat('%',#{product.productAbbreviation},'%')
+ </if>
</where>
order by a.id desc
- limit #{offset},#{pageSize}
- ;
+ limit #{offset},#{pageSize};
</select>
<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