1

heshaofeng

2026-03-25 37454e625df68d40897112b2e8c2e3cf4d7163e3

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

@@ -7,6 +7,7 @@
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
@@ -18,6 +19,7 @@
using WIDESEA_Core.Utilities;
using WIDESEA_DTO.Base;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Stock;
using WIDESEA_IBasicService;
using WIDESEA_IInboundService;
using WIDESEA_IRecordService;
@@ -46,9 +48,12 @@
        private readonly IRepository<Dt_StockInfo> _stockRepository;
        private readonly IRepository<Dt_LocationInfo> _locationInfoRepository;
        private readonly IBasicService _basicService;
        private readonly IRepository<Dt_AllocateOrder> _allocateOrderRepository;
        private readonly IRepository<Dt_OutboundOrder> _outboundOrderRepository;
        private readonly IRepository<Dt_OutboundOrderDetail> _outboundOrderDetailRepository;
        public IRepository<Dt_InboundOrder> Repository => BaseDal;

        public InboundOrderService(IRepository<Dt_InboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository, IRepository<Dt_Task> taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IMaterialUnitService materialUnitService, IRepository<Dt_StockInfoDetail> stockDetailRepository, IRepository<Dt_InboundOrder> inboundOrderRepository, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IRepository<Dt_StockInfo> stockRepository, IRepository<Dt_LocationType> locationTypeRepository, IMaterielInfoService materielInfoService, IBasicService basicService, IRepository<Dt_LocationInfo> locationInfoRepository) : base(BaseDal)
        public InboundOrderService(IRepository<Dt_InboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository, IRepository<Dt_Task> taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IMaterialUnitService materialUnitService, IRepository<Dt_StockInfoDetail> stockDetailRepository, IRepository<Dt_InboundOrder> inboundOrderRepository, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IRepository<Dt_StockInfo> stockRepository, IRepository<Dt_LocationType> locationTypeRepository, IMaterielInfoService materielInfoService, IBasicService basicService, IRepository<Dt_LocationInfo> locationInfoRepository, IRepository<Dt_AllocateOrder> allocateOrderRepository, IRepository<Dt_OutboundOrder> outboundOrderRepository, IRepository<Dt_OutboundOrderDetail> outboundOrderDetailRepository) : base(BaseDal)
        {
            _mapper = mapper;
            _unitOfWorkManage = unitOfWorkManage;
@@ -65,6 +70,9 @@
            _materielInfoService = materielInfoService;
            _basicService = basicService;
            _locationInfoRepository = locationInfoRepository;
            _allocateOrderRepository = allocateOrderRepository;
            _outboundOrderRepository = outboundOrderRepository;
            _outboundOrderDetailRepository = outboundOrderDetailRepository;
        }

        public async Task<WebResponseContent> ReceiveInboundOrder(List<Dt_InboundOrder> models, int operateType)
@@ -105,9 +113,10 @@

                    foreach (var item in model.Details)
                    {
                        Dt_MaterielInfo materielInfo = materielInfos.First(x => x.MaterielCode == item.MaterielCode);
                        //var purchaseToStockResult = await _materialUnitService.ConvertPurchaseToStockAsync(item.MaterielCode, item.BarcodeQty);

                        UnitConvertResultDTO totalResult = _basicService.UnitQuantityConvert(item.MaterielCode, item.Unit, item.BarcodeUnit, item.OrderQuantity);
                        UnitConvertResultDTO totalResult = _basicService.UnitQuantityConvert(item.MaterielCode, item.Unit, materielInfo.inventoryUOM, item.OrderQuantity);
                        item.Unit = totalResult.ToUnit;
                        item.OrderQuantity = totalResult.ToQuantity;
                        if (materielInfos.Any())
@@ -466,7 +475,7 @@
            WebResponseContent content = new WebResponseContent();
            try
            {
                

                (bool, string, object?) result2 = ModelValidate.ValidateModelData(materielGroupDTO);
                if (!result2.Item1) return content = WebResponseContent.Instance.Error(result2.Item2);

@@ -659,9 +668,9 @@
                {
                    resultDTO.UniqueUnit = "";
                }
                var inbound =_inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == orderNo);
                var inbound = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == orderNo);
                var inboundDetails = _inboundOrderDetailRepository.Db.Queryable<Dt_InboundOrderDetail>().Where(x => x.OrderId == inbound.First().Id).ToList();
                resultDTO.StockSumQuantity = inboundDetails.Where(x=>x.ReceiptQuantity==0).Sum(x=>x.OrderQuantity);
                resultDTO.StockSumQuantity = inboundDetails.Where(x => x.ReceiptQuantity == 0).Sum(x => x.OrderQuantity);
                resultDTO.StockCount = inboundDetails.Where(x => x.ReceiptQuantity == 0).Count();
                //var validDetails = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(s => s.OrderNo == orderNo).ToList();
                //resultDTO.StockSumQuantity = orderDetail.Details.Sum(d => d.OrderQuantity);
