From 227eff61120aaca63e068035d745d86452e6499a Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:35:12 +0800
Subject: [PATCH] feat(mes): 优化生产订单与排产任务列表显示，新增启停工及校验逻辑 1. 生产订单列表展示优化 (WorkOrder) - 新增「生产状态」列，全局注册 `ORDER_PRODUCTION_STATUS` 常量并绑定系统动态字典。 - 彻底重构「工序生产进度」单元格显示：弃用臃肿的 Steps 组件，改为极简横向布局（彩色状态圆点 + 进度百分比），解决表格行高被强行撑开及内容截断问题，支持横向滚动。 - 优化「完成进度」列宽及展示样式，将百分比数值外置同行显示，更加直观。 2. 排产任务列表改造 (Task) - 顶部表头重构，由单一标题重构为「全部 / 未完成 / 已完成」的 Tabs 标签页切换结构。 - 重写数据过滤逻辑，剥离写死的 status 查询，改为使用 `scheduleStatus` 字段动态响应 Tabs 切换 (0: 未完成, 1: 已完成)。 3. 工单业务逻辑增强与状态流转 - 落实「工单查询逻辑设计方案」，优化底层的工单条件检索逻辑。 - 实现「添加工单启停功能」与「停工状态」，支持工单在执行过程中的暂停与恢复业务流转。 - 强化容错与防呆设计：操作「完成订单」时增加前置校验 `handleCheckFinish`，若生产状态为未完成，强制弹出二次确认 Modal，避免误操作。 # 相关讨论/参考方案 # - 添加工单启停功能 # - 停工状态功能设计方案 # - 工单查询逻辑设计方案 # - 工单完成进度显示优化
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java | 55 +++++++++++++++++++++++++++----------------------------
1 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
index d44d171..0c989a6 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
@@ -2,45 +2,44 @@
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.MPJLambdaWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestPageReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
+
+import java.util.Collection;
+import java.util.List;
/**
* ERP 閲囪喘鐢宠 Mapper
- *
- * @author 鑺嬮亾婧愮爜
*/
@Mapper
public interface ErpPurchaseRequestMapper extends BaseMapperX<ErpPurchaseRequestDO> {
-
- default PageResult<ErpPurchaseRequestDO> selectPage(ErpPurchaseRequestPageReqVO reqVO) {
- MPJLambdaWrapperX<ErpPurchaseRequestDO> query = new MPJLambdaWrapperX<ErpPurchaseRequestDO>()
- .likeIfPresent(ErpPurchaseRequestDO::getNo, reqVO.getNo())
- .eqIfPresent(ErpPurchaseRequestDO::getRequestUserId, reqVO.getRequestUserId())
- .eqIfPresent(ErpPurchaseRequestDO::getRequestDeptId, reqVO.getRequestDeptId())
- .betweenIfPresent(ErpPurchaseRequestDO::getRequestTime, reqVO.getRequestTime())
- .eqIfPresent(ErpPurchaseRequestDO::getStatus, reqVO.getStatus())
- .likeIfPresent(ErpPurchaseRequestDO::getRequestReason, reqVO.getRequestReason())
- .orderByDesc(ErpPurchaseRequestDO::getId);
- if (reqVO.getProductId() != null) {
- query.leftJoin(ErpPurchaseRequestItemDO.class, ErpPurchaseRequestItemDO::getRequestId, ErpPurchaseRequestDO::getId)
- .eq(ErpPurchaseRequestItemDO::getProductId, reqVO.getProductId())
- .groupBy(ErpPurchaseRequestDO::getId);
- }
- return selectJoinPage(reqVO, ErpPurchaseRequestDO.class, query);
- }
-
- default int updateByIdAndStatus(Long id, Integer status, ErpPurchaseRequestDO updateObj) {
- return update(updateObj, new LambdaUpdateWrapper<ErpPurchaseRequestDO>()
- .eq(ErpPurchaseRequestDO::getId, id).eq(ErpPurchaseRequestDO::getStatus, status));
- }
default ErpPurchaseRequestDO selectByNo(String no) {
return selectOne(ErpPurchaseRequestDO::getNo, no);
}
-}
+ default List<ErpPurchaseRequestDO> selectRequestListByIds(Collection<Long> ids) {
+ return selectList(ErpPurchaseRequestDO::getId, ids);
+ }
+
+ default List<ErpPurchaseRequestDO> selectList(Long supplierId, Integer status) {
+ return selectList(new LambdaQueryWrapperX<ErpPurchaseRequestDO>()
+ .eqIfPresent(ErpPurchaseRequestDO::getSupplierId, supplierId)
+ .eqIfPresent(ErpPurchaseRequestDO::getStatus, status));
+ }
+
+ default PageResult<ErpPurchaseRequestDO> selectPage(ErpPurchaseRequestPageReqVO pageReqVO) {
+ return selectPage(pageReqVO, new LambdaQueryWrapperX<ErpPurchaseRequestDO>()
+ .likeIfPresent(ErpPurchaseRequestDO::getNo, pageReqVO.getNo())
+ .eqIfPresent(ErpPurchaseRequestDO::getRequestUserId, pageReqVO.getRequestUserId())
+ .eqIfPresent(ErpPurchaseRequestDO::getRequestDeptId, pageReqVO.getRequestDeptId())
+ .eqIfPresent(ErpPurchaseRequestDO::getSupplierId, pageReqVO.getSupplierId())
+ .eqIfPresent(ErpPurchaseRequestDO::getStatus, pageReqVO.getStatus())
+ .eqIfPresent(ErpPurchaseRequestDO::getInStatus, pageReqVO.getInStatus())
+ .betweenIfPresent(ErpPurchaseRequestDO::getRequestTime, pageReqVO.getRequestTime())
+ .orderByDesc(ErpPurchaseRequestDO::getId));
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.9.3