Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/17.14.1569.27729/CodeChunks.dbBinary files differ
Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/17.14.1569.27729/CodeChunks.db-shmBinary files differ
Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/17.14.1569.27729/CodeChunks.db-walBinary files differ
Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/17.14.1569.27729/SemanticSymbols.dbBinary files differ
Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/17.14.1569.27729/SemanticSymbols.db-shmBinary files differ
Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/17.14.1569.27729/SemanticSymbols.db-walBinary files differ
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessService/obj/Debug/net6.0/WIDESEAWCS_ProcessService.AssemblyInfo.cs
@@ -14,7 +14,7 @@ [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_ProcessService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+29aa484d06b2d4839536034bb1033d0e60334ec2")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+02a4fdd78cef9c7d2a26bfb9aa187179cf0baac3")] [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_ProcessService")] [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_ProcessService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/RouterService.cs
@@ -84,12 +84,12 @@ { // 用于记录已经访问过的起点和终点组合，避免重复访问进入死循环 HashSet<string> visitedRoutes = new HashSet<string>(); var stopwatch = Stopwatch.StartNew(); //var stopwatch = Stopwatch.StartNew(); var rasult = QueryNextRoutesInternal(startPosi, endPosi, visitedRoutes); stopwatch.Stop(); var elapsed = stopwatch.ElapsedMilliseconds; QuartzLogger.WriteLogToFile("路由查询", $"时长{elapsed},起点：{startPosi},终点{endPosi}"); //stopwatch.Stop(); //var elapsed = stopwatch.ElapsedMilliseconds; //QuartzLogger.WriteLogToFile("路由查询", $"时长{elapsed},起点：{startPosi},终点{endPosi}"); return rasult; }
@@ -151,9 +151,9 @@ if (childDeviceCode == "1670" || childDeviceCode == "1666" || childDeviceCode == "1548" || childDeviceCode == "1448") { if (lastUpdateTime > DateTime.Now.AddMinutes(1)) { lastUpdateTime = DateTime.Now; //if (lastUpdateTime > DateTime.Now.AddMinutes(1)) //{ // lastUpdateTime = DateTime.Now; Platform platform = _platFormRepository.QueryFirst(x => x.DeviceCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active"); if (platform != null) { @@ -167,7 +167,7 @@ } } } } //} } #region 调用事件总线通知前端 @@ -643,10 +643,11 @@ List<string> strings = platform.Location.Split(',').ToList(); var result = await HttpHelper.PostAsync(wmsIpAddress, new { Position = childDeviceCode, Tag = (int)taskType, AreaCdoe = platform.Stacker, AreaCdoes = strings, platform.ProductionLine }.Serialize()); WriteInfo("OCV请求返回参数", $"时间：【{DateTime.Now}】请求点位【{childDeviceCode}】返回参数【{JsonConvert.SerializeObject(result)}】"); WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result); ConsoleHelper.WriteSuccessLine($"时间：【{DateTime.Now}】请求WMS出库任务返回结果：【{content.Serialize()}】"); // 检查状态并返回 if (!content.Status) return; Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
@@ -345,7 +345,7 @@ } else { if (content.Message != "请求过于频繁，请稍后再试" && content.Message != "无法获取目标地址") if (content.Message != "请求过于频繁，请稍后再试" && content.Message != "无法获取目标地址" && !content.Message.Contains("存在任务")) { WriteInfo(conveyorLine.DeviceName, content.Message); conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, stationManager.stationNGChildCode, childDeviceCode); Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_NewCW/CommonConveyorLine_NewCWJob.cs
@@ -530,7 +530,6 @@ List<string> strings = platform.Location.Split(',').ToList(); var result = await HttpHelper.PostAsync(wmsIpAddress, new { Position = childDeviceCode, Tag = (int)taskType, AreaCdoe = platform.Stacker, AreaCdoes = strings, platform.ProductionLine }.Serialize()); WriteInfo("OCV请求返回参数", $"时间：【{DateTime.Now}】请求点位【{childDeviceCode}】返回参数【{JsonConvert.SerializeObject(result)}】"); WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result); Binary files differ
Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1569.27729/CodeChunks.db-shmBinary files differ
Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1569.27729/CodeChunks.db-walBinary files differ
Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1569.27729/SemanticSymbols.dbBinary files differ
Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1569.27729/SemanticSymbols.db-shmBinary files differ
Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1569.27729/SemanticSymbols.db-walBinary files differ
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs
@@ -276,4 +276,6 @@ /// </summary> /// <returns></returns> WebResponseContent GetLocationStatus(); Task<string> GetRoadWayAsync(List<string> process); } Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -1060,17 +1060,17 @@ } //var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel"); var outBoundMateriel = _dt_ChangeoversRepository.QueryData(x => x.Status == "1").ToList(); //var outBoundMateriel = _dt_ChangeoversRepository.QueryData(x => x.Status == "1").ToList(); List<string>? materielCodes = outBoundMateriel.Count != 0 ? outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == area.AreaCode) .Select(x => x.MaterielCode) .ToList() : null; //List<string>? materielCodes = outBoundMateriel.Count != 0 // ? outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == area.AreaCode) // .Select(x => x.MaterielCode) // .ToList() // : null; var result = new DtStockInfo(); //DtStockInfo result = null; var stockInfoList = await _stockInfoRepository.Db.Queryable<DtStockInfo>() var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>() .Includes(x => x.LocationInfo) //.Includes(x => x.StockInfoDetails) .Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull) @@ -1079,19 +1079,19 @@ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) //.WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode))) .OrderBy(x => x.OutboundTime) .ToListAsync(); foreach (var stock in stockInfoList) { var hasMatchingDetail = await _stockInfoRepository.Db.Queryable<DtStockInfoDetail>() .Where(d => d.StockId == stock.Id && materielCodes.Contains(d.MaterielCode)) .AnyAsync(); .FirstAsync(); //foreach (var stock in stockInfoList) //{ // var hasMatchingDetail = await _stockInfoRepository.Db.Queryable<DtStockInfoDetail>() // .Where(d => d.StockId == stock.Id && materielCodes.Contains(d.MaterielCode)) // .AnyAsync(); if (hasMatchingDetail) { result = stock; break; } } // if (hasMatchingDetail) // { // result = stock; // break; // } //} if (result.IsNullOrEmpty()) ConsoleHelper.WriteErrorLine($"{area.AreaName}-{productionLine}查询实盘库存信息失败:未找到符合条件的数据"); @@ -1597,6 +1597,13 @@ ConsoleHelper.WriteErrorLine(content.ToJsonString()); var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString()); if (result == null || !result.Success) return content.Error(result?.MOMMessage ?? "Deserialization error"); List<string> strings = station.productLine.Split(",").ToList(); if (!result.ProductionLine.Contains(strings)) { ConsoleHelper.WriteErrorLine($"托盘号【{palletCode}】请求产线【{result.ProductionLine}】不允许入【{station.Roadway}】"); return content.Error($"托盘号【{palletCode}】请求产线【{result.ProductionLine}】不允许入【{station.Roadway}】"); } if (result.SerialNos.Count > 0) { @@ -2328,7 +2335,7 @@ .Where(x => x.DeviceStatus == 1.ToString() && process.Contains(x.DeviceCode)) .Select(x => x.DeviceCode).ToListAsync(); var minGroup = _locationRepository.QueryData(x => deviceCode.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free) var minGroup = _locationRepository.QueryData(x => deviceCode.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == (int)EnableEnum.Enable) .GroupBy(x => x.RoadwayNo) .OrderByDescending(g => g.Count()) // 根据每个组的元素数量排序 .ToList(); // 取出数量最多的组 @@ -2337,6 +2344,10 @@ foreach (var item in minGroup) { var number = BaseDal.QueryData(x => x.TargetAddress == item.Key).Count(); if (item.Count() - number <= 0) { continue; } result.Add(item.Key, item.Count() - number); }
@@ -1,4 +1,8 @@ using WIDESEA_DTO; using WIDESEA_Core.BaseRepository; using WIDESEA_DTO; using WIDESEA_IStorageBasicRepository; using WIDESEA_IStorageTaskRepository; using WIDESEAWCS_QuartzJob.Models; namespace WIDESEA_WMSServer.Controllers; @@ -12,14 +16,18 @@ private readonly IHttpContextAccessor _httpContextAccessor; private readonly IDt_TaskService _taskService; private readonly ILocationInfoService _locationService; private readonly ILocationInfoRepository _locationRepository; private readonly IDt_TaskRepository BaseDal; public TaskController(IDt_TaskService taskService, IHttpContextAccessor httpContextAccessor, ILocationInfoService locationService) : base(taskService) ILocationInfoService locationService, ILocationInfoRepository locationInfoRepository,IDt_TaskRepository repository) : base(taskService) { _httpContextAccessor = httpContextAccessor; _taskService = taskService; _locationService = locationService; _locationRepository = locationInfoRepository; BaseDal = repository; } /// <summary> @@ -270,4 +278,10 @@ { return Service.GetLocationStatus(); } [HttpPost, AllowAnonymous, Route("GetRoadWayAsync")] public async Task<string> GetRoadWayAsync(List<string> process) { return await Service.GetRoadWayAsync(process); } } Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
@@ -10,11 +10,7 @@ "MainDB": "DB_WIDESEA", //当前项目的主库，所对应的连接字符串的Enabled必须为true //连接字符串 //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=", //"ConnectionString": "Data Source=192.168.15.253;Initial Catalog=WIDESEA_WMSDB_BBMain;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", "ConnectionString": "Data Source=192.168.20.253;Initial Catalog=WIDESEA_WMSDB;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", //"ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=WIDESEA_WMSDB_BBMain;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", //"ConnectionString": "Data Source=192.168.20.251;Initial Catalog=WIDESEA_WMSDB;User ID=sa;Password=123456@gy;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", //"ConnectionStringWCS": "Data Source=192.168.15.253;Initial Catalog=WIDESEA_WCSDB_BBMain;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", "ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WMSDB_BBMain;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", "ConnectionStringWCS": "Data Source=192.168.20.253;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", //跨域 "Cors": {
