From b28173836631e9ecb1aafbaa5786c0383462208e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 12 三月 2026 15:09:57 +0800
Subject: [PATCH] 1.生产成品添加审核流程，半成品不审核
---
src/main/resources/mapper/stock/StockUninventoryMapper.xml | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockUninventoryMapper.xml b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
index 2c0737f..8b7c21a 100644
--- a/src/main/resources/mapper/stock/StockUninventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
@@ -12,7 +12,7 @@
<result column="version" property="version" />
</resultMap>
<update id="updateSubtractStockUnInventory">
- update stock_inventory
+ update stock_uninventory
<set>
<if test="ew.qualitity != null">
qualitity = qualitity - #{ew.qualitity},
@@ -28,7 +28,7 @@
where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
</update>
<update id="updateAddStockUnInventory">
- update stock_inventory
+ update stock_uninventory
<set>
<if test="ew.qualitity != null">
qualitity = qualitity + #{ew.qualitity},
@@ -44,19 +44,32 @@
where product_model_id = #{ew.productModelId}
</update>
<select id="pageStockUninventory" resultType="com.ruoyi.stock.dto.StockUninventoryDto">
- select su.*,
- pm.model,
- pm.unit,
- p.product_name
- from stock_uninventory su
- left join product_model pm on su.product_model_id = pm.id
- left join product p on pm.product_id = p.id
- where 1 = 1
+ SELECT
+ su.id,
+ su.qualitity,
+ COALESCE(su.locked_quantity, 0) AS locked_quantity,
+ su.product_model_id,
+ su.create_time,
+ su.update_time,
+ su.version,
+ (su.qualitity - COALESCE(su.locked_quantity, 0)) AS un_locked_quantity,
+ pm.model,
+ pm.unit,
+ p.product_name,
+ p2.product_name AS parent_name
+ FROM
+ stock_uninventory su
+ LEFT JOIN product_model pm ON su.product_model_id = pm.id
+ LEFT JOIN product p ON pm.product_id = p.id
+ LEFT JOIN product p2 ON p.parent_id = p2.id
+ WHERE
+ 1 = 1
+ AND (p2.product_name != '鍗婃垚鍝�' OR p2.product_name IS NULL)
<if test="ew.productName != null and ew.productName !=''">
and p.product_name like concat('%',#{ew.productName},'%')
</if>
</select>
- <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
+ <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockUnInventoryExportData">
select su.*,
pm.model,
pm.unit,
--
Gitblit v1.9.3