From c653ef74b8b332a530f8d1b54a316d382d0647d1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 24 六月 2026 18:38:12 +0800
Subject: [PATCH] 1.客户，销售，供应商，采购增加总合同号
---
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 8 ++++++++
1 files changed, 8 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 5dc8d4a..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);
--
Gitblit v1.9.3