From 9daeb6eac6e46710055e625bbbd56331b8890e21 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:10:20 +0800
Subject: [PATCH] revert(energy): 撤销 energy 模块移植（与新高原有 em 模块重复）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java | 83 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 78 insertions(+), 5 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 fa1bda7..8d2ad22 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
@@ -99,8 +99,7 @@
.setSql("reserved_quantity = reserved_quantity + " + count);
if (checkFlag && count.compareTo(BigDecimal.ZERO) > 0) {
// 鏍￠獙鍙敤閲忓厖瓒筹細quantity - frozen_quantity - reserved_quantity >= count
- updateWrapper.setSql("reserved_quantity = reserved_quantity + " + count +
- " WHERE quantity - IFNULL(frozen_quantity, 0) - IFNULL(reserved_quantity, 0) >= " + count);
+ updateWrapper.apply("quantity - IFNULL(frozen_quantity, 0) - IFNULL(reserved_quantity, 0) >= {0}", count);
}
return update(null, updateWrapper);
}
@@ -125,6 +124,45 @@
* 鍞竴閿細(itemId, warehouseId, locationId, areaId, batchId, vendorId)
* 鍚屼竴鐗╂枡鍚屼竴搴撲綅锛屼笉鍚屼緵搴斿晢/鎵规鐨勫簱瀛樺垎寮�绠＄悊
*/
+ /** 鏌ユ壘瀵煎叆鍩虹缁村害鐨勬墍鏈夊簱瀛橈紝鐢ㄤ簬妫�娴嬩緵搴斿晢姝т箟銆� */
+ default List<MesWmMaterialStockDO> selectImportBaseStocksForUpdate(Long itemId, Long warehouseId,
+ Long locationId, Long areaId, Long batchId) {
+ LambdaQueryWrapperX<MesWmMaterialStockDO> query = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
+ .eq(MesWmMaterialStockDO::getItemId, itemId).eq(MesWmMaterialStockDO::getWarehouseId, warehouseId)
+ .eq(MesWmMaterialStockDO::getLocationId, locationId).eq(MesWmMaterialStockDO::getAreaId, areaId);
+ if (batchId == null) query.isNull(MesWmMaterialStockDO::getBatchId);
+ else query.eq(MesWmMaterialStockDO::getBatchId, batchId);
+ return selectList(query.last("FOR UPDATE"));
+ }
+ /** 搴撳瓨瀵煎叆浣跨敤褰撳墠璇伙紝渚涘簲鍟嗗拰鎵规涓虹┖鏃朵篃绮剧‘鍖归厤銆� */
+ default List<MesWmMaterialStockDO> selectAreaStocksForUpdate(Long areaId) {
+ return selectList(new LambdaQueryWrapperX<MesWmMaterialStockDO>()
+ .eq(MesWmMaterialStockDO::getAreaId, areaId).last("FOR UPDATE"));
+ }
+
+ /** 鍒涘缓搴撳瓨鏃剁殑褰撳墠璇伙紱渚涘簲鍟嗕负绌烘椂淇濈暀鐜版湁涓氬姟鐨勪换鎰忎緵搴斿晢鍖归厤瑙勫垯銆� */
+ default MesWmMaterialStockDO selectByCompositeKeyForUpdate(Long itemId, Long warehouseId, Long locationId,
+ Long areaId, Long batchId, Long vendorId) {
+ LambdaQueryWrapperX<MesWmMaterialStockDO> query = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
+ .eq(MesWmMaterialStockDO::getItemId, itemId).eq(MesWmMaterialStockDO::getWarehouseId, warehouseId)
+ .eq(MesWmMaterialStockDO::getLocationId, locationId).eq(MesWmMaterialStockDO::getAreaId, areaId);
+ if (batchId == null) query.isNull(MesWmMaterialStockDO::getBatchId);
+ else query.eq(MesWmMaterialStockDO::getBatchId, batchId);
+ if (vendorId != null) query.eq(MesWmMaterialStockDO::getVendorId, vendorId);
+ return selectOne(query.last("ORDER BY quantity DESC LIMIT 1 FOR UPDATE"));
+ }
+ /** 搴撳瓨瀵煎叆绮剧‘鍖归厤鎵规鍜屼緵搴斿晢锛岀┖鍊兼寜绌哄�煎尮閰嶃�� */
+ default List<MesWmMaterialStockDO> selectImportStocksForUpdate(Long itemId, Long warehouseId, Long locationId,
+ Long areaId, Long batchId, Long vendorId) {
+ LambdaQueryWrapperX<MesWmMaterialStockDO> query = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
+ .eq(MesWmMaterialStockDO::getItemId, itemId).eq(MesWmMaterialStockDO::getWarehouseId, warehouseId)
+ .eq(MesWmMaterialStockDO::getLocationId, locationId).eq(MesWmMaterialStockDO::getAreaId, areaId);
+ if (batchId == null) query.isNull(MesWmMaterialStockDO::getBatchId);
+ else query.eq(MesWmMaterialStockDO::getBatchId, batchId);
+ if (vendorId == null) query.isNull(MesWmMaterialStockDO::getVendorId);
+ else query.eq(MesWmMaterialStockDO::getVendorId, vendorId);
+ return selectList(query.last("FOR UPDATE"));
+ }
default MesWmMaterialStockDO selectByCompositeKey(Long itemId, Long warehouseId, Long locationId,
Long areaId, Long batchId, Long vendorId) {
LambdaQueryWrapperX<MesWmMaterialStockDO> wrapper = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
@@ -138,12 +176,35 @@
} else {
wrapper.isNull(MesWmMaterialStockDO::getBatchId);
}
- // vendorId=null 鏃剁簿纭尮閰� is null
+ // vendorId=null 鏃朵笉闄愬埗锛屽尮閰嶄换鎰忎緵搴斿晢鐨勫簱瀛�
+ // 锛堥伩鍏嶅洜渚涘簲鍟嗙淮搴︽媶鍒嗭紝OUT 浜嬪姟鎵句笉鍒扮湡姝ｆ湁搴撳瓨鐨勮褰曡�屾墸閿欏埌 vendor_id IS NULL 鐨勮褰曪級
if (vendorId != null) {
wrapper.eq(MesWmMaterialStockDO::getVendorId, vendorId);
- } else {
- wrapper.isNull(MesWmMaterialStockDO::getVendorId);
}
+ // 澶氳褰曟椂浼樺厛鍙栧簱瀛橀噺鏈�澶氱殑锛堥伩鍏嶆墸鍒伴浂搴撳瓨鎴栬礋搴撳瓨鐨勮褰曪級
+ wrapper.last("ORDER BY quantity DESC LIMIT 1");
+ 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);
}
@@ -162,4 +223,16 @@
.orderByAsc(MesWmMaterialStockDO::getReceiptTime));
}
+ /**
+ * 鎸夌墿鏂欑紪鍙锋壒閲忔煡璇㈠簱瀛樿褰曪紙鐢ㄤ簬鐗╂枡闇�姹傚簱瀛樻牎楠岋級
+ */
+ default List<MesWmMaterialStockDO> selectListByItemIds(Collection<Long> itemIds) {
+ if (itemIds == null || itemIds.isEmpty()) {
+ return java.util.Collections.emptyList();
+ }
+ return selectList(new LambdaQueryWrapperX<MesWmMaterialStockDO>()
+ .in(MesWmMaterialStockDO::getItemId, itemIds)
+ .ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO));
+ }
+
}
--
Gitblit v1.9.3