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 206659fb..3dca6051 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/BookingGoodsStatusConfigService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/BookingGoodsStatusConfigService.cs @@ -141,7 +141,25 @@ namespace DS.WMS.Core.Op.Method stream.Position = 0; //将内存流转成List集合 var list = await stream.QueryAsync(); - var configs = list.Adapt(); + var configs = new List(); + foreach (var item in list) + { + var config = new BookingGoodsStatusConfig() + { + SystemCode = item.SystemCode, + StatusName = item.StatusName, + StatusColor = item.StatusColor, + Note = item.Note, + OrderNo = item.OrderNo, + }; + configs.Add(config); + } + var codes = configs.Select(c => c.SystemCode).ToList(); + if (tenantDb.Queryable().Where(x=> codes.Contains(x.SystemCode)).Any()) { + + return DataResult.Failed("存在已有的系统编码,请检查"); + } + //var configs = list.Adapt(); await tenantDb.Insertable(configs).ExecuteCommandAsync(); return await Task.FromResult(DataResult.Failed("导入成功!", MultiLanguageConst.DataImportSuccess)); diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs index 01cdf8df..afda896d 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs @@ -867,7 +867,8 @@ namespace DS.WMS.Core.Op.Method DataObj = new BookingSlotBaseApiSaveDto { CarrierId = carrierInfo?.LinkId, - CarrierCode = carrierInfo?.Code, + CarrierCode = carrierInfo?.MapCode, + Carrier = carrierInfo?.MapName, SlotBookingNo = taskBCInfoDto.MBLNo, BookingParty = taskBCInfoDto.BookingParty, BookingSlotType = taskBCInfoDto.BookingSlotType, @@ -893,7 +894,7 @@ namespace DS.WMS.Core.Op.Method PortDischarge = taskBCInfoDto.PortDischarge, PortLoad = taskBCInfoDto.Portload, SICutDate = taskBCInfoDto.SICutDate, - //CustomSICutDate = taskBCInfoDto.CustomSICutDate, + CustomSICutDate = taskBCInfoDto.CustomSICutDate, TransferPort1 = taskBCInfoDto.TransferPort1, TransferPort2 = taskBCInfoDto.TransferPort2, PriceCalculationDate = taskBCInfoDto.PriceCalculationDate, diff --git a/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/TaskManageOrderBCInfo.cs b/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/TaskManageOrderBCInfo.cs index 9716c5b1..62179f0b 100644 --- a/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/TaskManageOrderBCInfo.cs +++ b/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/TaskManageOrderBCInfo.cs @@ -396,6 +396,11 @@ namespace DS.WMS.Core.TaskPlat.Dtos /// 货物标志 /// public string CARGOID { get; set; } + + /// + /// 客户样单截止日期 + /// + public Nullable CustomSICutDate { get; set; } } diff --git a/ds-wms-service/DS.WMS.OpApi/Controllers/DjyServiceStatusController.cs b/ds-wms-service/DS.WMS.OpApi/Controllers/DjyServiceStatusController.cs index 5d30a683..ecbd2500 100644 --- a/ds-wms-service/DS.WMS.OpApi/Controllers/DjyServiceStatusController.cs +++ b/ds-wms-service/DS.WMS.OpApi/Controllers/DjyServiceStatusController.cs @@ -100,10 +100,10 @@ namespace DS.WMS.OpApi.Controllers } /// - /// 取消服务状态 + /// 获取可用的服务项目字典列表 /// - /// - /// 返回回执 + /// 是否重新加载缓存 + /// [HttpGet] [Route("GetEnableProjectDictTreeList")] public async Task GetEnableProjectDictTreeList([FromQuery] bool isAvoidCache = false) diff --git a/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user index d2cbfc5a..321582b2 100644 --- a/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -6,7 +6,7 @@ <_PublishTargetUrl>D:\Code\PublishCopy\ds8-opapi - True|2024-07-24T10:28:12.1752469Z||;True|2024-07-24T18:11:54.2105215+08:00||;True|2024-07-24T18:10:14.9409342+08:00||;True|2024-07-24T17:52:10.3966338+08:00||;True|2024-07-24T16:01:13.8217949+08:00||;True|2024-07-24T15:56:15.7589616+08:00||;True|2024-07-24T15:38:29.2442086+08:00||;True|2024-07-24T14:48:12.2303919+08:00||;True|2024-07-24T14:18:05.5309704+08:00||;True|2024-07-24T12:56:48.1663545+08:00||;True|2024-07-24T08:47:26.1616069+08:00||;True|2024-07-24T08:42:02.7606608+08:00||;True|2024-07-24T08:41:18.4678459+08:00||;False|2024-07-24T08:40:29.5381703+08:00||;False|2024-07-24T08:39:20.2230656+08:00||;True|2024-07-23T15:56:16.8305907+08:00||;True|2024-07-22T16:42:12.1933090+08:00||;True|2024-07-19T18:28:29.1420269+08:00||;True|2024-07-19T15:45:49.1068004+08:00||;True|2024-07-19T15:33:45.3242155+08:00||;False|2024-07-19T15:32:41.9604526+08:00||;True|2024-07-19T13:48:27.9722093+08:00||;False|2024-07-19T13:47:56.7900396+08:00||;True|2024-07-19T11:41:15.4223247+08:00||;True|2024-07-19T08:46:28.8014836+08:00||;True|2024-07-18T19:24:50.4184188+08:00||;True|2024-07-18T19:19:14.7056635+08:00||;True|2024-07-18T19:04:43.5615501+08:00||;True|2024-07-18T18:38:39.1976753+08:00||;True|2024-07-18T18:25:15.6833492+08:00||;True|2024-07-18T18:08:46.3114951+08:00||;True|2024-07-18T17:59:12.5292256+08:00||;True|2024-07-18T16:18:45.8049777+08:00||;True|2024-07-18T16:12:42.9723969+08:00||;True|2024-07-18T16:07:14.1432207+08:00||;True|2024-07-17T17:44:18.4741963+08:00||;True|2024-07-17T17:42:47.2735071+08:00||;True|2024-07-17T16:13:32.9037697+08:00||;True|2024-07-17T15:40:21.2550083+08:00||;True|2024-07-17T14:03:08.1814323+08:00||;True|2024-07-15T13:43:42.6073130+08:00||;True|2024-07-15T11:53:40.6498579+08:00||;True|2024-07-15T11:53:03.1652559+08:00||;True|2024-07-15T11:42:33.0154478+08:00||;True|2024-07-15T10:20:03.3925876+08:00||;True|2024-07-15T10:13:28.1415352+08:00||;True|2024-07-08T14:33:12.6884426+08:00||;True|2024-07-08T09:56:58.4995696+08:00||; + True|2024-07-24T11:25:58.0077671Z||;True|2024-07-24T18:28:12.1752469+08:00||;True|2024-07-24T18:11:54.2105215+08:00||;True|2024-07-24T18:10:14.9409342+08:00||;True|2024-07-24T17:52:10.3966338+08:00||;True|2024-07-24T16:01:13.8217949+08:00||;True|2024-07-24T15:56:15.7589616+08:00||;True|2024-07-24T15:38:29.2442086+08:00||;True|2024-07-24T14:48:12.2303919+08:00||;True|2024-07-24T14:18:05.5309704+08:00||;True|2024-07-24T12:56:48.1663545+08:00||;True|2024-07-24T08:47:26.1616069+08:00||;True|2024-07-24T08:42:02.7606608+08:00||;True|2024-07-24T08:41:18.4678459+08:00||;False|2024-07-24T08:40:29.5381703+08:00||;False|2024-07-24T08:39:20.2230656+08:00||;True|2024-07-23T15:56:16.8305907+08:00||;True|2024-07-22T16:42:12.1933090+08:00||;True|2024-07-19T18:28:29.1420269+08:00||;True|2024-07-19T15:45:49.1068004+08:00||;True|2024-07-19T15:33:45.3242155+08:00||;False|2024-07-19T15:32:41.9604526+08:00||;True|2024-07-19T13:48:27.9722093+08:00||;False|2024-07-19T13:47:56.7900396+08:00||;True|2024-07-19T11:41:15.4223247+08:00||;True|2024-07-19T08:46:28.8014836+08:00||;True|2024-07-18T19:24:50.4184188+08:00||;True|2024-07-18T19:19:14.7056635+08:00||;True|2024-07-18T19:04:43.5615501+08:00||;True|2024-07-18T18:38:39.1976753+08:00||;True|2024-07-18T18:25:15.6833492+08:00||;True|2024-07-18T18:08:46.3114951+08:00||;True|2024-07-18T17:59:12.5292256+08:00||;True|2024-07-18T16:18:45.8049777+08:00||;True|2024-07-18T16:12:42.9723969+08:00||;True|2024-07-18T16:07:14.1432207+08:00||;True|2024-07-17T17:44:18.4741963+08:00||;True|2024-07-17T17:42:47.2735071+08:00||;True|2024-07-17T16:13:32.9037697+08:00||;True|2024-07-17T15:40:21.2550083+08:00||;True|2024-07-17T14:03:08.1814323+08:00||;True|2024-07-15T13:43:42.6073130+08:00||;True|2024-07-15T11:53:40.6498579+08:00||;True|2024-07-15T11:53:03.1652559+08:00||;True|2024-07-15T11:42:33.0154478+08:00||;True|2024-07-15T10:20:03.3925876+08:00||;True|2024-07-15T10:13:28.1415352+08:00||;True|2024-07-08T14:33:12.6884426+08:00||;True|2024-07-08T09:56:58.4995696+08:00||; \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.PrintApi/Model/PrintDataResult.cs b/ds-wms-service/DS.WMS.PrintApi/Model/PrintDataResult.cs index 0543d72b..eeab31ac 100644 --- a/ds-wms-service/DS.WMS.PrintApi/Model/PrintDataResult.cs +++ b/ds-wms-service/DS.WMS.PrintApi/Model/PrintDataResult.cs @@ -5,7 +5,7 @@ /// /// 是否成功 /// - public bool Successed { get; set; } + public bool Succeeded { get; set; } /// /// 返回消息 @@ -26,7 +26,7 @@ { return new PrintDataResult() { - Successed = false, + Succeeded = false, Message = message }; } @@ -35,7 +35,7 @@ { return new PrintDataResult() { - Successed = true, + Succeeded = true, Data = data }; }