From 2b6f399b45e6775afcd53be2c4748243fc5fae77 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Tue, 8 Apr 2025 09:49:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7=E5=92=8C?=
 =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=85=B3=E7=B3=BB=E5=AF=BC=E5=85=A5=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E9=97=AE=E9=A2=98=E3=80=81=E5=8F=96=E6=B6=88=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E5=92=8C=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E9=97=AE?=
 =?UTF-8?q?=E5=8F=B7=E9=9D=9E=E7=A9=BA=E9=80=89=E9=A1=B9=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9datachange=E5=8F=91=E5=B8=83=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.config/dotnet-tools.json                       | 13 +++++++++++++
 .../Properties/PublishProfiles/FolderProfile.pubxml | 12 ++++++++----
 .../Win_in.Sfs.Wms.DataExchange.HttpApi.Host.csproj |  5 -----
 .../CustomerItems/Inputs/CustomerItemImportInput.cs |  4 ++--
 .../CustomerItems/CustomerItemAppService.cs         |  2 +-
 5 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 be/DataExchange/host/Win_in.Sfs.Wms.DataExchange.HttpApi.Host/.config/dotnet-tools.json

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.
 -->
 <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>
\ 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 @@
 	  </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>
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; }
 
     /// <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>
     /// 备注
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<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);
         }