From 41ca2b65f055b9c7b8f3ce68418423bac15c8e46 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期二, 27 八月 2024 17:00:45 +0800
Subject: [PATCH] plc基础信息优化；堆垛机出库逻辑
---
Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs | 330 ++++++++++++++++++++++++++++++------------------------
1 files changed, 183 insertions(+), 147 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
index 4ce65df..b0c07e3 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
@@ -9,168 +9,204 @@
namespace WCS.Application;
+/// <summary>
+/// 璁惧淇℃伅鍩虹杈撳叆鍙傛暟
+/// </summary>
+public class WcsDeviceBaseInput
+{
/// <summary>
- /// 璁惧淇℃伅鍩虹杈撳叆鍙傛暟
+ /// PlcId
/// </summary>
- public class WcsDeviceBaseInput
- {
- /// <summary>
- /// PlcId
- /// </summary>
- public virtual long PlcId { get; set; }
-
- /// <summary>
- /// 璁惧绾у埆
- /// </summary>
- public virtual DeviceLevelEnum Level { get; set; }
-
- /// <summary>
- /// DB鍖哄煙
- /// </summary>
- public virtual string? DbNumber { get; set; }
-
- /// <summary>
- /// 宸ヤ綅鍙�
- /// </summary>
- public virtual string? StationNum { get; set; }
-
- /// <summary>
- /// PLC鍋忕Щ閲�
- /// </summary>
- public virtual string? PlcPos { get; set; }
-
- /// <summary>
- /// WCS鍋忕Щ閲�
- /// </summary>
- public virtual string? WcsPos { get; set; }
-
- /// <summary>
- /// 娴佺▼瀛楃被鍨�
- /// </summary>
- public virtual PLCDataTypeEnum? PosType { get; set; }
-
- /// <summary>
- /// 鏄剧ず灞廼p鍦板潃
- /// </summary>
- public virtual string? LedIP { get; set; }
-
- /// <summary>
- /// 鎻忚堪
- /// </summary>
- public virtual string? Text { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- public virtual DateTime? CreateTime { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- public virtual DateTime? UpdateTime { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰匢d
- /// </summary>
- public virtual long? CreateUserId { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呭鍚�
- /// </summary>
- public virtual string? CreateUserName { get; set; }
-
- /// <summary>
- /// 淇敼鑰匢d
- /// </summary>
- public virtual long? UpdateUserId { get; set; }
-
- /// <summary>
- /// 淇敼鑰呭鍚�
- /// </summary>
- public virtual string? UpdateUserName { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呴儴闂↖d
- /// </summary>
- public virtual long? CreateOrgId { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
- /// </summary>
- public virtual string? CreateOrgName { get; set; }
-
- /// <summary>
- /// 杞垹闄�
- /// </summary>
- public virtual bool IsDelete { get; set; }
-
- }
+ public virtual long PlcId { get; set; }
/// <summary>
- /// 璁惧淇℃伅鍒嗛〉鏌ヨ杈撳叆鍙傛暟
+ /// 璁惧绾у埆
/// </summary>
- public class PageWcsDeviceInput : BasePageInput
- {
- /// <summary>
- /// 鍏抽敭瀛楁煡璇�
- /// </summary>
- public string? SearchKey { get; set; }
-
- /// <summary>
- /// PlcId
- /// </summary>
- public long? PlcId { get; set; }
-
- /// <summary>
- /// 鎻忚堪
- /// </summary>
- public string? Text { get; set; }
-
- }
+ public virtual DeviceLevelEnum Level { get; set; }
/// <summary>
- /// 璁惧淇℃伅澧炲姞杈撳叆鍙傛暟
+ /// DB鍖哄煙
/// </summary>
- public class AddWcsDeviceInput : WcsDeviceBaseInput
- {
- /// <summary>
- /// PlcId
- /// </summary>
- [Required(ErrorMessage = "PlcId涓嶈兘涓虹┖")]
- public override long PlcId { get; set; }
-
- /// <summary>
- /// 杞垹闄�
- /// </summary>
- [Required(ErrorMessage = "杞垹闄や笉鑳戒负绌�")]
- public override bool IsDelete { get; set; }
-
- }
+ public virtual string DbNumber { get; set; }
/// <summary>
- /// 璁惧淇℃伅鍒犻櫎杈撳叆鍙傛暟
+ /// 宸ヤ綅鍙�
/// </summary>
- public class DeleteWcsDeviceInput : BaseIdInput
- {
- }
+ public virtual string StationNum { get; set; }
/// <summary>
- /// 璁惧淇℃伅鏇存柊杈撳叆鍙傛暟
+ /// PLC鍋忕Щ閲�
/// </summary>
- public class UpdateWcsDeviceInput : WcsDeviceBaseInput
- {
- /// <summary>
- /// 涓婚敭Id
- /// </summary>
- [Required(ErrorMessage = "涓婚敭Id涓嶈兘涓虹┖")]
- public long Id { get; set; }
-
- }
+ public virtual string PlcPos { get; set; }
/// <summary>
- /// 璁惧淇℃伅涓婚敭鏌ヨ杈撳叆鍙傛暟
+ /// WCS鍋忕Щ閲�
/// </summary>
- public class QueryByIdWcsDeviceInput : DeleteWcsDeviceInput
- {
+ public virtual string WcsPos { get; set; }
- }
+ /// <summary>
+ /// 娴佺▼瀛楃被鍨�
+ /// </summary>
+ public virtual PLCDataTypeEnum PosType { get; set; }
+
+ /// <summary>
+ /// 鏄剧ず灞廼p鍦板潃
+ /// </summary>
+ public virtual string? LedIP { get; set; }
+
+ /// <summary>
+ /// 鎻忚堪
+ /// </summary>
+ public virtual string? Text { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public virtual DateTime? CreateTime { get; set; }
+
+ /// <summary>
+ /// 鏇存柊鏃堕棿
+ /// </summary>
+ public virtual DateTime? UpdateTime { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰匢d
+ /// </summary>
+ public virtual long? CreateUserId { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰呭鍚�
+ /// </summary>
+ public virtual string? CreateUserName { get; set; }
+
+ /// <summary>
+ /// 淇敼鑰匢d
+ /// </summary>
+ public virtual long? UpdateUserId { get; set; }
+
+ /// <summary>
+ /// 淇敼鑰呭鍚�
+ /// </summary>
+ public virtual string? UpdateUserName { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰呴儴闂↖d
+ /// </summary>
+ public virtual long? CreateOrgId { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
+ /// </summary>
+ public virtual string? CreateOrgName { get; set; }
+
+ /// <summary>
+ /// 杞垹闄�
+ /// </summary>
+ public virtual bool IsDelete { get; set; }
+
+}
+
+/// <summary>
+/// 璁惧淇℃伅鍒嗛〉鏌ヨ杈撳叆鍙傛暟
+/// </summary>
+public class PageWcsDeviceInput : BasePageInput
+{
+ /// <summary>
+ /// 鍏抽敭瀛楁煡璇�
+ /// </summary>
+ public string? SearchKey { get; set; }
+
+ /// <summary>
+ /// PlcId
+ /// </summary>
+ public long? PlcId { get; set; }
+
+ /// <summary>
+ /// 鎻忚堪
+ /// </summary>
+ public string? Text { get; set; }
+
+}
+
+/// <summary>
+/// 璁惧淇℃伅澧炲姞杈撳叆鍙傛暟
+/// </summary>
+public class AddWcsDeviceInput : WcsDeviceBaseInput
+{
+ /// <summary>
+ /// PlcId
+ /// </summary>
+ [Required(ErrorMessage = "PlcId涓嶈兘涓虹┖")]
+ public override long PlcId { get; set; }
+
+ /// <summary>
+ /// 璁惧绾у埆
+ /// </summary>
+ [Required(ErrorMessage = "璁惧绾у埆涓嶈兘涓虹┖")]
+ public override DeviceLevelEnum Level { get; set; }
+
+ /// <summary>
+ /// DB鍖哄煙
+ /// </summary>
+ [Required(ErrorMessage = "DB鍖哄煙涓嶈兘涓虹┖")]
+ public override string? DbNumber { get; set; }
+
+ /// <summary>
+ /// 宸ヤ綅鍙�
+ /// </summary>
+ [Required(ErrorMessage = "宸ヤ綅鍙蜂笉鑳戒负绌�")]
+ public override string? StationNum { get; set; }
+
+ /// <summary>
+ /// PLC鍋忕Щ閲�
+ /// </summary>
+ [Required(ErrorMessage = "PLC鍋忕Щ閲忎笉鑳戒负绌�")]
+ public override string? PlcPos { get; set; }
+
+ /// <summary>
+ /// WCS鍋忕Щ閲�
+ /// </summary>
+ [Required(ErrorMessage = "WCS鍋忕Щ閲忎笉鑳戒负绌�")]
+ public override string? WcsPos { get; set; }
+
+ /// <summary>
+ /// 娴佺▼瀛楃被鍨�
+ /// </summary>
+ [Required(ErrorMessage = "娴佺▼瀛楃被鍨嬩笉鑳戒负绌�")]
+ public override PLCDataTypeEnum PosType { get; set; }
+
+ /// <summary>
+ /// 杞垹闄�
+ /// </summary>
+ [Required(ErrorMessage = "杞垹闄や笉鑳戒负绌�")]
+ public override bool IsDelete { get; set; }
+
+}
+
+/// <summary>
+/// 璁惧淇℃伅鍒犻櫎杈撳叆鍙傛暟
+/// </summary>
+public class DeleteWcsDeviceInput : BaseIdInput
+{
+}
+
+/// <summary>
+/// 璁惧淇℃伅鏇存柊杈撳叆鍙傛暟
+/// </summary>
+public class UpdateWcsDeviceInput : WcsDeviceBaseInput
+{
+ /// <summary>
+ /// 涓婚敭Id
+ /// </summary>
+ [Required(ErrorMessage = "涓婚敭Id涓嶈兘涓虹┖")]
+ public long Id { get; set; }
+
+}
+
+/// <summary>
+/// 璁惧淇℃伅涓婚敭鏌ヨ杈撳叆鍙傛暟
+/// </summary>
+public class QueryByIdWcsDeviceInput : DeleteWcsDeviceInput
+{
+
+}
--
Gitblit v1.8.0