From aaeff2d517b26bf2732182e4975f5b1156b752c3 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 07 六月 2025 11:37:28 +0800
Subject: [PATCH] 解决冲突

---
 Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs |  169 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 168 insertions(+), 1 deletions(-)

diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
index c998258..ff1cd39 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
@@ -127,6 +127,16 @@
     public long? PlcId { get; set; }
 
     /// <summary>
+    /// 宸ヤ綅鍙�
+    /// </summary>
+    public string? StationNum { get; set; }
+
+    /// <summary>
+    /// 浜や簰绫诲瀷
+    /// </summary>
+    public DeviceTypeEnum?  DeviceType { get; set; }
+
+    /// <summary>
     /// 鎻忚堪
     /// </summary>
     public string? Text { get; set; }
@@ -232,4 +242,161 @@
     /// </summary>
     [Required(ErrorMessage = "璧峰鐐逛綅涓嶈兘涓虹┖")]
     public int Pos { get; set; }
-}
\ No newline at end of file
+}
+/// <summary>
+/// 鍐欏叆鍙傛暟
+/// </summary>
+public class WriteWcsDeviceInput : WcsDeviceBaseInput
+{
+    /// <summary>
+    /// 涓婚敭Id
+    /// </summary>
+    [Required(ErrorMessage = "涓婚敭Id涓嶈兘涓虹┖")]
+    public long Id { get; set; }
+    /// <summary>
+    /// 浠诲姟鍙�
+    /// </summary>
+    public string? TaskNo { get; set; }
+    /// <summary>
+    /// 浠诲姟绫诲瀷
+    /// </summary>
+    public TaskTypeEnum? TaskType { get; set; }
+    /// <summary>
+    /// 璧峰宸ヤ綅
+    /// </summary>
+    public string? StartLocatNo { get; set; }
+    /// <summary>
+    /// 缁撴潫宸ヤ綅
+    /// </summary>
+    public string? EndLocatNo { get; set; }
+    /// <summary>
+    /// 鎵樼洏鐮�
+    /// </summary>
+    public string? PalletNo { get; set; }
+    public string? Plc { get; set; }
+    public string? Wcs { get; set; }
+    /// <summary>
+    /// 杩炴帴鐘舵��
+    /// </summary>
+    public bool Status { get; set; } = false;
+    /// <summary>
+    /// 鏀捐揣鎺�
+    /// </summary>
+    public int? ReleaseRow { get; set; }
+    /// <summary>
+    /// 鏀捐揣鍒�
+    /// </summary>
+    public int? ReleaseCol { get; set; }
+    /// <summary>
+    /// 鏀捐揣灞�
+    /// </summary>
+    public int? ReleaseStorey { get; set; }
+    /// <summary>
+    /// 鍙栬揣鎺�
+    /// </summary>
+    public int? PickRow { get; set; }
+    /// <summary>
+    /// 鍙栬揣鍒�
+    /// </summary>
+    public int? PickCol { get; set; }
+    /// <summary>
+    /// 鍙栬揣灞�
+    /// </summary>
+    public int? PickStorey { get; set; }
+} 
+
+
+
+public class WcsDeviceUpInfo
+{
+    /// <summary>
+    /// 宸ヤ綅
+    /// </summary>
+    public string LocatNo { get; set; }
+    /// <summary>
+    /// 妤煎眰
+    /// </summary>
+    public string Layer { get; set; }
+    /// <summary>
+    /// 鎿嶄綔绫诲瀷
+    /// </summary>
+    public string TypeName { get; set; }
+    /// <summary>
+    /// 浜嬩欢缁撴灉 true/false
+    /// </summary>
+    public string FuncName { get; set; }
+    /// <summary>
+    /// 浠诲姟鍙�
+    /// </summary>
+    public string TaskNo { get; set; }
+    /// <summary>
+    /// 鎵樼洏鍙�
+    /// </summary>
+    public string PalletNo { get; set; }
+    /// <summary>
+    /// 璧峰宸ヤ綅
+    /// </summary>
+    public string StartLoction { get; set; }
+    /// <summary>
+    /// 鐩殑宸ヤ綅
+    /// </summary>
+    public string EndLoction { get; set; }
+    /// <summary>
+    /// 璧峰鎺�
+    /// </summary>
+    public string StartPai { get; set; }
+    /// <summary>
+    /// 璧峰鍒�
+    /// </summary>
+    public string StartLie { get; set; }
+    /// <summary>
+    /// 璧峰灞�
+    /// </summary>
+    public string StartCeng { get; set; }
+    /// <summary>
+    /// 鐩殑鎺�
+    /// </summary>
+    public string EndPai { get; set; }
+    /// <summary>
+    /// 鐩殑鍒�
+    /// </summary>
+    public string EndLie { get; set; }
+    /// <summary>
+    /// 鐩殑灞�
+    /// </summary>
+    public string EndCeng { get; set; }
+
+
+    /// <summary>
+    /// 缂犺啘浜や簰
+    /// </summary>
+    public string ChanMo { get; set; }
+    /// <summary>
+    /// 鎷嗘ā浜や簰
+    /// </summary>
+    public string ChaiMo { get; set; }
+
+}
+
+public class WcsDeviceStartStop
+{
+    /// <summary>
+    /// 鎿嶄綔绫诲瀷
+    /// </summary>
+    public string Type { get; set; }
+    /// <summary>
+    /// 妤煎眰
+    /// </summary>
+    public string Layer { get; set; }
+    /// <summary>
+    /// 浜嬩欢缁撴灉 true/false
+    /// </summary>
+    public string FuncName { get; set; }
+}
+
+
+
+
+
+
+

--
Gitblit v1.8.0