From c19bcccbe4f091b4286a3ff40ee4a97c4e9848d6 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 19 三月 2026 10:22:37 +0800
Subject: [PATCH] 修改bom产品信息，如果有关联生成订单完成数量>0，则不许改；否则修改关联的产品结构，订单产品信息，工艺路线产品信息
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 106 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 84 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 9db56f9..9e0ab0e 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -16,12 +16,16 @@
<update id="updateAddStockInventory">
update stock_inventory
<set>
+ <if test="ew.productId != null">
+ product_id = #{ew.productId},
+ </if>
<if test="ew.qualitity != null">
qualitity = qualitity + #{ew.qualitity},
</if>
<if test="ew.version != null">
version = version + 1,
</if>
+
<if test="ew.remark != null and ew.remark !=''">
remark = #{ew.remark},
</if>
@@ -38,8 +42,8 @@
<update id="updateSubtractStockInventory">
update stock_inventory
<set>
- <if test="ew.qualitity != null">
- qualitity = qualitity - #{ew.qualitity},
+ <if test="ew.netWeight != null">
+ qualitity = qualitity - #{ew.netWeight},
</if>
<if test="ew.version != null">
version = version + 1,
@@ -51,28 +55,51 @@
</set>
where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
</update>
+
<select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
- select si.id,
+ SELECT
+ si.id,
+ -- 褰撳墠鍑�閲� = 鍏ュ簱鍑�閲� - 鍑哄簱鍑�閲�
+ (COALESCE(sir.total_net_weight, 0) - COALESCE(sor.total_net_weight, 0)) AS net_weight,
si.qualitity,
- COALESCE(si.locked_quantity, 0) as locked_quantity,
+ COALESCE(si.locked_quantity, 0) AS locked_quantity,
si.product_model_id,
si.create_time,
si.update_time,
- COALESCE(si.warn_num, 0) as warn_num,
+ COALESCE(si.warn_num, 0) AS warn_num,
si.version,
- (si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
+ (si.qualitity - COALESCE(si.locked_quantity, 0)) AS un_locked_quantity,
pm.model,
si.remark,
pm.unit,
- p.product_name
- from stock_inventory si
- left join product_model pm on si.product_model_id = pm.id
- left join product p on pm.product_id = p.id
- where 1 = 1
- <if test="ew.productName != null and ew.productName !=''">
- and p.product_name like concat('%',#{ew.productName},'%')
- </if>
+ p.product_name,
+ p1.product_name AS parent_name,
+ p1.id AS parent_id,
+ si.product_id AS productId
+ FROM stock_inventory si
+ INNER JOIN product_model pm ON si.product_model_id = pm.id
+ INNER JOIN product p ON pm.product_id = p.id
+ INNER JOIN product p1 ON p.parent_id = p1.id AND p1.product_name != '鍗婃垚鍝�'
+ LEFT JOIN (
+ SELECT product_model_id, SUM(net_weight) AS total_net_weight
+ FROM stock_in_record
+ GROUP BY product_model_id
+ ) sir ON si.product_model_id = sir.product_model_id
+ LEFT JOIN (
+ SELECT product_model_id, SUM(net_weight) AS total_net_weight
+ FROM stock_out_record
+ GROUP BY product_model_id
+ ) sor ON si.product_model_id = sor.product_model_id
+ <where>
+ <if test="ew.parentId != null and ew.parentId != ''">
+ AND p.parent_id = #{ew.parentId}
+ </if>
+ <if test="ew.productName != null and ew.productName != ''">
+ AND p.product_name LIKE CONCAT('%', #{ew.productName}, '%')
+ </if>
+ </where>
</select>
+
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
select si.qualitity,
pm.model,
@@ -90,18 +117,53 @@
and p.product_name like concat('%',#{ew.productName},'%')
</if>
</select>
+
<select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
- select sir.*,si.qualitity as current_stock,
+ select
+ sir.*,
+ si.qualitity as current_stock,
pm.model,
pm.unit,
p.product_name,
- su.nick_name as create_by
- from
- stock_in_record sir
- left join stock_inventory si on sir.product_model_id = si.product_model_id
- left join product_model pm on sir.product_model_id = pm.id
- left join product p on pm.product_id = p.id
- left join sys_user su on sir.create_user = su.user_id
+ su.nick_name as create_by,
+
+ -- 褰撳墠鍑�閲� = 鍏ュ簱鍑�閲� - 鍑哄簱鍑�閲�
+ IFNULL(inWeight.total_in_weight,0) - IFNULL(outWeight.total_out_weight,0) as current_weight
+
+ from stock_in_record sir
+
+ left join stock_inventory si
+ on sir.product_model_id = si.product_model_id
+
+ left join product_model pm
+ on sir.product_model_id = pm.id
+
+ left join product p
+ on pm.product_id = p.id
+
+ left join sys_user su
+ on sir.create_user = su.user_id
+
+ -- 鍏ュ簱鍑�閲嶇粺璁�
+ left join (
+ select
+ product_model_id,
+ sum(net_weight) as total_in_weight
+ from stock_in_record
+ group by product_model_id
+ ) inWeight
+ on sir.product_model_id = inWeight.product_model_id
+
+ -- 鍑哄簱鍑�閲嶇粺璁�
+ left join (
+ select
+ product_model_id,
+ sum(net_weight) as total_out_weight
+ from stock_out_record
+ group by product_model_id
+ ) outWeight
+ on sir.product_model_id = outWeight.product_model_id
+
<where>
<if test="ew.reportDate != null">
and sir.create_time >= #{ew.reportDate}
--
Gitblit v1.9.3