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 | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/Enum/PLCEnum.cs b/Admin.NET/WCS.Application/Enum/PLCEnum.cs
index 0677b5e..ac2f2ce 100644
--- a/Admin.NET/WCS.Application/Enum/PLCEnum.cs
+++ b/Admin.NET/WCS.Application/Enum/PLCEnum.cs
@@ -12,9 +12,9 @@
[Description("鍫嗚泛鏈�")]
StackingMachine = 0,
/// <summary>
- /// 杈撻�佺嚎
+ /// 鎵樼洏杈撻�佺嚎
/// </summary>
- [Description("杈撻�佺嚎")]
+ [Description("鎵樼洏杈撻�佺嚎")]
ConveyorLine = 1,
/// <summary>
/// AGV灏忚溅
@@ -26,6 +26,21 @@
/// </summary>
[Description("鍙犳媶鎵樻満")]
PalletMachine = 3,
+ /// <summary>
+ /// 浠剁杈撻�佺嚎
+ /// </summary>
+ [Description("浠剁杈撻�佺嚎")]
+ BoxConveyorLine = 4,
+ /// <summary>
+ /// 鐮佸灈鏈哄櫒浜�
+ /// </summary>
+ [Description("鐮佸灈鏈哄櫒浜�")]
+ RobotPalletizer = 5,
+ /// <summary>
+ /// 鎷嗗灈鏈哄櫒浜�
+ /// </summary>
+ [Description("鎷嗗灈鏈哄櫒浜�")]
+ StackingRobot = 6,
}
/// <summary>
@@ -133,4 +148,21 @@
//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