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 | 89 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 89 insertions(+), 0 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
index b0c07e3..404b81b 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
@@ -20,6 +20,11 @@
public virtual long PlcId { get; set; }
/// <summary>
+ /// 浜や簰绫诲瀷
+ /// </summary>
+ public virtual DeviceTypeEnum DeviceType { get; set; }
+
+ /// <summary>
/// 璁惧绾у埆
/// </summary>
public virtual DeviceLevelEnum Level { get; set; }
@@ -122,6 +127,11 @@
public long? PlcId { get; set; }
/// <summary>
+ /// 宸ヤ綅鍙�
+ /// </summary>
+ public string? StationNum { get; set; }
+
+ /// <summary>
/// 鎻忚堪
/// </summary>
public string? Text { get; set; }
@@ -138,6 +148,11 @@
/// </summary>
[Required(ErrorMessage = "PlcId涓嶈兘涓虹┖")]
public override long PlcId { get; set; }
+ /// <summary>
+ /// 浜や簰绫诲瀷
+ /// </summary>
+ [Required(ErrorMessage = "浜や簰绫诲瀷涓嶈兘涓虹┖")]
+ public override DeviceTypeEnum DeviceType { get; set; }
/// <summary>
/// 璁惧绾у埆
@@ -210,3 +225,77 @@
{
}
+public class GeneratePosInput
+{
+ /// <summary>
+ /// 涓婚敭Id
+ /// </summary>
+ [Required(ErrorMessage = "涓婚敭Id涓嶈兘涓虹┖")]
+ public long Id { get; set; }
+ /// <summary>
+ /// 璧峰鐐逛綅
+ /// </summary>
+ [Required(ErrorMessage = "璧峰鐐逛綅涓嶈兘涓虹┖")]
+ public int Pos { get; set; }
+}
+/// <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; }
+}
\ No newline at end of file
--
Gitblit v1.8.0