From 5870172a0b204afbfe678da90019a83a78032fcd Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing@myshipping.com>
Date: Mon, 15 Jul 2024 15:35:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=88=B1=E4=BD=8D=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=AE=9E=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Op/Entity/BookingLabel/BookingLabel.cs    | 34 +++++++++++++++++--
 .../BookingLabel/BookingLabelAllocation.cs    | 22 ++++++++++--
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingLabel/BookingLabel.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingLabel/BookingLabel.cs
index 58b3a18f..ce5b2d80 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingLabel/BookingLabel.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingLabel/BookingLabel.cs
@@ -1,12 +1,40 @@
-using System;
+using DS.Module.Core.Data;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DS.WMS.Core.Op.Entity.BookingLabel
+namespace DS.WMS.Core.Op.Entity
 {
-    internal class BookingLabel
+    /// <summary>
+    /// 订舱标签表
+    /// </summary>
+    [SqlSugar.SugarTable("op_sea_booking_label", "订舱标签表")]
+    public class BookingLabel : BaseModelV2<long>
     {
+        /// <summary>
+        /// 标签名称
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "标签名称", IsNullable = true)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 标签使用范围 1-舱位管理台账
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "标签使用范围 1-舱位管理台账", IsNullable = true)]
+        public int Scope { get; set; }
+
+        /// <summary>
+        /// 颜色
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "颜色",Length = 20, IsNullable = true)]
+        public string Color { get; set; }
+
+        /// <summary>
+        /// 正则匹配
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDataType = "text", ColumnDescription = "正则匹配", IsNullable = true)]
+        public string RegexPatternTxt { get; set; }
     }
 }
diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingLabel/BookingLabelAllocation.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingLabel/BookingLabelAllocation.cs
index 3f4292ad..625e199a 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingLabel/BookingLabelAllocation.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingLabel/BookingLabelAllocation.cs
@@ -1,12 +1,28 @@
-using System;
+using DS.Module.Core.Data;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DS.WMS.Core.Op.Entity.BookingLabel
+namespace DS.WMS.Core.Op.Entity
 {
-    internal class BookingLabelAllocation
+    /// <summary>
+    /// 订舱标签关联表
+    /// </summary>
+    [SqlSugar.SugarTable("booking_label_allocation", "订舱标签关联表")]
+    public class BookingLabelAllocation : BaseModelV2<long>
     {
+        /// <summary>
+        /// 标签主键
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "标签主键", IsNullable = false)]
+        public long LabelId { get; set; }
+
+        /// <summary>
+        /// 业务主键
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "业务主键", IsNullable = false)]
+        public long BusinessId { get; set; }
     }
 }