From 7bd10d34e8a8dc2437ec8551eb511e37634d7306 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:51:52 +0800
Subject: [PATCH] feat(mes): 生产计划审批改走协同办公，修复工单领料与产成品入库校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskLineMapper.java | 14 +++++++++++---
1 files changed, 11 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..f2cce0f 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,19 @@
.orderByAsc(MesWmStockTakingTaskLineDO::getId));
}
+ /**
+ * 鎸� 浠诲姟 + 鐗╂枡 + 搴撲綅 鏌ヨ鐩樼偣娓呭崟琛�
+ *
+ * 鍚屼竴鐗╂枡鍦ㄥ悓涓�搴撲綅鍙兘鍥犳壒娆�/渚涘簲鍟嗕笉鍚屽瓨鍦ㄥ琛岋紝姝ゆ椂鍙栨渶鏃╃敓鎴愮殑涓�琛岋紝
+ * 閬垮厤 selectOne 鍥犲琛岀洿鎺ユ姏寮傚父锛堢敤鎴锋湭閫夋嫨鐩樼偣娓呭崟鏃惰蛋璇ュ厹搴曢�昏緫锛夈��
+ */
default MesWmStockTakingTaskLineDO selectByTaskIdAndItemIdAndAreaId(Long taskId, Long itemId, Long areaId) {
- return selectOne(new LambdaQueryWrapperX<MesWmStockTakingTaskLineDO>()
+ List<MesWmStockTakingTaskLineDO> list = selectList(new LambdaQueryWrapperX<MesWmStockTakingTaskLineDO>()
.eq(MesWmStockTakingTaskLineDO::getTaskId, taskId)
.eq(MesWmStockTakingTaskLineDO::getItemId, itemId)
- .eqIfPresent(MesWmStockTakingTaskLineDO::getAreaId, areaId));
+ .eqIfPresent(MesWmStockTakingTaskLineDO::getAreaId, areaId)
+ .orderByAsc(MesWmStockTakingTaskLineDO::getId));
+ return list.isEmpty() ? null : list.get(0);
}
}
--
Gitblit v1.9.3