From 0578c6c76f13e367b5dc7d0882efe3c69ca4cb0e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 15 五月 2026 16:29:30 +0800
Subject: [PATCH] feat(customer): 添加客户银行代码字段并实现批量删除功能
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 189 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 186 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index afdfc4a..097a723 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -13,9 +13,21 @@
<result column="tenant_id" property="tenantId" />
<result column="product_name" property="productName" />
<result column="product_id" property="productId" />
- <result column="product_code" property="productCode" />
</resultMap>
- <select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
+
+ <resultMap id="ProductModelVoResultMap" type="com.ruoyi.basic.vo.ProductModelVo" extends="BaseResultMap">
+ <result column="create_time" property="createTime" />
+ <collection property="batchNoList"
+ ofType="java.lang.String"
+ column="{productModelId=id}"
+ select="selectBatchNoListByProductModelId"/>
+ </resultMap>
+
+ <resultMap id="ProductModelVoBaseResultMap" type="com.ruoyi.basic.vo.ProductModelVo" extends="BaseResultMap">
+ <result column="create_time" property="createTime" />
+ </resultMap>
+
+ <select id="listPageProductModel" resultMap="ProductModelVoResultMap">
select pm.*,p.product_name
from product_model pm
left join product p on pm.product_id = p.id
@@ -26,8 +38,33 @@
<if test="c.productName != null and c.productName != ''">
and p.product_name like concat('%',#{c.productName},'%')
</if>
+ <if test="c.topProductParentId != null and c.topProductParentId > 0">
+ and p.id in (
+ WITH RECURSIVE product_tree AS (
+ SELECT id
+ FROM product
+ WHERE id = #{c.topProductParentId}
+
+ UNION ALL
+
+ SELECT p.id
+ FROM product p
+ INNER JOIN product_tree pt ON p.parent_id = pt.id
+ )
+ select id from product_tree
+ )
+ </if>
</where>
order by pm.id
+ </select>
+
+ <select id="selectBatchNoListByProductModelId" resultType="java.lang.String">
+ select distinct si.batch_no
+ from stock_inventory si
+ where si.product_model_id = #{productModelId}
+ and si.batch_no is not null
+ and si.batch_no != ''
+ order by si.batch_no
</select>
<select id="selectLatestRecord" resultType="com.ruoyi.basic.pojo.ProductModel">
SELECT * FROM product_model
@@ -35,5 +72,151 @@
LIMIT 1
</select>
+ <select id="listPageProductionStock" resultType="com.ruoyi.basic.pojo.ProductModel">
+ SELECT
+ pm.id,
+ pm.product_id,
+ pm.model,
+ pm.unit,
+ p.product_name,
+ GREATEST(s.last_in_time, o.last_out_time) AS create_time,
+ COALESCE(s.inboundNum, 0) AS inboundNum,
+ COALESCE(o.outboundNum, 0) AS outboundNum,
+ COALESCE(s.inboundNum, 0) - COALESCE(o.outboundNum, 0) AS stockQuantity
+ FROM product_model pm
+ LEFT JOIN product p ON pm.product_id = p.id
-</mapper>
\ No newline at end of file
+ -- 鍏ュ簱姹囨��
+ LEFT JOIN (
+ SELECT
+ product_model_id,
+ SUM(inbound_num) AS inboundNum,
+ MAX(create_time) AS last_in_time
+ FROM procurement_record_storage
+ <where>
+ <if test="req.timeStr != null and req.timeStr != ''">
+ AND create_time >= #{req.timeStr}
+ AND create_time < DATE_ADD(#{req.timeStr}, INTERVAL 1 DAY)
+ </if>
+ </where>
+ GROUP BY product_model_id
+ ) s ON s.product_model_id = pm.id
+
+ -- 鍑哄簱姹囨��
+ LEFT JOIN (
+ SELECT
+ product_model_id,
+ SUM(inbound_num) AS outboundNum,
+ MAX(create_time) AS last_out_time
+ FROM procurement_record_out
+ <where>
+ <if test="req.timeStr != null and req.timeStr != ''">
+ AND create_time >= #{req.timeStr}
+ AND create_time < DATE_ADD(#{req.timeStr}, INTERVAL 1 DAY)
+ </if>
+ </where>
+ GROUP BY product_model_id
+ ) o ON o.product_model_id = pm.id
+
+ <where>
+ <if test="req.timeStr != null and req.timeStr != ''">
+ AND (s.product_model_id IS NOT NULL OR o.product_model_id IS NOT NULL)
+ </if>
+
+ <if test="req.productCategory != null and req.productCategory != ''">
+ AND EXISTS (
+ SELECT 1
+ FROM sales_ledger_product slp
+ WHERE slp.product_id = p.id
+ AND slp.product_category LIKE CONCAT('%', #{req.productCategory}, '%')
+ )
+ </if>
+ </where>
+ ORDER BY pm.id DESC
+ </select>
+ <select id="getProductAndModelList" resultType="java.util.Map">
+ select p.id as id,
+ pm.id as modelId,
+ p.product_name as productName ,
+ pm.model as model
+ from product_model pm
+ left join product p on p.id = pm.product_id
+ order by p.id,pm.id desc
+ </select>
+ <select id="selectModelByIds" resultType="com.ruoyi.basic.dto.ProductModelDto">
+ select pm.model,p.product_name,pm.unit
+ from product_model pm
+ left join product p on pm.product_id = p.id
+ <where>
+ <if test="list != null and list.size() > 0">
+ and pm.id in
+ <foreach item="item" collection="list" separator="," open="(" close=")" index="index">
+ #{item}
+ </foreach>
+ </if>
+ </where>
+ </select>
+ <select id="pageModelAndQua" resultMap="ProductModelVoBaseResultMap">
+ select pm.*, p.product_name
+ from product_model pm
+ left join product p on pm.product_id = p.id
+ <where>
+ <if test="c.model != null and c.model != ''">
+ and pm.model like concat('%',#{c.model},'%')
+ </if>
+ <if test="c.productName != null and c.productName != ''">
+ and p.product_name like concat('%',#{c.productName},'%')
+ </if>
+ <if test="c.topProductParentId != null and c.topProductParentId > 0">
+ and p.id in (
+ WITH RECURSIVE product_tree AS (
+ SELECT id
+ FROM product
+ WHERE id = #{c.topProductParentId}
+
+ UNION ALL
+
+ SELECT p.id
+ FROM product p
+ INNER JOIN product_tree pt ON p.parent_id = pt.id
+ )
+ select id from product_tree
+ )
+ </if>
+ </where>
+ order by pm.id
+ </select>
+
+ <select id="selectBatchNoQtyByProductModelIds" resultType="java.util.Map">
+ select si.product_model_id as productModelId,
+ si.warehouse_info_id as warehouseId,
+ si.batch_no as batchNo,
+ si.qualitity as qty
+ from stock_inventory si
+ where si.product_model_id in
+ <foreach collection="list" item="productModelId" separator="," open="(" close=")">
+ #{productModelId}
+ </foreach>
+ and si.warehouse_info_id is not null
+ and si.batch_no is not null
+ and si.batch_no != ''
+ order by si.product_model_id, si.warehouse_info_id, si.batch_no, si.id
+ </select>
+
+ <select id="selectUnqualifiedBatchNoQtyByProductModelIds" resultType="java.util.Map">
+ select su.product_model_id as productModelId,
+ su.warehouse_info_id as warehouseId,
+ su.batch_no as batchNo,
+ su.qualitity as qty
+ from stock_uninventory su
+ where su.product_model_id in
+ <foreach collection="list" item="productModelId" separator="," open="(" close=")">
+ #{productModelId}
+ </foreach>
+ and su.warehouse_info_id is not null
+ and su.batch_no is not null
+ and su.batch_no != ''
+ order by su.product_model_id, su.warehouse_info_id, su.batch_no, su.id
+ </select>
+
+</mapper>
--
Gitblit v1.9.3