优化与ERP出库单逻辑，增加打印程序

huangxiaoqiang

2025-10-27 387731cab892804912e68cb91e6fb804411c4756

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

@@ -3,20 +3,24 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.Linq.Expressions;
using WIDESEA_Common;
using WIDESEA_Core.BaseRepository;
using WIDESEA_DTO.Basic;
using WIDESEA_IOrderRepository;
using WIDESEA_OrderRepository;

namespace WIDESEA_StorageBasicService;

public class BoxingInfoService : ServiceBase<DtBoxingInfo, IBoxingInfoRepository>, IBoxingInfoService
{
    private readonly IDt_InboundOrderRepository _inboundOrderRepository;
    private readonly IUnitOfWorkManage _unitOfWorkManage;
    public BoxingInfoService(IBoxingInfoRepository BaseDal, IDt_InboundOrderRepository inboundOrderRepository, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
    private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
    private readonly IDt_InboundOrderRepository _inboundOrderRepository;
    public BoxingInfoService(IBoxingInfoRepository BaseDal,IUnitOfWorkManage unitOfWorkManage, ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository, IDt_InboundOrderRepository inboundOrderRepository) : base(BaseDal)
    {
        _inboundOrderRepository = inboundOrderRepository;
        _unitOfWorkManage = unitOfWorkManage;
        _locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
        _inboundOrderRepository = inboundOrderRepository;
    }
    public override PageGridData<DtBoxingInfo> GetPageData(PageDataOptions options)
    {
@@ -55,16 +59,17 @@
        return new PageGridData<DtBoxingInfo>(totalCount, data);
    }

    public async Task<WebResponseContent> AddBoxingInfoAsync(AddBoxingDto boxingInfo)
    #region ç»„盘
    public async Task<WebResponseContent> AddGroupPlateAsync(GroupPlate groupPlate)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            if(boxingInfo == null || boxingInfo.OrderNos.IsNullOrEmpty() || boxingInfo.palletCode.IsNullOrEmpty())
            if (groupPlate == null || groupPlate.groups.IsNullOrEmpty() || groupPlate.palletCode.IsNullOrEmpty())
            {
                return content.Error("参数错误");
            }
            var info = await BaseDal.QueryFirstAsync(x => x.PalletCode == boxingInfo.palletCode);
            var info = await BaseDal.QueryFirstAsync(x => x.PalletCode == groupPlate.palletCode);
            if (!info.IsNullOrEmpty())
            {
                content.Error("该托盘已存在组盘");
@@ -72,13 +77,13 @@
            else
            {
                List<DtBoxingInfoDetail> details = new List<DtBoxingInfoDetail>();
                foreach (var item in boxingInfo.OrderNos)
                foreach (var item in groupPlate.groups)
                {
                    var InboundOrder = _inboundOrderRepository.QueryFirst(x => x.PrintCode == item);
                    var InboundOrder = _inboundOrderRepository.QueryFirst(x => x.OrderNo == item.orderNo);

                    if(InboundOrder != null)
                    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();
                        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);
@@ -86,11 +91,11 @@
                            x.MaterielName = InboundOrder.MaterialName;
                            x.DemandClassification = InboundOrder.DemandClassification;
                            x.Warehouse = InboundOrder.WarehouseName;
                            x.OrderNo = InboundOrder.OrderNo;
                            x.OrderNo = InboundOrder.UpperOrderNo;
                            x.Unit = InboundOrder.Unit;
                            x.Specs = InboundOrder.Specs;
                            x.Weight = InboundOrder.Weight;
                            x.Quantity = x.Quantity + InboundOrder.Quantity;
                            x.Quantity = x.Quantity + item.quantity;
                            x.DrawingNumber = InboundOrder.ProductDrawingNumber;
                            x.Date = InboundOrder.Datetime;
                            details.Add(x);
@@ -103,11 +108,11 @@
                                MaterielName = InboundOrder.MaterialName,
                                DemandClassification = InboundOrder.DemandClassification,
                                Warehouse = InboundOrder.WarehouseName,
                                OrderNo = InboundOrder.OrderNo,
                                OrderNo = InboundOrder.UpperOrderNo,
                                Unit = InboundOrder.Unit,
                                Specs = InboundOrder.Specs,
                                Weight = InboundOrder.Weight,
                                Quantity = InboundOrder.Quantity,
                                Quantity = item.quantity,
                                DrawingNumber = InboundOrder.ProductDrawingNumber,
                                Date = InboundOrder.Datetime,
                            };
@@ -119,11 +124,11 @@
                        return content.Error("未找到入库单据信息");
                    }
                }

