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/util/CrmPermissionUtils.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/util/CrmPermissionUtils.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/util/CrmPermissionUtils.java
index 0563af0..24740c9 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/util/CrmPermissionUtils.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/util/CrmPermissionUtils.java
@@ -37,6 +37,16 @@
}
/**
+ * 鏍￠獙鐢ㄦ埛鏄惁鏈夋煡鐪嬪叏閮ㄥ鎴风殑鏉冮檺
+ *
+ * @return 鏄�/鍚�
+ */
+ private static boolean hasCustomerViewAllPermission() {
+ PermissionCommonApi permissionApi = SpringUtil.getBean(PermissionCommonApi.class);
+ return permissionApi.hasAnyPermissions(getLoginUserId(), "crm:customer:view-all");
+ }
+
+ /**
* 鏋勯�� CRM 鏁版嵁绫诲瀷鏁版嵁銆愬垎椤点�戞煡璇㈡潯浠�
*
* @param query 杩炶〃鏌ヨ瀵硅薄
@@ -58,11 +68,16 @@
if (CrmPermissionUtils.isCrmAdmin()) { // 鐗规畩閫昏緫锛氬鏋滄槸瓒呯锛岀洿鎺ユ煡璇㈡墍鏈夛紝涓嶈繃婊ゆ暟鎹潈闄�
return;
}
- query.innerJoin(CrmPermissionDO.class, on -> on.eq(CrmPermissionDO::getBizType, bizType)
- .eq(CrmPermissionDO::getBizId, bizId)
- .in(CrmPermissionDO::getLevel, CrmPermissionLevelEnum.READ.getLevel(), CrmPermissionLevelEnum.WRITE.getLevel())
- .eq(CrmPermissionDO::getUserId,userId));
- query.ne(ownerUserIdField, userId);
+ // 鍟嗘満鐗规畩澶勭悊锛氬悓鏃跺叧鑱斿晢鏈哄洟闃熷拰瀹㈡埛鍥㈤槦鐨勬潈闄�
+ if (CrmBizTypeEnum.CRM_BUSINESS.getType().equals(bizType)) {
+ appendBusinessPermissionCondition(query, bizId, userId, ownerUserIdField);
+ } else {
+ query.innerJoin(CrmPermissionDO.class, on -> on.eq(CrmPermissionDO::getBizType, bizType)
+ .eq(CrmPermissionDO::getBizId, bizId)
+ .in(CrmPermissionDO::getLevel, CrmPermissionLevelEnum.READ.getLevel(), CrmPermissionLevelEnum.WRITE.getLevel())
+ .eq(CrmPermissionDO::getUserId, userId));
+ query.ne(ownerUserIdField, userId);
+ }
}
// 鍦烘櫙涓夛細涓嬪睘璐熻矗鐨勬暟鎹紙涓嬪睘鏄礋璐ｄ汉锛�
if (CrmSceneTypeEnum.isSubordinate(sceneType)) {
@@ -74,6 +89,37 @@
query.in(ownerUserIdField, convertSet(subordinateUsers, AdminUserRespDTO::getId));
}
}
+ // 鍦烘櫙鍥涳細鍏ㄩ儴鏁版嵁锛堥渶瑕佹湁 view-all 鏉冮檺鎴� CRM 绠＄悊鍛橈級
+ if (CrmSceneTypeEnum.isAll(sceneType)) {
+ if (isCrmAdmin() || hasCustomerViewAllPermission()) {
+ return; // 璺宠繃杩囨护锛屾煡鐪嬪叏閮�
+ }
+ // 鏃犳潈闄愬垯闄嶇骇涓�"鎴戣礋璐ｇ殑"
+ query.eq(ownerUserIdField, userId);
+ }
+ }
+
+ /**
+ * 鍟嗘満鐗规畩鏉冮檺鏉′欢锛氬悓鏃跺叧鑱斿晢鏈哄洟闃熷拰瀹㈡埛鍥㈤槦鐨勬潈闄�
+ * 鍟嗘満缁ф壙瀹㈡埛鍥㈤槦鐨勬潈闄愶紝鍗冲鎴峰洟闃熸垚鍛樹篃鑳界湅鍒拌瀹㈡埛涓嬬殑鍟嗘満
+ */
+ private static <T extends MPJLambdaWrapper<?>, S> void appendBusinessPermissionCondition(T query, SFunction<S, ?> bizId,
+ Long userId, String ownerUserIdField) {
+ // 浣跨敤瀛愭煡璇㈡柟寮忥細鍟嗘満鍥㈤槦鎴愬憳 OR 瀹㈡埛鍥㈤槦鎴愬憳
+ // 瀛愭煡璇�1锛氬晢鏈哄洟闃熸垚鍛樻潈闄�
+ String subQuery1 = "(SELECT p1.biz_id FROM crm_permission p1 " +
+ "WHERE p1.biz_type = " + CrmBizTypeEnum.CRM_BUSINESS.getType() + " " +
+ "AND p1.level IN (" + CrmPermissionLevelEnum.READ.getLevel() + "," + CrmPermissionLevelEnum.WRITE.getLevel() + ") " +
+ "AND p1.user_id = " + userId + ")";
+ // 瀛愭煡璇�2锛氬鎴峰洟闃熸垚鍛樻潈闄愶紙閫氳繃鍟嗘満鐨� customer_id 鍏宠仈锛�
+ String subQuery2 = "(SELECT b.id FROM crm_business b " +
+ "INNER JOIN crm_permission p2 ON p2.biz_type = " + CrmBizTypeEnum.CRM_CUSTOMER.getType() + " " +
+ "AND p2.biz_id = b.customer_id " +
+ "AND p2.level IN (" + CrmPermissionLevelEnum.READ.getLevel() + "," + CrmPermissionLevelEnum.WRITE.getLevel() + ") " +
+ "AND p2.user_id = " + userId + ")";
+ // 浣跨敤 OR 杩炴帴涓や釜瀛愭煡璇紝骞舵帓闄よ嚜宸辨槸璐熻矗浜虹殑鎯呭喌
+ query.apply("t.id IN (" + subQuery1 + " UNION " + subQuery2 + ")")
+ .ne(ownerUserIdField, userId);
}
}
--
Gitblit v1.9.3