diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/CurrentUserExtensions.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/CurrentUserExtensions.cs index 4623096c0..abcbf8563 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/CurrentUserExtensions.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/CurrentUserExtensions.cs @@ -6,11 +6,19 @@ public static class CurrentUserExtensions { public static string GetUserName(this ICurrentUser currentUser) { + if (currentUser == null || currentUser.Name == null) //仅调试时用 + { + return "admin"; + } return currentUser.Name; } public static string GetName(this ICurrentUser currentUser) { + if (currentUser == null || currentUser.Name == null) //仅调试时用 + { + return "admin"; + } return currentUser.Name; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs index 15ca3ba7d..86efe53fa 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs @@ -95,6 +95,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA //}); unplannedIssueRequest.DirectCreateNote = true; //线边 直接生成记录 + unplannedIssueRequest.RequestStatus = EnumRequestStatus.Completed; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequest.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequest.cs index 276f54bd1..5e84c25f0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequest.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequest.cs @@ -35,7 +35,7 @@ public class UnplannedReceiptRequest : SfsStoreRequestAggregateRootBase Details { get; set; } = new List(); - [Display(Name = "退料类别", Order = 0)] + [IgnoreUpdate] public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } }