From c78de54cc66df1fc8d68e23858b37e50d1178a02 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 18 十月 2025 17:11:12 +0800
Subject: [PATCH] 报工逻辑优化
---
Controllers/MesCutterLedgerController.cs | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/Controllers/MesCutterLedgerController.cs b/Controllers/MesCutterLedgerController.cs
index da71d43..f0f2624 100644
--- a/Controllers/MesCutterLedgerController.cs
+++ b/Controllers/MesCutterLedgerController.cs
@@ -12,10 +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
@@ -46,19 +62,23 @@
/// <summary>
/// 涓婁笅鍒�鎿嶄綔锛堜笂鍒�type=0锛屼笅鍒�type=1锛�
+ /// 鎺ユ敹 JSON 璇锋眰浣擄紙Content-Type: application/json锛夛紝骞跺皢 sdjs/xdjs 涓�骞朵紶鍏ユ湇鍔″眰
/// </summary>
[HttpPost("SubmitToolAction")]
- public IActionResult SubmitToolAction(
- [FromForm] string workOrderNo,
- [FromForm] string machineNo,
- [FromForm] string toolNo,
- [FromForm] string type, // string 绫诲瀷
- [FromForm] int? useLimit
- )
+ public IActionResult SubmitToolAction([FromBody] ToolActionRequest req)
{
try
{
- var result = m.SubmitToolAction(workOrderNo, machineNo, toolNo, type, useLimit);
+ var result = m.SubmitToolAction(
+ req.workOrderNo,
+ req.machineNo,
+ req.toolNo,
+ req.type,
+ req.useLimit,
+ req.sdjs,
+ req.xdjs
+ );
+
return Ok(new ResponseResult
{
status = 0,
@@ -76,11 +96,11 @@
/// 鑾峰彇鍒�鍏疯〃鍗曟暟鎹紙鏍规嵁宸ュ崟鍙峰拰鏈哄彴缂栫爜锛�
/// </summary>
[HttpPost("GetFormData")]
- public ResponseResult GetFormData([FromForm] string workOrderNo,[FromForm] string machineNo)
+ public ResponseResult GetFormData([FromBody] FormDataRequest req)
{
try
{
- var data = m.GetFormData(workOrderNo, machineNo);
+ var data = m.GetFormData(req.workOrderNo, req.machineNo);
return new ResponseResult
{
status = 0,
--
Gitblit v1.9.3