WMS添加AGV任务完成取消

dengjunjie

4 天以前 fb79dc54d6484146b74d29bf5644df880fc1fa01

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

@@ -98,28 +98,41 @@
                    return WebResponseContent.Instance.Error("未找到任务信息");
                }
                _unitOfWorkManage.BeginTran();
                MethodInfo? methodInfo = GetType().GetMethod(((TaskTypeEnum)task.TaskType) + "TaskCompleted");
                if (methodInfo != null)
                #region MyRegion
                switch ((TaskTypeEnum)task.TaskType)
                {
                    WebResponseContent? responseContent = (WebResponseContent?)methodInfo.Invoke(this, new object[] { task });
                    if (responseContent != null)
                    {
                        if (App.User.UserId > 0)
                        {
                            var response = HttpHelper.Post<WebResponseContent>(url + "StackCraneTaskCompleted?taskNum=" + task.TaskNum, "", "任务完成");
                            if (!response.Status)
                            {
                                _unitOfWorkManage.RollbackTran();
                                return WebResponseContent.Instance.Error(response.Message);
                            }
                            _unitOfWorkManage.CommitTran();
                            return content = responseContent;
                        }
                        _unitOfWorkManage.CommitTran();
                        return content = responseContent;
                    }
                    case TaskTypeEnum.Inbound:
                        content = InboundTaskCompleted(task);
                        break;
                    case TaskTypeEnum.Outbound:
                        content = OutboundTaskCompleted(task);
                        break;
                    case TaskTypeEnum.PalletInbound:
                        content = PalletInboundTaskCompleted(task);
                        break;
                    case TaskTypeEnum.PalletOutbound:
                        content = PalletOutboundTaskCompleted(task);
                        break;
                    case TaskTypeEnum.Relocation:
                        content = RelocationTaskCompleted(task);
                        break;
                    case TaskTypeEnum.AGVCarry:
                        content = AGVCarryTaskCompleted(task);
                        break;
                    default:
                        return content = WebResponseContent.Instance.Error("未找到任务类型对应业务处理逻辑");
                }
                return content = WebResponseContent.Instance.Error("未找到任务类型对应业务处理逻辑");
                if (content.Status)
                {
                    if (App.User.UserId > 0 && task.TaskType != TaskTypeEnum.AGVCarry.ObjToInt())
                    {
                        content = HttpHelper.Post<WebResponseContent>(url + "StackCraneTaskCompleted?taskNum=" + task.TaskNum, "", "任务完成");
                        if (!content.Status) throw new Exception(content.Message);
                    }
                    _unitOfWorkManage.CommitTran();
                }
                return content;
                #endregion
            }
            catch (Exception ex)
            {
@@ -128,9 +141,14 @@
            }
            finally
            {
                WriteLog.GetLog("任务完成").Write($"操作人：{(App.User.UserId>0? App.User.UserName: "System")}{ Environment.NewLine}{ JsonConvert.SerializeObject(content)}", "任务完成");
                WriteLog.GetLog("任务完成").Write($"操作人：{(App.User.UserId > 0 ? App.User.UserName : "System")}{Environment.NewLine}任务号：{taskNum}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "任务完成");
            }
        }
        /// <summary>
        /// ä»»åŠ¡å–消
        /// </summary>
        /// <param name="taskNum"></param>
        /// <returns></returns>
        public WebResponseContent TaskCancel(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
@@ -139,43 +157,53 @@
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null)
                {
                    return content=WebResponseContent.Instance.Error("未找到任务信息");
                    return content = WebResponseContent.Instance.Error("未找到任务信息");
                }
                _unitOfWorkManage.BeginTran();
                MethodInfo? methodInfo = GetType().GetMethod(((TaskTypeEnum)task.TaskType) + "TaskCancel");
                if (methodInfo != null)
                #region MyRegion
                switch ((TaskTypeEnum)task.TaskType)
                {
                    WebResponseContent? responseContent = (WebResponseContent?)methodInfo.Invoke(this, new object[] { task });
                    if (responseContent != null)
                    {
                        if (responseContent != null)
                        {
                            if (App.User.UserId > 0)
                            {
                                var response = HttpHelper.Post<WebResponseContent>(url + "TaskCancel?taskNum=" + task.TaskNum, "", "任务取消");
                                if (!response.Status)
                                {
                                    _unitOfWorkManage.RollbackTran();
                                    return content=WebResponseContent.Instance.Error(response.Message);
                                }
                                _unitOfWorkManage.CommitTran();
                                return content=responseContent;
                            }
                            _unitOfWorkManage.CommitTran();
                            return content=responseContent;
                        }
                    }
                    case TaskTypeEnum.Inbound:
                        content = InboundTaskCancel(task);
                        break;
                    case TaskTypeEnum.Outbound:
                        content = OutboundTaskCancel(task);
                        break;
                    case TaskTypeEnum.PalletInbound:
                        content = PalletInboundTaskCancel(task);
                        break;
                    case TaskTypeEnum.PalletOutbound:
                        content = PalletOutboundTaskCancel(task);
                        break;
                    case TaskTypeEnum.Relocation:
                        content = RelocationTaskCancel(task);
                        break;
                    case TaskTypeEnum.AGVCarry:
                        content = AGVCarryTaskCompleted(task);
                        break;
                    default:
                        return content = WebResponseContent.Instance.Error("未找到任务类型对应业务处理逻辑");
                }
                return content=WebResponseContent.Instance.Error("未找到任务类型对应业务处理逻辑");
                if (content.Status)
                {
                    if (App.User.UserId > 0 && task.TaskType != TaskTypeEnum.AGVCarry.ObjToInt())
                    {
                        content = HttpHelper.Post<WebResponseContent>(url + "TaskCancel?taskNum=" + task.TaskNum, "", "任务取消");
                        if (!content.Status) throw new Exception(content.Message);
                    }
                    _unitOfWorkManage.CommitTran();
                }
                return content;
                #endregion
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return content=WebResponseContent.Instance.Error(ex.Message);
                return content = WebResponseContent.Instance.Error(ex.Message);
            }
            finally
            {
                WriteLog.GetLog("任务取消").Write($"操作人：{(App.User.UserId > 0 ? App.User.UserName : "System")}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "任务取消");
                WriteLog.GetLog("任务取消").Write($"操作人：{(App.User.UserId > 0 ? App.User.UserName : "System")}{Environment.NewLine}任务号：{taskNum}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "任务取消");
            }
        }

@@ -199,7 +227,7 @@
                }
                else if (task.TaskType == TaskTypeEnum.Relocation.ObjToInt())
                {
                    task.TaskStatus = InTaskStatusEnum.RelocationExecuting.ObjToInt();
                    task.TaskStatus = RelocationTaskStatusEnum.RelocationExecuting.ObjToInt();
                }
                else
                {
@@ -208,10 +236,10 @@
                _unitOfWorkManage.BeginTran();
                task.Dispatchertime = DateTime.Now;
                task.ModifyDate = DateTime.Now;
                task.Modifier = "System";
                task.Modifier = App.User.UserId > 0 ? App.User.UserName : "System";
                BaseDal.UpdateData(task);
                _unitOfWorkManage.CommitTran();
                 return content = WebResponseContent.Instance.OK();
                return content = WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
@@ -223,14 +251,37 @@
        {
            try
            {
                _unitOfWorkManage.BeginTran();
                decimal beforeQuantity = 0;

                Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
                Dt_StockInfoDetail stockInfoDetail = stockInfo.Details.FirstOrDefault();

                Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);

                CheckCompleted(stockInfo, locationInfo);

                Dt_InboundOrder inboundOrder = _inboundService.InbounOrderService.GetInboundOrder(stockInfoDetail.OrderNo);
                if (inboundOrder != null)
                {
                    Dt_InboundOrderDetail? inboundOrderDetail = inboundOrder.Details.Where(x => x.BatchNo == stockInfoDetail.BatchNo).FirstOrDefault();
                    if (inboundOrderDetail != null)
                    {
                        inboundOrderDetail.OverInQuantity++;
                        inboundOrderDetail.OrderDetailStatus = inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity ? OrderDetailStatusEnum.Over.ObjToInt() : OrderDetailStatusEnum.GroupAndInbound.ObjToInt();

                        if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt())
                        {
                            if (inboundOrder.Details.FirstOrDefault(x => x.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt() && x.BatchNo != inboundOrderDetail.BatchNo) == null)
                            {
                                inboundOrder.OrderStatus = InboundStatusEnum.入库完成.ObjToInt();
                                _inboundService.InbounOrderService.Repository.DeleteAndMoveIntoHty(inboundOrder, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                                _inboundService.InboundOrderDetailService.Repository.DeleteAndMoveIntoHty(inboundOrder.Details, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                            }
                        }
                        _inboundService.InboundOrderDetailService.Repository.UpdateData(inboundOrderDetail);
                    }
                    _inboundService.InbounOrderService.Repository.UpdateData(inboundOrder);
                }

                stockInfo.LocationCode = locationInfo.LocationCode;
                stockInfo.StockStatus = StockStatusEmun.已入库.ObjToInt();
@@ -248,16 +299,14 @@
                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);

                _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Inbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
                _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) + beforeQuantity, StockChangeType.Inbound,task.TaskNum);
                _unitOfWorkManage.CommitTran();
                _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) + beforeQuantity, StockChangeType.Inbound, task.TaskNum);
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
            

        }

        /// <summary>
