报工逻辑优化

快乐的昕的电脑

2025-10-18 c78de54cc66df1fc8d68e23858b37e50d1178a02

 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、xdjs 为可空 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,