From 704265308b1227dbada5a36b2027b588c062ded2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 12 十月 2026 09:14:37 +0800
Subject: [PATCH] feat(mes): 新增业务码支持并优化追溯查询功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/scan/MesProScanEventController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/scan/MesProScanEventController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/scan/MesProScanEventController.java
index 4566021..e9673b3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/scan/MesProScanEventController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/scan/MesProScanEventController.java
@@ -23,7 +23,7 @@
@RestController @RequestMapping("/mes/pro/scan-in")
public class MesProScanEventController {
@Resource private MesProScanEventService service;
- @PostMapping("/inbound") @PreAuthorize("@ss.hasPermission('mes:pro-scan-in:inbound')") @Operation(summary = "琚嬬爜鎵爜鍏ュ簱")
+ @PostMapping("/inbound") @PreAuthorize("@ss.hasPermission('mes:pro-scan-in:inbound')") @Operation(summary = "杩芥函鐮佹壂鐮佸叆搴擄紙琚嬬爜/鎵樼洏鐮�/鎵规鐮侊級")
public CommonResult<MesProScanEventRespVO> inbound(@Valid @RequestBody MesProScanEventCreateReqVO req) {
return success(BeanUtils.toBean(service.createInbound(req), MesProScanEventRespVO.class));
}
@@ -32,6 +32,20 @@
PageResult<MesProScanEventDO> page = service.getPage(req);
return success(new PageResult<>(BeanUtils.toBean(page.getList(), MesProScanEventRespVO.class), page.getTotal()));
}
+ @GetMapping("/my-page") @PreAuthorize("@ss.hasPermission('mes:pro-scan-in:query')")
+ @Operation(summary = "鏈汉鎵爜浣滀笟璁板綍")
+ public CommonResult<PageResult<MesProScanEventRespVO>> myPage(@Valid MesProScanEventPageReqVO req) {
+ req.setCreator(String.valueOf(cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId()));
+ return page(req);
+ }
+ @GetMapping("/my-event") @PreAuthorize("@ss.hasAnyPermissions('mes:pro-scan-in:query','mes:pro-scan-in:inbound')")
+ @Operation(summary = "鏍稿疄鏈汉鎵爜鎿嶄綔缁撴灉")
+ public CommonResult<MesProScanEventRespVO> myEvent(@RequestParam String eventId) {
+ MesProScanEventDO event = service.getByEventId(eventId);
+ String userId = String.valueOf(cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId());
+ return success(event != null && userId.equals(event.getCreator())
+ ? BeanUtils.toBean(event, MesProScanEventRespVO.class) : null);
+ }
@GetMapping("/latest") @PreAuthorize("@ss.hasPermission('mes:pro-scan-in:query')") @Operation(summary = "鏈�鏂版壂鐮佷簨浠�")
public CommonResult<MesProScanEventRespVO> latest(@RequestParam(required = false) String deviceCode) {
return success(BeanUtils.toBean(service.getLatest(deviceCode), MesProScanEventRespVO.class));
--
Gitblit v1.9.3