From a3de25446cb6cbf77bd53414f4f8d177b81b425a Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Fri, 9 Aug 2024 11:22:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89gateway=E7=9A=84FEEAPI?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ds-wms-service/DS.WMS.Gateway/DS.WMS.Gateway.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/ds-wms-service/DS.WMS.Gateway/DS.WMS.Gateway.csproj b/ds-wms-service/DS.WMS.Gateway/DS.WMS.Gateway.csproj index 006e5a96..fcb605b9 100644 --- a/ds-wms-service/DS.WMS.Gateway/DS.WMS.Gateway.csproj +++ b/ds-wms-service/DS.WMS.Gateway/DS.WMS.Gateway.csproj @@ -15,7 +15,6 @@ - From 225c7b022b1e0dbaa09491b6c7c4d0c8f52e47f3 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Fri, 9 Aug 2024 11:52:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/Mapper/AddTaskPlatMapsterSetup.cs | 45 ++++++++++++++++++- .../DS.WMS.OpApi/DS.WMS.OpApi.csproj.user | 2 +- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/Mapper/AddTaskPlatMapsterSetup.cs b/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/Mapper/AddTaskPlatMapsterSetup.cs index 21cbb3c9..186888bd 100644 --- a/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/Mapper/AddTaskPlatMapsterSetup.cs +++ b/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/Mapper/AddTaskPlatMapsterSetup.cs @@ -2,6 +2,7 @@ using DS.WMS.Core.TaskPlat.Entity; using Mapster; using Microsoft.Extensions.DependencyInjection; +using static Org.BouncyCastle.Math.EC.ECCurve; namespace DS.WMS.Core.TaskPlat.Dtos.Mapper { @@ -202,7 +203,7 @@ namespace DS.WMS.Core.TaskPlat.Dtos.Mapper } { - TypeAdapterConfig.NewConfig().TwoWays() + TypeAdapterConfig.NewConfig() .Map(dest => dest.MBLNo, src => src.MBL_NO) .Map(dest => dest.Vessel, src => src.VESSEL) .Map(dest => dest.VoyNo, src => src.VOYNO) @@ -495,6 +496,48 @@ namespace DS.WMS.Core.TaskPlat.Dtos.Mapper .Map(dest => dest.GroupBatchNo, src => src.GROUP_BATCH_NO) .Map(dest => dest.IsLast, src => src.IS_LAST); } + + { + TypeAdapterConfig.NewConfig() + .Map(dest => dest.CARRIER, src => src.CarrierId) + .Map(dest => dest.VESSEL, src => src.Vessel) + .Map(dest => dest.VOYNO, src => src.VoyNo) + .Map(dest => dest.NOTICE_DATE, src => src.CreateTime) + .Map(dest => dest.VESSEL, src => src.Vessel) + .Map(dest => dest.MBL_NO, src => src.MBLNo) + .Map(dest => dest.PORTLOAD_AREA, src => src.PortLoadArea) + .Map(dest => dest.REASON, src => src.Reason) + .Map(dest => dest.TASK_BATCH_TOTAL, src => src.TotalNum) + .Map(dest => dest.TASK_BATCH_PER_TOTAL, src => src.PerTotalNum) + .Map(dest => dest.TASK_BATCH_NO, src => src.BatchNo); + } + + { + TypeAdapterConfig.NewConfig() + .Map(dest => dest.MBL_NO, src => src.MBLNo) + .Map(dest => dest.VESSEL, src => src.Vessel) + .Map(dest => dest.VOYNO, src => src.VoyNo) + .Map(dest => dest.SI_CUTOFF, src => src.SICutDate) + .Map(dest => dest.SI_CUTOFF_TXT, src => src.SICutDateTxt) + .Map(dest => dest.CY_OPEN, src => src.CYOpenDate) + .Map(dest => dest.CY_OPEN_TXT, src => src.CYOpenDateTxt) + .Map(dest => dest.CY_CUTOFF, src => src.CYCutoffTime) + .Map(dest => dest.CY_CUTOFF_TXT, src => src.CYCutoffTimeTxt) + .Map(dest => dest.MANIFEST_CUT, src => src.ManifestCutDate) + .Map(dest => dest.MANIFEST_CUT_TXT, src => src.ManifestCutDateTxt) + .Map(dest => dest.MDGF_CUT, src => src.MDGFCutDate) + .Map(dest => dest.MDGF_CUT_TXT, src => src.MDGFCutDateTxt) + .Map(dest => dest.VGM_CUT, src => src.VGMCutoffTime) + .Map(dest => dest.VGM_CUT_TXT, src => src.VGMCutoffTimeTxt) + .Map(dest => dest.CLOSING_DATE, src => src.ClosingDate) + .Map(dest => dest.CLOSING_DATE_TXT, src => src.ClosingDateTxt) + .Map(dest => dest.VOUCHER_CUT_DATE, src => src.VoucherCutoffTime) + .Map(dest => dest.LOAD_PORT, src => src.LoadPort) + .Map(dest => dest.ETD, src => src.ETD) + .Map(dest => dest.ETB, src => src.ETB) + .Map(dest => dest.REASON, src => src.Reason) + .Map(dest => dest.CONTA_NO, src => src.ContaNo); + } } } } diff --git a/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user b/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user index fb7be066..da141c5a 100644 --- a/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user +++ b/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user @@ -1,7 +1,7 @@  - D:\Source\Repos\DS8\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml + E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml MvcControllerEmptyScaffolder root/Common/MVC/Controller From ccb8b8536f29557de7b027c1dfbf31db4ebeafaf Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Fri, 9 Aug 2024 11:53:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/TaskPlat/Dtos/Mapper/AddTaskPlatMapsterSetup.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/Mapper/AddTaskPlatMapsterSetup.cs b/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/Mapper/AddTaskPlatMapsterSetup.cs index 186888bd..17aa70c1 100644 --- a/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/Mapper/AddTaskPlatMapsterSetup.cs +++ b/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/Mapper/AddTaskPlatMapsterSetup.cs @@ -2,7 +2,6 @@ using DS.WMS.Core.TaskPlat.Entity; using Mapster; using Microsoft.Extensions.DependencyInjection; -using static Org.BouncyCastle.Math.EC.ECCurve; namespace DS.WMS.Core.TaskPlat.Dtos.Mapper {