From f02d0df2f1dfc7a8b775cf50d45375e57628a5ef Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 10 十一月 2026 11:26:22 +0800
Subject: [PATCH] feat(ncr): 完善NCR处置联动逻辑与关闭校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 4c2e3a9..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
@@ -12,7 +12,7 @@
/**
* MES 鐩樼偣浠诲姟琛� Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface MesWmStockTakingTaskLineMapper extends BaseMapperX<MesWmStockTakingTaskLineDO> {
@@ -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