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/WcsDeviceOutput.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs
index e66ea48..5a8f9a1 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs
@@ -12,6 +12,11 @@
public long Id { get; set; }
/// <summary>
+ /// 浜や簰绫诲瀷
+ /// </summary>
+ public DeviceTypeEnum DeviceType { get; set; }
+
+ /// <summary>
/// PlcId
/// </summary>
public long PlcId { get; set; }
@@ -20,6 +25,11 @@
/// PlcId 鎻忚堪
/// </summary>
public string PlcIdIP { get; set; }
+
+ /// <summary>
+ /// 璁惧绫诲瀷
+ /// </summary>
+ public PLCTypeEnum Type { get; set; }
/// <summary>
/// 璁惧绾у埆
@@ -106,6 +116,56 @@
/// </summary>
public bool IsDelete { 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; }
}
--
Gitblit v1.8.0