From 88e384da863bb2f7324cb1e1474885df3b7cce91 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 13 七月 2026 11:27:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
index c0ec167..247c35b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
@@ -146,6 +146,25 @@
return success(true);
}
+ @PostMapping("/generate-from-arrival-notice")
+ @Operation(summary = "鏍规嵁鍒拌揣閫氱煡鍗曠敓鎴愰噰璐叆搴撳崟")
+ @Parameter(name = "arrivalNoticeId", description = "鍒拌揣閫氱煡鍗曠紪鍙�", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:create')")
+ public CommonResult<Long> generateFromArrivalNotice(@RequestParam("arrivalNoticeId") Long arrivalNoticeId) {
+ return success(itemReceiptService.generateItemReceiptFromArrivalNotice(arrivalNoticeId));
+ }
+
+ @PutMapping("/submit-approval")
+ @Operation(summary = "鎻愪氦閲囪喘鍏ュ簱鍗曞鎵�")
+ @Parameter(name = "id", description = "鍏ュ簱鍗曠紪鍙�", required = true)
+ @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟 Key", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:update')")
+ public CommonResult<Boolean> submitApproval(@RequestParam("id") Long id,
+ @RequestParam("processDefinitionKey") String processDefinitionKey) {
+ itemReceiptService.submitItemReceiptApproval(id, processDefinitionKey);
+ return success(true);
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesWmItemReceiptRespVO> buildRespVOList(List<MesWmItemReceiptDO> list) {
@@ -166,7 +185,7 @@
MapUtils.findAndThen(iqcMap, vo.getIqcId(),
iqc -> vo.setIqcCode(iqc.getCode()));
MapUtils.findAndThen(noticeMap, vo.getNoticeId(), notice ->
- vo.setNoticeCode(notice.getCode()).setPurchaseOrderCode(notice.getPurchaseOrderCode()));
+ vo.setNoticeCode(notice.getCode()));
});
}
--
Gitblit v1.9.3