From 8b0d749cfbec8bf0afe71a8956bfeeed6f27cdfc Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期四, 16 一月 2025 15:32:30 +0800
Subject: [PATCH] Merge branch 'csc'

---
 Admin.NET/WCS.Application/Enum/PLCEnum.cs |  131 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 126 insertions(+), 5 deletions(-)

diff --git a/Admin.NET/WCS.Application/Enum/PLCEnum.cs b/Admin.NET/WCS.Application/Enum/PLCEnum.cs
index 786fcbb..ac2f2ce 100644
--- a/Admin.NET/WCS.Application/Enum/PLCEnum.cs
+++ b/Admin.NET/WCS.Application/Enum/PLCEnum.cs
@@ -12,20 +12,35 @@
     [Description("鍫嗚泛鏈�")]
     StackingMachine = 0,
     /// <summary>
-    /// 杈撻�佺嚎
+    /// 鎵樼洏杈撻�佺嚎
     /// </summary>
-    [Description("杈撻�佺嚎")]
+    [Description("鎵樼洏杈撻�佺嚎")]
     ConveyorLine = 1,
     /// <summary>
-    /// RGV灏忚溅
+    /// AGV灏忚溅
     /// </summary>
-    [Description("RGV灏忚溅")]
-    RGV = 2,
+    [Description("AGV灏忚溅")]
+    AGV = 2,
     /// <summary>
     /// 鍙犳媶鎵樻満
     /// </summary>
     [Description("鍙犳媶鎵樻満")]
     PalletMachine = 3,
+    /// <summary>
+    /// 浠剁杈撻�佺嚎
+    /// </summary>
+    [Description("浠剁杈撻�佺嚎")]
+    BoxConveyorLine = 4,
+    /// <summary>
+    /// 鐮佸灈鏈哄櫒浜�
+    /// </summary>
+    [Description("鐮佸灈鏈哄櫒浜�")]
+    RobotPalletizer = 5,
+    /// <summary>
+    /// 鎷嗗灈鏈哄櫒浜�
+    /// </summary>
+    [Description("鎷嗗灈鏈哄櫒浜�")]
+    StackingRobot = 6,
 }
 
 /// <summary>
@@ -44,4 +59,110 @@
     /// </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,
+}
+/// <summary>
+/// 浜や簰绫诲瀷
+/// </summary>
+[Description("浜や簰绫诲瀷")]
+public enum DeviceTypeEnum
+{
+    /// <summary>
+    /// 涓氬姟
+    /// </summary>
+    [Description("涓氬姟")]
+    Business = 1,
+    /// <summary>
+    /// 椤甸潰灞曠ず
+    /// </summary>
+    [Description("椤甸潰灞曠ず")]
+    Show = 2,
 }
\ No newline at end of file

--
Gitblit v1.8.0