1.携客云到货单主表新增单据类型字段 2.条码入库前拆分

南骏 池

15 小时以前 52d1e37bb116c995b601728bfe81e3816c3944c9

 Controllers/Wom/WomdaaController.cs

@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.service.Wom;
using NewPdaSqlServer.util;

@@ -12,6 +13,7 @@
public class WomdaaController : ControllerBase
{
    private readonly WomdaaManager m = new();
    private readonly MesPrintMangeer _mCf = new();

    #region 生产领料

@@ -73,6 +75,15 @@
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.ScanCode(query);
            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,
@@ -93,7 +104,10 @@
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.ScanCodeCF(query);
            resultInfos.tbBillList = new ExpandoObject();
            resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(query);
            var scanResult = m.ScanCodeCF(query);
            resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
            return new ResponseResult
            {
                status = 0,
@@ -227,6 +241,7 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    

    /// <summary>
    ///     修改
@@ -251,6 +266,322 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    #endregion

    #region 现场管理


    /// <summary>
    ///     扫描注塑码，获取工单和条码信息
    /// </summary>
    /// <returns></returns>
    [HttpPost("getZsBarInfo")]
    public ResponseResult getZsBarInfo([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            // 先初始化tbBillList属性
            resultInfos.tbBillList = new ExpandoObject();
            resultInfos.tbBillList.ZsBarInfo = m.getZsBarInfo(query);
            resultInfos.tbBillList.Traceability = m.getTraceability(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }


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

    /// <summary>
    ///     获取卡板信息
    /// </summary>
    /// <returns></returns>
    [HttpPost("getKbBarInfo")]
    public ResponseResult getKbBarInfo([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            // 先初始化tbBillList属性
            resultInfos.tbBillList = new ExpandoObject();
            resultInfos.tbBillList.KbBarInfo = m.getKbBarInfo(query);
            resultInfos.tbBillList.KbBarMxInfo = m.getKbBarMxInfo(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     获取箱码信息
    /// </summary>
    /// <returns></returns>
    [HttpPost("getXBarInfo")]
    public ResponseResult getXBarInfo([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            // 先初始化tbBillList属性
            resultInfos.tbBillList = new ExpandoObject();
            resultInfos.tbBillList.XBarInfo = m.getXBarInfo(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     绑定箱码与托板码
    /// </summary>
    /// <returns></returns>
    [HttpPost("submitAllChecked")]
    public ResponseResult submitAllChecked([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            // 先初始化tbBillList属性
            resultInfos.tbBillList = new ExpandoObject();
            resultInfos.tbBillList = m.submitAllChecked(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     核对送检
    /// </summary>
    /// <returns></returns>
    [HttpPost("submitInspection")]
    public ResponseResult submitInspection([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            // 先初始化tbBillList属性
            resultInfos.tbBillList = new ExpandoObject();
            resultInfos.tbBillList = m.SubmitKbInspection(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    //GetItemsXcsl
    /// <summary>
    ///     根据工单号获取待收料物料明细
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetItemsXcsl")]
    public ResponseResult GetItemsXcsl(WarehouseQuery query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetItemsXcsl(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }


    //GetItemsXcsl
    /// <summary>
    ///     物料条码收料
    /// </summary>
    /// <returns></returns>
    [HttpPost("ScanXcsl")]
    public ResponseResult ScanXcsl(dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.ScanXcsl(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    //GetItemsXcsl
    /// <summary>
    ///     根据线体获取仪器重量
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetWeightByXt")]
    public ResponseResult GetWeightByXt(dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetWeightByXt(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }


    /// <summary>
    /// 现场收料获取可选工单信息
    /// </summary>
    /// <param name="query"></param>
    /// <returns></returns>
    [HttpPost("GetXcslDaa")]
    public ResponseResult GetXcslDaa([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetXcslDaa(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }


    //GetItemsXctl
    /// <summary>
    ///     根据工单号获取待投料物料明细
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetItemsXctl")]
    public ResponseResult GetItemsXctl(WarehouseQuery query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetItemsXctl(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    //GetItemsXcsl
    /// <summary>
    ///     物料条码投料
    /// </summary>
    /// <returns></returns>
    [HttpPost("ScanXctl")]
    public ResponseResult ScanXctl(dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.ScanXctl(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    #endregion
}