往来单位联系人添加船信息

ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs

@@ -481,6 +481,9 @@ public static class MultiLanguageConst
     [Description("海运出口规则引擎校验完成!")]
     public const string SeaExportRuleEngineFinished = "Sea_Export_RuleEngine_Finished";
 
+    [Description("订舱货物状态已存在")]
+    public const string BookingGoodsStatusConfigExist = "Booking_Goods_Status_Config_Exist";
+    
 
     [Description("舱单分票件数合计超出限制")]
     public const string SeaExportPartCtnPKGSLimit = "Sea_Export_PartCtn_PKGS_Limit";

ds-wms-service/DS.WMS.Core/Info/Dtos/ClientContactReq.cs

@@ -1,5 +1,6 @@
 using DS.Module.Core;
 using FluentValidation;
+using SqlSugar;
 
 namespace DS.WMS.Core.Info.Dtos;
 
@@ -114,6 +115,14 @@ public class ClientContactReq
     /// </summary>
     public string AnniversaryNote2 { get; set; }
 
+    /// <summary>
+    /// 船公司Id 
+    /// </summary>
+    public long CarrierId { get; set; } = 0;
+    /// <summary>
+    /// 船公司 
+    /// </summary>
+    public string Carrier { get; set; }
     /// <summary>
     /// 状态 0 启用 1 禁用
     /// </summary>

ds-wms-service/DS.WMS.Core/Info/Dtos/ClientContactRes.cs

@@ -112,7 +112,14 @@ public class ClientContactRes
     /// 提醒备注2
     /// </summary>
     public string AnniversaryNote2 { get; set; }
-
+    /// <summary>
+    /// 船公司Id 
+    /// </summary>
+    public long CarrierId { get; set; }
+    /// <summary>
+    /// 船公司 
+    /// </summary>
+    public string Carrier { get; set; }
     /// <summary>
     /// 状态 0 启用 1 禁用
     /// </summary>

ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientContact.cs

@@ -136,4 +136,16 @@ public class InfoClientContact : BaseOrgModel<long>
     /// </summary>
     [SugarColumn(ColumnDescription = "状态",DefaultValue = "0")]
     public StatusEnum? Status { get; set; } = StatusEnum.Enable;
+
+
+    /// <summary>
+    /// 船公司Id 
+    /// </summary>
+    [SugarColumn(ColumnDescription = "船公司Id", IsNullable = true, DefaultValue = "0")]
+    public long CarrierId { get; set; }
+    /// <summary>
+    /// 船公司 
+    /// </summary>
+    [SugarColumn(ColumnDescription = "船公司", IsNullable = true, Length = 100)]
+    public string Carrier { get; set; }
 }

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

@@ -25,7 +25,11 @@ namespace DS.WMS.Core.Op.Entity
         /// </summary>
         [SqlSugar.SugarColumn(ColumnDescription = "状态名称", IsNullable = false, Length = 100)]
         public string StatusName { get; set; }
-
+        /// <summary>
+        /// 状态颜色
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "状态颜色", IsNullable = false, Length = 100)]
+        public string StatusColor { get; set; }
         /// <summary>
         /// 排序
         /// </summary>

ds-wms-service/DS.WMS.Core/Op/Method/BookingGoodsStatusConfigService.cs

@@ -9,6 +9,7 @@ using SqlSugar;
 using DS.Module.Core.Extensions;
 using Mapster;
 using Org.BouncyCastle.Ocsp;
+using DS.WMS.Core.Code.Entity;
 
 namespace DS.WMS.Core.Op.Method
 {
@@ -38,6 +39,10 @@ namespace DS.WMS.Core.Op.Method
             var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
             if (req.Id == 0)
             {
+                if (tenantDb.Queryable<BookingGoodsStatusConfig>().Where(x => x.SystemCode == req.SystemCode.Trim()).Any())
+                {
+                    return DataResult.Failed("订舱货物状态已存在!", MultiLanguageConst.BookingGoodsStatusConfigExist);
+                }
                 var data = req.Adapt<BookingGoodsStatusConfig>();
 
                 var entity = tenantDb.Insertable(data).ExecuteReturnEntity();

ds-wms-service/DS.WMS.Core/Op/Method/SeaExportCommonService.cs

@@ -753,7 +753,7 @@ namespace DS.WMS.Core.Op.Method
                             BusinessId = bookingId,
                             ConfigId = gsCfg.Id,
                             FinishTime = DateTime.Now,
-                            FinishUserName = user.UserId.IsNull() ? "超级管理员" : user.UserId,
+                            FinishUserName = user.UserId.IsNull() ? "超级管理员" : user.UserName,
                             FinishBy = user.UserId.IsNull() ? 0 : long.Parse(user.UserId),
                             StatusCode = gsCfg.SystemCode,
                             StatusName = gsCfg.StatusName,