ssd12313

IPC-610

2024-09-22 d79fcd9534d97f5bbb4edb66dbb925dea0479304

 Admin.NET/WCS.Application/PLC/PLCTaskAction.cs

@@ -20,7 +20,6 @@

    private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
    private static readonly SysCacheService sysCacheService = App.GetRequiredService<SysCacheService>();
    private static readonly IHubContext<PlcHub, IPlcHub> _plcHubContext = App.GetService<IHubContext<PlcHub, IPlcHub>>();
    private static readonly SysConfigService _sysConfigService = App.GetService<SysConfigService>();

    private static List<WcsPlc> listPlc = new List<WcsPlc>();
@@ -79,7 +78,7 @@
            var plc = new PLCUtil(modPlc);
            listPlcUtil.Add(plc);
        }
        _plcHubContext.Clients.All.UpdateService(new PLCServiceModel()
        HubUtil.UpdateService(new PLCServiceModel()
        {
            BoRunningState = boRunningState,
            BoOffline = boOffline,
@@ -172,7 +171,7 @@
                            }
                        }

                        Thread.Sleep(10000);
                        Thread.Sleep(1000);
                    }
                    catch (OperationCanceledException)
                    {
@@ -225,14 +224,14 @@
                            {
                                //连接状态变更 通知前端
                                Console.WriteLine($"通知前端变更{modPlc.Text} {modPlc.IsConn}");
                                _plcHubContext.Clients.All.PublicPlcConn(modPlc);
                                HubUtil.PublicPlcConn(modPlc);
                            }
                            sysCacheService.Set("PLCCONN:" + modPlc.Id, modPlc);
                        }
                        else
                        {
                            sysCacheService.Set("PLCCONN:" + modPlc.Id, modPlc);
                            _plcHubContext.Clients.All.PublicPlcConn(modPlc);
                            HubUtil.PublicPlcConn(modPlc);
                        }
                    }
                    Thread.Sleep(1000);
@@ -331,7 +330,7 @@
                                listLog.Add(modLog);
                            }
                            _db.Insertable(listLog).ExecuteCommand();
                            _plcHubContext.Clients.All.PublicAlarm(listPulish);
                            HubUtil.PublicAlarm(listPulish);
                        }
                    }
                    catch (Exception ex)
@@ -398,16 +397,26 @@
                                    {
                                        var value = Convert.ToInt32(item.Value);
                                        var height = Math.Round(value / 790000d * 200).ToInt();
                                        if (modDevice.BoxHeight != height)
                                        var modPosition = listPlcPosition.FirstOrDefault(s => s.DeviceId == modDevice.Id && s.Text == "目的工位");
                                        string EndLocat = "";
                                        if (modPosition != null)
                                        {
                                            var (result2, value2) = modPlcUtil.GetPlcDBValue(modPosition.PosType, modDevice.DbNumber, modPosition.PlcPos);
                                            if (result2.IsSucceed)
                                                EndLocat = Convert.ToString(value2);
                                        }
                                        if (modDevice.BoxHeight != height || modDevice.EndLocat != EndLocat)
                                        {
                                            modDevice.EndLocat = EndLocat;
                                            modDevice.BoxHeight = Math.Round(value / 790000d * 200).ToInt();
                                            var modInfo = new PlcPositionInfo()
                                            {
                                                Type = modPlc.Type,
                                                StationNum = modDevice.StationNum,
                                                BoxHeight = modDevice.BoxHeight
                                                BoxHeight = modDevice.BoxHeight,
                                                EndLocat = EndLocat,
                                            };
                                            _plcHubContext.Clients.All.PublicPosition(modInfo);
                                            HubUtil.PublicPosition(modInfo);
                                            UpdatePosition(modInfo);
                                        }
                                    }
@@ -420,7 +429,7 @@
                                            modDevice.BoHaveItem = value;
                                            //下发状态
                                            var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum, BoHaveItem = value };
                                            _plcHubContext.Clients.All.PublicPosition(modInfo);
                                            HubUtil.PublicPosition(modInfo);
                                            UpdatePosition(modInfo);
                                        }
                                    }
@@ -430,7 +439,7 @@
                            }
                        }
                    }
                    Thread.Sleep(1000);
                    Thread.Sleep(300);
                }
                catch (Exception ex)
                {