From 1f64a4497d2ace3ad805a164363bb7a409d2cefb Mon Sep 17 00:00:00 2001
From: "boxu.zheng" <boxu.zheng@ccwin-in.com>
Date: Fri, 21 Jul 2023 09:38:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Enums/Store/EnumMaterialRequestType.cs                | 2 +-
 .../MaterialRequests/Inputs/MaterialRequestImportInput.cs | 8 ++++++--
 .../MaterialRequests/MaterialRequestAppService.cs         | 5 +++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumMaterialRequestType.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumMaterialRequestType.cs
index 0fa48dec0..5a66aec27 100644
--- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumMaterialRequestType.cs
+++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumMaterialRequestType.cs
@@ -27,6 +27,6 @@ public enum EnumMaterialRequestType
     //[Display(Name = "安全库存拉动")]
     //Issue_SfaetyStock = 1504,
 
-    [Display(Name = "直接发料")]
+    [Display(Name = "非生产调拨")]
     Issue_Direct = 1505
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/MaterialRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/MaterialRequestImportInput.cs
index 82b194b03..5d9e57d59 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/MaterialRequestImportInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/MaterialRequestImportInput.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
@@ -10,8 +11,11 @@ public class MaterialRequestImportInput : SfsStoreImportInputBase
     /// 叫料类型
     /// </summary>
     [Display(Name = "叫料类型")]
-    [Required]
-    public EnumMaterialRequestType Type { get; set; }
+    [Required(ErrorMessage = "{0}是必填项")]
+    [ImporterHeader(Name = "叫料类型")]
+    [ExporterHeader(DisplayName = "叫料类型")]
+    [ValueMapping("人工拉动", EnumMaterialRequestType.Issue_Manual)]
+    public string Type { get; set; }
 
     /// <summary>
     /// 物品代码
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 304fd2166..b1d0efd78 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
@@ -83,6 +83,11 @@ public class MaterialRequestAppService : SfsStoreRequestAppServiceBase<MaterialR
         {
             materialRequest.Worker = CurrentUser.GetUserName();
             materialRequest.CreatorId = CurrentUser.Id;
+            if (materialRequest.Type == EnumTransSubType.Issue_Manual.GetDisplayName())
+            {
+                materialRequest.Type = EnumTransSubType.Issue_Manual.ToString();
+            }
+
             foreach (var detail in materialRequest.Details)
             {
                 var locationDto= await _locationAppService.GetByCodeAsync(detail.ToLocationCode).ConfigureAwait(false);