覆盖祈禧的代码

啊鑫

8 天以前 59af98c2aeb6c40d820e8d5c2f9f6764f57721bd

 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;

@@ -12,9 +14,10 @@
/// </summary>
[Route("api/[controller]")]
[ApiController]
public class MesItemBlController : ControllerBase
public class MesItemBlController : BaseController
{
    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,
@@ -226,12 +232,12 @@
    /// <response code="200">成功获取补料单号列表</response>
    /// <response code="400">获取失败</response>
    [HttpPost("GetSCBLBillNo")]
    public ResponseResult GetSCBLBillNo(WarehouseQuery query)
    public ResponseResult GetSCBLBillNo([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = _manager.GetSCBLBillNo(query);
            resultInfos.tbBillList = _manager.GetSCBLBillNo(query, RequestInfo);
            return new ResponseResult
            {
                status = 0,
@@ -280,6 +286,26 @@
        }
    }

    [HttpPost("GetLineInfo")]
    public ResponseResult GetLineInfo([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbLineInfo = _manager.GetLineInfo(query, RequestInfo);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     扫描条码
    /// </summary>