@@ -277,7 +326,7 @@
                    LocationCode = task.TargetAddress,
                    StockStatus = StockStatusEmun.已入库.ObjToInt(),
                    Creater = App.User.UserId > 0 ? App.User.UserName : "System",
                    CreateDate = App.User.UserId > 0 ? DateTime.Now : DateTime.Now,
                    CreateDate = DateTime.Now,
                };
                Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);

@@ -335,7 +384,6 @@
        {
            try
            {
                _unitOfWorkManage.BeginTran();
                decimal beforeQuantity = 0;
                Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);

@@ -368,13 +416,11 @@
                _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
                _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) - beforeQuantity, StockChangeType.Outbound, task.TaskNum);

                _unitOfWorkManage.CommitTran();
                return OnOutboundTaskCompleted?.Invoke(task) ?? WebResponseContent.Instance.OK();

            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
@@ -451,7 +497,7 @@

                _basicService.LocationInfoService.RelocationFree(locationEnd, task.TaskNum);

                task.TaskStatus = InTaskStatusEnum.RelocationFinish.ObjToInt();
                task.TaskStatus = RelocationTaskStatusEnum.RelocationFinish.ObjToInt();
                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);

                _unitOfWorkManage.CommitTran();
@@ -460,6 +506,18 @@
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        public WebResponseContent AGVCarryTaskCompleted(Dt_Task task)
        {
            try
            {
                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
@@ -538,7 +596,7 @@
            }
        }

        

        public WebResponseContent OutboundTaskCancel(Dt_Task task)
        {
            try
@@ -617,7 +675,7 @@

                task.TaskStatus = OutTaskStatusEnum.OutCancel.ObjToInt();
                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                

                _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);

                _unitOfWorkManage.CommitTran();
