From 32a079c12e0b45cc7039f45a9bb8255b826df50d Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 11 十月 2025 16:58:46 +0800
Subject: [PATCH] 调试
---
Controllers/MesCutterLedgerController.cs | 67 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 1 deletions(-)
diff --git a/Controllers/MesCutterLedgerController.cs b/Controllers/MesCutterLedgerController.cs
index 81a1ca4..709a95b 100644
--- a/Controllers/MesCutterLedgerController.cs
+++ b/Controllers/MesCutterLedgerController.cs
@@ -16,6 +16,19 @@
{
private readonly MesCutterLedgerManager m = new();
+ public record ToolActionRequest(
+ string workOrderNo,
+ string machineNo,
+ string toolNo,
+ string type,
+ int? useLimit
+ );
+
+ public record FormDataRequest(
+ string workOrderNo,
+ string machineNo
+ );
+
/// <summary>
/// 鍒�鍏锋煡璇紙鏀寔缂栧彿鎴栧悕绉版ā绯婃煡璇級MesCutterLedger
/// </summary>
@@ -27,7 +40,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 +55,54 @@
return ResponseResult.ResponseError(ex);
}
}
+
+ /// <summary>
+ /// 涓婁笅鍒�鎿嶄綔锛堜笂鍒�type=0锛屼笅鍒�type=1锛�
+ /// </summary>
+ [HttpPost("SubmitToolAction")]
+ public IActionResult SubmitToolAction(
+ [FromForm] string workOrderNo,
+ [FromForm] string machineNo,
+ [FromForm] string toolNo,
+ [FromForm] string type, // string 绫诲瀷
+ [FromForm] int? useLimit
+ )
+ {
+ try
+ {
+ var result = m.SubmitToolAction(workOrderNo, machineNo, toolNo, type, useLimit);
+ 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