更新 .gitignore 和优化任务处理逻辑

xxyy

2025-02-28 c2461f320a6b36390d8dd26d4ce11a62baa0e215

更新 .gitignore 和优化任务处理逻辑

- 在 `.gitignore` 中添加了与 CopilotIndices 相关的数据库文件路径。
- 修改 `CommonConveyorLine_BZJob.cs` 中的条件判断，确保在途数量小于缓存数量时才执行后续逻辑。
- 修正 `Dt_TaskService.cs` 中多个方法调用的参数格式，确保参数之间有适当的空格。
- 将 `Thread.Sleep(10000)` 修改为 `Thread.Sleep(TimeSpan.FromMinutes(10))`，并添加设备信息查询逻辑，以优化库存处理。

 .gitignore

@@ -1666,3 +1666,9 @@
/Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.12.53.23981/SemanticSymbols.db
/Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.12.53.23981/SemanticSymbols.db-shm
/Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.12.53.23981/SemanticSymbols.db-wal
/Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.13.433.20974/CodeChunks.db
/Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.13.433.20974/CodeChunks.db-shm
/Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.13.433.20974/CodeChunks.db-wal
/Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.13.433.20974/SemanticSymbols.db
/Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.13.433.20974/SemanticSymbols.db-shm
/Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.13.433.20974/SemanticSymbols.db-wal

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_BZ/CommonConveyorLine_BZJob.cs

@@ -191,7 +191,7 @@
            needBarcode.inLineNum = _taskRepository.QueryData(x => x.TargetAddress == station.stationChildCode).Count();

            //若在途数量小于目标位置的缓存数量 则寻找对应常温库存中常温3工序的可出库数据 并建立出库任务
            if (needBarcode.inLineNum <= needBarcode.cacheNum)
            if (needBarcode.inLineNum < needBarcode.cacheNum)
            {
                if (_taskService.RequestOutTaskToBZAsync(station).Result.Status)
                {

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs

@@ -896,7 +896,7 @@
                List<string> strings = stationManagers.Roadway.Split(',').ToList();
                Console.WriteLine(strings.ToJsonString() + "b-----------------------");
                //// 调用CreateNewTask方法，创建新任务
                content = await CreateNewTask(input, result.ProductionLine,result.ProcessCode, strings);
                content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings);
                if (content.Status)
                {
                    var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -1128,7 +1128,7 @@
            }
            List<string> strings = stationManagers.Roadway.Split(',').ToList();

            return await CreateNewTask(input, result.ProductionLine, result.ProcessCode,strings, 1);
            return await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings, 1);
        }
        catch (Exception)
        {
@@ -1282,7 +1282,7 @@

        var devices = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
            .Where(x => x.DeviceStatus == "1")
            .Where(x => x.DeviceRemark == "1")
            .Where(x => x.DeviceCode.Contains("CWSC"))
            .ToList();
        var deviceCode = devices.Select(x => x.DeviceCode).ToList();

@@ -1734,7 +1734,7 @@
                        TaskNum = await BaseDal.GetTaskNo(),
                        Creater = "Systeam",
                        ProductionLine = result.ProductionLine,
                        ProcessCode=result.ProcessCode,
                        ProcessCode = result.ProcessCode,
                    };

                    // 创建WMS任务

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs

@@ -804,14 +804,21 @@
                {
                    try
                    {
                        Thread.Sleep(10000);
                        Thread.Sleep(TimeSpan.FromMinutes(10));

                        var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == "GWSC1");
                        var devices = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
                            .Where(x => x.DeviceStatus == "1")
                            .Where(x => x.DeviceCode.Contains("GWSC"))
                            .ToList();
                        var deviceCode = devices.Select(x => x.DeviceCode).ToList();

                        var stockInfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
                             .Includes(x => x.LocationInfo) // 预加载LocationInfo
                             .Includes(x => x.StockInfoDetails) // 预加载StockInfoDetails
                             .Where(x => x.AreaCode == area.AreaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 过滤条件
                             .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 过滤条件
                             .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
                             .OrderBy(x => x.OutboundTime) // 排序
                             .ToListAsync(); // 获取第一个元素

@@ -983,12 +990,19 @@
            Dt_StationManager station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == json.Position && x.stationType == 12 && x.stationArea == "Call");
            if (station == null) { throw new Exception($"未找到包装站台信息，请检查传入参数{json.Position}"); }

            var devices = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
                .Where(x => x.DeviceStatus == "1")
                .Where(x => x.DeviceCode.Contains("GWSC"))
                .ToList();
            var deviceCode = devices.Select(x => x.DeviceCode).ToList();

            //LogFactory.GetLog("常温3出库至包装").Info(true, $"常温3出库至包装传入参数：" + JsonConvert.SerializeObject(json, Formatting.Indented));
            var stockInfo = _stockInfoRepository.Db.Queryable<DtStockInfo>()
                    .Where(x => x.ProductionLine == station.productLine)
                    .Includes(x => x.LocationInfo) // 预加载LocationInfo
                    .Where(x => x.AreaCode == "CWSC3" && x.IsFull == true) // 过滤条件
                    .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock) // 过滤条件
                    .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
                    .OrderBy(x => x.OutboundTime) // 排序
                    .First(); // 获取第一个元素