From c06382f1b619e1dc7f37be36a0cee126239abdee Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 30 十月 2024 11:35:22 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
Admin.NET/WCS.Application/Model/TaskRequest.cs | 281 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 279 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/Model/TaskRequest.cs b/Admin.NET/WCS.Application/Model/TaskRequest.cs
index 7587e00..fc7a5c1 100644
--- a/Admin.NET/WCS.Application/Model/TaskRequest.cs
+++ b/Admin.NET/WCS.Application/Model/TaskRequest.cs
@@ -1,4 +1,6 @@
锘�
+using WCS.Application.Entity;
+
namespace WCS.Application;
public class TaskRequest
{
@@ -7,15 +9,86 @@
public TaskTypeEnum TaskType { get; set; } // 浠诲姟绫诲瀷
public TaskStatusEnum TaskStatus { get; set; } // 浠诲姟鐘舵�� 0 绛夊緟鎵ц 1 姝ｅ湪鎵ц 2 鎵ц瀹屾垚 3 寮傚父缁撴潫 4 浠诲姟鍙栨秷
}
+public class TaskRequestWMS
+{
+ public string TaskNo { get; set; } // 浠诲姟鍙�
+ public string PalletNo { get; set; } // 鎵樼洏鍙�
+ public string TaskType { get; set; } // 浠诲姟绫诲瀷
+ public string TaskStatus { get; set; } // 浠诲姟鐘舵�� 0 绛夊緟鎵ц 1 姝ｅ湪鎵ц 2 鎵ц瀹屾垚 3 寮傚父缁撴潫 4 浠诲姟鍙栨秷
+}
+
+/// <summary>
+/// 鐢宠宸烽亾WMS杩斿洖鐨勫疄浣�
+/// </summary>
public class ResponseTasks
{
public string StatusCode { get; set; }
- public string Success { get; set; }
+ public int Success { get; set; }
public string Message { get; set; }
- public WcsTask TaskList { get; set; }
+ public ResponseTasksModel TaskList { get; set; }
}
+
+/// <summary>
+/// 浠诲姟瀹屾垚 WMS杩斿洖瀹炰綋
+/// </summary>
+public class ResponseModel
+{
+ public int StatusCode { get; set; }
+ public string Msg { get; set; }
+
+}
+
+public class ResponseTasksModel
+{
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ public string TaskNo { get; set; }
+
+ /// <summary>
+ /// 浠诲姟绫诲瀷
+ /// </summary>
+ public string TaskType { get; set; }
+
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ public string PalletNo { get; set; }
+
+ /// <summary>
+ /// 璧峰浣嶇疆
+ /// </summary>
+ public string StartLocate { get; set; }
+
+ /// <summary>
+ /// 璧峰宸烽亾
+ /// </summary>
+ public string StartRoadway { get; set; }
+
+ /// <summary>
+ /// 缁撴潫浣嶇疆
+ /// </summary>
+ public string EndLocate { get; set; }
+
+ /// <summary>
+ /// 鐩爣宸烽亾
+ /// </summary>
+ public string EndRoadway { get; set; }
+
+ /// <summary>
+ /// 鍑哄簱鍙�
+ /// </summary>
+ public string OutMode { get; set; }
+
+ /// <summary>
+ /// 椤哄簭-浼樺厛绾�
+ /// </summary>
+ public int Order { get; set; }
+
+}
+
/// <summary>
/// 鐢宠鍏ュ簱浠诲姟 宸烽亾鎴栧偍浣�
/// </summary>
@@ -28,3 +101,207 @@
}
+//鎴愬搧鐮佸灈淇℃伅
+public class BoxPalletBindVm
+{
+ /// <summary>
+ /// 鐢熶骇宸ュ崟
+ /// </summary>
+ public string OrderCode { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗曞彿
+ /// </summary>
+ public string AsnNo { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗曟槑缁�
+ /// </summary>
+ public int AsnDetailNo { get; set; }
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ public string PalletNo { get; set; }
+ /// <summary>
+ /// 鎵樼洏鏁伴噺
+ /// </summary>
+ public decimal Qty { get; set; }
+ /// <summary>
+ /// 鎵樼洏绫诲瀷 0鐗╂枡鎵� 1绌烘墭鐩樻墭
+ /// </summary>
+ public string Type { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string SkuNo { get; set; }
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string LotNo { get; set; }
+ /// <summary>
+ /// 鎵规鎻忚堪
+ /// </summary>
+ public string LotText { get; set; }
+ /// <summary>
+ /// 渚涜揣鎵规
+ /// </summary>
+ public string SupplierLot { get; set; }
+ public List<WcsBoxInfo> Detail { get; set; }
+}
+//鐮佸灈绠辩爜鏄庣粏淇℃伅
+public class BoxPalletBindDetailVm
+{
+ /// <summary>
+ /// 鐢熶骇鍗曟嵁鍙�
+ /// </summary>
+ public string OrderCode { get; set; }
+ /// <summary>
+ /// 绠卞彿
+ /// </summary>
+ public string BoxNo { get; set; }
+ /// <summary>
+ /// 鐩掑彿
+ /// </summary>
+ public string BoxNo2 { get; set; }
+ /// <summary>
+ /// 鏀彿
+ /// </summary>
+ public string BoxNo3 { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public decimal Qty { get; set; }
+ /// <summary>
+ /// 婊＄鏁伴噺
+ /// </summary>
+ public decimal FullQty { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string SkuNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string SkuName { get; set; }
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string LotNo { get; set; }
+ /// <summary>
+ /// 鎵规鎻忚堪
+ /// </summary>
+ public string LotText { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ public DateTime? ProductionTime { get; set; }
+ /// <summary>
+ /// 杩囨湡鏃堕棿
+ /// </summary>
+ public DateTime? ExpirationTime { get; set; }
+ /// <summary>
+ /// 妫�楠屾爣璁�
+ /// </summary>
+ public string InspectMark { get; set; }
+ /// <summary>
+ /// 闆剁鏍囪
+ /// </summary>
+ public string BitBoxMark { get; set; }
+ /// <summary>
+ /// 璐ㄦ鐘舵��
+ /// </summary>
+ public string InspectStatus { get; set; }
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ public string Standard { get; set; }
+ /// <summary>
+ /// 鍖呰瑙勬牸
+ /// </summary>
+ public string PackageStandard { get; set; }
+ /// <summary>
+ /// 鍌ㄥ瓨鏈熻嚦
+ /// </summary>
+ public DateTime? StoreTime { get; set; }
+ /// <summary>
+ /// 绗嚑浠�
+ /// </summary>
+ public int? QtyOrd { get; set; }
+ /// <summary>
+ /// 鎬讳欢鏁�
+ /// </summary>
+ public int? QtyCount { get; set; }
+
+}
+
+
+public class ResponseOrderTaskModel
+{
+ /// <summary>
+ /// WMS涓嬪彂鍗曞彿
+ /// </summary>
+ public string? OrderNo { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ public string? TaskNo { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string? LotNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string? SkuNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string? SkuName { get; set; }
+
+ /// <summary>
+ /// 瑙勬牸
+ /// </summary>
+ public string? BoxType { get; set; }
+
+ /// <summary>
+ /// 鎬荤鏁�/璁″垝绠辨暟/棰勪及绠辨暟
+ /// </summary>
+ public int? Qty { get; set; }
+
+ /// <summary>
+ /// 浠诲姟绫诲瀷
+ /// </summary>
+ public int TaskType { get; set; }
+}
+
+/// <summary>
+/// 绌烘墭鐩樺嚭搴�
+/// </summary>
+public class OutPalletModel
+{
+ /// <summary>
+ /// 鍑哄簱鍨涙暟
+ /// </summary>
+ public string Num { get; set; }
+ /// <summary>
+ /// 鍑哄簱鍙�
+ /// </summary>
+ public string OutMode { get; set; }
+}
+
+
+/// <summary>
+/// 鐢宠绌烘墭鍑哄簱WMS杩斿洖鐨勫疄浣�
+/// </summary>
+public class ResponseOutPallet
+{
+ public string StatusCode { get; set; }
+ public int Success { get; set; }
+
+ public string Message { get; set; }
+
+ public List<ResponseTasksModel> TaskList { get; set; }
+}
+
--
Gitblit v1.8.0