From 87733eb3623593da247c051593d64b8ff9e1d3a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:39 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstockbag/MesWmMaterialStockBagMapper.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstockbag/MesWmMaterialStockBagMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstockbag/MesWmMaterialStockBagMapper.java
index a6851fa..6637530 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstockbag/MesWmMaterialStockBagMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstockbag/MesWmMaterialStockBagMapper.java
@@ -25,7 +25,7 @@
return selectPage(reqVO, new LambdaQueryWrapperX<MesWmMaterialStockBagDO>()
.eq(MesWmMaterialStockBagDO::getMaterialStockId, reqVO.getMaterialStockId())
.likeIfPresent(MesWmMaterialStockBagDO::getBagCode, reqVO.getBagCode())
- .eq(MesWmMaterialStockBagDO::getStatus, 1)
+ .eqIfPresent(MesWmMaterialStockBagDO::getStatus, Boolean.TRUE.equals(reqVO.getIncludeHistory()) ? null : 1)
.orderByAsc(MesWmMaterialStockBagDO::getInboundTime));
}
@@ -81,6 +81,12 @@
.orderByAsc(MesWmMaterialStockBagDO::getInboundTime));
}
+ default List<MesWmMaterialStockBagDO> selectHistoryByMaterialStockIds(Collection<Long> materialStockIds) {
+ if (materialStockIds.isEmpty()) return List.of();
+ return selectList(new LambdaQueryWrapperX<MesWmMaterialStockBagDO>()
+ .in(MesWmMaterialStockBagDO::getMaterialStockId, materialStockIds));
+ }
+
default List<MesWmMaterialStockBagDO> selectListByMaterialStockId(Long materialStockId) {
return selectList(new LambdaQueryWrapperX<MesWmMaterialStockBagDO>()
.eq(MesWmMaterialStockBagDO::getMaterialStockId, materialStockId)
--
Gitblit v1.9.3