1.来料检验优化

南骏 池

3 天以前 154ecf3d94edef23247796ea313d00b35314563a

 Controllers/Warehouse/MesItemBlController.cs

@@ -1,7 +1,9 @@
using System.Dynamic;
using Masuit.Tools.Win32.AntiVirus;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;

@@ -15,6 +17,7 @@
public class MesItemBlController : ControllerBase
{
    private readonly MesItemBlManager _manager = new();
    private readonly MesPrintMangeer _mCf = new();

    /***进入模版管理可以修改模版***/

@@ -201,9 +204,12 @@
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var (success, pendingList) = _manager.SplitBarcode(query);
            resultInfos.success = success;
            resultInfos.pendingList = pendingList;
            resultInfos.tbBillList = new ExpandoObject();
            resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(query);
            var scanResult = _manager.SplitBarcode(query);
            resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
            //resultInfos.success = success;
            //resultInfos.pendingList = pendingList;
            return new ResponseResult
            {
                status = 0,
@@ -297,15 +303,24 @@
    /// </remarks>
    /// <response code="200">扫描成功</response>
    /// <response code="400">扫描失败，返回具体错误信息</response>
    [HttpPost("SctlScanBarcode")]
    public ResponseResult SctlScanBarcode([FromBody] WarehouseQuery query)
    [HttpPost("ScblScanBarcode")]
    public ResponseResult ScblScanBarcode([FromBody] WarehouseQuery query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var (success, pendingList) = _manager.SctlScanBarcode(query);
            var (success, pendingList) = _manager.ScblScanBarcode(query);
            resultInfos.success = success;
            resultInfos.pendingList = pendingList;
            if(success.status == 2)
            {
                return new ResponseResult
                {
                    status = Convert.ToInt32(success.status),
                    message = success.message,
                    data = resultInfos.success
                };
            }
            return new ResponseResult
            {
                status = 0,
@@ -450,5 +465,41 @@
        }
    }


    /// <summary>
    ///     根据单号获取生产补料单明细
    /// </summary>
    /// <param name="query">查询参数，必须包含billNo</param>
    /// <returns>补料单明细列表</returns>
    /// <remarks>
    ///     请求示例:
    ///     POST /api/MesItemBl/GetMesItemBlDetailByBillNo
    ///     {
    ///     "billNo": "BL202401010001"
    ///     }
    /// </remarks>
    /// <response code="200">成功获取补料单明细</response>
    /// <response code="400">获取失败，可能是单据号不存在或已完成</response>
    [HttpPost("GetMesItemWWBlDetailByBillNo")]
    public ResponseResult GetMesItemWWBlDetailByBillNo(
        [FromBody] WarehouseQuery query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = _manager.GetMesItemWWBlDetailByBillNo(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    #endregion
}