diff --git a/be/DataExchange/host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host/.config/dotnet-tools.json b/be/DataExchange/host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host/.config/dotnet-tools.json new file mode 100644 index 000000000..0280531dd --- /dev/null +++ b/be/DataExchange/host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host/.config/dotnet-tools.json @@ -0,0 +1,13 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "9.0.3", + "commands": [ + "dotnet-ef" + ], + "rollForward": false + } + } +} \ No newline at end of file diff --git a/be/DataExchange/host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host/Properties/PublishProfiles/FolderProfile.pubxml b/be/DataExchange/host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host/Properties/PublishProfiles/FolderProfile.pubxml index e5db083ab..aac6b02de 100644 --- a/be/DataExchange/host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host/Properties/PublishProfiles/FolderProfile.pubxml +++ b/be/DataExchange/host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host/Properties/PublishProfiles/FolderProfile.pubxml @@ -4,13 +4,17 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - False - False - True + false + false + true Release Any CPU FileSystem - .\..\..\..\OutPut\DataEchange\ + D:\发布\WMS\DataExchange FileSystem + + net6.0 + 864ab9c7-ef7d-4337-bbaa-68fae0c77731 + false \ No newline at end of file diff --git a/be/DataExchange/host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host.csproj b/be/DataExchange/host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host.csproj index 15b79326f..2bc033066 100644 --- a/be/DataExchange/host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host.csproj +++ b/be/DataExchange/host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host.csproj @@ -35,9 +35,4 @@ - - - - - diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemImportInput.cs index b306fa646..6b96b6851 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemImportInput.cs @@ -71,7 +71,7 @@ public class CustomerItemImportInput : SfsBaseDataImportInputBase [ImporterHeader(Name = "开始时间", Format = "yyyy-MM-dd HH:mm")] [ExporterHeader(DisplayName = "开始时间", Format = "yyyy-MM-dd HH:mm")] [Required(ErrorMessage = "{0}是必填项")] - public DateTime? BeginTime { get; set; } + public DateTime BeginTime { get; set; } /// /// 结束时间 @@ -80,7 +80,7 @@ public class CustomerItemImportInput : SfsBaseDataImportInputBase [ImporterHeader(Name = "结束时间", Format = "yyyy-MM-dd HH:mm")] [ExporterHeader(DisplayName = "结束时间", Format = "yyyy-MM-dd HH:mm")] [Required(ErrorMessage = "{0}是必填项")] - public DateTime? EndTime { get; set; } + public DateTime EndTime { get; set; } /// /// 备注 diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/CustomerItems/CustomerItemAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/CustomerItems/CustomerItemAppService.cs index 3b1f0b463..8bbc0c970 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/CustomerItems/CustomerItemAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/CustomerItems/CustomerItemAppService.cs @@ -52,7 +52,7 @@ public class CustomerItemAppService : SfsBaseDataAppServiceBase