From 7bd10d34e8a8dc2437ec8551eb511e37634d7306 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:51:52 +0800
Subject: [PATCH] feat(mes): 生产计划审批改走协同办公，修复工单领料与产成品入库校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java
index c1f4a06..dfd69aa 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java
@@ -9,6 +9,7 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssuePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueSupplementReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueSaveReqVO;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
@@ -65,6 +66,22 @@
return success(issueService.createProductIssue(createReqVO));
}
+ @PostMapping("/generate-by-work-order")
+ @Operation(summary = "鏍规嵁鐢熶骇宸ュ崟鐢熸垚棰嗘枡浠诲姟",
+ description = "鎸夊伐鍗� BOM 鐗╂枡娓呭崟 脳 宸ュ崟璁″垝鏁伴噺绠楀嚭搴旈鏁伴噺锛屾墸闄ゅ凡棰嗘暟閲忓悗鐢熸垚鑽夌棰嗘枡鍑哄簱鍗�")
+ @Parameter(name = "workOrderId", description = "鐢熶骇宸ュ崟缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:create')")
+ public CommonResult<Long> generateByWorkOrder(@RequestParam("workOrderId") Long workOrderId) {
+ return success(issueService.generateByWorkOrder(workOrderId));
+ }
+
+ @PostMapping("/supplement")
+ @Operation(summary = "鍒涘缓琛ラ杈呮枡鍗�", description = "鎸夊伐鍗曡ˉ棰嗚緟鏂欙紝鐢熸垚鑽夌棰嗘枡鍗曪紙绫诲瀷=琛ラ杈呮枡锛夛紝鍚庣画璧� 鎻愪氦鈫掓嫞璐р啋瀹屾垚 娴佺▼")
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:create')")
+ public CommonResult<Long> createSupplementIssue(@Valid @RequestBody MesWmProductIssueSupplementReqVO reqVO) {
+ return success(issueService.createSupplementIssue(reqVO));
+ }
+
@PutMapping("/update")
@Operation(summary = "淇敼棰嗘枡鍑哄簱鍗�")
@PreAuthorize("@ss.hasPermission('mes:wm-product-issue:update')")
@@ -85,7 +102,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱棰嗘枡鍑哄簱鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:query')")
public CommonResult<MesWmProductIssueRespVO> getProductIssue(@RequestParam("id") Long id) {
MesWmProductIssueDO issue = issueService.getProductIssue(id);
if (issue == null) {
@@ -96,7 +112,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱棰嗘枡鍑哄簱鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:query')")
public CommonResult<PageResult<MesWmProductIssueRespVO>> getProductIssuePage(
@Valid MesWmProductIssuePageReqVO pageReqVO) {
PageResult<MesWmProductIssueDO> pageResult = issueService.getProductIssuePage(pageReqVO);
@@ -154,7 +169,6 @@
@GetMapping("/check-quantity")
@Operation(summary = "鏍￠獙棰嗘枡鍑哄簱鍗曟暟閲�", description = "鏍￠獙姣忚鏄庣粏鏁伴噺涔嬪拰鏄惁绛変簬琛岄鏂欐暟閲�")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:query')")
public CommonResult<Boolean> checkProductIssueQuantity(@RequestParam("id") Long id) {
return success(issueService.checkProductIssueQuantity(id));
}
--
Gitblit v1.9.3