hwh
2024-10-12 1dff5c1f690299efcd0fc456eb7d7d20c503775b
Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -498,7 +498,7 @@
                                                    // 根据任务号获取起始工位地址,根据起始工位地址获取LEDIP 推送到LED屏幕。
                                                    var taskModel = _db.Queryable<WcsTask>().First(w => w.TaskNo == modTask.TaskNo);
                                                    modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskModel.StartLocate).Select(s => s.LedIP).First();
                                                    modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskModel.EndLocate).Select(s => s.LedIP).First();
                                                    // led显示内容
                                                    LedDisplay(modDevice.LedIP, "工位:" + modDevice.StationNum, "出库中 ", "托盘号:" + modTask.PalletNo);
@@ -1279,7 +1279,7 @@
                        // 根据任务号获取起始工位地址,根据起始工位地址获取LEDIP 推送到LED屏幕。
                        var taskInfo = _db.Queryable<WcsTask>().First(w => w.TaskNo == modInsertTaskMonitor.TaskNo);
                        modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskInfo.StartLocate).Select(s => s.LedIP).First();
                        modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskInfo.EndLocate).Select(s => s.LedIP).First();
                        // led显示内容
                        LedDisplay(modDevice.LedIP, "到达工位:" + modDevice.StationNum, "出库完成 " + $"储位地址:{modInsertTaskMonitor.StartLocat}", "托盘号:" + palletVal);
@@ -1359,7 +1359,7 @@
                        // 通知任务界面任务已存在更新 请更新界面
                        HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                        // led显示内容
                        modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == modTask.StartLocate).Select(s => s.LedIP).First();
                        modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == modTask.EndLocate).Select(s => s.LedIP).First();
                        LedDisplay(modDevice.LedIP, "工位:" + modTask.StartLocate, $"拣选完成,托盘离开工位", "托盘号:" + modTask.PalletNo);
                    }
                    #endregion
@@ -1793,6 +1793,23 @@
                                            // 将入库任务由正在执行改为正在执行
                                            taskModel.Status = TaskStatusEnum.Doing;
                                            _db.Updateable(taskModel).ExecuteCommand();
                                            // 插入任务明细
                                            var modInsertTaskMonitor = new WcsTaskMonitor()
                                            {
                                                TaskNo = TaskNo,
                                                PlcId = modDevice.Id,
                                                PlcName = modDevice.Text,
                                                InteractiveMsg = $"写入指令50:申请巷道成功",
                                                PalletNo = palletNo,
                                                Status = TaskStatusEnum.Complete,
                                                StartLocat = modDevice.StationNum,
                                                EndLocat = strMsg,
                                            };
                                            // 插入交互日志
                                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
                                            // 通知任务界面任务已存在更新 请更新界面
                                            HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                                        }
                                    }
@@ -1871,6 +1888,23 @@
                                            // 将入库任务由正在执行改为正在执行
                                            taskModel.Status = TaskStatusEnum.Doing;
                                            _db.Updateable(taskModel).ExecuteCommand();
                                            // 插入任务明细
                                            var modInsertTaskMonitor = new WcsTaskMonitor()
                                            {
                                                TaskNo = TaskNo,
                                                PlcId = modDevice.Id,
                                                PlcName = modDevice.Text,
                                                InteractiveMsg = $"写入指令50:申请巷道成功",
                                                PalletNo = palletNo,
                                                Status = TaskStatusEnum.Complete,
                                                StartLocat = modDevice.StationNum,
                                                EndLocat = strMsg,
                                            };
                                            // 插入交互日志
                                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
                                            // 通知任务界面任务已存在更新 请更新界面
                                            HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                                        }
                                    }
                                }