From eccad5a129106377a275be4f7cdc58e99e9b95d4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 21 七月 2026 13:45:14 +0800
Subject: [PATCH] feat(mes): 实现库存移库功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 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 a22847d..5769273 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
@@ -86,6 +86,39 @@
}
/**
+ * 澧為噺鏇存柊搴撳瓨鍗犵敤閲�
+ *
+ * @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)
@@ -113,6 +146,28 @@
return selectOne(wrapper);
}
+ /**
+ * 鎸夌粍鍚堥敭鏌ヨ搴撳瓨璁板綍锛堝拷鐣ヤ緵搴斿晢缁村害锛�
+ *
+ * 鐢ㄤ簬绉诲簱鍦烘櫙锛氱Щ搴撴椂灏嗗簱瀛樺悎骞跺埌鐩爣搴撲綅宸叉湁搴撳瓨锛屼笉鍖哄垎渚涘簲鍟�
+ */
+ default MesWmMaterialStockDO selectByCompositeKeyIgnoreVendor(Long itemId, Long warehouseId, Long locationId,
+ Long areaId, Long batchId) {
+ LambdaQueryWrapperX<MesWmMaterialStockDO> wrapper = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
+ .eq(MesWmMaterialStockDO::getItemId, itemId)
+ .eq(MesWmMaterialStockDO::getWarehouseId, warehouseId)
+ .eq(MesWmMaterialStockDO::getLocationId, locationId)
+ .eq(MesWmMaterialStockDO::getAreaId, areaId);
+ // batchId=null 鏃剁簿纭尮閰� is null
+ if (batchId != null) {
+ wrapper.eq(MesWmMaterialStockDO::getBatchId, batchId);
+ } else {
+ wrapper.isNull(MesWmMaterialStockDO::getBatchId);
+ }
+ wrapper.last("LIMIT 1");
+ return selectOne(wrapper);
+ }
+
default List<MesWmMaterialStockDO> selectList(MesWmMaterialStockListReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<MesWmMaterialStockDO>()
.eqIfPresent(MesWmMaterialStockDO::getWarehouseId, reqVO.getWarehouseId())
--
Gitblit v1.9.3