From 530b456eded06e0692e1d8bd5891069439c8f8f8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 17 四月 2026 15:10:56 +0800
Subject: [PATCH] fix: 1.已发货的销售台账对应的出入库记录做限制不能删除;2.销售台账入库操作后，点击删除，对应的销售入库记录未一并删除；3.销售台账入库状态新增部分入库
---
src/main/resources/mapper/stock/StockUninventoryMapper.xml | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockUninventoryMapper.xml b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
index 2c0737f..e043bd7 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,30 @@
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
+ 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.update_time,
+ (su.qualitity - COALESCE(su.locked_quantity, 0)) as un_locked_quantity,
+ 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
+ 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
<if test="ew.productName != null and ew.productName !=''">
and p.product_name like concat('%',#{ew.productName},'%')
</if>
+ <if test="ew.productModelId != null">
+ and su.product_model_id = #{ew.productModelId}
+ </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