From 2ecd9c5db603efcde9e6e51a500b3c2b1162fb85 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期一, 28 四月 2025 17:15:44 +0800
Subject: [PATCH] 冲突合并
---
Admin.NET/WCS.Application/Entity/WcsStorageLocat.cs | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/Entity/WcsStorageLocat.cs b/Admin.NET/WCS.Application/Entity/WcsStorageLocat.cs
index cebf8ef..ecc7f62 100644
--- a/Admin.NET/WCS.Application/Entity/WcsStorageLocat.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsStorageLocat.cs
@@ -106,11 +106,28 @@
/// </summary>
[SugarColumn(ColumnName = "SkuNo", ColumnDescription = "鐗╂枡鍙�", Length = 32)]
public string? SkuNo { get; set; }
-
+
/// <summary>
/// 鎵樼洏鍙�
/// </summary>
[SugarColumn(ColumnName = "PalletNo", ColumnDescription = "鎵樼洏鍙�", Length = 32)]
public string? PalletNo { get; set; }
-
+
+ /// <summary>
+ /// 閫氶亾鍙�1
+ /// </summary>
+ [SugarColumn(ColumnName = "AisleOne", ColumnDescription = "閫氶亾鍙�1", Length = 32)]
+ public string? AisleOne { get; set; }
+
+ /// <summary>
+ /// 閫氶亾鍙�2
+ /// </summary>
+ [SugarColumn(ColumnName = "AisleTwo", ColumnDescription = "閫氶亾鍙�2", Length = 32)]
+ public string? AisleTwo { get; set; }
+
+ /// <summary>
+ /// 鍌ㄤ綅绫诲瀷 1瀛愰�氶亾 0涓婚�氶亾 2 杈撻�佺嚎鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "Make", ColumnDescription = "鍌ㄤ綅绫诲瀷", Length = 32)]
+ public string? Make { get; set; }
}
--
Gitblit v1.8.0