PLC新增报警与解锁加延时

Service/Execute/Api/TboxApi.cs

@@ -144,6 +144,7 @@ public class TBoxApi
         string url = BASE_URL + StaticStationInfo.TboxUrlUnLock + carNo;
         try
         {
+            Thread.Sleep(1000);
             StationSoftMgr.PutDeviceLog((int)StationConstant.DeviceCode.Tbox,SwapConstant.TboxProtocol.UnLock,
            
                 carNo ,(int)SwapConstant.CommunicationType.Send);

Service/Execute/Step/CarCtrlState.cs

@@ -73,13 +73,15 @@ public class CarCtrlState : IState
                         SoundClient.SoundPlay(SoundEnum.music93);
                         Thread.Sleep(6000);
                         SoundClient.SoundPlay(SoundEnum.music92);
+                        Thread.Sleep(4000);
                     }
                 }
             }, () =>
             {
             Task<bool> result = TBoxApi.UnLockCarManyTimes(machine.RfidReadModel.VelVin);
-           // await result;
+                Thread.Sleep(1000);
-            bool unLock = result.Result;
+                // await result;
+                bool unLock = result.Result;
                 if (!unLock )
                 {
 
@@ -87,7 +89,7 @@ public class CarCtrlState : IState
                     SoundClient.SoundPlay(SoundEnum.music104);
                     Thread.Sleep(7000);
                     SoundClient.SoundPlay(SoundEnum.music105);
-                    Thread.Sleep(4000);
+                    Thread.Sleep(5000);
                 }
                 
             },

Service/Execute/Step/CarPrepareState.cs

