精简修正代码

啊鑫

9 天以前 0aa54059b26e6641196e9953490dd18616e916e3

 Controllers/Wom/WomdaaController.cs

@@ -10,10 +10,10 @@

[ApiController]
[Route("api/[controller]")]
public class WomdaaController : ControllerBase
public class WomdaaController : BaseController
{
    private readonly WomdaaManager m = new();
    private readonly MesPrintMangeer _mCf = new();
    private readonly WomdaaManager m = new();

    #region 生产领料

@@ -28,32 +28,8 @@
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetProductionPickDaa001(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    //GetItemsByDaa001
    /// <summary>
    ///     根据工单号和登录账号获取代领物料明细
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetItemsByDaa001User")]
    public ResponseResult GetItemsByDaa001User(WarehouseQuery query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetItemsByDaa001User(query);
            resultInfos.tbBillList =
                m.GetProductionPickDaa001(query, RequestInfo);
            return new ResponseResult
            {
                status = 0,
@@ -75,10 +51,13 @@
    [HttpPost("GetItemsByDaa001")]
    public ResponseResult GetItemsByDaa001(WarehouseQuery query)
    {
        // 从 HttpContext.Items 获取 orgId
        var orgId = HttpContext.Request.Headers["OrgId"].ToString();

        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetItemsByDaa001(query);
            resultInfos.tbBillList = m.GetItemsByDaa001(query, RequestInfo);
            return new ResponseResult
            {
                status = 0,
@@ -100,15 +79,13 @@
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.ScanCode(query);
            if(resultInfos.tbBillList.result == "2")
            {
            if (resultInfos.tbBillList.result == "2")
                return new ResponseResult
                {
                    status = Convert.ToInt32(resultInfos.tbBillList.result),
                    message = resultInfos.tbBillList.strMsg,
                    data = resultInfos
                };
            }
            return new ResponseResult
            {
                status = 0,
@@ -130,9 +107,34 @@
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = new ExpandoObject();
            //resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(query);
            resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(query);
            var scanResult = m.ScanCodeCF(query);
            resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }


    /// <summary>
    ///     生产领料点击物料明细获取相关条码信息
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetBarKwByItem")]
    public ResponseResult GetBarKwByItem(dynamic unity)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetBarKwByItem(unity);
            return new ResponseResult
            {
                status = 0,
@@ -266,7 +268,7 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    


    /// <summary>
    ///     修改
@@ -291,10 +293,10 @@
            return ResponseResult.ResponseError(ex);
        }
    }

    #endregion

    #region 现场管理


    /// <summary>
    ///     扫描注塑码，获取工单和条码信息
@@ -533,7 +535,7 @@


    /// <summary>
    /// 现场收料获取可选工单信息
    ///     现场收料获取可选工单信息
    /// </summary>
    /// <param name="query"></param>
    /// <returns></returns>
@@ -543,7 +545,7 @@
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetXcslDaa(query);
            resultInfos.tbBillList = m.GetXcslDaa(query, RequestInfo);
            return new ResponseResult
            {
                status = 0,
@@ -608,5 +610,205 @@
        }
    }

    /// <summary>
    ///     内箱核对 ： 扫描后盖码获取信息
    /// </summary>
    /// <returns></returns>
    [HttpPost("getHgBarInfo")]
    public ResponseResult getHgBarInfo([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            // 先初始化tbBillList属性
            resultInfos.tbBillList = new ExpandoObject();
            resultInfos.tbBillList.ZsBarInfo = m.getHgBarInfo(query);
            resultInfos.tbBillList.Traceability =
                m.getTraceabilityByLsBar(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     内箱核对，追溯码和流水码绑定
    /// </summary>
    /// <returns></returns>
    [HttpPost("ScanNxhd")]
    public ResponseResult ScanNxhd([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            // 先初始化tbBillList属性
            resultInfos.tbBillList = new ExpandoObject();
            resultInfos.tbBillList = m.ScanNxhd(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     返工绑定
    /// </summary>
    [HttpPost("ScanFgbd")]
    public ResponseResult ScanFgbd([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.ScanFgbd(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }


    /// <summary>
    ///     AGV呼叫线体列表
    /// </summary>
    /// <param name="query"></param>
    /// <returns></returns>
    [HttpPost("GetAgvXt")]
    public ResponseResult GetAgvXt([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetAgvXt(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    #endregion


    #region pda调用AGV相关

    /// <summary>
    ///     AGV送检
    /// </summary>
    [HttpPost("handleAGVInspection")]
    public ResponseResult HandleAGVInspection([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.HandleAGVInspection(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     AGV呼叫
    /// </summary>
    [HttpPost("handleAGVCall")]
    public ResponseResult HandleAGVCall([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.HandleAGVCall(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     AGV检验处理
    /// </summary>
    [HttpPost("handleAgvJy")]
    public ResponseResult HandleAgvJy([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.HandleAgvJy(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     AGV入立库
    /// </summary>
    [HttpPost("handleAgvRk")]
    public ResponseResult HandleAgvRk([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.HandleAgvRk(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    #endregion
}