.新框架wcs
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wxw
8 天以前 6a738089d6471d048c32ce7f3dcbd15c935ada79 
 Admin.NET/WCS.Application/Hub/PlcDeviceHub.cs


@@ -16,7 +16,6 @@


[MapHub("/hubs/PlcDevice")]


public class PlcDeviceHub : Hub<IPlcDeviceHub>


{


    private static readonly IHubContext<PlcDeviceHub, IPlcDeviceHub> _plcDeviceHubContext = App.GetService<IHubContext<PlcDeviceHub, IPlcDeviceHub>>();


    private static readonly SysCacheService _sysCacheService = App.GetRequiredService<SysCacheService>();


    private static bool boRunningState = false;


    private static CancellationTokenSource cts;//取消线程标识


@@ -73,7 +72,7 @@




            var listPlc = _db.Queryable<WcsPlc>().Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine).Where(s => s.Enable == YesNoEnum.Y).ToList();


            var listPlcId = listPlc.Select(s => s.Id).ToList();


            var listPlcDevice = _db.Queryable<WcsDevice>().Where(s => s.DeviceType == DeviceTypeEnum.Business && listPlcId.Contains(s.PlcId)).Select<WcsDeviceOutput>().ToList();


            var listPlcDevice = _db.Queryable<WcsDevice>().Where(s => s.DeviceType == DeviceTypeEnum.Business && listPlcId.Contains(s.PlcId) && s.IsDelete).Select<WcsDeviceOutput>().ToList();


            var listPlcDeviceId = listPlcDevice.Select(s => s.Id).ToList();


            var listPlcStation = _db.Queryable<WcsPosition>().Where(s => listPlcDeviceId.Contains(s.DeviceId)).ToList();


            while (true)


@@ -188,6 +187,13 @@


                                    modDevice.PickStorey = Convert.ToInt32(pickStorey);


                                }




                                if (modPlc.Type == PLCTypeEnum.StackingMachine)


                                {


                                    //跺机的起始工位用取货排列层


                                    modDevice.StartLocatNo = $"{modDevice.PickRow.ToString()}{modDevice.PickCol.ToString()}{modDevice.PickStorey.ToString()}";


                                    //跺机的目的工位用放货排列层


                                    modDevice.EndLocatNo = $"{modDevice.ReleaseRow.ToString()}{modDevice.ReleaseCol.ToString()}{modDevice.ReleaseStorey.ToString()}";


                                }


                            }


                        }


                        //else


@@ -219,7 +225,7 @@


                                     modDevice.PickStorey != initialState.PickStorey)))


                            {


                                // 通知用户变更


                                _plcDeviceHubContext.Clients.All.PublicPlcDevice(modDevice);


                                HubUtil.PublicPlcDevice(modDevice);


                            }


                        }


                        initialStates[modDevice.Id] = modDevice.Adapt<WcsDeviceOutput>();