@@ -643,11 +701,11 @@
                stockInfo.StockStatus = StockStatusEmun.已入库.ObjToInt();
                _stockService.StockInfoService.Repository.UpdateData(stockInfo);

                locationEnd.LocationStatus= LocationStatusEnum.Free.ObjToInt();
                locationEnd.LocationStatus = LocationStatusEnum.Free.ObjToInt();
                _basicService.LocationInfoService.RelocationFree(locationStart, task.TaskNum);
                _basicService.LocationInfoService.Repository.UpdateData(locationEnd);

                task.TaskStatus = InTaskStatusEnum.RelocationCancel.ObjToInt();
                task.TaskStatus = RelocationTaskStatusEnum.RelocationCancel.ObjToInt();
                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);

                _unitOfWorkManage.CommitTran();
@@ -661,7 +719,7 @@
        }
        public bool DepthTask(Dt_LocationInfo location)
        {
            if (location != null )
            if (location != null)
            {
                Dt_LocationInfo locations = _locationInfoService.Repository.QueryFirst(x => x.RoadwayNo == location.RoadwayNo && x.Column == location.Column && x.Layer == location.Layer && x.Depth != location.Depth && x.Row != location.Row && (SqlFunc.Abs(x.Row - location.Row) == 1));
                if (locations != null)
@@ -682,7 +740,7 @@
                {
                    expression = x => x.Creater == App.User.UserName;
                }
                var task = BaseDal.Db.Queryable<Dt_Task>().OrderByDescending(x => x.CreateDate).Take(10).Select(x => new Dt_Task { TaskNum = x.TaskNum, PalletCode=x.PalletCode, TaskType=x.TaskType,SourceAddress=x.SourceAddress,TargetAddress=x.TargetAddress }).ToList();
                var task = BaseDal.Db.Queryable<Dt_Task>().OrderByDescending(x => x.CreateDate).Take(10).Select(x => new Dt_Task { TaskNum = x.TaskNum, PalletCode = x.PalletCode, TaskType = x.TaskType, SourceAddress = x.SourceAddress, TargetAddress = x.TargetAddress }).ToList();
                content = WebResponseContent.Instance.OK(data: task);
            }
            catch (Exception ex)