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/returnissue/MesWmReturnIssueMapper.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java
index 1dab867..c8c785a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -14,14 +15,22 @@
public interface MesWmReturnIssueMapper extends BaseMapperX<MesWmReturnIssueDO> {
default PageResult<MesWmReturnIssueDO> selectPage(MesWmReturnIssuePageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<MesWmReturnIssueDO>()
+ LambdaQueryWrapperX<MesWmReturnIssueDO> wrapper = new LambdaQueryWrapperX<MesWmReturnIssueDO>()
.likeIfPresent(MesWmReturnIssueDO::getCode, reqVO.getCode())
.likeIfPresent(MesWmReturnIssueDO::getName, reqVO.getName())
.eqIfPresent(MesWmReturnIssueDO::getWorkstationId, reqVO.getWorkstationId())
.eqIfPresent(MesWmReturnIssueDO::getWorkOrderId, reqVO.getWorkOrderId())
.eqIfPresent(MesWmReturnIssueDO::getTaskId, reqVO.getTaskId())
.eqIfPresent(MesWmReturnIssueDO::getType, reqVO.getType())
- .orderByDesc(MesWmReturnIssueDO::getId));
+ .eqIfPresent(MesWmReturnIssueDO::getStatus, reqVO.getStatus())
+ .orderByDesc(MesWmReturnIssueDO::getId);
+ // 鎸夊伐鍗曠紪鍙锋绱細璧板瓙鏌ヨ锛岄伩鍏嶄笌宸ュ崟琛ㄨ仈琛ㄥ奖鍝嶅垎椤垫�绘暟
+ if (StrUtil.isNotBlank(reqVO.getWorkOrderCode())) {
+ wrapper.apply("work_order_id IN (SELECT id FROM mes_pro_work_order"
+ + " WHERE deleted = 0 AND code LIKE CONCAT('%', {0}, '%'))",
+ reqVO.getWorkOrderCode());
+ }
+ return selectPage(reqVO, wrapper);
}
default MesWmReturnIssueDO selectByCode(String code) {
--
Gitblit v1.9.3