From 3e9a6a06132b06b8c2568f900df936ccc654bd58 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期二, 29 四月 2025 14:09:20 +0800
Subject: [PATCH] 修改问题，添加四向车车充电流程
---
Admin.NET/WCS.Application/Entity/WcsTask.cs | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/Admin.NET/WCS.Application/Entity/WcsTask.cs b/Admin.NET/WCS.Application/Entity/WcsTask.cs
index 7333be5..3482a07 100644
--- a/Admin.NET/WCS.Application/Entity/WcsTask.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsTask.cs
@@ -1,11 +1,18 @@
-锘縰sing Admin.NET.Core;
-namespace WCS.Application;
+锘�// Admin.NET 椤圭洰鐨勭増鏉冦�佸晢鏍囥�佷笓鍒╁拰鍏朵粬鐩稿叧鏉冨埄鍧囧彈鐩稿簲娉曞緥娉曡鐨勪繚鎶ゃ�備娇鐢ㄦ湰椤圭洰搴旈伒瀹堢浉鍏虫硶寰嬫硶瑙勫拰璁稿彲璇佺殑瑕佹眰銆�
+//
+// 鏈」鐩富瑕侀伒寰� MIT 璁稿彲璇佸拰 Apache 璁稿彲璇侊紙鐗堟湰 2.0锛夎繘琛屽垎鍙戝拰浣跨敤銆傝鍙瘉浣嶄簬婧愪唬鐮佹爲鏍圭洰褰曚腑鐨� LICENSE-MIT 鍜� LICENSE-APACHE 鏂囦欢銆�
+//
+// 涓嶅緱鍒╃敤鏈」鐩粠浜嬪嵄瀹冲浗瀹跺畨鍏ㄣ�佹壈涔辩ぞ浼氱З搴忋�佷镜鐘粬浜哄悎娉曟潈鐩婄瓑娉曞緥娉曡绂佹鐨勬椿鍔紒浠讳綍鍩轰簬鏈」鐩簩娆″紑鍙戣�屼骇鐢熺殑涓�鍒囨硶寰嬬籂绾峰拰璐ｄ换锛屾垜浠笉鎵挎媴浠讳綍璐ｄ换锛�
+
+using Admin.NET.Core;
+namespace WCS.Application.Entity;
/// <summary>
/// 浠诲姟琛�
/// </summary>
[SugarTable("WCSTask","浠诲姟琛�")]
-public class WcsTask : EntityBaseData
+[Tenant("1300000000001")]
+public class WcsTask : EntityBase
{
/// <summary>
/// 浠诲姟鍙�
@@ -14,7 +21,7 @@
public string? TaskNo { get; set; }
/// <summary>
- /// 浠诲姟绫诲瀷
+ /// 浠诲姟绫诲瀷
/// </summary>
[SugarColumn(ColumnName = "TaskType", ColumnDescription = "浠诲姟绫诲瀷")]
public TaskTypeEnum? TaskType { get; set; }
@@ -42,19 +49,19 @@
/// </summary>
[SugarColumn(ColumnName = "Origin", ColumnDescription = "鏉ユ簮", Length = 20)]
public string? Origin { get; set; }
-
+
/// <summary>
/// 浠撳簱鍙�
/// </summary>
[SugarColumn(ColumnName = "WareHouseNo", ColumnDescription = "浠撳簱鍙�", Length = 20)]
public string? WareHouseNo { get; set; }
-
+
/// <summary>
/// 璧峰浣嶇疆
/// </summary>
[SugarColumn(ColumnName = "StartLocate", ColumnDescription = "璧峰浣嶇疆", Length = 20)]
public string? StartLocate { get; set; }
-
+
/// <summary>
/// 璧峰宸烽亾
/// </summary>
@@ -114,25 +121,25 @@
/// </summary>
[SugarColumn(ColumnName = "CompleteQty", ColumnDescription = "鎷嗗灈鏁伴噺")]
public int? CompleteQty { get; set; }
-
+
/// <summary>
/// 鏄惁缁戝畾
/// </summary>
[SugarColumn(ColumnName = "IsBind", ColumnDescription = "鏄惁缁戝畾")]
public IsBindEnum? IsBind { get; set; }
-
+
/// <summary>
- /// 鏁村灈鏁伴噺
+ /// 鏁磋泛鏁伴噺
/// </summary>
- [SugarColumn(ColumnName = "PalletQty", ColumnDescription = "鏁村灈鏁伴噺")]
+ [SugarColumn(ColumnName = "PalletQty", ColumnDescription = "鏁磋泛鏁伴噺")]
public int? PalletQty { get; set; }
-
+
/// <summary>
/// 鎷嗗灈宸ヤ綅鍙�
/// </summary>
[SugarColumn(ColumnName = "StationNum", ColumnDescription = "鎷嗗灈宸ヤ綅鍙�", Length = 10)]
public string? StationNum { get; set; }
-
+
/// <summary>
/// 鎷ｈ揣鏂瑰紡
/// </summary>
@@ -158,13 +165,28 @@
public string? WcsPosValue { get; set; }
/// <summary>
- /// 浼樺厛绾�
+ /// 浼樺厛绾� 鍥涘悜杞� 灏忚溅鍏呯數888 鍏朵粬浠诲姟999
/// </summary>
[SugarColumn(ColumnName = "Levels", ColumnDescription = "浼樺厛绾�")]
public int? Levels { get; set; }
+
+ /// <summary>
+ /// 璁惧绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "Type", ColumnDescription = "")]
+ public PLCTypeEnum? Type { get; set; }
+
+ /// <summary>
+ /// PLC-WCS浜や簰浠诲姟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "TaskId", ColumnDescription = "PLC-WCS浜や簰浠诲姟鍙�")]
+ public int? TaskId { get; set; }
+
/// <summary>
- /// 璁惧绫诲瀷
+ /// 灏忚溅IP
/// </summary>
- public PLCTypeEnum? Type { get; set; }
+ public string? CarIp { get; set; }
+
+
}
--
Gitblit v1.8.0