From 381e02b9eccbe953b31d09f2af1c2ce77c816140 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 14:51:05 +0800
Subject: [PATCH] fix(mes): 隔离设备物料并支持销售产品映射
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/sn/MesWmSnController.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 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 3b49cc7..4fae577 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
@@ -8,8 +8,12 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
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.sn.vo.MesWmSnDetailRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnGenerateReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnGroupRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnInStockPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnInStockReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnOutStockReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnRespVO;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
@@ -62,7 +66,6 @@
@GetMapping("/group-page")
@Operation(summary = "鑾峰緱 SN 鐮佸垎缁勫垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-sn:query')")
public CommonResult<PageResult<MesWmSnGroupRespVO>> getSnGroupPage(@Valid MesWmSnPageReqVO reqVO) {
PageResult<MesWmSnGroupRespVO> pageResult = snService.getSnGroupPage(reqVO);
if (CollUtil.isEmpty(pageResult.getList())) {
@@ -75,7 +78,6 @@
@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);
@@ -92,6 +94,37 @@
return success(true);
}
+ @PostMapping("/in-stock")
+ @Operation(summary = "鍏ュ簱鐧昏 SN", description = "鎸� SN 寤虹珛鍗曚欢鍏ュ簱浜嬪姟骞跺叆鍙帮紝闇�鐗╂枡宸插惎鐢ㄥ簭鍒楀彿绠＄悊")
+ @PreAuthorize("@ss.hasPermission('mes:wm-sn:update')")
+ public CommonResult<Boolean> registerSnInStock(@Valid @RequestBody MesWmSnInStockReqVO reqVO) {
+ snService.registerSnInStock(reqVO);
+ return success(true);
+ }
+
+ @PostMapping("/out-stock")
+ @Operation(summary = "鍑哄簱鏍搁攢 SN", description = "鎸� SN 寤虹珛鍗曚欢鍑哄簱浜嬪姟骞舵牳閿�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-sn:update')")
+ public CommonResult<Boolean> outboundSn(@Valid @RequestBody MesWmSnOutStockReqVO reqVO) {
+ snService.outboundSn(reqVO);
+ return success(true);
+ }
+
+ @GetMapping("/detail")
+ @Operation(summary = "鑾峰緱 SN 鍗曚欢鏄庣粏", description = "杩斿洖鐘舵�併�佸湪搴撲綅缃強鏈�杩戜竴绗斿簱瀛樹簨鍔�")
+ @Parameter(name = "code", description = "SN 鐮�", required = true, example = "SN20260305000001")
+ public CommonResult<MesWmSnDetailRespVO> getSnDetail(@RequestParam("code") @NotBlank(message = "SN 鐮佷笉鑳戒负绌�") String code) {
+ return success(snService.getSnDetail(code));
+ }
+
+ @GetMapping("/in-stock-page")
+ @Operation(summary = "SN 鐮佺姸鎬佸垎椤�", description = "鎸夌姸鎬�/鐗╂枡/搴撲綅绛夌淮搴﹀垎椤垫煡璇� SN锛堟敮鎸佺洏鐐规牳瀵癸級")
+ public CommonResult<PageResult<MesWmSnRespVO>> getSnInStockPage(@Valid MesWmSnInStockPageReqVO reqVO) {
+ PageResult<MesWmSnRespVO> pageResult = BeanUtils.toBean(snService.getSnInStockPage(reqVO), MesWmSnRespVO.class);
+ buildSnItemVO(pageResult.getList());
+ return success(pageResult);
+ }
+
@GetMapping("/group-export-excel")
@Operation(summary = "瀵煎嚭 SN 鐮佸垎缁� Excel")
@PreAuthorize("@ss.hasPermission('mes:wm-sn:export')")
--
Gitblit v1.9.3