From cd3e490b95b7e6130c506b47debc5ca004bc01f2 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 23 五月 2025 15:36:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend 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 = "閽i噾璁″垝澶ц〃", description = "瀵煎嚭鍔熻兘")
     @Log(title = "閽i噾杞﹂棿缁熻", 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