´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs
@@ -79,6 +79,12 @@ InboundJT = 570, /// <summary> /// ç©ºç®±å ¥åº /// </summary> [Description("ç©ºç®±å ¥åº")] InEmpty = 600, /// <summary> /// å··éå ç§»åº /// </summary> [Description("å··éå 移åº")] ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/CTU_AGVController .cs
@@ -109,7 +109,7 @@ if (agvUpdateModel.Method == "end") { if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt()) PutFinish(task.NextAddress); if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() || task.TaskType == TaskTypeEnum.OutEmpty.ObjToInt()) PutFinish(task.NextAddress); _taskService.TaskCompleted(task.TaskNum); } agvResponseContent.Code = "0"; ´úÂë¹ÜÀí/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
@@ -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) ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/¸¨ÁϲÖ/AGV_FLExtend.cs
@@ -35,7 +35,7 @@ { TaskCode = task.AgvTaskNum, ReqCode = DateTime.Now.ToString("yyyyMMddHHmmss"), TaskTyp = task.TaskType == TaskTypeEnum.Outbound.ObjToInt() ? "FLC" : "FLR", TaskTyp = task.TaskType < TaskTypeEnum.Inbound.ObjToInt() ? "FLC" : "FLR", ctnrCode = task.PalletCode, PositionCodePath = new List<CodePath>() { @@ -94,6 +94,7 @@ }; var b = Layer > 9 ? "" + Layer : "0" + Layer; var c = Column > 9 ? "" + Column : "0" + Column; if (Column == 10) c = "010"; Address = a + b + c; } else ´úÂë¹ÜÀí/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 => { @@ -203,6 +203,8 @@ _ => throw new Exception($"æªå®ä¹çæ,å°å:ã{locationCode}ã"), }; var Column = locationCode.Substring(4, 2); if (locationCode.Length == 7) Column = locationCode.Substring(5, 2); var Layer = locationCode.Substring(2, 2); locationCode = "AGV_FL-" + Row + "-0" + Column + "-0" + Layer + "-01"; return locationCode; ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs
@@ -18,10 +18,6 @@ /// <summary> /// è´§ä½ç¼å· /// </summary> public int WarehouseId { get; set; } /// <summary> /// /// </summary> public string LocationCode { get; set; } /// <summary> ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs
@@ -81,7 +81,6 @@ ISugarQueryable<StockViewDTO> list = sugarQueryable1.InnerJoin(sugarQueryable, (b, a) => a.LocationCode == b.LocationCode).Select((b, a) => new StockViewDTO { WarehouseId=a.WarehouseId, LocationCode = b.LocationCode, Column = a.Column, CreateDate = b.CreateDate, ´úÂë¹ÜÀí/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=" + code); return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("è¿åé误"); } @@ -192,7 +202,7 @@ if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt()) { stockInfo.StockStatus = StockStatusEmun.å ¥åºå®æ.ObjToInt(); task.TaskStatus = (int)TaskStatusEnum.Finish; task.TaskStatus = TaskStatusEnum.Finish.ObjToInt(); _unitOfWorkManage.BeginTran(); BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateTypeEnum.人工å®æ : OperateTypeEnum.èªå¨å®æ); _basicService.LocationInfoService.UpdateLocationStatus(locationInfo, stockInfo.PalletType, LocationStatusEnum.InStock, stockInfo.WarehouseId); @@ -332,7 +342,7 @@ List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>(); List<Dt_MesOutboundOrder> mesOutboundOrders = new List<Dt_MesOutboundOrder>(); if ((outStockLockInfos == null || outStockLockInfos.Count == 0) && warehouse.WarehouseCode != WarehouseEnum.HA64.ToString()) if ((outStockLockInfos == null || outStockLockInfos.Count == 0) && warehouse.WarehouseCode != WarehouseEnum.HA64.ToString() && task.TaskType != TaskTypeEnum.OutEmpty.ObjToInt()) { return WebResponseContent.Instance.Error($"æªæ¾å°åºåºè¯¦æ ä¿¡æ¯"); } @@ -384,6 +394,11 @@ stockInfo.StockStatus = StockStatusEmun.åºåºå®æ.ObjToInt(); _stockService.StockInfoService.Repository.UpdateData(stockInfo); } else if (task.TaskType == TaskTypeEnum.OutEmpty.ObjToInt()) { _basicService.LocationInfoService.UpdateLocationStatus(locationInfo, stockInfo.PalletType, LocationStatusEnum.Free, stockInfo.WarehouseId); _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.人工å®æ); } else if (task.TaskType == TaskTypeEnum.MesOutbound.ObjToInt()) { _outboundService.MesOutboundOrderService.Repository.UpdateData(mesOutboundOrders); ´úÂë¹ÜÀí/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",