@@ -680,91 +689,165 @@
            }
        }

        public WebResponseContent UndoPalletGroup(string palletCode, string barcode = "")
        /// <summary>
        /// æ’¤é”€ç»„盘（智能识别输入是托盘号或条码）
        /// </summary>
        /// <param name="code">托盘号或条码</param>
        /// <returns>操作结果</returns>
        public WebResponseContent UndoPalletGroup(string code)
        {

            if (string.IsNullOrWhiteSpace(palletCode))
            if (string.IsNullOrWhiteSpace(code))
            {
                return WebResponseContent.Instance.Error("托盘号不能为空");
                return WebResponseContent.Instance.Error("托盘号或条码不能为空");
            }


            try
            {
                _unitOfWorkManage.BeginTran();

                // 2. æŸ¥è¯¢æ‰˜ç›˜åº“存主记录（避免无数据抛异常）
                var stock = _stockRepository.Db.Queryable<Dt_StockInfo>()
                    .Includes(o => o.Details)
                    .First(x => x.PalletCode == palletCode
                                         && (x.StockStatus == (int)StockStatusEmun.组盘暂存
                                             || x.StockStatus == StockStatusEmun.入库确认.ObjToInt()));
              
                string palletCode = null;
                string barcode = null;
                int stockStatus = 0; 

                if (stock == null)
                // 1. å…ˆå°è¯•æŒ‰æ‰˜ç›˜å·æŸ¥è¯¢
                var stockByPallet = _stockRepository.Db.Queryable<Dt_StockInfo>()
                    .Includes(o => o.Details)
                    .First(x => x.PalletCode == code
                        && (x.StockStatus == (int)StockStatusEmun.组盘暂存
                            || x.StockStatus == StockStatusEmun.入库确认.ObjToInt()));

                if (stockByPallet != null)
                {
                    return WebResponseContent.Instance.Error($"未找到托盘号{palletCode}对应的库存记录");
                    // è¯†åˆ«ä¸ºæ‰˜ç›˜å·
                    palletCode = code;
                    stockStatus = stockByPallet.StockStatus; 

                    var task = _taskRepository.Db.Queryable<Dt_Task>().Where(t => t.PalletCode == palletCode).ToList();
                    if (task != null && task.Any())
                    {
                        return WebResponseContent.Instance.Error($"托盘号 {palletCode} å­˜åœ¨æœªå®Œæˆçš„任务，无法撤销");
                    }

                    if (stockStatus == StockStatusEmun.入库确认.ObjToInt())
                    {
                        return WebResponseContent.Instance.Error($"托盘号 {palletCode} å¤„于入库确认状态，禁止整托盘撤销，请单独撤销条码");
                    }
                }
                else
                {
                    var detail = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(d => d.Barcode == code).First();

                    if (detail != null)
                    {
                        var stockInfo = _stockRepository
                            .Db.Queryable<Dt_StockInfo>()
                            .Where(s => s.Id == detail.StockId && (s.StockStatus == (int)StockStatusEmun.组盘暂存 || s.StockStatus == StockStatusEmun.入库确认.ObjToInt()))
                            .First();

                        if (stockInfo != null)
                        {
                            barcode = code;
                            palletCode = stockInfo.PalletCode;
                            stockStatus = stockInfo.StockStatus; 
                        }
                    }
                    else
                    {
                        _unitOfWorkManage.RollbackTran();
                        return WebResponseContent.Instance.Error($"未找到 {code} å¯¹åº”的托盘或条码记录");
                    }
                }

                // 3. åœºæ™¯1：删除指定条码
                // æ ¹æ®è¯†åˆ«ç»“果执行撤销逻辑
                if (!string.IsNullOrWhiteSpace(barcode))
                {
                    // ===== æ’¤é”€æŒ‡å®šæ¡ç  =====
                    var stock = _stockRepository.Db.Queryable<Dt_StockInfo>()
                        .Includes(o => o.Details)
                        .First(x => x.PalletCode == palletCode
                            && (x.StockStatus == (int)StockStatusEmun.组盘暂存
                                || x.StockStatus == StockStatusEmun.入库确认.ObjToInt()));

                    if (stock == null)
                    {
                        _unitOfWorkManage.RollbackTran();
                        return WebResponseContent.Instance.Error($"未找到托盘号 {palletCode} å¯¹åº”的库存记录");
                    }

                    var targetDetail = stock.Details?.FirstOrDefault(x => x.Barcode == barcode);
                    if (targetDetail == null)
                    {
                        _unitOfWorkManage.RollbackTran();
                        return WebResponseContent.Instance.Error($"托盘{palletCode}下未找到条码{barcode}的明细记录");
                        return WebResponseContent.Instance.Error($"托盘 {palletCode} ä¸‹æœªæ‰¾åˆ°æ¡ç  {barcode} çš„明细记录");
                    }

                    if (stockStatus == StockStatusEmun.入库确认.ObjToInt())
                    {
                        var totalDetails = stock.Details?.Count ?? 0;
                        if (totalDetails <= 1)
                        {
                            _unitOfWorkManage.RollbackTran();
                            return WebResponseContent.Instance.Error($"托盘 {palletCode} å¤„于入库确认状态，当前仅剩余最后1条明细，禁止撤销（必须保留至少1条库存明细）");
                        }
                    }

                    ResetInboundOrderStatus(new List<string> { targetDetail.OrderNo }, new List<string> { targetDetail.Barcode });
                    // åˆ é™¤æŒ‡å®šæ˜Žç»†
                    _stockDetailRepository.DeleteData(targetDetail);


                    // é‡æ–°æŸ¥è¯¢å‰©ä½™æ˜Žç»†ï¼ˆä¿è¯æ•°æ®å‡†ç¡®æ€§ï¼‰
                    var remainingDetails = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>()
                        .Where(x => x.StockId == stock.Id)
                        .ToList();

                    // å‰©ä½™æ˜Žç»†ä¸ºç©º â†’ åˆ é™¤ä¸»è¡¨ + é‡ç½®å…¥åº“单及明细状态
                    if (!remainingDetails.Any())
                    {
                        // é‡ç½®å…¥åº“单及明细状态
                        ResetInboundOrderStatus(stock.Details.Select(d => d.OrderNo).Distinct().ToList());

                        _stockRepository.DeleteData(stock);
                        if (stockStatus == (int)StockStatusEmun.组盘暂存)
                        {
                            ResetInboundOrderStatus(stock.Details.Select(d => d.OrderNo).Distinct().ToList());
                            _stockRepository.DeleteData(stock);
                        }
                        _unitOfWorkManage.CommitTran();
                        return WebResponseContent.Instance.OK($"条码{barcode}撤销成功，托盘无剩余明细，已删除托盘并重置关联入库单状态");
                        return WebResponseContent.Instance.OK($"条码 {barcode} æ’¤é”€æˆåŠŸï¼Œæ‰˜ç›˜æ— å‰©ä½™æ˜Žç»†ï¼Œå·²é‡ç½®å…³è”入库单状态");
                    }

                    _unitOfWorkManage.CommitTran();
                    return WebResponseContent.Instance.OK($"条码{barcode}撤销成功，托盘仍有剩余明细");
                    return WebResponseContent.Instance.OK($"条码 {barcode} æ’¤é”€æˆåŠŸï¼Œæ‰˜ç›˜ä»æœ‰å‰©ä½™æ˜Žç»†");
                }

                // åˆ é™¤æ•´æ‰˜ç›˜ï¼ˆæ— æ¡ç ä¼ å…¥ï¼‰
                if (stock.Details == null || !stock.Details.Any())
                else
                {
                    var stock = _stockRepository.Db.Queryable<Dt_StockInfo>()
                        .Includes(o => o.Details)
                        .First(x => x.PalletCode == palletCode
                            && (x.StockStatus == (int)StockStatusEmun.组盘暂存
                                || x.StockStatus == StockStatusEmun.入库确认.ObjToInt()));

                    if (stock == null)
                    {
                        _unitOfWorkManage.RollbackTran();
                        return WebResponseContent.Instance.Error($"未找到托盘号 {palletCode} å¯¹åº”的库存记录");
                    }

                    if (stock.Details == null || !stock.Details.Any())
                    {
                        _stockRepository.DeleteData(stock);
                        _unitOfWorkManage.CommitTran();
                        return WebResponseContent.Instance.OK("托盘无明细记录，已直接删除托盘主数据");
                    }

                    var relatedOrderNos = stock.Details.Select(d => d.OrderNo).Distinct().ToList();
                    if (!relatedOrderNos.Any())
                    {
                        _unitOfWorkManage.RollbackTran();
                        return WebResponseContent.Instance.Error("库存明细未关联任何入库单号，无法完成撤销");
                    }

                    ResetInboundOrderStatus(relatedOrderNos, stock.Details.Select(d => d.Barcode).ToList());
                    _stockDetailRepository.DeleteData(stock.Details);
                    _stockRepository.DeleteData(stock);

                    _unitOfWorkManage.CommitTran();
                    return WebResponseContent.Instance.OK("托盘无明细记录，已直接删除托盘主数据");
                    return WebResponseContent.Instance.OK("托盘撤销成功，已重置关联入库单及明细状态");
                }

                // æœ‰æ˜Žç»† â†’ é‡ç½®å…¥åº“单及明细状态 + åˆ é™¤åº“å­˜
                var relatedOrderNos = stock.Details.Select(d => d.OrderNo).Distinct().ToList();
                if (!relatedOrderNos.Any())
                {
                    _unitOfWorkManage.RollbackTran();
                    return WebResponseContent.Instance.Error("库存明细未关联任何入库单号，无法完成撤销");
                }

                // é‡ç½®å…¥åº“单主状态 + æ˜Žç»†çŠ¶æ€
                ResetInboundOrderStatus(relatedOrderNos, stock.Details.Select(d => d.Barcode).ToList());

                // 4.3 åˆ é™¤åº“存明细和主表
                _stockDetailRepository.DeleteData(stock.Details);
                _stockRepository.DeleteData(stock);

                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK("托盘撤销成功，已重置关联入库单及明细状态");
            }
            catch (Exception ex)
            {
@@ -803,6 +886,10 @@
                {
                    detail.ReceiptQuantity = 0;
                    detail.OrderDetailStatus = 0;
                    if(inboundOrder.BusinessType == "11")
                    {
                        detail.WarehouseCode = "";
                    }
                    _inboundOrderDetailRepository.UpdateData(detail);
                }
            }
@@ -844,13 +931,23 @@
                        {
                            sugarQueryable1 = sugarQueryable1.Where(x => x.InboundOrderNo.Contains(searchParameters.Value.ToString())
                            || x.UpperOrderNo.Contains(searchParameters.Value.ToString()) ||
                            x.Details.Any(d => d.Barcode == searchParameters.Value.ToString()));
                            x.Details.Any(d => d.Barcode == searchParameters.Value.ToString()) ||
                            x.Details.Any(d => d.OutBoxbarcodes == searchParameters.Value.ToString()));
                        }
                        searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_InboundOrder.OrderType).FirstLetterToLower());
                        if (searchParameters != null)
                        {
                            sugarQueryable1 = sugarQueryable1.Where(x => x.OrderType.Equals(searchParameters.Value.ToString()));
                        }

                        var detailMaterielCode = searchParametersList.FirstOrDefault(x => x.Name == "materielCode");
                        if(detailMaterielCode!=null && !string.IsNullOrEmpty(detailMaterielCode.Value?.ToString()))
                        {
                            string materielCode = detailMaterielCode.Value.ToString().Trim();
                            sugarQueryable1 = sugarQueryable1.Where(x => x.Details.Any(d => d.MaterielCode.Contains(materielCode)));

                        }

                        //var dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
                        //return new PageGridData<Dt_InboundOrder>(totalCount, dataList);
                    }
