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/sn/MesWmSnController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/sn/MesWmSnController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/sn/MesWmSnController.java
index 63d5afe..7b14295 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/sn/MesWmSnController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/sn/MesWmSnController.java
@@ -65,8 +65,19 @@
if (CollUtil.isEmpty(pageResult.getList())) {
return success(PageResult.empty(pageResult.getTotal()));
}
- buildGroupItemInfo(pageResult.getList());
+ buildSnGroupItemVO(pageResult.getList());
return success(pageResult);
+ }
+
+ @GetMapping("/list-by-uuid")
+ @Operation(summary = "鑾峰緱鎵规 SN 鐮佹槑缁嗗垪琛�")
+ @Parameter(name = "uuid", description = "鎵规 UUID", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-sn:query')")
+ public CommonResult<List<MesWmSnRespVO>> getSnListByUuid(
+ @RequestParam("uuid") @NotBlank(message = "鎵规 UUID 涓嶈兘涓虹┖") String uuid) {
+ List<MesWmSnRespVO> list = BeanUtils.toBean(snService.getSnListByUuid(uuid), MesWmSnRespVO.class);
+ buildSnItemVO(list);
+ return success(list);
}
@DeleteMapping("/delete-batch")
@@ -85,7 +96,7 @@
public void exportSnGroupExcel(@Valid MesWmSnPageReqVO reqVO, HttpServletResponse response) throws IOException {
reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<MesWmSnGroupRespVO> list = snService.getSnGroupPage(reqVO).getList();
- buildGroupItemInfo(list);
+ buildSnGroupItemVO(list);
ExcelUtils.write(response, "SN鐮佸垎缁�.xls", "鏁版嵁", MesWmSnGroupRespVO.class, list);
}
@@ -96,13 +107,13 @@
@ApiAccessLog(operateType = EXPORT)
public void exportSnExcel(@RequestParam("uuid") String uuid, HttpServletResponse response) throws IOException {
List<MesWmSnRespVO> list = BeanUtils.toBean(snService.getSnListByUuid(uuid), MesWmSnRespVO.class);
- buildItemInfo(list);
+ buildSnItemVO(list);
ExcelUtils.write(response, "SN鐮佹槑缁�.xls", "鏁版嵁", MesWmSnRespVO.class, list);
}
// ==================== 鎷兼帴 VO ====================
- private void buildGroupItemInfo(List<MesWmSnGroupRespVO> list) {
+ private void buildSnGroupItemVO(List<MesWmSnGroupRespVO> list) {
if (CollUtil.isEmpty(list)) {
return;
}
@@ -115,7 +126,7 @@
}));
}
- private void buildItemInfo(List<MesWmSnRespVO> list) {
+ private void buildSnItemVO(List<MesWmSnRespVO> list) {
if (CollUtil.isEmpty(list)) {
return;
}
--
Gitblit v1.9.3