覆盖祈禧的代码

啊鑫

9 天以前 59af98c2aeb6c40d820e8d5c2f9f6764f57721bd

 Controllers/Warehouse/MesBarCFController.cs

@@ -47,33 +47,6 @@
    ///     获取条码信息和物料信息
    /// </summary>
    /// <returns></returns>
    [HttpPost("BarCF")]
    public ResponseResult BarCF(WarehouseQuery unity)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = new ExpandoObject();
            //resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(unity);
            var scanResult = m.BarCF(unity);
            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("GetBarInfoBefore")]
    public ResponseResult GetBarInfoBefore(WarehouseQuery unity)
    {
@@ -96,7 +69,62 @@
    }

    /// <summary>
    ///     获取条码信息和物料信息 （入库前拆分）
    ///     获取条码信息和物料信息
    /// </summary>
    /// <returns></returns>
    [HttpPost("BarCF")]
    public ResponseResult BarCF(WarehouseQuery unity)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = new ExpandoObject();
            resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(unity);
            var scanResult = m.BarCF(unity);
            resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }


    /// <summary>
    ///     PDA重打条码
    /// </summary>
    /// <returns></returns>
    [HttpPost("BarRePrint")]
    public ResponseResult BarRePrint(WarehouseQuery unity)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = new ExpandoObject();
            resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(unity);
            resultInfos.tbBillList.cfBarInfo = _mCf.getPrintBarInfo(unity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }


    /// <summary>
    ///     获取条码信息和物料信息
    /// </summary>
    /// <returns></returns>
    [HttpPost("BarCfBefore")]
@@ -121,5 +149,4 @@
            return ResponseResult.ResponseError(ex);
        }
    }

}