优化出入库逻辑

dengjunjie

6 天以前 4f39dcc195f28fa275fc2d065fbf1bf6a46c21b7

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs

@@ -22,17 +22,21 @@
        public WebResponseContent ShelfOutboundCarry(Dt_Task outTask)
        {
            //判断是否为电芯库，辅料库人工处理(立库目标地址转换成AGV站点地址)
            Dt_CachePoint cachePoint = GetCachePointByStartPoint(outTask.TargetAddress);
            if (!outTask.Roadway.Contains("CP")) return WebResponseContent.Instance.OK();
            Dt_RoadwayInfo dt_RoadwayInfo = _basicService.RoadwayInfoService.Repository.QueryFirst(x => x.OutSCStationCode == outTask.TargetAddress);
            if (dt_RoadwayInfo == null) return WebResponseContent.Instance.OK();
            Dt_CachePoint startcachePoint = new Dt_CachePoint();
            Dt_CachePoint cachePoint = GetCachePointByStartPoint(dt_RoadwayInfo.OutStationCode, ref startcachePoint);

            Dt_Task task = new()
            {
                CurrentAddress = outTask.TargetAddress,
                CurrentAddress = startcachePoint.PointCode,
                Grade = 0,
                NextAddress = cachePoint.PointCode,
                OrderNo = outTask.OrderNo,
                PalletCode = outTask.PalletCode + "-AGV",
                Roadway = "",
                SourceAddress = outTask.TargetAddress,
                SourceAddress = startcachePoint.PointCode,
                TargetAddress = cachePoint.PointCode,
                SourceKey = outTask.TaskId,
                TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
@@ -42,10 +46,68 @@
                Creater = App.User.UserId > 0 ? App.User.UserName : "System",
            };
            cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
            startcachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();

            _basicService.CachePointService.Repository.UpdateData(cachePoint);
            _basicService.CachePointService.Repository.UpdateData(startcachePoint);
            Repository.AddData(task);
            SendAGVTask(task, cachePoint);
            return WebResponseContent.Instance.OK();
        }

        /// <summary>
        /// è´§ä½ç»‘定
        /// </summary>
        /// <param name="qty"></param>
        /// <param name="Point"></param>
        /// <returns></returns>
        public WebResponseContent Bind(string qty, string point)
        {
            try
            {
                if (Repository.QueryFirst(x => x.SourceAddress == point &&
                x.TaskStatus < AGVTaskStatusEnum.DoneFetch.ObjToInt() ||
                x.TargetAddress == point) != null)
                    throw new Exception($"站点【{point}】存在任务！");
                Dt_CachePoint? cachePoint = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == point);
                if (cachePoint == null) throw new Exception("未找到缓存点!");
                if (cachePoint.AreaId != 4) throw new Exception("当前缓存点区域无绑定权限!");
                cachePoint.PointStatus = LocationStatusEnum.InStock.ObjToInt();
                cachePoint.Remark = qty;
                cachePoint.Modifier = App.User.UserName;
                _basicService.CachePointService.Repository.UpdateData(cachePoint);
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        /// <summary>
        /// é‡Šæ”¾ç¼“存点
        /// </summary>
        /// <param name="point"></param>
        /// <returns></returns>
        public WebResponseContent AcrossFloorCallMat(string point)
        {
            try
            {
                if (Repository.QueryFirst(x => x.SourceAddress == point &&
                x.TaskStatus < AGVTaskStatusEnum.DoneFetch.ObjToInt() ||
                x.TargetAddress == point) != null)
                    throw new Exception($"站点【{point}】存在任务！");
                Dt_CachePoint? cachePoint = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == point);
                if (cachePoint == null) throw new Exception("未找到缓存点!");
                if (cachePoint.AreaId != 2 && cachePoint.AreaId != 5 && cachePoint.AreaId != 8)
                    throw new Exception("当前缓存点区域无释放权限!");
                cachePoint.PointStatus = LocationStatusEnum.Free.ObjToInt();
                _basicService.CachePointService.Repository.UpdateData(cachePoint);
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }

        /// <summary>
@@ -57,6 +119,11 @@
        {
            try
            {
                if (Repository.QueryFirst(x => x.SourceAddress == endPoint &&
                x.TaskStatus < AGVTaskStatusEnum.DoneFetch.ObjToInt() ||
                x.TargetAddress == endPoint) != null)
                    throw new Exception($"站点【{endPoint}】存在任务！");

                Dt_CachePoint cachePoint = GetCachePointByEndPoint(endPoint);

                Dt_Task task = new Dt_Task()
@@ -78,7 +145,7 @@

                Db.Ado.BeginTran();
                var response = SendAGVTask(task, cachePoint);
                if (response.Status)
                if (!response.Status)
                {
                    _unitOfWorkManage.RollbackTran();
                    return WebResponseContent.Instance.Error($"{response.Message}");
@@ -105,7 +172,12 @@
        {
            try
            {
                Dt_CachePoint cachePoint = GetCachePointByStartPoint(startPoint);
                if (Repository.QueryFirst(x => x.SourceAddress == startPoint &&
                x.TaskStatus < AGVTaskStatusEnum.DoneFetch.ObjToInt() ||
                x.TargetAddress == startPoint) != null)
                    throw new Exception($"站点【{startPoint}】存在任务！");
                Dt_CachePoint startcachePoint = new Dt_CachePoint();
                Dt_CachePoint cachePoint = GetCachePointByStartPoint(startPoint, ref startcachePoint);

                Dt_Task task = new()
                {
@@ -124,12 +196,21 @@
                };
                cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();

                Db.Ado.BeginTran();
                var response = SendAGVTask(task, cachePoint);
                if (!response.Status)
                {
                    _unitOfWorkManage.RollbackTran();
                    return WebResponseContent.Instance.Error($"{response.Message}");
                }
                _basicService.CachePointService.Repository.UpdateData(cachePoint);
                Repository.AddData(task);
                Db.Ado.CommitTran();
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
@@ -139,12 +220,12 @@
        /// <param name="startPoint"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        private Dt_CachePoint GetCachePointByStartPoint(string startPoint)
        private Dt_CachePoint GetCachePointByStartPoint(string startPoint, ref Dt_CachePoint startcachePoint)
        {
            #region MyRegion
            Dt_CachePoint? StartcachePoint = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == startPoint);
            if (StartcachePoint == null) throw new Exception("未找到缓存点!");

            startcachePoint = StartcachePoint;
            Dt_AreaRouter areaRouter = _basicService.AreaRouterService.Repository.QueryFirst(x => x.StartArea == StartcachePoint.AreaId.ToString());
            if (areaRouter == null) throw new Exception("未找到路由信息!");

@@ -219,6 +300,8 @@
            {
                return new { code = 404, message = "未找到该任务!" };
            }
            if (task.TaskStatus == ((AGVTaskStatusEnum)Enum.Parse(typeof(AGVTaskStatusEnum), model.Task_status)).ObjToInt())
                return new { code = 200, message = "成功" };
            switch ((AGVTaskStatusEnum)Enum.Parse(typeof(AGVTaskStatusEnum), model.Task_status))
            {
                case AGVTaskStatusEnum.Create:
@@ -242,6 +325,10 @@
                                if (qty > 0) startCachePoint.PointStatus = LocationStatusEnum.InStock.ObjToInt();
                                startCachePoint.Remark = qty.ToString();
                            }
                            else if (startCachePoint.AreaId == 1)
                            {
                                startCachePoint.PointStatus = LocationStatusEnum.PalletLock.ObjToInt();
                            }
                            _basicService.CachePointService.Repository.UpdateData(startCachePoint);
                        }
                    }
@@ -264,17 +351,25 @@
                        return new { code = 200, message = "成功" };
                    }
                case AGVTaskStatusEnum.Cancel:
                case AGVTaskStatusEnum.Terminate:
                case AGVTaskStatusEnum.Error:
                    {
                        if (task.TaskStatus < AGVTaskStatusEnum.DoneFetch.ObjToInt())
                        {
                            Dt_CachePoint startCachePoint = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == task.SourceAddress);
                            startCachePoint.PointStatus = LocationStatusEnum.InStock.ObjToInt();
                            _basicService.CachePointService.Repository.UpdateData(startCachePoint);
                        }
                        task.TaskStatus = AGVTaskStatusEnum.Cancel.ObjToInt();
                        BaseDal.DeleteAndMoveIntoHty(task, OperateType.自动删除);
                        return new { code = 200, message = "成功" };
                    }
                case AGVTaskStatusEnum.Terminate:
                    task.TaskStatus = AGVTaskStatusEnum.Terminate.ObjToInt();
                    break;
                case AGVTaskStatusEnum.Error:
                    task.TaskStatus = AGVTaskStatusEnum.Error.ObjToInt();
                    break;
                //case AGVTaskStatusEnum.Terminate:
                //    task.TaskStatus = AGVTaskStatusEnum.Terminate.ObjToInt();
                //    break;
                //case AGVTaskStatusEnum.Error:
                //    task.TaskStatus = AGVTaskStatusEnum.Error.ObjToInt();
                //    break;
                default:
                    return new { code = 404, message = "未定义任务类型!" };
            }