From 6da289fff756eaecc600422d77c4afff1ddebab0 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 23 五月 2025 15:23:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateProcessShopStatController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateProcessShopStatController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateProcessShopStatController.java
index ef09bbc..931dbc8 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateProcessShopStatController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateProcessShopStatController.java
@@ -34,7 +34,7 @@
*/
@Operation(summary = "閽ｉ噾璁″垝澶ц〃", description = "瀵煎嚭鍔熻兘")
@Log(title = "閽ｉ噾杞﹂棿缁熻", businessType = BusinessType.EXPORT)
- @RequiresPermissions("plateProcessShopStat:export")
+ //@RequiresPermissions("plateProcessShopStat:export")
@PostMapping("/export")
public void export(HttpServletResponse response, ApsPlateProcessShopStat apsPlateProcessShopStat)
{
@@ -52,8 +52,13 @@
@PostMapping("/update")
public AjaxResult update()
{
- apsPlateProcessShopStatService.saveShopStat();
- return toAjax(true);
+ try {
+ apsPlateProcessShopStatService.saveShopStat();
+ return toAjax(true);
+ } catch (Exception e) {
+ return AjaxResult.error("鏇存柊澶辫触锛�"+e.getMessage());
+ }
+
}
/**
--
Gitblit v1.9.3