From dd973f741617e3bbf5ecf11747ff71960991549c Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期二, 15 十月 2024 10:21:19 +0800
Subject: [PATCH] Merge branch 'master' into liudl
---
Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
index a52ca44..404b81b 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
@@ -127,6 +127,11 @@
public long? PlcId { get; set; }
/// <summary>
+ /// 宸ヤ綅鍙�
+ /// </summary>
+ public string? StationNum { get; set; }
+
+ /// <summary>
/// 鎻忚堪
/// </summary>
public string? Text { get; set; }
@@ -246,7 +251,7 @@
/// <summary>
/// 浠诲姟鍙�
/// </summary>
- public string TaskNo { get; set; }
+ public string? TaskNo { get; set; }
/// <summary>
/// 浠诲姟绫诲瀷
/// </summary>
@@ -254,17 +259,17 @@
/// <summary>
/// 璧峰宸ヤ綅
/// </summary>
- public string StartLocatNo { get; set; }
+ public string? StartLocatNo { get; set; }
/// <summary>
/// 缁撴潫宸ヤ綅
/// </summary>
- public string EndLocatNo { get; set; }
+ public string? EndLocatNo { get; set; }
/// <summary>
/// 鎵樼洏鐮�
/// </summary>
- public string PalletNo { get; set; }
- public string Plc { get; set; }
- public string Wcs { get; set; }
+ public string? PalletNo { get; set; }
+ public string? Plc { get; set; }
+ public string? Wcs { get; set; }
/// <summary>
/// 杩炴帴鐘舵��
/// </summary>
@@ -272,25 +277,25 @@
/// <summary>
/// 鏀捐揣鎺�
/// </summary>
- public int ReleaseRow { get; set; }
+ public int? ReleaseRow { get; set; }
/// <summary>
/// 鏀捐揣鍒�
/// </summary>
- public int ReleaseCol { get; set; }
+ public int? ReleaseCol { get; set; }
/// <summary>
/// 鏀捐揣灞�
/// </summary>
- public int ReleaseStorey { get; set; }
+ public int? ReleaseStorey { get; set; }
/// <summary>
/// 鍙栬揣鎺�
/// </summary>
- public int PickRow { get; set; }
+ public int? PickRow { get; set; }
/// <summary>
/// 鍙栬揣鍒�
/// </summary>
- public int PickCol { get; set; }
+ public int? PickCol { get; set; }
/// <summary>
/// 鍙栬揣灞�
/// </summary>
- public int PickStorey { get; set; }
+ public int? PickStorey { get; set; }
}
\ No newline at end of file
--
Gitblit v1.8.0