0124

patrick.xu

2021-01-24 b5e7fa2db4ac36fdb7bf9fd330d12a72ade9d483

 src/Bro.M071.Process/M071Process_MotionCard.cs

@@ -29,6 +29,7 @@
                if (machineState == value)
                    return;

                LogAsync(DateTime.Now, $"设备状态切换:{machineState.ToString()}->{value.ToString()}", "");
                machineState = value;

                Task.Run(() =>
@@ -249,15 +250,15 @@

            RaisedAlarm("");

            if (MachineState != MachineState.Pause)
            {
                MachineState = MachineState.Ready;
            }
            else
            {
                LogAsync(DateTime.Now, "设备暂停中，无法复位", "");
                return new ProcessResponse(true);
            }
            //if (MachineState != MachineState.Pause)
            //{
            MachineState = MachineState.Ready;
            //}
            //else
            //{
            //    LogAsync(DateTime.Now, "设备暂停中，无法复位", "");
            //    return new ProcessResponse(true);
            //}

            if (IsEmergencyStopped)
            {
@@ -301,8 +302,11 @@
            MachineState = MachineState.Resetting;
            MotionCardDefaultRun("FullReset", ref opConfig, ref invokeDevice);

            productionList.ForEach(u => u.Dispose());
            productionList.Clear();
            lock (productionLock)
            {
                productionList.ForEach(u => u.Dispose());
                productionList.Clear();
            }

            OnFullResetDone?.Invoke();