1

huangxiaoqiang

2025-10-22 d4b0b578752a1478f6c11b352fbb8d2bad1f9e1d

 ÏîÄ¿´úÂë/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;

@@ -7,105 +11,45 @@

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,IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
    {
        _inboundOrderRepository = inboundOrderRepository;
        _unitOfWorkManage = unitOfWorkManage;
    }

    public async Task<WebResponseContent> AddBoxingInfoAsync(AddBoxingDto boxingInfo)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            var info = await BaseDal.QueryFirstAsync(x => x.PalletCode == boxingInfo.palletCode);
            if (!info.IsNullOrEmpty())
            {
                content.Error("该托盘已存在组盘");
            }
            else
            {
                List<DtBoxingInfoDetail> details = new List<DtBoxingInfoDetail>();
                foreach (var item in boxingInfo.OrderNos)
                {
                    var InboundOrder = _inboundOrderRepository.QueryFirst(x => x.PrintCode == item);

                    if(InboundOrder != null)
                    {
                        var x = details.Where(x => x.MaterielCode == InboundOrder.MaterialNo && x.Warehouse == InboundOrder.WarehouseName && x.DrawingNumber==InboundOrder.ProductDrawingNumber &&x.DemandClassification ==InboundOrder.DemandClassification).FirstOrDefault();
                        if (x != null)
                        {
                            details.Remove(x);
                            x.MaterielCode = InboundOrder.MaterialNo;
                            x.MaterielName = InboundOrder.MaterialName;
                            x.DemandClassification = InboundOrder.DemandClassification;
                            x.Warehouse = InboundOrder.WarehouseName;
                            x.OrderNo = InboundOrder.OrderNo;
                            x.Unit = InboundOrder.Unit;
                            x.Specs = InboundOrder.Specs;
                            x.Weight = InboundOrder.Weight;
                            x.Quantity = x.Quantity + InboundOrder.Quantity;
                            x.DrawingNumber = InboundOrder.ProductDrawingNumber;
                            x.Date = InboundOrder.Datetime;
                            details.Add(x);
                        }
                        else
                        {
                            DtBoxingInfoDetail detail = new DtBoxingInfoDetail()
                            {
                                MaterielCode = InboundOrder.MaterialNo,
                                MaterielName = InboundOrder.MaterialName,
                                DemandClassification = InboundOrder.DemandClassification,
                                Warehouse = InboundOrder.WarehouseName,
                                OrderNo = InboundOrder.OrderNo,
                                Unit = InboundOrder.Unit,
                                Specs = InboundOrder.Specs,
                                Weight = InboundOrder.Weight,
                                Quantity = InboundOrder.Quantity,
                                DrawingNumber = InboundOrder.ProductDrawingNumber,
                                Date = InboundOrder.Datetime,
                            };
                            details.Add(detail);
                        }
                    }
                    else
                    {
                        return content.Error("未找到入库单据信息");
                    }
                }

                DtBoxingInfo boxing = new DtBoxingInfo()
                {
                    PalletCode=boxingInfo.palletCode,
                    BoxingInfoDetails= details
                };
                await BaseDal.AddDataNavAsync(boxing);
            }
            return content;
        }
        catch (Exception ex)
        {
            return content.OK();
        }
    }

    public override PageGridData<DtBoxingInfo> GetPageData(PageDataOptions options)
    {
        return base.GetPageData(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);
        }

    // éªŒè¯æ¨¡åž‹
    public static List<ValidationResult> ValidateModel(object model)
    {
        // åˆ›å»ºä¸€ä¸ªéªŒè¯ç»“果列表
        var validationResults = new List<ValidationResult>();
        // åˆ›å»ºä¸€ä¸ªéªŒè¯ä¸Šä¸‹æ–‡
        var validationContext = new ValidationContext(model, serviceProvider: null, items: null);

        // ä½¿ç”¨éªŒè¯å™¨å°è¯•éªŒè¯æ¨¡åž‹ï¼Œå¹¶å°†éªŒè¯ç»“果添加到验证结果列表中
        Validator.TryValidateObject(model, validationContext, validationResults, validateAllProperties: true);

        // è¿”回验证结果列表
        return validationResults;
        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);
    }
}