From 80ddf4c9c0bcb0f6c31524e0d9f5599c8001e904 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 10 七月 2026 13:29:38 +0800
Subject: [PATCH] Merge branch 'dev_business' of http://114.132.189.42:9002/r/mom-pro2-after into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
index 50405b6..638bae4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
@@ -148,9 +148,9 @@
@Override
public MesWmMaterialStockDO getOrCreateMaterialStock(Long itemId, Long warehouseId, Long locationId, Long areaId,
Long batchId, String batchCode, Long vendorId, LocalDateTime receiptTime) {
- // 1. 鏌ユ壘宸叉湁搴撳瓨璁板綍
+ // 1. 鏌ユ壘宸叉湁搴撳瓨璁板綍锛坴endorId 鍙備笌鍞竴閿級
MesWmMaterialStockDO stock = materialStockMapper.selectByCompositeKey(
- itemId, warehouseId, locationId, areaId, batchId);
+ itemId, warehouseId, locationId, areaId, batchId, vendorId);
if (stock != null) {
return stock;
}
--
Gitblit v1.9.3