From bfcc71f500625a26886b43c43a8fdf2ea1152844 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 23 六月 2026 13:47:59 +0800
Subject: [PATCH] 环境检测排序,仓库绑定物联设备

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

diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
index fa76bc7..48f39f1 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -83,6 +83,12 @@
         }
         stockInventoryDto.setBatchNo(batchNo);
 
+        // 澶勭悊浠撳簱瀛楁锛氱┖瀛楃涓叉垨null鏃跺彇娑堢粦瀹�
+        String warehouse = stockInventoryDto.getWarehouse();
+        if (StringUtils.isEmpty(warehouse)) {
+            stockInventoryDto.setWarehouse(null);
+        }
+
         LambdaQueryWrapper<StockInventory> eq = new QueryWrapper<StockInventory>().lambda()
                 .eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId());
         eq.eq(StockInventory::getBatchNo, stockInventoryDto.getBatchNo());
@@ -108,6 +114,7 @@
             newStockInventory.setBatchNo(stockInventoryDto.getBatchNo());
             newStockInventory.setLockedQuantity(stockInventoryDto.getLockedQuantity());
             newStockInventory.setWarnNum(stockInventoryDto.getWarnNum());
+            newStockInventory.setWarehouse(stockInventoryDto.getWarehouse());
             stockInventoryMapper.insert(newStockInventory);
         } else {
             stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
@@ -134,6 +141,7 @@
         stockOutRecordDto.setStockOutNum(stockInventoryDto.getQualitity());
         stockOutRecordDto.setBatchNo(stockInventoryDto.getBatchNo());
         stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
+        stockOutRecordDto.setOutboundBatches(stockInventoryDto.getOutboundBatches());
         stockOutRecordDto.setType("0");
         stockOutRecordService.add(stockOutRecordDto);
 
@@ -292,6 +300,7 @@
         stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
         stockOutRecordDto.setType("0");
         stockOutRecordDto.setRemark(stockInventoryDto.getRemark());
+        stockOutRecordDto.setOutboundBatches(stockInventoryDto.getOutboundBatches());
         stockOutRecordService.add(stockOutRecordDto);
         return true;
     }

--
Gitblit v1.9.3