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 | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 5 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 45d87ba..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;
@@ -34,15 +37,24 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.ArrayList;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_MPS_MERGE_ISSUE_DISABLED;
@Tag(name = "绠＄悊鍚庡彴 - MES 鐢熶骇涓昏鍒�")
@RestController
@RequestMapping("/mes/pro-mps")
@Validated
+@Slf4j
public class MesProMpsController {
@Resource
@@ -53,6 +65,10 @@
private MesMdUnitMeasureService unitMeasureService;
@Resource
private CrmCustomerApi customerApi;
+ @Resource
+ private ErpSaleOrderApi saleOrderApi;
+ @Resource
+ private PermissionApi permissionApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇涓昏鍒�")
@@ -81,7 +97,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鐢熶骇涓昏鍒�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pro-mps:query')")
public CommonResult<MesProMpsRespVO> getMps(@RequestParam("id") Long id) {
MesProMpsDO mps = mpsService.getMps(id);
if (mps == null) {
@@ -92,7 +107,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鐢熶骇涓昏鍒掑垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:pro-mps:query')")
public CommonResult<PageResult<MesProMpsRespVO>> getMpsPage(@Valid MesProMpsPageReqVO pageReqVO) {
PageResult<MesProMpsDO> pageResult = mpsService.getMpsPage(pageReqVO);
return success(new PageResult<>(buildMpsRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -122,7 +136,36 @@
@Operation(summary = "鍚堝苟涓嬪彂鐢熶骇涓昏鍒�")
@PreAuthorize("@ss.hasPermission('mes:pro-mps:merge-issue')")
public CommonResult<Long> mergeAndIssueMps(@RequestBody List<Long> mpsIds) {
- return success(mpsService.mergeAndIssueMps(mpsIds));
+ // 鏃у叆鍙ｄ繚鐣欑敤浜庢槑纭彁绀烘棫瀹㈡埛绔崌绾э紝绂佹缁曡繃鏂扮殑閫愭潯涓嬪彂鏉冮檺鏍￠獙銆�
+ throw exception(PRO_MPS_MERGE_ISSUE_DISABLED);
+ }
+
+ @PostMapping("/batch-issue")
+ @Operation(summary = "鎵归噺閫愭潯涓嬪彂鐢熶骇涓昏鍒�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-mps:issue')")
+ public CommonResult<List<BatchIssueResult>> batchIssueMps(@RequestBody @NotEmpty List<@NotNull Long> ids) {
+ List<BatchIssueResult> results = new ArrayList<>();
+ for (Long id : ids) {
+ BatchIssueResult result = new BatchIssueResult();
+ result.setMpsId(id);
+ try {
+ result.setWorkOrderId(mpsService.issueMps(id));
+ } catch (ServiceException ex) {
+ result.setError(ex.getMessage());
+ } catch (Exception ex) {
+ log.error("[batchIssueMps] 涓嬪彂澶辫触锛宮psId={}", id, ex);
+ result.setError("涓嬪彂澶辫触锛岃鑱旂郴绠＄悊鍛樻煡鐪嬫棩蹇�");
+ }
+ results.add(result);
+ }
+ return success(results);
+ }
+
+ @Data
+ public static class BatchIssueResult {
+ private Long mpsId;
+ private Long workOrderId;
+ private String error;
}
@PostMapping("/cancel")
@@ -147,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())
@@ -158,7 +207,19 @@
});
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)));
+ }
});
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3