Browse Source

Merge branch '交付给东阳的源代码' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into 交付给东阳的源代码

交付给东阳的源代码
郑勃旭 3 weeks ago
parent
commit
6b12b3e17d
  1. 13
      be/DataExchange/host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host/.config/dotnet-tools.json
  2. 12
      be/DataExchange/host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host/Properties/PublishProfiles/FolderProfile.pubxml
  3. 5
      be/DataExchange/host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host.csproj
  4. 4
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemImportInput.cs
  5. 2
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/CustomerItems/CustomerItemAppService.cs

13
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
}
}
}

12
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.
-->
<Project>
<PropertyGroup>
<DeleteExistingFiles>False</DeleteExistingFiles>
<ExcludeApp_Data>False</ExcludeApp_Data>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<DeleteExistingFiles>false</DeleteExistingFiles>
<ExcludeApp_Data>false</ExcludeApp_Data>
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
<PublishUrl>.\..\..\..\OutPut\DataEchange\</PublishUrl>
<PublishUrl>D:\发布\WMS\DataExchange</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
<TargetFramework>net6.0</TargetFramework>
<ProjectGuid>864ab9c7-ef7d-4337-bbaa-68fae0c77731</ProjectGuid>
<SelfContained>false</SelfContained>
</PropertyGroup>
</Project>

5
be/DataExchange/host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host.csproj

@ -35,9 +35,4 @@
</PackageReference>
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="if $(ConfigurationName) == Release (powershell Compress-Archive -Path '$(TargetDir)Win_in*.dll','$(TargetDir)Win_in*.pdb' -DestinationPath '$(SolutionDir)Output\DataExchangeHost.zip' -Force)" />
</Target>
</Project>

4
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; }
/// <summary>
/// 结束时间
@ -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; }
/// <summary>
/// 备注

2
be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/CustomerItems/CustomerItemAppService.cs

@ -52,7 +52,7 @@ public class CustomerItemAppService : SfsBaseDataAppServiceBase<CustomerItem, Cu
{
await base.CheckItemBasicItemCodeAsync(importInput.ItemCode, validationRresult).ConfigureAwait(false);
await base.CheckCustomerCodeAsync(importInput.CustomerCode, validationRresult).ConfigureAwait(false);
if (string.IsNullOrEmpty(importInput.LocationCode))
if (!string.IsNullOrEmpty(importInput.LocationCode))
{
await base.CheckLocationDefaultLocationCodeByTypeAsync(importInput.LocationCode, EnumLocationType.CUST, validationRresult).ConfigureAwait(false);
}

Loading…
Cancel
Save