From e935889261ef38c8eaef31e54cbfc466d63d2ef4 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期四, 17 七月 2025 09:42:28 +0800
Subject: [PATCH] fanuc获取程序名、获取报警描述

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java |   61 ++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java
index bd1031a..2734032 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java
@@ -6,6 +6,7 @@
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.tms.entity.OutStoreDetail;
 import org.jeecg.modules.tms.entity.ToolLedger;
 import org.jeecg.modules.tms.entity.ToolSharpening;
 import org.jeecg.modules.tms.entity.ToolsLossBoundDetail;
@@ -35,19 +36,7 @@
     @Autowired
     private IToolsSharpeningService toolSharpeningService;
 
-    /**
-     * 鍒嗛〉鏌ヨ
-     */
-//    @GetMapping("/list")
-//    @ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
-//    public Result<IPage<ToolSharpening>> queryPageList(ToolSharpening toolSharpening,
-//                                                       @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-//                                                       @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
-//        Page<ToolSharpening> page = new Page<>(pageNo, pageSize);
-//        QueryWrapper<ToolSharpening> queryWrapper = new QueryWrapper<>(toolSharpening);
-//        IPage<ToolSharpening> iPage = toolSharpeningService.page(page, queryWrapper);
-//        return Result.OK(iPage);
-//    }
+
 
 
     @ApiOperation(value="鎶ユ崯鐢宠鍗曟槑缁�-閫氳繃涓昏〃ID鏌ヨ", notes="鎶ユ崯鐢宠鍗曟槑缁�-閫氳繃涓昏〃ID鏌ヨ")
@@ -88,20 +77,33 @@
     @ApiOperation(value="tms_tool_sharpening-娣诲姞", notes="tms_tool_sharpening-娣诲姞")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody ToolSharpening toolSharpening) {
+        toolSharpening.setSharpeningStatus("1");
         toolSharpeningService.save(toolSharpening);
         return Result.OK("娣诲姞鎴愬姛锛�");
     }
+//    /**
+//     * 淇敼
+//     */
+//    @PutMapping
+//    @ApiOperation(value = "淇敼", notes = "淇敼")
+//    public Result<ToolSharpening> edit(@RequestBody ToolSharpening toolSharpening) {
+//        toolSharpeningService.updateById(toolSharpening);
+//        return Result.OK(toolSharpening);
+//    }
+
     /**
-     * 淇敼
+     *  缂栬緫
+     *
+     * @param toolSharpening
+     * @return
      */
-    @PutMapping
-    @ApiOperation(value = "淇敼", notes = "淇敼")
-    public Result<ToolSharpening> edit(@RequestBody ToolSharpening toolSharpening) {
+    @AutoLog(value = "tms_tool_sharpening-缂栬緫")
+    @ApiOperation(value="tms_tool_sharpening-缂栬緫", notes="tms_tool_sharpening-缂栬緫")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+    public Result<String> edit(@RequestBody ToolSharpening toolSharpening) {
         toolSharpeningService.updateById(toolSharpening);
-        return Result.OK(toolSharpening);
+        return Result.OK("缂栬緫鎴愬姛!");
     }
-
-
 
 
     /**
@@ -115,4 +117,23 @@
         toolSharpeningService.removeById(id);
         return Result.OK("鍒犻櫎鎴愬姛!");
     }
+
+    /**
+     * 宸ュ叿鍙拌处-鍒冪（瀛愰〉闈㈠垪琛ㄦ煡璇�
+     *
+     * @param toolSharpening
+     * @param pageNo
+     * @param pageSize
+     * @param query
+     * @return
+     */
+    @ApiOperation(value="宸ュ叿鍙拌处-鍒冪（瀛愰〉闈㈠垪琛ㄦ煡璇�", notes="宸ュ叿鍙拌处-鍒冪（瀛愰〉闈㈠垪琛ㄦ煡璇�")
+    @GetMapping(value = "/toolSharpeningList")
+    public Result<?> toolSharpeningList(ToolSharpening toolSharpening,
+                                        @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                        @RequestParam Map<String, String> query) {
+        IPage<Map<String, Object>> pageList = toolSharpeningService.toolSharpeningList(pageNo,pageSize, query);
+        return Result.OK(pageList);
+    }
 }

--
Gitblit v1.9.3