From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
index 03fe143..20f1267 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
@@ -14,6 +14,9 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.mps.vo.MesProMpsSaveReqVO;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.mps.MesProMpsDO;
@@ -62,6 +65,10 @@
private MesMdUnitMeasureService unitMeasureService;
@Resource
private CrmCustomerApi customerApi;
+ @Resource
+ private ErpSaleOrderApi saleOrderApi;
+ @Resource
+ private PermissionApi permissionApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇涓昏鍒�")
@@ -183,7 +190,13 @@
convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
Map<Long, CrmCustomerRespDTO> clientMap = customerApi.getCustomerMap(
convertSet(list, MesProMpsDO::getClientId));
- // 2. 鎷兼帴 VO
+ // 2. 涓嬪彂鏉冮檺锛氫笌 MesProMpsServiceImpl#validateIssuePermission 淇濇寔涓�鑷�
+ Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+ boolean superAdmin = loginUserId != null && permissionApi.hasAnyRoles(loginUserId, "super_admin");
+ Map<Long, MesProMpsDO> mpsMap = list.stream()
+ .collect(java.util.stream.Collectors.toMap(MesProMpsDO::getId, mps -> mps));
+ Map<Long, String> saleOrderCreatorMap = new java.util.HashMap<>();
+ // 3. 鎷兼帴 VO
return BeanUtils.toBean(list, MesProMpsRespVO.class, vo -> {
MapUtils.findAndThen(itemMap, vo.getProductId(), item -> {
vo.setProductName(item.getName())
@@ -194,6 +207,18 @@
});
MapUtils.findAndThen(clientMap, vo.getClientId(),
client -> vo.setClientName(client.getName()));
+ MesProMpsDO mps = mpsMap.get(vo.getId());
+ if (mps != null) {
+ String creator = mps.getCreator();
+ if (mps.getSaleOrderId() != null) {
+ creator = saleOrderCreatorMap.computeIfAbsent(mps.getSaleOrderId(), orderId -> {
+ var order = saleOrderApi.getSaleOrder(orderId).getCheckedData();
+ return order != null ? order.getCreator() : null;
+ });
+ }
+ vo.setCreator(creator);
+ vo.setCanIssue(superAdmin || (loginUserId != null && String.valueOf(loginUserId).equals(creator)));
+ }
});
}
--
Gitblit v1.9.3