From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java
index f3c863f..ddfd19a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java
@@ -33,11 +33,18 @@
.orderByAsc(MesWmStockTakingTaskLineDO::getId));
}
- default MesWmStockTakingTaskLineDO selectByTaskIdAndItemIdAndAreaId(Long taskId, Long itemId, Long areaId) {
+ default MesWmStockTakingTaskLineDO selectByStockDimensions(Long taskId, Long itemId, Long warehouseId,
+ Long locationId, Long areaId, Long batchId) {
return selectOne(new LambdaQueryWrapperX<MesWmStockTakingTaskLineDO>()
.eq(MesWmStockTakingTaskLineDO::getTaskId, taskId)
.eq(MesWmStockTakingTaskLineDO::getItemId, itemId)
- .eqIfPresent(MesWmStockTakingTaskLineDO::getAreaId, areaId));
+ .eq(MesWmStockTakingTaskLineDO::getWarehouseId, warehouseId)
+ .eq(locationId != null, MesWmStockTakingTaskLineDO::getLocationId, locationId)
+ .isNull(locationId == null, MesWmStockTakingTaskLineDO::getLocationId)
+ .eq(areaId != null, MesWmStockTakingTaskLineDO::getAreaId, areaId)
+ .isNull(areaId == null, MesWmStockTakingTaskLineDO::getAreaId)
+ .eq(batchId != null, MesWmStockTakingTaskLineDO::getBatchId, batchId)
+ .isNull(batchId == null, MesWmStockTakingTaskLineDO::getBatchId));
}
}
--
Gitblit v1.9.3