From 6c010905f5e26438ea41a3faa62181975c89c9df Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 10 九月 2024 16:46:10 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs
index 21fbc14..d0c4936 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs
@@ -124,12 +124,48 @@
/// 浠诲姟绫诲瀷
/// </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; }
+ 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