Merge branch 'master' into Liudl

bklLiudl

2024-07-15 fe2b27527084667a15c424ffba00052cbf35ef7f

 Wms/Wms/Controllers/BllSoController.cs

@@ -13,6 +13,10 @@
using Newtonsoft.Json;
using Utility.Tools;
using Model.InterFaceModel;
using SqlSugar;
using Utility;
using System.Threading.Tasks;
using Model.ModelDto.BllSoDto;

namespace Wms.Controllers
{
@@ -53,18 +57,13 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult GetExportNoticeList(GetExportNoticeVm model)
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<SqlSugarPagedList> GetExportNoticeList(GetExportNoticeVm model)
        {
            try
            {
                var bolls = _exNoticeSvc.GetExportNoticeList(model.No, model.Type, model.Status,model.LotNo,model.LogisticsId,model.IsWave,model.IsDespatch,model.WaveNo, model.Page, model.Limit, out int count);
            RefAsync<int> count = new RefAsync<int>();
            var bolls = await _exNoticeSvc.GetExportNoticeList(model, count);

                return Ok(new { code = 0, count, msg = "出库单信息", data = bolls });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            return new SqlSugarPagedList() { Items = bolls, Total = count };
        }

        /// <summary>
@@ -280,18 +279,13 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult GetExportNoticeDetailList(GetExportNoticeDetailVm model)
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<SqlSugarPagedList> GetExportNoticeDetailList(GetExportNoticeDetailVm model)
        {
            try
            {
                var bolls = _exNoticeDetailSvc.GetExportNoticeDetailList(model.SoNo, model.Page, model.Limit, out int count);
            RefAsync<int> count = new RefAsync<int>();
            var bolls = await _exNoticeDetailSvc.GetExportNoticeDetailList(model, count);

                return Ok(new { code = 0, count, msg = "出库单明细信息", data = bolls });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            return new SqlSugarPagedList() { Items = bolls, Total = count };
        }

        /// <summary>
@@ -720,12 +714,13 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult GetExportTaskList(GetTaskVm model)
        public async Task<IActionResult> GetExportTaskList(GetTaskVm model)
        {
            try
            {
                var type = new List<string>(){"1","4"};
                var bolls = _taskSvc.GetTaskList( type, model.Type,model.Status,model.TaskNo,model.IsSuccess,model.PalletNo,model.Msg,model.Page, model.Limit, out int count);
                RefAsync<int> count = new RefAsync<int>();
                var bolls = await _taskSvc.GetTaskList( type, model.Type,model.Status,model.TaskNo,model.IsSuccess,model.PalletNo,model.Msg,model.Page, model.Limit, count);

                return Ok(new { code = 0, count, msg = "出库任务信息", data = bolls });
            }