增加位置码导入校验

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>

be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.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>.\..\..\..\OutPut\StoreHost\</PublishUrl>
+    <PublishUrl>D:\发布\WMS\store</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <SiteUrlToLaunchAfterPublish />
     <TargetFramework>net6.0</TargetFramework>

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;
             }
 
         });

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

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

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

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

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);

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)
     {

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

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

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