@@ -207,8 +207,7 @@ public class CarPrepareState : IState
                         che++;
                         if (che == 10)
                         {
-                            LedClient.SendMsgByKey(InfoEnum.SwapInfo.upcar.GetLed());
+                          
-                            LedClient.SendMsgByKey(InfoEnum.SwapInfo.upcar.GetLed());
                             LedClient.SendMsgByKey(InfoEnum.SwapInfo.upcar.GetLed());
                             SoundClient.SoundPlay(SoundEnum.music100);
                             Thread.Sleep(3000);

Service/Execute/Step/StationReadyState.cs

@@ -284,9 +284,9 @@ public class StationReadyState : IState
         return Invoker.Invoke(" BeginRead read rfid", 1000, 20, machine.IsCanceled,
             () => machine.BeginRfidReadFlag, () =>
             {
-               //  Task<bool> open = RfidApi.Connect();
+                //  Task<bool> open = RfidApi.Connect();
-
+                LedClient.SendMsgByKey(InfoEnum.SwapInfo.diparkir.GetLed());
-                     machine.RfidConnectFlag = true;
+                machine.RfidConnectFlag = true;
                      Task<bool> beginRead = RfidApi.BeginRead();
                      beginRead.Wait();
                      if (!beginRead.Result)

Service/Plc/Handler/SummaryFailuresReqHandler.cs

@@ -205,6 +205,40 @@ public class SummaryFailuresReqHandler : SimpleChannelInboundHandler<SummaryFail
             Alarm("71");
         if (msg.YZSafetyWarehouseBitAlarm)
             Alarm("72");
+        if (msg.XOffsetValuelargeAlarm)
+            Alarm("73");
+        if (msg.YOffsetValuelargeAlarm)
+            Alarm("74");
+        if (msg.CarParkingAngleAlarm)
+            Alarm("75");
+        if (msg.NotSimulatedUnlockingAlarm)
+            Alarm("76");
+        if (msg.ManualJOGAreBatteriesAlarm1)
+            Alarm("77");
+        if (msg.ManualJOGAreBatteriesAlarm2)
+            Alarm("78");
+        if (msg.ManualJOGAreBatteriesAlarm3)
+            Alarm("79");
+        if (msg.ManualJOGAreBatteriesAlarm4)
+            Alarm("80");
+        if (msg.ManualJOGAreBatteriesAlarm5)
+            Alarm("81");
+        if (msg.ManualJOGAreBatteriesAlarm6)
+            Alarm("82");
+        if (msg.ManualJOGAreBatteriesAlarm7)
+            Alarm("83");
+        if (msg.ManualJOGAreBatteriesAlarm8)
+            Alarm("84");
+        if (msg.InitialNotCompleteAlarm)
+            Alarm("85");
+        if (msg.RowFrameSpreaderJawAlarm)
+            Alarm("86");
+
+
+
+
+
+
 
 
         //查询当前充电机的实时报警信息

Service/Plc/Msg/Plc/Req/SummaryFailuresReq.cs

@@ -596,8 +596,89 @@ public class SummaryFailuresReq : ASDU
     [Property(104, 1)]
     public bool YZSafetyWarehouseBitAlarm { get; set; }
 
+    /// <summary>
+    /// X轴偏移值过大报警
+    /// </summary>
+    [Property(105, 1)]
+    public bool XOffsetValuelargeAlarm { get; set; }
+
+    /// <summary>
+    /// Y轴偏移值过大报警
+    /// </summary>
+    [Property(106, 1)]
+    public bool YOffsetValuelargeAlarm { get; set; }
+
+    /// <summary>
+    /// 停车角度过大报警
+    /// </summary>
+    [Property(107, 1)]
+    public bool CarParkingAngleAlarm { get; set; }
+
+    /// <summary>
+    /// 请解锁后模拟车辆到位和模拟解锁按钮打开
+    /// </summary>
+    [Property(108, 1)]
+    public bool NotSimulatedUnlockingAlarm { get; set; }
+
+    /// <summary>
+    /// 手动定位+JOG>1号电池仓内有电池
+    /// </summary>
+    [Property(109, 1)]
+    public bool ManualJOGAreBatteriesAlarm1 { get; set; }
+
+    /// <summary>
+    /// 手动定位+JOG>2号电池仓内有电池
+    /// </summary>
+    [Property(110, 1)]
+    public bool ManualJOGAreBatteriesAlarm2 { get; set; }
 
+    /// <summary>
+    /// 手动定位+JOG>3号电池仓内有电池
+    /// </summary>
+    [Property(111, 1)]
+    public bool ManualJOGAreBatteriesAlarm3 { get; set; }
 
+    /// <summary>
+    /// 手动定位+JOG>4号电池仓内有电池
+    /// </summary>
+    [Property(112, 1)]
+    public bool ManualJOGAreBatteriesAlarm4 { get; set; }
+    /// <summary>
+    /// 手动定位+JOG>5号电池仓内有电池
+    /// </summary>
+    [Property(113, 1)]
+    public bool ManualJOGAreBatteriesAlarm5 { get; set; }
+
+    /// <summary>
+    /// 手动定位+JOG>6号电池仓内有电池
+    /// </summary>
+    [Property(114, 1)]
+    public bool ManualJOGAreBatteriesAlarm6 { get; set; }
+
+    /// <summary>
+    /// 手动定位+JOG>7号电池仓内有电池
+    /// </summary>
+    [Property(115, 1)]
+    public bool ManualJOGAreBatteriesAlarm7 { get; set; }
+
+    /// <summary>
+    /// 手动定位+JOG>8号电池仓内有电池
+    /// </summary>
+    [Property(116, 1)]
+    public bool ManualJOGAreBatteriesAlarm8 { get; set; }
+
+    /// <summary>
+    /// 初始化未完成报警
+    /// </summary>
+    [Property(117, 1)]
+    public bool InitialNotCompleteAlarm { get; set; }
+
+
+    /// <summary>
+    /// 行架吊具钩爪异常报警
+    /// </summary>
+    [Property(118, 1)]
+    public bool RowFrameSpreaderJawAlarm { get; set; }
 
 
     ///// <summary>

Service/Sound/SoundClient/SoundClient.cs

@@ -193,7 +193,8 @@ public enum SoundEnum
     music91,//[Info("换电开始印尼")] ErrStartSwap,
     music92,//[Info(" 解锁成功中")] ErrStartSwap,
     music93,//[Info(" 解锁成功印尼")] ErrStartSwap,
-    music100=100,//[Info(" 车辆停放不到位印尼")] ErrStartSwap,
+    music99=99,
+    music100,//[Info(" 车辆停放不到位印尼")] ErrStartSwap,
     music101,//[Info(" 车辆停放不到位")] ErrStartSwap,
     music102,//[Info(" 正在等待车辆连接印尼")] ErrStartSwap,
     music103,//[Info(" 正在等待车辆连接")] ErrStartSwap,