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-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java | 93 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 93 insertions(+), 0 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java
index 1303112..8b635f1 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.crm.dal.mysql.contract;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
@@ -14,6 +15,7 @@
import cn.iocoder.yudao.module.crm.util.CrmPermissionUtils;
import org.apache.ibatis.annotations.Mapper;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
@@ -50,6 +52,18 @@
}
default PageResult<CrmContractDO> selectPage(CrmContractPageReqVO pageReqVO, Long userId, CrmContractConfigDO config) {
+ return selectPage(pageReqVO, userId, config, null);
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ锛堝甫瀹㈡埛鏉冮檺杩囨护锛�
+ *
+ * @param pageReqVO 鏌ヨ鏉′欢
+ * @param userId 鐢ㄦ埛ID
+ * @param config 鍚堝悓閰嶇疆
+ * @param permittedCustomerIds 鏈夋潈闄愮殑瀹㈡埛ID鍒楄〃锛坣ull琛ㄧず涓嶉檺鍒讹級
+ */
+ default PageResult<CrmContractDO> selectPage(CrmContractPageReqVO pageReqVO, Long userId, CrmContractConfigDO config, List<Long> permittedCustomerIds) {
MPJLambdaWrapperX<CrmContractDO> query = new MPJLambdaWrapperX<>();
// 鎷兼帴鏁版嵁鏉冮檺鐨勬煡璇㈡潯浠�
CrmPermissionUtils.appendPermissionCondition(query, CrmBizTypeEnum.CRM_CONTRACT.getType(),
@@ -62,6 +76,14 @@
.eqIfPresent(CrmContractDO::getBusinessId, pageReqVO.getBusinessId())
.eqIfPresent(CrmContractDO::getAuditStatus, pageReqVO.getAuditStatus())
.orderByDesc(CrmContractDO::getId);
+
+ // 瀹㈡埛鏉冮檺杩囨护
+ if (permittedCustomerIds != null) {
+ if (CollUtil.isEmpty(permittedCustomerIds)) {
+ return PageResult.empty();
+ }
+ query.in(CrmContractDO::getCustomerId, permittedCustomerIds);
+ }
// Backlog: 鍗冲皢鍒版湡鐨勫悎鍚�
LocalDateTime beginOfToday = LocalDateTimeUtil.beginOfDay(LocalDateTime.now());
@@ -113,4 +135,75 @@
.eq(CrmContractDO::getOwnerUserId, ownerUserId));
}
+ default CrmContractDO selectByBusinessId(Long businessId) {
+ return selectOne(CrmContractDO::getBusinessId, businessId);
+ }
+
+ default CrmContractDO selectByOrderId(Long orderId) {
+ return selectOne(CrmContractDO::getOrderId, orderId);
+ }
+
+ default List<CrmContractDO> selectListByCustomerId(Long customerId) {
+ return selectList(CrmContractDO::getCustomerId, customerId);
+ }
+
+ // ========== 缁熻鏂规硶 ==========
+
+ default Long selectTodayCount() {
+ LocalDateTime beginOfToday = LocalDateTimeUtil.beginOfDay(LocalDateTime.now());
+ LocalDateTime endOfToday = LocalDateTimeUtil.endOfDay(LocalDateTime.now());
+ return selectCount(new LambdaQueryWrapperX<CrmContractDO>()
+ .between(CrmContractDO::getCreateTime, beginOfToday, endOfToday));
+ }
+
+ default BigDecimal selectTotalPriceSum() {
+ LambdaQueryWrapperX<CrmContractDO> query = new LambdaQueryWrapperX<>();
+ query.select(CrmContractDO::getTotalPrice);
+ List<CrmContractDO> list = selectList(query);
+ return list.stream()
+ .map(CrmContractDO::getTotalPrice)
+ .filter(p -> p != null)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
+
+ default Long selectApproveCount() {
+ return selectCount(CrmContractDO::getAuditStatus, CrmAuditStatusEnum.APPROVE.getStatus());
+ }
+
+ default BigDecimal selectApprovePriceSum() {
+ LambdaQueryWrapperX<CrmContractDO> query = new LambdaQueryWrapperX<>();
+ query.eq(CrmContractDO::getAuditStatus, CrmAuditStatusEnum.APPROVE.getStatus())
+ .select(CrmContractDO::getTotalPrice);
+ List<CrmContractDO> list = selectList(query);
+ return list.stream()
+ .map(CrmContractDO::getTotalPrice)
+ .filter(p -> p != null)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
+
+ default Long selectProcessCount() {
+ return selectCount(CrmContractDO::getAuditStatus, CrmAuditStatusEnum.PROCESS.getStatus());
+ }
+
+ default List<Long> selectOwnerUserIds() {
+ LambdaQueryWrapperX<CrmContractDO> query = new LambdaQueryWrapperX<>();
+ query.select(CrmContractDO::getOwnerUserId).isNotNull(CrmContractDO::getOwnerUserId);
+ List<CrmContractDO> list = selectList(query);
+ return list.stream().map(CrmContractDO::getOwnerUserId).distinct().toList();
+ }
+
+ default Long selectCountByOwnerUserId(Long ownerUserId) {
+ return selectCount(CrmContractDO::getOwnerUserId, ownerUserId);
+ }
+
+ default BigDecimal selectPriceSumByOwnerUserId(Long ownerUserId) {
+ LambdaQueryWrapperX<CrmContractDO> query = new LambdaQueryWrapperX<>();
+ query.eq(CrmContractDO::getOwnerUserId, ownerUserId).select(CrmContractDO::getTotalPrice);
+ List<CrmContractDO> list = selectList(query);
+ return list.stream()
+ .map(CrmContractDO::getTotalPrice)
+ .filter(p -> p != null)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
+
}
--
Gitblit v1.9.3