1

heshaofeng

2026-03-25 37454e625df68d40897112b2e8c2e3cf4d7163e3

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs

@@ -2,8 +2,10 @@
using AutoMapper;
using MailKit.Search;
using SqlSugar;
using System.Text.RegularExpressions;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Helper;
@@ -20,7 +22,7 @@
    public partial class StockInfoService : ServiceBase<Dt_StockInfo, IRepository<Dt_StockInfo>>, IStockInfoService
    {
        private readonly IMapper _mapper;

        private readonly IUnitOfWorkManage _unitOfWorkManage;
        private readonly IRecordService _recordService;
        public IRepository<Dt_StockInfo> Repository => BaseDal;
        private readonly IRepository<Dt_StockInfoDetail> _stockInfoDetailRepository;
@@ -29,7 +31,7 @@

        private readonly IRepository<Dt_AllocateOrder> _allocateRepository;
        private readonly ILocationInfoService _locationInfoService;
        public StockInfoService(IRepository<Dt_StockInfo> BaseDal, IMapper mapper, IRepository<Dt_StockInfoDetail> stockInfoDetailRepository, IRecordService recordService, ILocationInfoService locationInfoService, IOutboundOrderService outboundOrderService, IRepository<Dt_AllocateOrder> allocateRepository) : base(BaseDal)
        public StockInfoService(IRepository<Dt_StockInfo> BaseDal, IUnitOfWorkManage unitOfWorkManage, IMapper mapper, IRepository<Dt_StockInfoDetail> stockInfoDetailRepository, IRecordService recordService, ILocationInfoService locationInfoService, IOutboundOrderService outboundOrderService, IRepository<Dt_AllocateOrder> allocateRepository) : base(BaseDal)
        {
            _mapper = mapper;
            _stockInfoDetailRepository = stockInfoDetailRepository;
@@ -37,6 +39,7 @@
            _locationInfoService = locationInfoService;
            _outboundOrderService = outboundOrderService;
            _allocateRepository = allocateRepository;
            _unitOfWorkManage = unitOfWorkManage;
            //_outboundOrderDetailService = outboundOrderDetailService;
        }

@@ -55,7 +58,34 @@
            return stockInfo;
        }

        public override WebResponseContent DeleteData(object[] keys)
        {
            try
            {
                List<int> stockIds = keys.Select(x => x.ObjToInt()).ToList();

                List<Dt_StockInfo> stockInfos = BaseDal.QueryData(x => stockIds.Contains(x.Id) && x.StockStatus == StockStatusEmun.入库完成.ObjToInt());

                List<string> locationCodes = stockInfos.Select(x => x.LocationCode).Distinct().ToList();

                List<Dt_LocationInfo> locationInfos = _locationInfoService.Repository.QueryData(x => locationCodes.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Pallet.ObjToInt());

                stockInfos = stockInfos.Where(x => locationInfos.Select(l => l.LocationCode).Contains(x.LocationCode)).ToList();

                _unitOfWorkManage.BeginTran();
                _locationInfoService.UpdateLocationStatus(locationInfos, LocationStatusEnum.Free);

                BaseDal.DeleteAndMoveIntoHty(stockInfos, WIDESEA_Core.Enums.OperateTypeEnum.人工删除);
                _unitOfWorkManage.CommitTran();

                return WebResponseContent.Instance.OK("删除成功");
            }
            catch(Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return WebResponseContent.Instance.Error("删除失败，"+ex.Message);
            }
        }
        public void AddMaterielGroup(Dt_StockInfo stockInfo)
        {
            decimal beforeQuantity = 0;
@@ -462,7 +492,7 @@
                // æž„建查询条件
                var stockQuery = Db.Queryable<Dt_StockInfo>()
                    .Where(x => locationCodes.Contains(x.LocationCode))
                    .Where(x => x.StockStatus == (int)StockStatusEmun.入库完成 || x.StockStatus == (int)StockStatusEmun.过期)
                    .Where(x => x.StockStatus == (int)StockStatusEmun.入库完成)
                    .Includes(x => x.Details);

                // æ‰§è¡ŒæŸ¥è¯¢å¹¶æŒ‰å…ˆè¿›å…ˆå‡ºæŽ’序
@@ -493,23 +523,25 @@

                    if (relevantDetails.Any())
                    {
                        var firstDetail = relevantDetails.First();
                        var useableQuantity = relevantDetails.Sum(d => d.StockQuantity - d.OutboundQuantity);

                        result.Add(new StockSelectViewDTO
                        foreach (var item in relevantDetails)
                        {
                            LocationCode = stock.LocationCode,
                            MaterielCode = firstDetail.MaterielCode,
                            MaterielName = firstDetail.MaterielName,
                            BatchNo = orderDetail.BatchNo,
                            SupplyCode = orderDetail.SupplyCode,
                            Barcode = firstDetail.Barcode,
                            PalletCode = stock.PalletCode,
                            UseableQuantity = useableQuantity,
                            StockCreateDate = stock.CreateDate,
                            StockId = stock.Id,
                            OrderDetailId = orderDetail.Id // å…³è”到具体的出库单明细
                        });
                            result.Add(new StockSelectViewDTO
                            {
                                LocationCode = stock.LocationCode,
                                MaterielCode = item.MaterielCode,
                                MaterielName = item.MaterielName,
                                BatchNo = item.BatchNo,
                                SupplyCode = item.SupplyCode,
                                Barcode = item.Barcode,
                                PalletCode = stock.PalletCode,
                                UseableQuantity = item.StockQuantity,
                                StockCreateDate = stock.CreateDate,
                                StockId = item.Id,
                                StockStatus = item.Status,
                                OrderDetailId = orderDetail.Id // å…³è”到具体的出库单明细
                            });
                        }
                        
                    }
                }
            }
@@ -517,5 +549,50 @@
            return result;
        }


        public override PageGridData<Dt_StockInfo> GetPageData(PageDataOptions options)
        {
            ISugarQueryable<Dt_StockInfo> sugarQueryable = Db.Queryable<Dt_StockInfo>();

            ValidatePageOptions(options, ref sugarQueryable);

            List<OrderByModel> orderByModels = new List<OrderByModel>();

            if (OrderByParameters != null)
            {
                foreach (var item in OrderByParameters)
                {
                    OrderByModel orderByModel = new OrderByModel()
                    {
                        FieldName = item.Key,
                        OrderByType = item.Value
                    };
                    orderByModels.Add(orderByModel);
                }
            }
            if (EnableWebOrderBy)
            {
                //获取排序字段
                Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);

                foreach (var item in orderbyDic)
                {
                    OrderByModel orderByModel = new OrderByModel()
                    {
                        FieldName = item.Key,
                        OrderByType = item.Value
                    };
                    orderByModels.Add(orderByModel);
                }
            }

            int total = 0;
            PageGridData<Dt_StockInfo> pageGridData = new PageGridData<Dt_StockInfo>();
            sugarQueryable = sugarQueryable.OrderBy(orderByModels);
            pageGridData.Rows = sugarQueryable.ToPageList(options.Page, options.Rows, ref total);
            pageGridData.Total = total;

            return pageGridData;
        }
    }
}