1

huangxiaoqiang

2025-10-21 6c663b92b0078aa89657df22ec188dff65599f04

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs

@@ -1,5 +1,9 @@
using Masuit.Tools;
using Mapster;
using Masuit.Tools;
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.Linq.Expressions;
using WIDESEA_Core.BaseRepository;
using WIDESEA_DTO.Basic;
using WIDESEA_IOrderRepository;

@@ -8,9 +12,47 @@
public class BoxingInfoService : ServiceBase<DtBoxingInfo, IBoxingInfoRepository>, IBoxingInfoService
{
    private readonly IDt_InboundOrderRepository _inboundOrderRepository;
    public BoxingInfoService(IBoxingInfoRepository BaseDal, IDt_InboundOrderRepository inboundOrderRepository) : base(BaseDal)
    private readonly IUnitOfWorkManage _unitOfWorkManage;
    public BoxingInfoService(IBoxingInfoRepository BaseDal, IDt_InboundOrderRepository inboundOrderRepository, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
    {
        _inboundOrderRepository = inboundOrderRepository;
        _unitOfWorkManage = unitOfWorkManage;
    }
    public override PageGridData<DtBoxingInfo> GetPageData(PageDataOptions options)
    {
        string wheres = ValidatePageOptions(options);
        //获取排序字段
        Dictionary<string, OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
        List<OrderByModel> orderByModels = new List<OrderByModel>();
        foreach (var item in orderbyDic)
        {
            OrderByModel orderByModel = new()
            {
                FieldName = item.Key,
                OrderByType = item.Value
            };
            orderByModels.Add(orderByModel);
        }


        int totalCount = 0;
        List<SearchParameters> searchParametersList = new List<SearchParameters>();
        if (!string.IsNullOrEmpty(options.Wheres))
        {
            try
            {
                searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
                options.Filter = searchParametersList;
            }
            catch { }
        }
        var data = BaseDal.Db.Queryable<DtBoxingInfo>()
            .Includes(x => x.BoxingInfoDetails)
            .WhereIF(!wheres.IsNullOrEmpty(), wheres)
            .OrderBy(orderByModels)
            .ToPageList(options.Page, options.Rows, ref totalCount);
        new PageGridData<DtBoxingInfo>(totalCount, data);
        return new PageGridData<DtBoxingInfo>(totalCount, data);
    }

    public async Task<WebResponseContent> AddBoxingInfoAsync(AddBoxingDto boxingInfo)
@@ -18,6 +60,10 @@
        WebResponseContent content = new WebResponseContent();
        try
        {
            if(boxingInfo == null || boxingInfo.OrderNos.IsNullOrEmpty() || boxingInfo.palletCode.IsNullOrEmpty())
            {
                return content.Error("参数错误");
            }
            var info = await BaseDal.QueryFirstAsync(x => x.PalletCode == boxingInfo.palletCode);
            if (!info.IsNullOrEmpty())
            {
@@ -80,18 +126,57 @@
                    BoxingInfoDetails= details
                };
                await BaseDal.AddDataNavAsync(boxing);
                content.OK("组盘成功");
            }
            return content;
        }
        catch (Exception ex)
        {
            return content.OK();
            return content.Error(ex.Message);
        }
    }

    public override PageGridData<DtBoxingInfo> GetPageData(PageDataOptions options)
    public async Task<WebResponseContent> DeleteBoxingInfoAsync(AddBoxingDto boxingInfo)
    {
        return base.GetPageData(options);
        WebResponseContent content = new WebResponseContent();
        try
        {
            if (boxingInfo == null || boxingInfo.palletCode.IsNullOrEmpty())
            {
                return content.Error("参数错误");
            }
            var boxing = await BaseDal.QueryFirstNavAsync(x => x.PalletCode == boxingInfo.palletCode);
            if (!boxing.IsNullOrEmpty())
            {
                DtBoxingInfo_Hty boxingInfo_Hty = boxing.Adapt<DtBoxingInfo_Hty>();
                boxingInfo_Hty.ModifyDate = DateTime.Now;
                await _unitOfWorkManage.UseTranAsync(async () =>
                {
                    await BaseDal.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxing.Id)
                                            .Include(x => x.BoxingInfoDetails)
                                            .ExecuteCommandAsync();
                    await AddBoxingHtyAsync(boxingInfo_Hty);
                });
                content.OK("解盘成功");
            }
            else
            {
                content.Error("未找到组盘数据");
            }
            return content;
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
    }
    private async Task AddBoxingHtyAsync(DtBoxingInfo_Hty boxingInfo)
    {
        var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(boxingInfo).IncludesAllFirstLayer().ExecuteCommandAsync();
        if (!isStockAdd)
        {
            throw new Exception("组盘历史信息添加失败");
        }
    }

    // éªŒè¯æ¨¡åž‹