优化

yanjinhui

2026-03-21 687aeb1192d8bb180ae9eb848a667436186c9898

优化

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs

@@ -80,8 +80,20 @@
                            task.TaskState = (int)TaskStatusEnum.Takeing;
                            TaskFeedback(task, 1);
                            break;
                        case "outbin":
                        case "outbin"://离开起点
                            {
                                if (task.TaskType == TaskTypeEnum.CK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
                                {
                                    var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
                                    if (device == null) task.ExceptionMessage = "未找到提升机信息";
                                    else
                                    {
                                        if (device.IsConnected)
                                            device.SetValue(HoistEnum.Outboundboxon, 1);
                                        else
                                            task.ExceptionMessage = "提升机信息设备连接失败";
                                    }
                                }
                                ///判断任务是否跟设备有关
                                TaskFromCompleted(task, deviceTypeEnum);
                            }
@@ -98,7 +110,7 @@
                                BaseDal.UpdateData(task);
                            }
                            break;
                        case "end":
                        case "end"://任务完成通知
                            {
                                ///判断任务是否跟设备有关
                                if(task.TaskType== TaskTypeEnum.RK3F.ObjToInt()&& task.TaskState == (int)TaskStatusEnum.CheckPalletCodeFinish)

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -1137,7 +1137,17 @@
                }
                else if (getLocationInfo.WarehouseId == 3)
                {

                    //这里是提升机的
                    var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
                    if (device == null) throw new Exception("未找到提升机设备信息");
                    if (!device.IsConnected) throw new Exception("PLC1提升机设备连接失败");
                    var value = device.GetValue<HoistEnum, short>(HoistEnum.Outboundmaterialbox, "TSJ");
                    list.Add(new
                    {
                        LoctionCode = value,
                        LocationStatus = value!=0? 100 : 0,
                        EnableStatus = 0,
                    });
                }
                else if (getLocationInfo.WarehouseId == 4)
                {

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs

@@ -41,7 +41,6 @@

        public Task Execute(IJobExecutionContext context)
        {

            bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
            if (flag && value != null)
            {
@@ -103,16 +102,31 @@
                        }
                        else if(task.TaskType == TaskTypeEnum.CK3F.ObjToInt()) //出库
                        {
                            ////出库料箱缓存数量
                            ////出库料箱缓存数量(这个是库区查询的时候要查一下，返给wms)
                            //if (device.GetValue<HoistEnum, short>(HoistEnum.Outboundmaterialbox, "TSJ") == 0) throw new Exception("没有出库料箱缓存数量为空");
                            //读取3楼出库料箱到位
                            if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, "TSJ") != 1) throw new Exception("3楼出库料箱没有到位");
                            if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, "TSJ") != 1)
                            {
                                if (task.ExceptionMessage != "3楼出库料箱没有到位")
                                {
                                    task.ExceptionMessage = "3楼出库料箱没有到位";
                                    Uptasks.Add(task);
                                }
                                continue;
                            }
                            //然后调用输送线接口，通知输送线有料箱需要入库，任务举行执行
                            if (_taskService.Hikvisiontaskscontinue(task.WMSTaskNum).Status == false) throw new Exception($"3楼出库任务举行执行失败，错误信息{_taskService.Hikvisiontaskscontinue(task.WMSTaskNum).Message}");//给任务号

                            //去更新任务里写值
                            //写3楼出库箱取货完成
                            device.SetValue<HoistEnum, short>(HoistEnum.Outboundboxon, 1);
                            var result = _taskService.Hikvisiontaskscontinue(task.WMSTaskNum);
                            if (result.Status == false) 
                            {
                                if (task.ExceptionMessage != result.Message)
                                {
                                    task.ExceptionMessage = result.Message;
                                    Uptasks.Add(task);
                                }
                                continue;
                            }
                            task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
                            Uptasks.Add(task);
                        }
                        else if (task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt())//4楼入库
                        {
@@ -139,40 +153,37 @@


                    //查找三楼入库任务状态为CheckPalletCodeing的任务托盘号确认中
                    var RK3FTasks = taskList.Where(x => x.TaskType == TaskTypeEnum.RK3F.ObjToInt()&&x.TaskState== (int)TaskStatusEnum.CheckPalletCodeing).ToList();
                    foreach (var item in RK3FTasks)
                    var RK3FTasks = _taskService.Repository.QueryFirst(x => x.TaskType == TaskTypeEnum.RK3F.ObjToInt() && x.TaskState == (int)TaskStatusEnum.CheckPalletCodeing);
                    if (RK3FTasks!=null)
                    {
                        var Barcode = device.SetValue<HoistEnum, short>(HoistEnum.Codereadingtriggered, 1);
                        //检查3楼入库箱号是多少，然后传给wms
                        var BinNumber = device.GetValue<HoistEnum, string>(HoistEnum.Inboxnumber, "TSJ");
                        //根据读到的箱号进行料箱检验，检验通过就触发读码器读取，如果不通过就抛出异常
                        var Verification = _taskService.MaterialBoxInspection(item.WMSTaskNum, BinNumber.ToString());
                        var Verification = _taskService.MaterialBoxInspection(RK3FTasks.WMSTaskNum, BinNumber.ToString());
                        if (!Verification.Status) 
                        {
                            if (!(item.ExceptionMessage == Verification.Message))
                            if (!(RK3FTasks.ExceptionMessage == Verification.Message))
                            {
                                item.ExceptionMessage = Verification.Message;
                                Uptasks.Add(item);
                                RK3FTasks.ExceptionMessage = Verification.Message;
                                Uptasks.Add(RK3FTasks);
                            }
                            //料箱验证写好后，需要更改
                            item.TargetAddress = Verification.Data.ToString();
                            RK3FTasks.TargetAddress = Verification.Data.ToString();
                        } 
                        
                        //如果料箱检验成功就写入读码器的值
                        var result = _taskService.Hikvisiontaskscontinue(item.WMSTaskNum, item.TargetAddress);
                        var result = _taskService.Hikvisiontaskscontinue(RK3FTasks.WMSTaskNum, RK3FTasks.TargetAddress);
                        if (result.Status == false)
                        {
                            if (item.ExceptionMessage != result.Message)
                            if (RK3FTasks.ExceptionMessage != result.Message)
                            {
                                item.ExceptionMessage = result.Message;
                                Uptasks.Add(item);
                                RK3FTasks.ExceptionMessage = result.Message;
                                Uptasks.Add(RK3FTasks);
                            }
                            continue;
                        }
                        item.TaskState = (int)TaskStatusEnum.CheckPalletCodeFinish;


                        Uptasks.Add(item);
                        RK3FTasks.TaskState = (int)TaskStatusEnum.CheckPalletCodeFinish;
                        Uptasks.Add(RK3FTasks);
                    }
                    if (Uptasks.Count > 0)
                    {

 ÏîÄ¿×ÊÁÏ/ÓëÉ豸½»»¥½Ó¿Ú/¸ßÆÕPLC-WCSͨѶ±äÁ¿±í.xlsx

Binary files differ