From aaeff2d517b26bf2732182e4975f5b1156b752c3 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 07 六月 2025 11:37:28 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskInput.cs | 21 ++++++++++++++++++---
1 files changed, 18 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..897d0f5 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>
/// 鎷ｈ揣鏂瑰紡
/// </summary>
- public virtual string? UnstackingMode { get; set; }
+ public virtual UnstackingModeEnum? UnstackingMode { get; set; }
/// <summary>
/// 鍙栨秷鏃堕棿
@@ -195,8 +195,23 @@
/// 鐘舵��
/// </summary>
public TaskStatusEnum? Status { get; set; }
-
- }
+
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ public string? PalletNo { get; set; }
+
+ /// <summary>
+ /// 鏉ユ簮
+ /// </summary>
+ public string? Origin { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁鍙�
+ /// </summary>
+ public string? OrderNo { get; set; }
+
+}
/// <summary>
/// 浠诲姟琛ㄥ鍔犺緭鍏ュ弬鏁�
--
Gitblit v1.8.0