Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbany...

647556386

3 天以前 696edbff3c8812e4b820f624d66a02ae6ddb1a06

 ÏîÄ¿´úÂë/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;
@@ -48,9 +49,11 @@
        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, IRepository<Dt_AllocateOrder> allocateOrderRepository) : 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;
@@ -68,6 +71,8 @@
            _basicService = basicService;
            _locationInfoRepository = locationInfoRepository;
            _allocateOrderRepository = allocateOrderRepository;
            _outboundOrderRepository = outboundOrderRepository;
            _outboundOrderDetailRepository = outboundOrderDetailRepository;
        }

        public async Task<WebResponseContent> ReceiveInboundOrder(List<Dt_InboundOrder> models, int operateType)
@@ -700,9 +705,10 @@
            {
                _unitOfWorkManage.BeginTran();

                // æ™ºèƒ½è¯†åˆ«è¾“入类型
              
                string palletCode = null;
                string barcode = null;
                int stockStatus = 0; 

                // 1. å…ˆå°è¯•æŒ‰æ‰˜ç›˜å·æŸ¥è¯¢
                var stockByPallet = _stockRepository.Db.Queryable<Dt_StockInfo>()
@@ -715,6 +721,18 @@
                {
                    // è¯†åˆ«ä¸ºæ‰˜ç›˜å·
                    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
                {
@@ -724,13 +742,14 @@
                    {
                        var stockInfo = _stockRepository
                            .Db.Queryable<Dt_StockInfo>()
                            .Where(s => s.Id == detail.StockId&& (s.StockStatus == (int)StockStatusEmun.组盘暂存 || s.StockStatus == StockStatusEmun.入库确认.ObjToInt()))
                            .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
@@ -763,6 +782,16 @@
                        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);

@@ -772,10 +801,13 @@

                    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();
@@ -783,7 +815,6 @@
                }
                else
                {
                    // ===== æ’¤é”€æ•´ä¸ªæ‰˜ç›˜ =====
                    var stock = _stockRepository.Db.Queryable<Dt_StockInfo>()
                        .Includes(o => o.Details)
                        .First(x => x.PalletCode == palletCode
@@ -908,6 +939,15 @@
                        {
                            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);
                    }
@@ -970,6 +1010,18 @@
            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
@@ -977,16 +1029,62 @@
                foreach (var orderNo in orderNos)
                {
                    var inbound = _inboundOrderRepository.QueryFirst(x => x.InboundOrderNo == orderNo);
                    if(inbound == null)
                    var outbound = _outboundOrderRepository.QueryFirst(x=>x.OrderNo == orderNo);
                    
                    if (inbound != null)
                    {
                        return WebResponseContent.Instance.Error($"该单据不存在，无法进行关闭");
                        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();
                            }
                        }
                    }
                    if (inbound.OrderStatus != (int)InOrderStatusEnum.未开始 && inbound.OrderStatus != (int)InOrderStatusEnum.入库中)
                    else if (outbound != null)
                    {
                        return WebResponseContent.Instance.Error($"该单据状态不可以关闭");
                        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();
                        }
                    }
                    inbound.OrderStatus = (int)InOrderStatusEnum.手动关闭;
                    _inboundOrderRepository.UpdateData(inbound);
                    
                }
                return WebResponseContent.Instance.OK($"单据关闭成功");
            }