Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/Mapper/AddTaskPlatMapsterSetup.cs

@@ -202,7 +202,7 @@ namespace DS.WMS.Core.TaskPlat.Dtos.Mapper
             }
 
             {
-                TypeAdapterConfig<TaskCutDateChangeDetailInfo, TaskCutDateChangeShowDto>.NewConfig().TwoWays()
+                TypeAdapterConfig<TaskCutDateChangeDetailInfo, TaskCutDateChangeShowDto>.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 +495,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<TaskCutDateChangeDto, TaskCutDateChangeInfo>.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<CutDateChangeDetailDto, TaskCutDateChangeDetailInfo>.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);
+            }
         }
     }
 }

ds-wms-service/DS.WMS.Gateway/DS.WMS.Gateway.csproj

@@ -15,7 +15,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\DS.Module.Core\DS.Module.Core.csproj" />
-    <ProjectReference Include="..\DS.WMS.FeeApi\DS.WMS.FeeApi.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -1,7 +1,7 @@
 <?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.OpApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
   </PropertyGroup>