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/WcsTask/Dto/WcsTaskInput.cs |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskInput.cs b/Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskInput.cs
index 1fd8664..39dba5f 100644
--- a/Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskInput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskInput.cs
@@ -102,7 +102,7 @@
         /// <summary>
         /// 鎷h揣鏂瑰紡
         /// </summary>
-        public virtual string? UnstackingMode { get; set; }
+        public virtual UnstackingModeEnum? UnstackingMode { get; set; }
         
         /// <summary>
         /// 鍙栨秷鏃堕棿
@@ -195,8 +195,18 @@
         /// 鐘舵��
         /// </summary>
         public TaskStatusEnum? Status { get; set; }
-        
-    }
+
+        /// <summary>
+        /// 鎵樼洏鍙�
+        /// </summary>
+        public string? PalletNo { get; set; }
+
+        /// <summary>
+        /// 鏉ユ簮
+        /// </summary>
+        public string? Origin { get; set; }
+
+}
 
     /// <summary>
     /// 浠诲姟琛ㄥ鍔犺緭鍏ュ弬鏁�

--
Gitblit v1.8.0