111

啊鑫

2 天以前 8b7abd97e7b69800789134ed8e809e19a5b5ba74

 Controllers/Warehouse/MesItemBlController.cs

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

@@ -12,9 +13,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 +203,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 +231,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 +285,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>
@@ -306,15 +331,13 @@
            var (success, pendingList) = _manager.ScblScanBarcode(query);
            resultInfos.success = success;
            resultInfos.pendingList = pendingList;
            if(success.status == 2)
            {
            if (success.status == 2)
                return new ResponseResult
                {
                    status = Convert.ToInt32(success.status),
                    message = success.message,
                    data = resultInfos.success
                };
            }
            return new ResponseResult
            {
                status = 0,
@@ -481,7 +504,8 @@
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = _manager.GetMesItemWWBlDetailByBillNo(query);
            resultInfos.tbBillList =
                _manager.GetMesItemWWBlDetailByBillNo(query);
            return new ResponseResult
            {
                status = 0,