From d6388d041cc58b9f2be3ddcddfb6042e7af094f7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 11 五月 2026 10:11:00 +0800
Subject: [PATCH] fix(stock): 修复库存盘点计划中的出入库记录类型错误
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 62 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 6e8a3bc..65c1c41 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -63,6 +63,17 @@
and batch_no = #{ew.batchNo}
</if>
</update>
+ <update id="updateLocked">
+ update stock_inventory
+ set locked = #{locked}
+ where product_model_id = #{ew.productModelId}
+ <if test="batchNo == null">
+ and batch_no is null
+ </if>
+ <if test="batchNo != null">
+ and batch_no = #{ew.batchNo}
+ </if>
+ </update>
<select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
select si.id,
si.qualitity,
@@ -439,4 +450,55 @@
AND sor.approval_status = 0
</select>
+ <select id="listSelectableBatchNoByProductModelIds" resultType="com.ruoyi.stock.pojo.StockInventory">
+ select distinct si.product_model_id,
+ si.batch_no
+ from stock_inventory si
+ where si.product_model_id in
+ <foreach collection="productModelIds" item="productModelId" open="(" separator="," close=")">
+ #{productModelId}
+ </foreach>
+ and si.batch_no is not null
+ and si.batch_no != ''
+ and (si.qualitity - ifnull(si.locked_quantity, 0)) > 0
+ order by si.product_model_id, si.batch_no
+ </select>
+ <select id="getByModelId" resultType="com.ruoyi.stock.pojo.StockInventory">
+ select spd.id, spd.batch_no, spd.locked_quantity, (spd.qualitity - IFNULL(sd.qualitity, 0)) as qualitity
+ from stock_inventory spd
+ left join (select stock_inventory_id, sum(quantity) as qualitity
+ from shipping_product_detail
+ group by stock_inventory_id) as sd on sd.stock_inventory_id = spd.id
+ where product_model_id = #{productModelId}
+ </select>
+ <select id="selectStockInvenrory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
+ select spd.id, spd.batch_no,pm.model,pm.unit,p.product_name, spd.qualitity,spd.product_model_id
+ from stock_inventory spd
+ left join product_model pm on pm.id = spd.product_model_id
+ left join product p on p.id = pm.product_id
+ where product_model_id = #{productModelId}
+ </select>
+ <select id="pagestockInventoryNoQua" resultType="com.ruoyi.stock.dto.StockInventoryDto">
+ select
+ si.product_model_id,
+ pm.model ,
+ 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>
+ <if test="ew.model != null and ew.model !=''">
+ and pm.model like concat('%',#{ew.model},'%')
+ </if>
+ group by si.product_model_id,
+ pm.model,
+ pm.unit,
+ p.product_name
+ </select>
+
+
</mapper>
--
Gitblit v1.9.3