修改箱型映射、签单方式映射、MSK API订舱

ds-wms-service/DS.WMS.Core/Map/Method/MappingCtnService.cs

@@ -72,7 +72,10 @@ namespace DS.WMS.Core.Map.Method
             if (req.Id == 0)
             {
 
-                if (tenantDb.Queryable<MappingCtn>().Where(x => x.LinkId == req.LinkId && x.Module == req.Module).Any())
+                if (tenantDb.Queryable<MappingCtn>().Where(x => x.LinkId == req.LinkId && x.Module == req.Module)
+                    .WhereIF(req.CarrierId > 0, x => x.CarrierId != null && x.CarrierId.Value == req.CarrierId)
+                    .WhereIF(req.CarrierId == 0, x => x.CarrierId == null || x.CarrierId.Value == 0)
+                    .Any())
                 {
                     return DataResult.Failed("箱型映射信息已存在!", MultiLanguageConst.MappingCtnExist);
                 }

ds-wms-service/DS.WMS.Core/Map/Method/MappingIssueTypeService.cs

@@ -78,7 +78,10 @@ namespace DS.WMS.Core.Map.Method
             if (req.Id == 0)
             {
 
-                if (tenantDb.Queryable<MappingIssueType>().Where(x => x.LinkId == req.LinkId && x.Module == req.Module).Any())
+                if (tenantDb.Queryable<MappingIssueType>().Where(x => x.LinkId == req.LinkId && x.Module == req.Module)
+                    .WhereIF(req.CarrierId > 0, x => x.CarrierId != null && x.CarrierId.Value == req.CarrierId)
+                    .WhereIF(req.CarrierId == 0, x => x.CarrierId == null || x.CarrierId.Value == 0)
+                    .Any())
                 {
                     return DataResult.Failed("签单方式映射信息已存在!", MultiLanguageConst.MappingIssueTypeExist);
                 }

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

@@ -508,5 +508,15 @@ namespace DS.WMS.Core.Op.Dtos
         /// 删除人
         /// </summary>
         public long DeleteBy { get; set; }
+
+        /// <summary>
+        /// 定时方案ID
+        /// </summary>
+        public string TimerPlanId { get; set; }
+
+        /// <summary>
+        /// 定时方案ID
+        /// </summary>
+        public string TimerPlanName { get; set; }
     }
 }

ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>D:\Source\Repos\DS8\ds-wms-service\DS.WMS.MainApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.MainApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
 </Project>