diff --git a/ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs b/ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs index def257b0..73e2838a 100644 --- a/ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs +++ b/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"; diff --git a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientContactReq.cs b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientContactReq.cs index 642eead6..0c0e7534 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientContactReq.cs +++ b/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 /// public string AnniversaryNote2 { get; set; } + /// + /// 船公司Id + /// + public long CarrierId { get; set; } = 0; + /// + /// 船公司 + /// + public string Carrier { get; set; } /// /// 状态 0 启用 1 禁用 /// diff --git a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientContactRes.cs b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientContactRes.cs index df3a7da2..16507e04 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientContactRes.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientContactRes.cs @@ -112,7 +112,14 @@ public class ClientContactRes /// 提醒备注2 /// public string AnniversaryNote2 { get; set; } - + /// + /// 船公司Id + /// + public long CarrierId { get; set; } + /// + /// 船公司 + /// + public string Carrier { get; set; } /// /// 状态 0 启用 1 禁用 /// diff --git a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientContact.cs b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientContact.cs index 034656b9..86599b48 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientContact.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientContact.cs @@ -136,4 +136,16 @@ public class InfoClientContact : BaseOrgModel /// [SugarColumn(ColumnDescription = "状态",DefaultValue = "0")] public StatusEnum? Status { get; set; } = StatusEnum.Enable; + + + /// + /// 船公司Id + /// + [SugarColumn(ColumnDescription = "船公司Id", IsNullable = true, DefaultValue = "0")] + public long CarrierId { get; set; } + /// + /// 船公司 + /// + [SugarColumn(ColumnDescription = "船公司", IsNullable = true, Length = 100)] + public string Carrier { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingGoodsStatusConfig.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingGoodsStatusConfig.cs index cc85e36c..89277346 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingGoodsStatusConfig.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingGoodsStatusConfig.cs @@ -25,7 +25,11 @@ namespace DS.WMS.Core.Op.Entity /// [SqlSugar.SugarColumn(ColumnDescription = "状态名称", IsNullable = false, Length = 100)] public string StatusName { get; set; } - + /// + /// 状态颜色 + /// + [SqlSugar.SugarColumn(ColumnDescription = "状态颜色", IsNullable = false, Length = 100)] + public string StatusColor { get; set; } /// /// 排序 /// diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/BookingGoodsStatusConfigService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/BookingGoodsStatusConfigService.cs index b33552bb..24421370 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/BookingGoodsStatusConfigService.cs +++ b/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().Where(x => x.SystemCode == req.SystemCode.Trim()).Any()) + { + return DataResult.Failed("订舱货物状态已存在!", MultiLanguageConst.BookingGoodsStatusConfigExist); + } var data = req.Adapt(); var entity = tenantDb.Insertable(data).ExecuteReturnEntity(); diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportCommonService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportCommonService.cs index eb666aef..f0736467 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportCommonService.cs +++ b/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,