@@ -903,14 +1000,98 @@
        {
            WebResponseContent content = new WebResponseContent();
            var inbound = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == orderNo).First();
            if(inbound == null)
            if (inbound == null)
            {
                return content.Error();
            }

            var details = _inboundOrderDetailRepository.Db.Queryable<Dt_InboundOrderDetail>().Where(x => x.OrderId == inbound.Id && x.ReceiptQuantity == 0).ToList();

            return content.OK(data:details);
            return content.OK(data: details);
        }

        public WebResponseContent GetLocationType(string code)
        {
           var warehouseAreaName = _warehouseAreaRepository.QueryFirst(x => x.Code == code);
            if(string.IsNullOrWhiteSpace(warehouseAreaName.ToString()))
            {
                return WebResponseContent.Instance.Error("未找到仓库名称");
            }
            var locationTypeDesc = _locationTypeRepository.Db.Queryable<Dt_LocationType>().Where(x => string.Equals(x.LocationTypeDesc, warehouseAreaName.Name, StringComparison.OrdinalIgnoreCase)).First();

            return WebResponseContent.Instance.OK(data:locationTypeDesc.LocationType);
        }

        public WebResponseContent HandCloseOrder(List<string> orderNos)
        {
            try
            {
                foreach (var orderNo in orderNos)
                {
                    var inbound = _inboundOrderRepository.QueryFirst(x => x.InboundOrderNo == orderNo);
                    var outbound = _outboundOrderRepository.QueryFirst(x=>x.OrderNo == orderNo);
                    
                    if (inbound != null)
                    {
                        if (inbound.OrderStatus != (int)InOrderStatusEnum.未开始 && inbound.OrderStatus != (int)InOrderStatusEnum.入库中)
                        {
                            return WebResponseContent.Instance.Error($"该单据状态不可以关闭");
                        }
                        inbound.OrderStatus = (int)InOrderStatusEnum.手动关闭;
                        inbound.Operator = App.User.UserName;
                        _inboundOrderRepository.UpdateData(inbound);

                        var inboundItems = _inboundOrderDetailRepository.QueryData(x => x.OrderId == inbound.Id);
                        if(inboundItems.FirstOrDefault().OrderDetailStatus == (int)OrderDetailStatusEnum.New)
                        {
                            foreach (var item in inboundItems)
                            {
                                item.OrderDetailStatus = (int)InOrderStatusEnum.手动关闭;
                                item.Modifier = App.User.UserName;
                                BaseDal.Db.Updateable<Dt_InboundOrderDetail>(item).ExecuteCommand();
                            }
                        }
                    }
                    else if (outbound != null)
                    {
                        if(outbound.OrderStatus ==(int)OutOrderStatusEnum.出库完成)
                        {
                            return WebResponseContent.Instance.Error($"该单据状态不可以关闭");
                        }
                        if(outbound.OrderStatus == (int)OutOrderStatusEnum.出库中)
                        {
                           var outboundDetails = _outboundOrderDetailRepository.QueryData(x => x.OrderId == outbound.Id);
                            if (outboundDetails == null)
                            {
                                return WebResponseContent.Instance.Error("该单据状态不能关闭");
                            }
                            var detailStatus = outboundDetails.All(x => x.LockQuantity == x.OverOutQuantity);
                            if (!detailStatus)
                            {
                                return WebResponseContent.Instance.Error("该单据有正在出库的物料，不能关闭");
                            }
                        }
                        outbound.OrderStatus = (int)OutOrderStatusEnum.关闭;
                        outbound.Operator = App.User.UserName;
                        _outboundOrderRepository.UpdateData(outbound);

                        var outboundItems = BaseDal.Db.Queryable<Dt_OutboundOrderDetail>().Where(x => x.OrderId == outbound.Id).ToList();
                        if(outboundItems.FirstOrDefault().OrderDetailStatus == (int)OrderDetailStatusEnum.New)
                        foreach(var item in outboundItems)
                        {
                            item.OrderDetailStatus = (int)OutOrderStatusEnum.关闭;
                            item.Modifier = App.User.UserName;
                            BaseDal.Db.Updateable<Dt_OutboundOrderDetail>(item).ExecuteCommand();
                        }
                    }
                    
                }
                return WebResponseContent.Instance.OK($"单据关闭成功");
            }
            catch (Exception e)
            {
                return WebResponseContent.Instance.Error(e.Message);
            }
        }
    }
}