From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 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..3086782 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,47 @@
return update(null, updateWrapper);
}
+ /**
+ * 澧為噺鏇存柊搴撳瓨鍗犵敤閲�
+ *
+ * @param id 搴撳瓨璁板綍缂栧彿
+ * @param count 鍙樺姩鏁伴噺锛堟鏁�=澧炲姞鍗犵敤锛岃礋鏁�=鍑忓皯鍗犵敤锛�
+ * @param checkFlag 鏄惁鏍￠獙鍙敤閲忓厖瓒筹紙涓� true 鏃跺崰鐢ㄤ笉鍏佽瓒呰繃鍙敤閲忥級
+ * @return 褰卞搷琛屾暟
+ */
+ default int updateReservedQuantity(Long id, BigDecimal count, boolean checkFlag) {
+ LambdaUpdateWrapper<MesWmMaterialStockDO> updateWrapper = new LambdaUpdateWrapper<MesWmMaterialStockDO>()
+ .eq(MesWmMaterialStockDO::getId, id)
+ .setSql("reserved_quantity = reserved_quantity + " + count);
+ if (checkFlag && count.compareTo(BigDecimal.ZERO) > 0) {
+ // 鏍￠獙鍙敤閲忓厖瓒筹細quantity - frozen_quantity - reserved_quantity >= count
+ updateWrapper.apply("quantity - IFNULL(frozen_quantity, 0) - IFNULL(reserved_quantity, 0) >= {0}", count);
+ }
+ return update(null, updateWrapper);
+ }
+
+ /**
+ * 澧為噺鏇存柊搴撳瓨鍦ㄩ�旈噺
+ *
+ * @param id 搴撳瓨璁板綍缂栧彿
+ * @param count 鍙樺姩鏁伴噺锛堟鏁�=澧炲姞鍦ㄩ�旓紝璐熸暟=鍑忓皯鍦ㄩ�旓級
+ * @return 褰卞搷琛屾暟
+ */
+ default int updateInTransitQuantity(Long id, BigDecimal count) {
+ LambdaUpdateWrapper<MesWmMaterialStockDO> updateWrapper = new LambdaUpdateWrapper<MesWmMaterialStockDO>()
+ .eq(MesWmMaterialStockDO::getId, id)
+ .setSql("in_transit_quantity = in_transit_quantity + " + count);
+ 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 +137,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 +153,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