Merge branch 'master' of http://115.159.85.185:8098/r/RuiShiGe/LingPaoCheSh...

WINDOWS-F96JH03\Kain

2026-03-17 021ec32a095410d28d4552d7365ca64308494fa6

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/BackgroundJob.cs

@@ -47,23 +47,15 @@
        {
            try
            {
                //var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == "GWSC1");
                //总装不生产  åˆ™åœæ­¢æ‹‰åŠ¨å‡ºåº“
                var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == "5");
                if (area.AreaStatus != 1l) { return Task.CompletedTask; }

                //if (area == null) { return; }

                //IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
                //List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();

                //var stockInfo = stockInfoList.Where(x => x.AreaCode == area.AreaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // è¿‡æ»¤æ¡ä»¶
                //     .Where(x => x.LocationInfo != null && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // è¿‡æ»¤æ¡ä»¶
                //     .OrderBy(x => x.OutboundTime) // æŽ’序
                //     .ToList(); // èŽ·å–第一个元素
                var lockInfo = _palletStockInfoRepository.Db.Queryable<Dt_MESLockInfo>()
                    //.Where(x => x.LockStatue == 0)
                    .Includes(x => x.CarBodyInfo)
                    .OrderBy(x => x.sequenceNo) // æŽ’序
                    .ToList(); // èŽ·å–第一个元素


                if (lockInfo.Where(x => x.LockStatue == 1).Count() > 10) return Task.CompletedTask;
                if (lockInfo.Count == 0) return Task.CompletedTask;
@@ -132,6 +124,7 @@
                    Creater = "System",
                    CreateDate = DateTime.Now,
                    TaskId = 0,
                    CarType = stock.CarType,
                };

                // åˆ›å»ºä»»åŠ¡ä¼ è¾“用的DTO对象
@@ -160,6 +153,7 @@
                    _unitOfWorkManage.CommitTran();
                }

                #region é›†åˆ
                //foreach (var item in lockInfo)
                //{
                //    var hasTask = _taskRepository.QueryFirst(x => x.PalletCode == item.CarBodyInfo.PalletCode);
@@ -252,6 +246,7 @@
                //        _unitOfWorkManage.CommitTran();
                //    }
                //}
                #endregion
            }
            catch (Exception ex)
            {
@@ -263,31 +258,6 @@
            }
           
            return Task.CompletedTask;
        }

        /// <summary>
        /// åˆ›å»ºä»»åŠ¡å®žä¾‹
        /// </summary>
        private Dt_Task CreateTask(DtStockInfo stockInfo, string position, int tag)
        {
            return new Dt_Task
            {
                Grade = 1,
                Roadway = stockInfo.LocationInfo.RoadwayNo,
                TargetAddress = position,
                Dispatchertime = DateTime.Now,
                NextAddress = position,
                OrderNo = null,
                PalletCode = stockInfo.PalletCode,
                SourceAddress = stockInfo.LocationCode,
                CurrentAddress = stockInfo.LocationCode,
                TaskState = (int)TaskOutStatusEnum.OutNew,
                TaskType = tag,
                TaskNum = _taskRepository.GetTaskNo().Result,
                Creater = "System", // ä¿®æ­£æ‹¼å†™é”™è¯¯
                CreateDate = DateTime.Now,
                TaskId = 0,
            };
        }

        /// <summary>
@@ -307,8 +277,8 @@
                Id = 0,
                TaskType = task.TaskType,
                pvi = task.PVI,
                NextAddress = task.NextAddress

                NextAddress = task.NextAddress,
                CarType = task.CarType
            };
        }