From 54da8a22c438e1495b9c5fbae75ca9d4b5ca7335 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 02 九月 2024 16:04:37 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Admin.NET/WCS.Application/Enum/PLCEnum.cs | 73 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 24 deletions(-)
diff --git a/Admin.NET/WCS.Application/Enum/PLCEnum.cs b/Admin.NET/WCS.Application/Enum/PLCEnum.cs
index 7b0d9e4..d0f45f7 100644
--- a/Admin.NET/WCS.Application/Enum/PLCEnum.cs
+++ b/Admin.NET/WCS.Application/Enum/PLCEnum.cs
@@ -12,20 +12,25 @@
[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>
@@ -106,28 +111,48 @@
//Byte
[Description("Byte")]
Byte = 2,
- //Char
- [Description("Char")]
- Char = 3,
- //Word
- [Description("Word")]
- Word = 4,
- //DWord
- [Description("DWord")]
- DWord = 5,
+ //Short
+ [Description("Short")]
+ Short = 3,
+ //UShort
+ [Description("UShort")]
+ UShort = 4,
//Int
[Description("Int")]
- Int = 6,
+ Int = 5,
//DInt
- [Description("DInt")]
- DInt = 7,
- //Real
- [Description("Real")]
- Real = 8,
- //LReal
- [Description("LReal")]
- LReal = 9,
+ [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 = 10,
+ 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