From 1cc4eb4c758358c5cc12cb98fdb45ced9b54dbca Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Wed, 6 Mar 2024 15:27:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=8D=E7=BD=AE=E7=A0=81?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Properties/PublishProfiles/FolderProfile.pubxml       | 2 +-
 .../Properties/PublishProfiles/FolderProfile.pubxml       | 4 ++--
 .../Controllers/Stores/IssueNoteController.cs             | 8 ++++----
 .../PositionCode/Inputs/PositionCodeImportInput.cs        | 2 ++
 .../Jobs/IssueJobs/Inputs/IssueJobDetailInput.cs          | 2 +-
 .../Notes/IssueNotes/Inputs/IssueNoteDetailInput.cs       | 2 +-
 .../MaterialRequests/Inputs/MaterialRequestDetailInput.cs | 2 +-
 .../MaterialRequests/MaterialRequestAppService.cs         | 8 ++++----
 .../Jobs/IssueJobs/IssueJobDetail.cs                      | 2 +-
 .../Notes/IssueNotes/IssueNoteDetail.cs                   | 2 +-
 .../Requests/MaterialRequests/MaterialRequestDetail.cs    | 2 +-
 .../IssueJobs/IssueJobDbContextModelCreatingExtensions.cs | 2 +-
 12 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/Properties/PublishProfiles/FolderProfile.pubxml b/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/Properties/PublishProfiles/FolderProfile.pubxml
index ef3bc86af..39db2b9e4 100644
--- a/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>C:\发布\WMS</PublishUrl>
+    <PublishUrl>D:\发布\WMS\base</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <SiteUrlToLaunchAfterPublish />
     <TargetFramework>net6.0</TargetFramework>
diff --git a/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/Properties/PublishProfiles/FolderProfile.pubxml b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/Properties/PublishProfiles/FolderProfile.pubxml
index 83d3b93a7..893ee79a0 100644
--- a/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,11 +10,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>.\..\..\..\OutPut\StoreHost\</PublishUrl>
+    <PublishUrl>D:\发布\WMS\store</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <SiteUrlToLaunchAfterPublish />
     <TargetFramework>net6.0</TargetFramework>
     <ProjectGuid>488eeada-cfed-4016-9884-7a1dcbe5eb9c</ProjectGuid>
     <SelfContained>false</SelfContained>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/IssueNoteController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/IssueNoteController.cs
