From 9075785a9e14f6220783d052d231f915c6930b87 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:21:45 +0800
Subject: [PATCH] revert(collect): 撤销 collect 数采模块（新高设备管理已有自己的采集方式）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java
index 10faf64..4b3bd7a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java
@@ -22,7 +22,6 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -56,7 +55,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰彇搴撳瓨浜嬪姟娴佹按鍒嗛〉")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1")
- @PreAuthorize("@ss.hasPermission('mes:wm-transaction:query')")
public CommonResult<PageResult<MesWmTransactionRespVO>> getTransactionPage(@Valid MesWmTransactionPageReqVO pageReqVO) {
PageResult<MesWmTransactionDO> pageResult = transactionService.getTransactionPage(pageReqVO);
if (pageResult.getTotal() == 0) {
@@ -119,6 +117,8 @@
return "鏈煡";
}
switch (bizType) {
+ case MesBizTypeConstants.WM_STOCK_IMPORT_IN:
+ return "搴撳瓨瀵煎叆鍏ュ簱";
case MesBizTypeConstants.WM_STOCK_ADJUST_IN:
return "鑷畾涔夊叆搴�";
case MesBizTypeConstants.WM_STOCK_ADJUST_OUT:
@@ -153,9 +153,19 @@
return "澶栧崗鍙戞枡";
case MesBizTypeConstants.WM_OUTSOURCE_RECPT:
return "澶栧崗鍏ュ簱";
+ case MesBizTypeConstants.WM_STOCK_TAKING:
+ return "鐩樼偣璋冩暣";
+ case MesBizTypeConstants.WM_SN:
+ return "SN 鍑哄叆搴�";
+ case MesBizTypeConstants.WM_ITEM_RECEIPT_CANCEL:
+ return "閲囪喘鍏ュ簱绾㈠啿";
+ case MesBizTypeConstants.DV_MACHINERY:
+ return "璁惧鍙拌处鍏ュ簱";
+ case MesBizTypeConstants.DV_EQUIPMENT_RECEIPT:
+ return "璁惧鍏ュ簱";
default:
return "鏈煡绫诲瀷(" + bizType + ")";
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3