From ec899ee7e9ead5152bd9b4c2dedd75c79cab6fb0 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 28 八月 2024 17:03:44 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs
index 62b371f..9a3c42d 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs
@@ -34,27 +34,27 @@
/// <summary>
/// DB鍖哄煙
/// </summary>
- public string? DbNumber { get; set; }
+ public string DbNumber { get; set; }
/// <summary>
/// 宸ヤ綅鍙�
/// </summary>
- public string? StationNum { get; set; }
+ public string StationNum { get; set; }
/// <summary>
/// PLC鍋忕Щ閲�
/// </summary>
- public string? PlcPos { get; set; }
+ public string PlcPos { get; set; }
/// <summary>
/// WCS鍋忕Щ閲�
/// </summary>
- public string? WcsPos { get; set; }
+ public string WcsPos { get; set; }
/// <summary>
/// 娴佺▼瀛楃被鍨�
/// </summary>
- public PLCDataTypeEnum? PosType { get; set; }
+ public PLCDataTypeEnum PosType { get; set; }
/// <summary>
/// 鏄剧ず灞廼p鍦板潃
@@ -116,5 +116,5 @@
public PLCUtil PLCUtil { get; set; }
public List<WcsDevice> listDevice { get; set; }
- public List<WcsStation> listStation { get; set; }
+ public List<WcsPosition> listStation { get; set; }
}
--
Gitblit v1.8.0