index bad5c92d0..f8ac25b4b 100644
--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/IssueNoteController.cs
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/IssueNoteController.cs
@@ -41,19 +41,19 @@ public class IssueNoteController : AbpController
             p.ToPackingCode = string.Empty;
             if(p.PositionCode.Contains('W'))
             {
-                p.RecommendType = "W";
+                p.RecommendType = EnumRecommendType.W;
             }
             else if(p.PositionCode.Contains('Q'))
             {
-                p.RecommendType = "Q";
+                p.RecommendType = EnumRecommendType.Q;
             }
             else if (p.PositionCode.Contains('K'))
             {
-                p.RecommendType = "K";
+                p.RecommendType = EnumRecommendType.K;
             }
             else
             {
-                p.RecommendType = "None";
+                p.RecommendType = EnumRecommendType.None;
             }
 
         });
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs
index 9136deffe..53432b077 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs
@@ -13,6 +13,7 @@ public class PositionCodeImportInput : SfsBaseDataImportInputBase
     [Key]
     [Display(Name = "代码")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    [Required(ErrorMessage = "{0}是必填项")]
     public string Code { get; set; }
     /// <summary>
     /// 物料号
@@ -60,6 +61,7 @@ public class PositionCodeImportInput : SfsBaseDataImportInputBase
     /// 类型
     /// </summary>
     [Display(Name = "类型")]
+    [Required(ErrorMessage = "{0}是必填项")]
     public EnumRecommendType Type { get; set; }
 
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/Inputs/IssueJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/Inputs/IssueJobDetailInput.cs
index 022a32dc5..b059524c9 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/Inputs/IssueJobDetailInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/Inputs/IssueJobDetailInput.cs
@@ -130,5 +130,5 @@ public class IssueJobDetailInput : SfsJobRecommendFromDetailInputBase, IHasToLoc
     /// <summary>
     /// 推荐类型
     /// </summary>
-    public string RecommendType { get; set; }
+    public EnumRecommendType RecommendType { get; set; }
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/Inputs/IssueNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/Inputs/IssueNoteDetailInput.cs
index 226f02145..0d8769392 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/Inputs/IssueNoteDetailInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/Inputs/IssueNoteDetailInput.cs
@@ -48,6 +48,6 @@ public class IssueNoteDetailInput : SfsStoreRecommendFromDetailWithFromToInputBa
     /// <summary>
     /// 推荐类型
     /// </summary>
-    public string RecommendType { get; set; }
+    public EnumRecommendType RecommendType { get; set; }
 
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/MaterialRequestDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/MaterialRequestDetailInput.cs
index b58996f7a..058c47f49 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/MaterialRequestDetailInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/MaterialRequestDetailInput.cs
@@ -79,7 +79,7 @@ public class MaterialRequestDetailInput : SfsStoreDetailWithQtyInputBase
     /// <summary>
     /// 推荐类型
     /// </summary>
-    public string RecommendType { get; set; }
+    public EnumRecommendType RecommendType { get; set; }
 
 
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/MaterialRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/MaterialRequestAppService.cs
index decb16295..64d689dbc 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/MaterialRequestAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/MaterialRequestAppService.cs
@@ -216,19 +216,19 @@ public class MaterialRequestAppService : SfsStoreRequestAppServiceBase<MaterialR
             detailInput.ItemDesc1 = itemBasicDto.Desc1;
             if(detailInput.PositionCode.Contains('W'))
             {
-                detailInput.RecommendType = "W";
+                detailInput.RecommendType = EnumRecommendType.W;
             }
             else if(detailInput.PositionCode.Contains('Q'))
             {
-                detailInput.RecommendType = "Q";
+                detailInput.RecommendType = EnumRecommendType.Q;
             }
             else if(detailInput.PositionCode.Contains('K'))
             {
-                detailInput.RecommendType = "K";
+                detailInput.RecommendType = EnumRecommendType.K;
             }
             else
             {
-                detailInput.RecommendType = "None";
+                detailInput.RecommendType = EnumRecommendType.None;
             }
 
             var productionLineDto = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationDto.LocationGroupCode).ConfigureAwait(false);
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobDetail.cs
index 734d338ab..160e7d6f3 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobDetail.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobDetail.cs
@@ -99,7 +99,7 @@ public class IssueJobDetail : SfsJobRecommendFromDetailEntityBase, IHasToLocatio
     /// <summary>
     /// 推荐类型
     /// </summary>
-    public string RecommendType { get; set; }
+    public EnumRecommendType RecommendType { get; set; }
 
     public void SetId(Guid id)
     {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNoteDetail.cs
index de7699dc9..bd3fad75b 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNoteDetail.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNoteDetail.cs
@@ -39,5 +39,5 @@ public class IssueNoteDetail : SfsStoreRecommendFromDetailWithFromToEntityBase
     /// <summary>
     /// 推荐类型
     /// </summary>
-    public string RecommendType { get; set; }
+    public EnumRecommendType RecommendType { get; set; }
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestDetail.cs
index ce4890d59..19420cba8 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestDetail.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestDetail.cs
@@ -99,6 +99,6 @@ public class MaterialRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasToLoca
     /// <summary>
     /// 推荐类型
     /// </summary>
-    public string RecommendType { get; set; }
+    public EnumRecommendType RecommendType { get; set; }
 
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/IssueJobDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/IssueJobDbContextModelCreatingExtensions.cs
index 3923b6b1a..2a6c87990 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/IssueJobDbContextModelCreatingExtensions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/IssueJobDbContextModelCreatingExtensions.cs
@@ -57,7 +57,7 @@ public static class IssueJobDbContextModelCreatingExtensions
             b.Property(q => q.PlannedSplitRule).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
             b.Property(q => q.OnTheWayLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
             b.Property(q => q.PositionCode).HasMaxLength(SfsPropertyConst.CodeLength).IsRequired(false);
-            b.Property(q => q.RecommendType).HasMaxLength(SfsPropertyConst.CodeLength).IsRequired(false);
+            b.Property(q => q.RecommendType).HasMaxLength(SfsPropertyConst.CodeLength).HasConversion<string>();
 
             //Relations
             //None