yanjinhui
13 小时以前 d878d164699ad5eafb1241b1de0a108ff79d18a4
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/HKTaskExtend.cs
@@ -71,6 +71,7 @@
                                if (content.Status)
                                {
                                    item.TaskState = (int)TaskStatusEnum.Execut;
                                    _taskService.UpdateData(item);
                                }
                            }
                            else
@@ -85,11 +86,13 @@
                                    {
                                        // åŽŸä»»åŠ¡çŠ¶æ€æ”¹ä¸ºç­‰å¾…ç©ºè½¦
                                        item.TaskState = (int)TaskStatusEnum.WaitingHkAGVMovePosition;
                                        _taskService.UpdateData(item);
                                    }
                                }
                                else
                                {
                                    item.ExceptionMessage = "未找到可用AGV小车";
                                    _taskService.UpdateData(item);
                                }
                            }
                        }
@@ -97,6 +100,7 @@
                    else
                    {
                        item.ExceptionMessage = "获取AGV小车信息失败";
                        _taskService.UpdateData(item);
                    }
                }
                else if (item.TaskType == (int)TaskTypeEnum.F01)
@@ -111,7 +115,7 @@
                        {
                            // ä»Žä»»åŠ¡çš„èµ·å§‹åœ°å€ä¸­æå–éœ€è¦çš„æ¥¼å±‚ä»£ç 
                            string requiredMapCode = GetMapCodeFromAddress(item.SourceAddress);
                            if (string.IsNullOrEmpty(requiredMapCode))
                            if (requiredMapCode==null)
                            {
                                item.ExceptionMessage = $"无法从目标地址 {item.SourceAddress} ä¸­è¯†åˆ«æ¥¼å±‚信息";
                                _taskService.UpdateData(item);
@@ -128,6 +132,7 @@
                                if (content.Status)
                                {
                                    item.TaskState = (int)TaskStatusEnum.Execut;
                                    _taskService.UpdateData(item);
                                }
                            }
                            else
@@ -141,17 +146,18 @@
                                    if (callCarResult.Status)
                                    {
                                        item.TaskState = (int)TaskStatusEnum.WaitingHkAGVMovePosition;
                                        _taskService.UpdateData(item);
                                    }
                                }
                                else
                                {
                                    item.ExceptionMessage = "未找到可用AGV小车";
                                    _taskService.UpdateData(item);
                                }
                            }
                        }
                    }
                }
                _taskService.UpdateData(item);
            }
        }
@@ -263,20 +269,16 @@
        private string GetMapCodeFromAddress(string address)
        {
            if (string.IsNullOrEmpty(address))
            {
                return null;
            }
            // åœ°å€æ ¼å¼ç¤ºä¾‹ ï¼šAA å¯¹åº” 0339050AA0309145
            // keys æ˜¯ AA、BB、CC、DD、EE、FF,vule是对应的点位信息
            foreach (var floorCode in FloorMapping.FloorMap.Keys)
            else
            {
                if (address.Contains(floorCode))
                {
                    return floorCode;//返回的就是AA、BB、CC、DD、EE、FF中的一个,代表对应的楼层
                }
                var reslut = _stationInfoService.Repository.QueryFirst(x => x.StationCode == address);
                return reslut.FloorNumber;
            }
            return null;
        }
    }
}