From c06382f1b619e1dc7f37be36a0cee126239abdee Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 30 十月 2024 11:35:22 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
Admin.NET/WCS.Application/Hub/IPlcHub.cs | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/Admin.NET/WCS.Application/Hub/IPlcHub.cs b/Admin.NET/WCS.Application/Hub/IPlcHub.cs
index e3a92ab..1f58fde 100644
--- a/Admin.NET/WCS.Application/Hub/IPlcHub.cs
+++ b/Admin.NET/WCS.Application/Hub/IPlcHub.cs
@@ -27,11 +27,39 @@
/// </summary>
/// <param name="context"></param>
/// <returns></returns>
- Task PublicAlarm(WcsAlarmInfoOutput context);
+ Task PublicAlarm(List<WcsAlarmInfo> context);
/// <summary>
/// 淇敼鏈嶅姟鐘舵��
/// </summary>
/// <param name="context"></param>
Task UpdateService(PLCServiceModel context);
+
+ /// <summary>
+ /// 涓嬪彂鎺у埗鍙颁綅缃俊鎭�
+ /// </summary>
+ /// <param name="context"></param>
+ /// <returns></returns>
+ Task PublicPosition(PlcPositionInfo context);
+ }
+ public class PlcPositionInfo
+ {
+ /// <summary>
+ /// 宸ヤ綅鍙�
+ /// </summary>
+ public string StationNum { get; set; }
+ /// <summary>
+ /// 鏄惁鏈夌墿鍝�
+ /// </summary>
+ public bool BoHaveItem { get; set; }
+ /// <summary>
+ /// Plc绫诲瀷
+ /// </summary>
+ public PLCTypeEnum Type { get; set; }
+
+ /// <summary>
+ /// 璺烘満浣嶇疆
+ /// </summary>
+ public int BoxHeight { get; set; }
+ public string EndLocat { get; set; }
}
}
--
Gitblit v1.8.0