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/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
index 2810c05..a22847d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
@@ -85,8 +85,14 @@
return update(null, updateWrapper);
}
+ /**
+ * 鎸夌粍鍚堥敭鏌ヨ搴撳瓨璁板綍
+ *
+ * 鍞竴閿細(itemId, warehouseId, locationId, areaId, batchId, vendorId)
+ * 鍚屼竴鐗╂枡鍚屼竴搴撲綅锛屼笉鍚屼緵搴斿晢/鎵规鐨勫簱瀛樺垎寮�绠＄悊
+ */
default MesWmMaterialStockDO selectByCompositeKey(Long itemId, Long warehouseId, Long locationId,
- Long areaId, Long batchId) {
+ Long areaId, Long batchId, Long vendorId) {
LambdaQueryWrapperX<MesWmMaterialStockDO> wrapper = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
.eqIfPresent(MesWmMaterialStockDO::getItemId, itemId)
.eqIfPresent(MesWmMaterialStockDO::getWarehouseId, warehouseId)
@@ -98,6 +104,12 @@
} else {
wrapper.isNull(MesWmMaterialStockDO::getBatchId);
}
+ // vendorId=null 鏃剁簿纭尮閰� is null
+ if (vendorId != null) {
+ wrapper.eq(MesWmMaterialStockDO::getVendorId, vendorId);
+ } else {
+ wrapper.isNull(MesWmMaterialStockDO::getVendorId);
+ }
return selectOne(wrapper);
}
@@ -108,6 +120,7 @@
.eqIfPresent(MesWmMaterialStockDO::getAreaId, reqVO.getAreaId())
.eqIfPresent(MesWmMaterialStockDO::getItemId, reqVO.getItemId())
.eqIfPresent(MesWmMaterialStockDO::getBatchId, reqVO.getBatchId())
+ .eqIfPresent(MesWmMaterialStockDO::getVendorId, reqVO.getVendorId())
.likeIfPresent(MesWmMaterialStockDO::getBatchCode, reqVO.getBatchCode())
.geIfPresent(MesWmMaterialStockDO::getUpdateTime, reqVO.getStartTime())
.leIfPresent(MesWmMaterialStockDO::getUpdateTime, reqVO.getEndTime())
--
Gitblit v1.9.3