                DtBoxingInfo boxing = new DtBoxingInfo()
                {
                    PalletCode=boxingInfo.palletCode,
                    BoxingInfoDetails= details
                    PalletCode = groupPlate.palletCode,
                    StockStatus = (int)StockStateEmun.组盘暂存,
                    BoxingInfoDetails = details
                };
                await BaseDal.AddDataNavAsync(boxing);
                content.OK("组盘成功");
@@ -135,27 +140,30 @@
            return content.Error(ex.Message);
        }
    }
    #endregion

    public async Task<WebResponseContent> DeleteBoxingInfoAsync(AddBoxingDto boxingInfo)
    #region è§£ç›˜
    public async Task<WebResponseContent> DeleteGroupPlateAsync(GroupPlate groupPlate)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            if (boxingInfo == null || boxingInfo.palletCode.IsNullOrEmpty())
            if (groupPlate == null || groupPlate.palletCode.IsNullOrEmpty())
            {
                return content.Error("参数错误");
            }
            var boxing = await BaseDal.QueryFirstNavAsync(x => x.PalletCode == boxingInfo.palletCode);
            if (!boxing.IsNullOrEmpty())
            var stock = await BaseDal.QueryFirstNavAsync(x => x.PalletCode == groupPlate.palletCode && x.StockStatus == (int)StockStateEmun.组盘暂存);
            if (!stock.IsNullOrEmpty())
            {
                DtBoxingInfo_Hty boxingInfo_Hty = boxing.Adapt<DtBoxingInfo_Hty>();
                boxingInfo_Hty.ModifyDate = DateTime.Now;
                stock.StockStatus = (int)StockStateEmun.组盘撤销;
                DtStockInfo_Hty stockhty = stock.Adapt<DtStockInfo_Hty>();
                stockhty.ModifyDate = DateTime.Now;
                await _unitOfWorkManage.UseTranAsync(async () =>
                {
                    await BaseDal.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxing.Id)
                                            .Include(x => x.BoxingInfoDetails)
                    await BaseDal.Db.DeleteNav<DtStockInfo>(x => x.Id == stock.Id)
                                            .Include(x => x.StockInfoDetails)
                                            .ExecuteCommandAsync();
                    await AddBoxingHtyAsync(boxingInfo_Hty);
                    await AddStockHtyAsync(stockhty);
                });
                content.OK("解盘成功");
            }
@@ -170,27 +178,51 @@
            return content.Error(ex.Message);
        }
    }
    private async Task AddBoxingHtyAsync(DtBoxingInfo_Hty boxingInfo)
    private async Task AddStockHtyAsync(DtStockInfo_Hty stockhty)
    {
        var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(boxingInfo).IncludesAllFirstLayer().ExecuteCommandAsync();
        var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(stockhty).IncludesAllFirstLayer().ExecuteCommandAsync();
        if (!isStockAdd)
        {
            throw new Exception("组盘历史信息添加失败");
            throw new Exception("库存历史信息添加失败");
        }
    }

    // éªŒè¯æ¨¡åž‹
    public static List<ValidationResult> ValidateModel(object model)
    /// <summary>
    /// æ‰¹é‡åˆ é™¤
    /// </summary>
    /// <param name="keys"></param>
    /// <returns></returns>
    public override WebResponseContent DeleteData(object[] keys)
    {
        // åˆ›å»ºä¸€ä¸ªéªŒè¯ç»“果列表
        var validationResults = new List<ValidationResult>();
        // åˆ›å»ºä¸€ä¸ªéªŒè¯ä¸Šä¸‹æ–‡
        var validationContext = new ValidationContext(model, serviceProvider: null, items: null);
        try
        {
            List<DtStockInfo_Hty> stockInfos = new List<DtStockInfo_Hty>();
            List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();

        // ä½¿ç”¨éªŒè¯å™¨å°è¯•éªŒè¯æ¨¡åž‹ï¼Œå¹¶å°†éªŒè¯ç»“果添加到验证结果列表中
        Validator.TryValidateObject(model, validationContext, validationResults, validateAllProperties: true);
            foreach (var item in keys)
            {
                var stock = BaseDal.QueryFirstNavAsync(x => x.Id == item.ObjToInt()).Result;
                var stockHty = stock.Adapt<DtStockInfo_Hty>();
                stockInfos.Add(stockHty);

        // è¿”回验证结果列表
        return validationResults;
                var location = SqlSugarHelper.DbWMS.Queryable<DtLocationInfo>().FirstAsync(x => x.LocationCode == stock.LocationCode).Result;
                var lastStatus = location.LocationStatus;
                location.LocationStatus = (int)LocationEnum.Free;
                locationInfos.Add(location);
                _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.ManualOperation, 0);
            }
            //var hty = BaseDal.Db.InsertNav(stockInfos)
            //    .Include(x => x.StockInfoDetails)
            //    .ExecuteCommand();
            var isStockAdd = SqlSugarHelper.DbWMS.InsertNav(stockInfos).IncludesAllFirstLayer().ExecuteCommandAsync();

            var locationd = SqlSugarHelper.DbWMS.Updateable(locationInfos).ExecuteCommandHasChange();
            return base.DeleteData(keys);
        }
        catch (Exception ex)
        {
            return WebResponseContent.Instance.Error(ex.Message);
        }
    }
    #endregion
}