From ec899ee7e9ead5152bd9b4c2dedd75c79cab6fb0 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 28 八月 2024 17:03:44 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Admin.NET/WCS.Application/Enum/PLCEnum.cs | 95 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 92 insertions(+), 3 deletions(-)
diff --git a/Admin.NET/WCS.Application/Enum/PLCEnum.cs b/Admin.NET/WCS.Application/Enum/PLCEnum.cs
index 786fcbb..0677b5e 100644
--- a/Admin.NET/WCS.Application/Enum/PLCEnum.cs
+++ b/Admin.NET/WCS.Application/Enum/PLCEnum.cs
@@ -17,10 +17,10 @@
[Description("杈撻�佺嚎")]
ConveyorLine = 1,
/// <summary>
- /// RGV灏忚溅
+ /// AGV灏忚溅
/// </summary>
- [Description("RGV灏忚溅")]
- RGV = 2,
+ [Description("AGV灏忚溅")]
+ AGV = 2,
/// <summary>
/// 鍙犳媶鎵樻満
/// </summary>
@@ -44,4 +44,93 @@
/// </summary>
[Description("宸ヤ綅绾у埆")]
Station = 2,
+}
+/// <summary>
+/// PLC鏋氫妇
+/// </summary>
+[Description("PLC鏋氫妇")]
+public enum PLCEnum
+{
+ //鏈畾涔�
+ [Description("鏈畾涔�")]
+ None = 0,
+ //瑗块棬瀛怱7-200
+ [Description("瑗块棬瀛怱7-200")]
+ S7_200 = 1,
+ //瑗块棬瀛怱7-200Smar
+ [Description("瑗块棬瀛怱7-200Smar")]
+ S7_200Smart = 2,
+ //瑗块棬瀛怱7-300
+ [Description("瑗块棬瀛怱7-300")]
+ S7_300 = 3,
+ //瑗块棬瀛怱7-400
+ [Description("瑗块棬瀛怱7-400")]
+ S7_400 = 4,
+ //瑗块棬瀛怱7-1200
+ [Description("瑗块棬瀛怱7-1200")]
+ S7_1200 = 5,
+ //瑗块棬瀛怱7-1500
+ [Description("瑗块棬瀛怱7-1500")]
+ S7_1500 = 6,
+ //ModBusTcp
+ [Description("ModBusTcp")]
+ ModBusTcp =7,
+ //ModBusRtu
+ [Description("ModBusRtu")]
+ ModBusRtu = 8,
+ //ModBusAscii
+ [Description("ModBusAscii")]
+ ModBusAscii = 9,
+ //ModbusRtuOverTcp
+ [Description("ModbusRtuOverTcp")]
+ ModbusRtuOverTcp = 10,
+ //涓夎彵
+ [Description("涓夎彵")]
+ Mitsubishi = 11,
+ //娆у榫�
+ [Description("娆у榫�")]
+ OmronFins = 12,
+ //缃楀厠闊﹀皵
+ [Description("缃楀厠闊﹀皵")]
+ AllenBradley = 13,
+}
+/// <summary>
+/// PLC鏁版嵁绫诲瀷鏋氫妇
+/// </summary>
+[Description("PLC鏁版嵁绫诲瀷鏋氫妇")]
+public enum PLCDataTypeEnum
+{
+ //Bit
+ [Description("Bit")]
+ Bit = 1,
+ //Byte
+ [Description("Byte")]
+ Byte = 2,
+ //Short
+ [Description("Short")]
+ Short = 3,
+ //UShort
+ [Description("UShort")]
+ UShort = 4,
+ //Int
+ [Description("Int")]
+ Int = 5,
+ //DInt
+ [Description("UInt")]
+ UInt = 6,
+ //Long
+ [Description("Long")]
+ Long = 7,
+ //ULong
+ [Description("ULong")]
+ ULong = 8,
+ //Float
+ [Description("Float")]
+ Float = 9,
+ //Double
+ [Description("Double")]
+ Double = 10,
+ //String
+ [Description("String")]
+ String = 11,
}
\ No newline at end of file
--
Gitblit v1.8.0