From 6a2bc48c4117e5dfc675d3be90b8ad256f85a37f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 30 四月 2026 14:55:14 +0800
Subject: [PATCH] fix(stock): 修复库存盘点单号生成中的产品型号字段错误

---
 src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
index 4154682..4d3ca12 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
@@ -85,7 +85,11 @@
         for (Long id : ids) {
             StockInRecord stockInRecord = stockInRecordMapper.selectById(id);
             if (stockInRecord.getType().equals("0")) {
-                StockInventory stockInventory = stockInventoryMapper.selectOne(new LambdaQueryWrapper<StockInventory>().eq(StockInventory::getProductModelId, stockInRecord.getProductModelId()));
+                StockInventory stockInventory = stockInventoryMapper.selectOne(
+                        new LambdaQueryWrapper<StockInventory>()
+                                .eq(StockInventory::getProductModelId, stockInRecord.getProductModelId())
+                                .eq(StockInventory::getBatchNo, stockInRecord.getBatchNo())
+                );
                 if (stockInventory == null) {
                     throw new BaseException("搴撳瓨璁板綍涓病鏈夊搴旂殑浜у搧,鏃犳硶鍒犻櫎!!!");
                 } else {
@@ -95,7 +99,10 @@
                     stockInventoryMapper.updateSubtractStockInventory(stockInRecordDto);
                 }
             } else if (stockInRecord.getType().equals("1")) {
-                StockUninventory stockUninventory = stockUninventoryMapper.selectOne(new LambdaQueryWrapper<StockUninventory>().eq(StockUninventory::getProductModelId, stockInRecord.getProductModelId()));
+                StockUninventory stockUninventory = stockUninventoryMapper.selectOne(
+                        new LambdaQueryWrapper<StockUninventory>()
+                                .eq(StockUninventory::getProductModelId, stockInRecord.getProductModelId())
+                                .eq(StockUninventory::getBatchNo, stockInRecord.getBatchNo()));
                 if (stockUninventory == null) {
                     throw new BaseException("搴撳瓨璁板綍涓病鏈夊搴旂殑浜у搧,鏃犳硶鍒犻櫎!!!");
                 } else {

--
Gitblit v1.9.3