From b876edb8c9865d15a41cc0926cde34aa8c89c1f2 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 18 十月 2025 13:28:12 +0800
Subject: [PATCH] 逻辑优化

---
 Controllers/MesCutterLedgerController.cs |   75 +++++++++++++++++++++++++++++++++++++
 1 files changed, 74 insertions(+), 1 deletions(-)

diff --git a/Controllers/MesCutterLedgerController.cs b/Controllers/MesCutterLedgerController.cs
index 81a1ca4..f0f2624 100644
--- a/Controllers/MesCutterLedgerController.cs
+++ b/Controllers/MesCutterLedgerController.cs
@@ -12,9 +12,26 @@
 /// </summary>
 [ApiController]
 [Route("api/[controller]")]
+[Route("[controller]")] // 鍏佽 /MesCutterLedger/... 褰㈠紡鐨勮矾鐢憋紝鍏煎鍓嶇褰撳墠鍐欐硶
 public class MesCutterLedgerController : ControllerBase
 {
     private readonly MesCutterLedgerManager m = new();
+
+    // 鍔犲叆 sdjs銆亁djs 涓哄彲绌� decimal锛屼繚鎸佷笌鍓嶇 JSON 瀛楁鍚嶄竴鑷�
+    public record ToolActionRequest(
+        string workOrderNo,
+        string machineNo,
+        string toolNo,
+        string type,
+        int? useLimit,
+        decimal? sdjs,
+        decimal? xdjs
+    );
+
+    public record FormDataRequest(
+        string workOrderNo,
+        string machineNo
+    );
 
     /// <summary>
     /// 鍒�鍏锋煡璇紙鏀寔缂栧彿鎴栧悕绉版ā绯婃煡璇級MesCutterLedger
@@ -27,7 +44,9 @@
         try
         {
             dynamic resultInfos = new ExpandoObject();
-            resultInfos.tbBillList = m.QueryTools(req.searchKey);
+            var queryResult = m.QueryTools(req.searchKey, req.pageIndex, req.pageSize);
+            resultInfos.tbBillList = queryResult.tbBillList;
+            resultInfos.total = queryResult.total;
             return new ResponseResult
             {
                 status = 0,
@@ -40,4 +59,58 @@
             return ResponseResult.ResponseError(ex);
         }
     }
+
+    /// <summary>
+    /// 涓婁笅鍒�鎿嶄綔锛堜笂鍒�type=0锛屼笅鍒�type=1锛�
+    /// 鎺ユ敹 JSON 璇锋眰浣擄紙Content-Type: application/json锛夛紝骞跺皢 sdjs/xdjs 涓�骞朵紶鍏ユ湇鍔″眰
+    /// </summary>
+    [HttpPost("SubmitToolAction")]
+    public IActionResult SubmitToolAction([FromBody] ToolActionRequest req)
+    {
+        try
+        {
+            var result = m.SubmitToolAction(
+                req.workOrderNo,
+                req.machineNo,
+                req.toolNo,
+                req.type,
+                req.useLimit,
+                req.sdjs,
+                req.xdjs
+            );
+
+            return Ok(new ResponseResult
+            {
+                status = 0,
+                message = "OK",
+                data = result
+            });
+        }
+        catch (Exception ex)
+        {
+            return Ok(ResponseResult.ResponseError(ex));
+        }
+    }
+
+    /// <summary>
+    /// 鑾峰彇鍒�鍏疯〃鍗曟暟鎹紙鏍规嵁宸ュ崟鍙峰拰鏈哄彴缂栫爜锛�
+    /// </summary>
+    [HttpPost("GetFormData")]
+    public ResponseResult GetFormData([FromBody] FormDataRequest req)
+    {
+        try
+        {
+            var data = m.GetFormData(req.workOrderNo, req.machineNo);
+            return new ResponseResult
+            {
+                status = 0,
+                message = "OK",
+                data = data
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3