´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
@@ -23,7 +23,7 @@ // 注æï¼http://127.0.0.1:1818 å http://localhost:1818 æ¯ä¸ä¸æ ·ç "IPs": "http://127.0.0.1:8080,http://localhost:8080" }, "WMSApiAddress": "http://127.0.0.1:9293", "WMSApiAddress": "http://127.0.0.1:9293", //"http://127.0.0.1:9283",æ£å¼ç¯å¢å°å "ApiName": "WIDESEA", "ExpMinutes": 120, "QuartzJobAutoStart": true ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -195,7 +195,7 @@ task.NextAddress = router.NextPosi; task.DeviceCode = stationManger.StationDeviceCode; } else if(item.TaskType == TaskTypeEnum.MesOutbound.ObjToInt()) else if (item.TaskType == TaskTypeEnum.MesOutbound.ObjToInt()) { task.NextAddress = router.NextPosi; task.DeviceCode = stationManger.StackerCraneCode; @@ -290,7 +290,7 @@ return WebResponseContent.Instance.Error($"æªæ¾å°ç«å°ä¿¡æ¯"); } string address = AppSettings.Get("WMSApiAddress"); if(string.IsNullOrEmpty(address)) if (string.IsNullOrEmpty(address)) { return WebResponseContent.Instance.Error($"æªæ¾å°WMSApiå°å"); } @@ -323,7 +323,7 @@ { return WebResponseContent.Instance.Error($"æªæ¾å°WMSApiå°å"); } string responseStr = HttpHelper.Post($"{address}/api/Task/AssignRoadway?taskNum={taskNum}",roadwayNos.Serialize()); string responseStr = HttpHelper.Post($"{address}/api/Task/AssignRoadway?taskNum={taskNum}", roadwayNos.Serialize()); WebResponseContent? responseContent = JsonConvert.DeserializeObject<WebResponseContent>(responseStr); if (responseContent != null && responseContent.Status && responseContent.Data != null) { @@ -346,7 +346,9 @@ /// <returns></returns> public string? RequestAssignLocation(int taskNum, string roadwayNo) { string responseStr = HttpHelper.Get($"http://127.0.0.1:9283/api/Task/AssignInboundTaskLocation?taskNum={taskNum}&roadwayNo={roadwayNo}"); string address = AppSettings.Get("WMSApiAddress"); if (string.IsNullOrEmpty(address)) throw new Exception("æªæ¾å°WMSApiå°å"); string responseStr = HttpHelper.Get($"{address}/api/Task/AssignInboundTaskLocation?taskNum={taskNum}&roadwayNo={roadwayNo}"); WebResponseContent? responseContent = JsonConvert.DeserializeObject<WebResponseContent>(responseStr); if (responseContent != null && responseContent.Status && responseContent.Data != null) ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs
@@ -165,7 +165,7 @@ } stockInfos.Add(stockInfo); } var LocationCodes = stockInfos/*.Where(x => x.LocationCode != "å¹³åºä½")*/.Select(stockInfo => stockInfo.LocationCode).ToList(); var LocationCodes = stockInfos.Where(x => x.LocationCode != "å¹³åºä½").Select(stockInfo => stockInfo.LocationCode).ToList(); List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => LocationCodes.Contains(x.LocationCode)); locationInfos.ForEach(x => { ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -112,7 +112,12 @@ { x.AGVArea = agvDescription; }); string response = HttpHelper.Post("http://127.0.0.1:9281/api/Task/ReceiveTask", taskDTOs.Serialize()); string address = AppSettings.Get("WCSApiAddress"); if (string.IsNullOrEmpty(address)) { return WebResponseContent.Instance.Error($"æªæ¾å°WCSApiå°å"); } string response = HttpHelper.Post($"{address}/api/Task/ReceiveTask", taskDTOs.Serialize()); return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("è¿åé误"); } @@ -130,7 +135,12 @@ { try { string response = HttpHelper.Post("http://127.0.0.1:9281/api/CTU_AGV/PutFinish", code); string address = AppSettings.Get("WCSApiAddress"); if (string.IsNullOrEmpty(address)) { return WebResponseContent.Instance.Error($"æªæ¾å°WCSApiå°å"); } string response = HttpHelper.Post($"{address}/api/CTU_AGV/PutFinish", code); return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("è¿åé误"); } ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
@@ -26,6 +26,7 @@ }, "WCS": "http://localhost:9291/api/Task/", "WCSApiAddress": "http://127.0.0.1:9291",//"http://127.0.0.1:9281",æ£å¼ç¯å¢å°å "LogAopEnable": false, "PrintSql": true, //æå°SQLè¯å¥ "ApiName": "WIDESEA",