bug修改

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs

@@ -119,6 +119,16 @@ public class TyrpIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
                 //转换Dictpj
                 await dictConverter.ConvertAsync(dictpjOutsFromExternalList).ConfigureAwait(false);
 
+
+                Logger.LogInformation($"Read ErpLocation");//ERP库位
+                var ErpLocationReader = workerContext.ServiceProvider.GetRequiredService<ErpLocationReader>();
+                var ErpLocationConverter = workerContext.ServiceProvider.GetRequiredService<ErpLocationConverter>();
+                //读取并保存ErpLocationItem
+                var erpLocationFromExternalList = await ErpLocationReader.ReadAsync().ConfigureAwait(false);
+                //转换ErpLocationItem
+                await ErpLocationConverter.ConvertAsync(erpLocationFromExternalList).ConfigureAwait(false);
+
+
                 Logger.LogInformation($"Read Customer");//客户资料
                 var CustomerReader = workerContext.ServiceProvider.GetRequiredService<CustomerReader>();
                 var CustomerConverter = workerContext.ServiceProvider.GetRequiredService<CustomerConverter>();

be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Job/EnumJobStatus.cs

@@ -48,8 +48,8 @@ public enum EnumJobStatus
     Cancelled = 9,
 
     /// <summary>
-    /// 等待
+    /// 待库移
     /// </summary>
-    [Display(Name = "等待")]
+    [Display(Name = "待库移")]
     Wait=30,
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestImportInput.cs

@@ -1,3 +1,4 @@
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -73,7 +74,8 @@ public class TransferRequestImportInput : SfsStoreImportInputBase
     /// </summary>
     [Display(Name = "状态")]
     [Required(ErrorMessage = "{0}是必填项")]
-    public EnumInventoryStatus Status { get; set; }
+    [ValueMapping("合格", EnumInventoryStatus.OK)]
+    public string Status { get; set; }
 
     #region 回调服务相关
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InjectionPlanJobs/InjectionPlanJobAppService.cs

@@ -64,7 +64,7 @@ public class InjectionPlanJobAppService
     }
 
     /// <summary>
-    ///     判断是不是在最底层 如果不是则把状态变更为等待 并把库移推荐的From和To赋值
+    ///     判断是不是在最底层 如果不是则把状态变更为待库移 并把库移推荐的From和To赋值
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs

@@ -564,7 +564,7 @@ public class AssembleIssueJobAppService
     }
 
     /// <summary>
-    ///     判断是不是在最底层 如果不是则把状态变更为等待 并把库移推荐的From和To赋值
+    ///     判断是不是在最底层 如果不是则把状态变更为待库移 并把库移推荐的From和To赋值
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs

@@ -559,7 +559,7 @@ public class CoatingIssueJobAppService
     }
 
     /// <summary>
-    ///     判断是不是在最底层 如果不是则把状态变更为等待 并把库移推荐的From和To赋值
+    ///     判断是不是在最底层 如果不是则把状态变更为待库移 并把库移推荐的From和To赋值
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs

@@ -512,7 +512,7 @@ public class InjectionIssueJobAppService
     }
 
     /// <summary>
-    ///     判断是不是在最底层 如果不是则把状态变更为等待 并把库移推荐的From和To赋值
+    ///     判断是不是在最底层 如果不是则把状态变更为待库移 并把库移推荐的From和To赋值
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs

@@ -509,7 +509,7 @@ public class KittingIssueJobAppService
     }
 
     /// <summary>
-    ///     判断是不是在最底层 如果不是则把状态变更为等待 并把库移推荐的From和To赋值
+    ///     判断是不是在最底层 如果不是则把状态变更为待库移 并把库移推荐的From和To赋值
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs

@@ -493,7 +493,7 @@ public class SparePartIssueJobAppService
     }
 
     /// <summary>
-    ///     判断是不是在最底层 如果不是则把状态变更为等待 并把库移推荐的From和To赋值
+    ///     判断是不是在最底层 如果不是则把状态变更为待库移 并把库移推荐的From和To赋值
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/InjectionPlanJobEventHandler.cs

@@ -202,7 +202,7 @@ public class InjectionPlanJobEventHandler :
     }
 
     /// <summary>
-    ///     判断是不是在最底层 如果不是则把状态变更为等待
+    ///     判断是不是在最底层 如果不是则把状态变更为待库移
     /// </summary>
     /// <param name="injectionJob"></param>
     /// <returns></returns>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/AssembleIssueJobEventHandler.cs

@@ -214,7 +214,7 @@ public class AssembleIssueJobEventHandler :
     }
 
     /// <summary>
-    ///     判断是不是在最底层 如果不是则把状态变更为等待
+    ///     判断是不是在最底层 如果不是则把状态变更为待库移
     /// </summary>
     /// <param name="assembleIssueJob"></param>
     /// <returns></returns>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/CoatingIssueJobEventHandler.cs

@@ -214,7 +214,7 @@ public class CoatingIssueJobEventHandler :
     }
 
     /// <summary>
-    ///     判断是不是在最底层 如果不是则把状态变更为等待
+    ///     判断是不是在最底层 如果不是则把状态变更为待库移
     /// </summary>
     /// <param name="coatingIssueJob"></param>
     /// <returns></returns>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/InjectionIssueJobEventHandler.cs

@@ -213,7 +213,7 @@ public class InjectionIssueJobEventHandler :
     }
 
     /// <summary>
-    ///     判断是不是在最底层 如果不是则把状态变更为等待
+    ///     判断是不是在最底层 如果不是则把状态变更为待库移
     /// </summary>
     /// <param name="injectionIssueJob"></param>
     /// <returns></returns>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/KittingIssueJobEventHandler.cs

@@ -213,7 +213,7 @@ public class KittingIssueJobEventHandler :
     }
 
     /// <summary>
-    ///     判断是不是在最底层 如果不是则把状态变更为等待
+    ///     判断是不是在最底层 如果不是则把状态变更为待库移
     /// </summary>
     /// <param name="kittingIssueJob"></param>
     /// <returns></returns>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/SparePartIssueJobEventHandler.cs

@@ -213,7 +213,7 @@ public class SparePartIssueJobEventHandler :
     }
 
     /// <summary>
-    ///     判断是不是在最底层 如果不是则把状态变更为等待
+    ///     判断是不是在最底层 如果不是则把状态变更为待库移
     /// </summary>
     /// <param name="sparePartIssueJob"></param>
     /// <returns></returns>