From 70ea74cfb981f812bfa4e3ef91843c5ad93f7b27 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 04 十一月 2026 17:32:49 +0800
Subject: [PATCH] feat(erp): 采购台账改造与采购退货增强
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 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 807be55..03fe143 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
@@ -34,15 +34,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
@@ -120,7 +129,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")
@@ -159,4 +197,4 @@
});
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3