Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.WMS.Core/Code/Dtos/CodePortReq.cs

@@ -1,5 +1,6 @@
 using DS.Module.Core;
 using FluentValidation;
+using SqlSugar;
 
 namespace DS.WMS.Core.Code.Dtos;
 
@@ -47,6 +48,14 @@ public class CodePortReq
     /// </summary>
     public long LaneId { get; set; }= 0;
     /// <summary>
+    /// 航线代码 
+    /// </summary>
+    public string LaneCode { get; set; }
+    /// <summary>
+    /// 航线 
+    /// </summary>
+    public string Lane { get; set; }
+    /// <summary>
     /// EDI代码
     /// </summary>
     public string EdiCode { get; set; } = "";

ds-wms-service/DS.WMS.Core/Code/Dtos/CodePortRes.cs

@@ -1,4 +1,5 @@
 using DS.Module.Core;
+using SqlSugar;
 
 namespace DS.WMS.Core.Code.Dtos;
 
@@ -45,6 +46,14 @@ public class CodePortRes
     /// </summary>
     public long LaneId { get; set; }= 0;
     /// <summary>
+    /// 航线代码 
+    /// </summary>
+    public string LaneCode { get; set; }
+    /// <summary>
+    /// 航线 
+    /// </summary>
+    public string Lane { get; set; }
+    /// <summary>
     /// EDI代码
     /// </summary>
     public string EdiCode { get; set; } = "";

ds-wms-service/DS.WMS.Core/Code/Dtos/CodePortSelectRes.cs

@@ -26,6 +26,19 @@ public class CodePortSelectRes
     /// </summary>
     public string EdiCode { get; set; }
 
+    /// <summary>
+    /// 航线Id
+    /// </summary>
+    public long LaneId { get; set; }
+    /// <summary>
+    /// 航线代码 
+    /// </summary>
+    public string LaneCode { get; set; }
+    /// <summary>
+    /// 航线 
+    /// </summary>
+    public string Lane { get; set; }
+
     /// <summary>
     /// 助记码
     /// </summary>

ds-wms-service/DS.WMS.Core/Code/Entity/CodePort.cs

@@ -49,6 +49,17 @@ public class CodePort: BaseModel<long>
     /// </summary>
     [SugarColumn(ColumnDescription = "航线Id",IsNullable = true)]
     public long LaneId { get; set; }
+
+    /// <summary>
+    /// 航线代码 
+    /// </summary>
+    [SugarColumn(ColumnDescription = "航线代码", IsNullable = true, Length = 100)]
+    public string LaneCode { get; set; }
+    /// <summary>
+    /// 航线 
+    /// </summary>
+    [SugarColumn(ColumnDescription = "航线", IsNullable = true, Length = 100)]
+    public string Lane { get; set; }
     /// <summary>
     /// EDI代码
     /// </summary>

ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs

@@ -1153,6 +1153,11 @@ public class SeaExportReq
     /// 签单地点代码
     /// </summary>
     public string IssuePlaceCode { get; set; }
+
+    /// <summary>
+    /// 航线代码 
+    /// </summary>
+    public string LaneCode { get; set; }
 }
 
 /// <summary>

ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs

@@ -1349,4 +1349,9 @@ public class SeaExportRes
     /// 签单地点代码
     /// </summary>
     public string IssuePlaceCode { get; set; }
+
+    /// <summary>
+    /// 航线代码 
+    /// </summary>
+    public string LaneCode { get; set; }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs

@@ -570,6 +570,11 @@ public class SeaExport : BaseOrgModel<long>
     [SugarColumn(ColumnDescription = "航线Id", IsNullable = true, DefaultValue = "0")]
     public long LaneId { get; set; }
 
+    /// <summary>
+    /// 航线代码 
+    /// </summary>
+    [SugarColumn(ColumnDescription = "航线代码", IsNullable = true, Length = 100)]
+    public string LaneCode { get; set; }
     /// <summary>
     /// 航线 
     /// </summary>