From 66da0f6808fa8496a3216c94973a552389ab96ba Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 02 九月 2024 13:27:25 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
index b0c07e3..c998258 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
@@ -20,6 +20,11 @@
public virtual long PlcId { get; set; }
/// <summary>
+ /// 浜や簰绫诲瀷
+ /// </summary>
+ public virtual DeviceTypeEnum DeviceType { get; set; }
+
+ /// <summary>
/// 璁惧绾у埆
/// </summary>
public virtual DeviceLevelEnum Level { get; set; }
@@ -138,6 +143,11 @@
/// </summary>
[Required(ErrorMessage = "PlcId涓嶈兘涓虹┖")]
public override long PlcId { get; set; }
+ /// <summary>
+ /// 浜や簰绫诲瀷
+ /// </summary>
+ [Required(ErrorMessage = "浜や簰绫诲瀷涓嶈兘涓虹┖")]
+ public override DeviceTypeEnum DeviceType { get; set; }
/// <summary>
/// 璁惧绾у埆
@@ -210,3 +220,16 @@
{
}
+public class GeneratePosInput
+{
+ /// <summary>
+ /// 涓婚敭Id
+ /// </summary>
+ [Required(ErrorMessage = "涓婚敭Id涓嶈兘涓虹┖")]
+ public long Id { get; set; }
+ /// <summary>
+ /// 璧峰鐐逛綅
+ /// </summary>
+ [Required(ErrorMessage = "璧峰鐐逛綅涓嶈兘涓虹┖")]
+ public int Pos { get; set; }
+}
\ No newline at end of file
--
Gitblit v1.8.0