diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json index 8a93db331..7ec7d8dd5 100644 --- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json +++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json @@ -1,34 +1,34 @@ { "ConfigServer": "http://localhost:21093", "ConfigServer.Docker": "http://gateway:21093", - "ConnectionStrings": { - "Default": "Server=dev.ccwin-in.com,21195;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;", - "Auth": "Server=dev.ccwin-in.com,21195;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;" - }, - "SwaggerAuthServer": { - "Authority": "http://localhost:59093", - "RequireHttpsMetadata": "false" - }, - "IdentityServer": { - "Clients": { - "Auth_Web": { - "ClientId": "Auth_Web", - "RootUrl": "http://localhost:59093/", - "RequireHttpsMetadata": "false" - }, - "Auth_App": { - "ClientId": "Auth_App", - "ClientSecret": "1q2w3e*", - "RootUrl": "http://localhost:59093", - "RequireHttpsMetadata": "false" - }, - "Auth_Swagger": { - "ClientId": "Auth_Swagger", - "ClientSecret": "1q2w3e*", - "RootUrl": "http://localhost:59093", - "RequireHttpsMetadata": "false" - } - } - } + //"ConnectionStrings": { + // "Default": "Server=dev.ccwin-in.com,21195;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;", + // "Auth": "Server=dev.ccwin-in.com,21195;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;" + //}, + //"SwaggerAuthServer": { + // "Authority": "http://localhost:59093", + // "RequireHttpsMetadata": "false" + //}, + //"IdentityServer": { + // "Clients": { + // "Auth_Web": { + // "ClientId": "Auth_Web", + // "RootUrl": "http://localhost:59093/", + // "RequireHttpsMetadata": "false" + // }, + // "Auth_App": { + // "ClientId": "Auth_App", + // "ClientSecret": "1q2w3e*", + // "RootUrl": "http://localhost:59093", + // "RequireHttpsMetadata": "false" + // }, + // "Auth_Swagger": { + // "ClientId": "Auth_Swagger", + // "ClientSecret": "1q2w3e*", + // "RootUrl": "http://localhost:59093", + // "RequireHttpsMetadata": "false" + // } + // } + //} } diff --git a/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/appsettings.json b/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/appsettings.json index fc30b6483..8de8aa776 100644 --- a/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/appsettings.json +++ b/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/appsettings.json @@ -1,34 +1,34 @@ { "ConfigServer": "http://localhost:21093", "ConfigServer.Docker": "http://gateway:21093", - "ConnectionStrings": { - "Default": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;", - "Auth": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;" - }, - "SwaggerAuthServer": { - "Authority": "http://localhost:59093", - "RequireHttpsMetadata": "false" - }, - "IdentityServer": { - "Clients": { - "Auth_Web": { - "ClientId": "Auth_Web", - "RootUrl": "http://localhost:59093/", - "RequireHttpsMetadata": "false" - }, - "Auth_App": { - "ClientId": "Auth_App", - "ClientSecret": "1q2w3e*", - "RootUrl": "http://localhost:59093", - "RequireHttpsMetadata": "false" - }, - "Auth_Swagger": { - "ClientId": "Auth_Swagger", - "ClientSecret": "1q2w3e*", - "RootUrl": "http://localhost:59093", - "RequireHttpsMetadata": "false" - } - } - } + //"ConnectionStrings": { + // "Default": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;", + // "Auth": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;" + //}, + //"SwaggerAuthServer": { + // "Authority": "http://localhost:59093", + // "RequireHttpsMetadata": "false" + //}, + //"IdentityServer": { + // "Clients": { + // "Auth_Web": { + // "ClientId": "Auth_Web", + // "RootUrl": "http://localhost:59093/", + // "RequireHttpsMetadata": "false" + // }, + // "Auth_App": { + // "ClientId": "Auth_App", + // "ClientSecret": "1q2w3e*", + // "RootUrl": "http://localhost:59093", + // "RequireHttpsMetadata": "false" + // }, + // "Auth_Swagger": { + // "ClientId": "Auth_Swagger", + // "ClientSecret": "1q2w3e*", + // "RootUrl": "http://localhost:59093", + // "RequireHttpsMetadata": "false" + // } + // } + //} } diff --git a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Win_in.Sfs.Wms.Dashboard.Host.csproj b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Win_in.Sfs.Wms.Dashboard.Host.csproj index 56115b4ec..f55c19d89 100644 --- a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Win_in.Sfs.Wms.Dashboard.Host.csproj +++ b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Win_in.Sfs.Wms.Dashboard.Host.csproj @@ -48,8 +48,8 @@ - + diff --git a/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/appsettings.json b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/appsettings.json index fc30b6483..8de8aa776 100644 --- a/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/appsettings.json +++ b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/appsettings.json @@ -1,34 +1,34 @@ { "ConfigServer": "http://localhost:21093", "ConfigServer.Docker": "http://gateway:21093", - "ConnectionStrings": { - "Default": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;", - "Auth": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;" - }, - "SwaggerAuthServer": { - "Authority": "http://localhost:59093", - "RequireHttpsMetadata": "false" - }, - "IdentityServer": { - "Clients": { - "Auth_Web": { - "ClientId": "Auth_Web", - "RootUrl": "http://localhost:59093/", - "RequireHttpsMetadata": "false" - }, - "Auth_App": { - "ClientId": "Auth_App", - "ClientSecret": "1q2w3e*", - "RootUrl": "http://localhost:59093", - "RequireHttpsMetadata": "false" - }, - "Auth_Swagger": { - "ClientId": "Auth_Swagger", - "ClientSecret": "1q2w3e*", - "RootUrl": "http://localhost:59093", - "RequireHttpsMetadata": "false" - } - } - } + //"ConnectionStrings": { + // "Default": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;", + // "Auth": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;" + //}, + //"SwaggerAuthServer": { + // "Authority": "http://localhost:59093", + // "RequireHttpsMetadata": "false" + //}, + //"IdentityServer": { + // "Clients": { + // "Auth_Web": { + // "ClientId": "Auth_Web", + // "RootUrl": "http://localhost:59093/", + // "RequireHttpsMetadata": "false" + // }, + // "Auth_App": { + // "ClientId": "Auth_App", + // "ClientSecret": "1q2w3e*", + // "RootUrl": "http://localhost:59093", + // "RequireHttpsMetadata": "false" + // }, + // "Auth_Swagger": { + // "ClientId": "Auth_Swagger", + // "ClientSecret": "1q2w3e*", + // "RootUrl": "http://localhost:59093", + // "RequireHttpsMetadata": "false" + // } + // } + //} } diff --git a/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/scripts/db.Microsoft.EntityFrameworkCore.SqlServer.StoreDbContext.sql b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/scripts/db.Microsoft.EntityFrameworkCore.SqlServer.StoreDbContext.sql index 9e908aedd..87364c0a6 100644 --- a/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/scripts/db.Microsoft.EntityFrameworkCore.SqlServer.StoreDbContext.sql +++ b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/scripts/db.Microsoft.EntityFrameworkCore.SqlServer.StoreDbContext.sql @@ -2957,6 +2957,7 @@ CREATE TABLE [Store_DeliverNoteDetail] ( [ItemDesc1] nvarchar(64) NULL, [ItemDesc2] nvarchar(64) NULL, [ItemCode] nvarchar(64) NOT NULL, + [Uom] nvarchar(64) NOT NULL, [Qty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL, [FromPackingCode] nvarchar(64) NOT NULL, @@ -2993,7 +2994,6 @@ CREATE TABLE [Store_DeliverNoteDetail] ( [RecommendFromLocationGroup] nvarchar(64) NULL, [RecommendFromLocationErpCode] nvarchar(64) NULL, [RecommendFromWarehouseCode] nvarchar(64) NULL, - [Uom] nvarchar(64) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL, [HandledContainerCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL, @@ -3411,6 +3411,7 @@ CREATE TABLE [Store_IssueNoteDetail] ( [ItemDesc1] nvarchar(64) NULL, [ItemDesc2] nvarchar(64) NULL, [ItemCode] nvarchar(64) NOT NULL, + [Uom] nvarchar(64) NOT NULL, [Qty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL, [FromPackingCode] nvarchar(450) NULL, @@ -3447,7 +3448,6 @@ CREATE TABLE [Store_IssueNoteDetail] ( [RecommendFromLocationGroup] nvarchar(64) NULL, [RecommendFromLocationErpCode] nvarchar(64) NULL, [RecommendFromWarehouseCode] nvarchar(64) NULL, - [Uom] nvarchar(64) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL, [HandledContainerCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL, @@ -3855,6 +3855,7 @@ CREATE TABLE [Store_ProductionReturnNoteDetail] ( [ItemDesc1] nvarchar(64) NULL, [ItemDesc2] nvarchar(64) NULL, [ItemCode] nvarchar(64) NOT NULL, + [Uom] nvarchar(64) NOT NULL, [Qty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL, [FromPackingCode] nvarchar(450) NULL, @@ -3891,7 +3892,6 @@ CREATE TABLE [Store_ProductionReturnNoteDetail] ( [RecommendToLocationGroup] nvarchar(64) NULL, [RecommendToLocationErpCode] nvarchar(64) NULL, [RecommendToWarehouseCode] nvarchar(64) NULL, - [Uom] nvarchar(64) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL, [HandledContainerCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL, @@ -4021,6 +4021,7 @@ CREATE TABLE [Store_ProductReceiptNoteDetail] ( [LocationErpCode] nvarchar(64) NOT NULL, [WarehouseCode] nvarchar(64) NOT NULL, [Status] nvarchar(64) NOT NULL, + [Uom] nvarchar(64) NOT NULL, [Qty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL, [RecommendContainerCode] nvarchar(64) NULL, @@ -4035,7 +4036,6 @@ CREATE TABLE [Store_ProductReceiptNoteDetail] ( [RecommendToLocationGroup] nvarchar(64) NULL, [RecommendToLocationErpCode] nvarchar(64) NULL, [RecommendToWarehouseCode] nvarchar(64) NULL, - [Uom] nvarchar(64) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL, [HandledContainerCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL, @@ -4279,6 +4279,7 @@ CREATE TABLE [Store_PurchaseReceiptNoteDetail] ( [LocationErpCode] nvarchar(64) NOT NULL, [WarehouseCode] nvarchar(64) NOT NULL, [Status] nvarchar(64) NOT NULL, + [Uom] nvarchar(64) NOT NULL, [Qty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL, [RecommendContainerCode] nvarchar(64) NULL, @@ -4293,7 +4294,6 @@ CREATE TABLE [Store_PurchaseReceiptNoteDetail] ( [RecommendToLocationGroup] nvarchar(64) NULL, [RecommendToLocationErpCode] nvarchar(64) NULL, [RecommendToWarehouseCode] nvarchar(64) NULL, - [Uom] nvarchar(64) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL, [HandledContainerCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL, @@ -4378,6 +4378,7 @@ CREATE TABLE [Store_PurchaseReturnNoteDetail] ( [LocationErpCode] nvarchar(64) NOT NULL, [WarehouseCode] nvarchar(64) NOT NULL, [Status] nvarchar(64) NOT NULL, + [Uom] nvarchar(64) NOT NULL, [Qty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL, [RecommendContainerCode] nvarchar(64) NULL, @@ -4392,7 +4393,6 @@ CREATE TABLE [Store_PurchaseReturnNoteDetail] ( [RecommendFromLocationGroup] nvarchar(64) NULL, [RecommendFromLocationErpCode] nvarchar(64) NULL, [RecommendFromWarehouseCode] nvarchar(64) NULL, - [Uom] nvarchar(64) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL, [HandledContainerCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL, @@ -4466,6 +4466,7 @@ CREATE TABLE [Store_PutawayNoteDetail] ( [ItemDesc1] nvarchar(64) NULL, [ItemDesc2] nvarchar(64) NULL, [ItemCode] nvarchar(64) NOT NULL, + [Uom] nvarchar(64) NOT NULL, [Qty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL, [FromPackingCode] nvarchar(450) NULL, @@ -4502,7 +4503,6 @@ CREATE TABLE [Store_PutawayNoteDetail] ( [RecommendToLocationGroup] nvarchar(64) NULL, [RecommendToLocationErpCode] nvarchar(64) NULL, [RecommendToWarehouseCode] nvarchar(64) NULL, - [Uom] nvarchar(64) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL, [HandledContainerCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL, @@ -4901,6 +4901,7 @@ CREATE TABLE [Store_UnplannedIssueNoteDetail] ( [LocationErpCode] nvarchar(64) NOT NULL, [WarehouseCode] nvarchar(64) NOT NULL, [Status] nvarchar(64) NOT NULL, + [Uom] nvarchar(64) NOT NULL, [Qty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL, [RecommendContainerCode] nvarchar(64) NULL, @@ -4915,7 +4916,6 @@ CREATE TABLE [Store_UnplannedIssueNoteDetail] ( [RecommendFromLocationGroup] nvarchar(64) NULL, [RecommendFromLocationErpCode] nvarchar(64) NULL, [RecommendFromWarehouseCode] nvarchar(64) NULL, - [Uom] nvarchar(64) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL, [HandledContainerCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL, @@ -5000,6 +5000,7 @@ CREATE TABLE [Store_UnplannedReceiptNoteDetail] ( [LocationErpCode] nvarchar(64) NOT NULL, [WarehouseCode] nvarchar(64) NOT NULL, [Status] nvarchar(64) NOT NULL, + [Uom] nvarchar(64) NOT NULL, [Qty] decimal(18,6) NOT NULL, [StdPackQty] decimal(18,6) NOT NULL, [RecommendContainerCode] nvarchar(64) NULL, @@ -5014,7 +5015,6 @@ CREATE TABLE [Store_UnplannedReceiptNoteDetail] ( [RecommendToLocationGroup] nvarchar(64) NULL, [RecommendToLocationErpCode] nvarchar(64) NULL, [RecommendToWarehouseCode] nvarchar(64) NULL, - [Uom] nvarchar(64) NOT NULL, [RecommendQty] decimal(18,6) NOT NULL, [HandledContainerCode] nvarchar(64) NULL, [HandledPackingCode] nvarchar(64) NULL, diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs index b6d428c62..0eea0a436 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs @@ -70,7 +70,7 @@ public class JobController : AbpController /// 获取全部任务数量统计 /// /// - [HttpGet("")] + [HttpGet("{isToday}")] public virtual async Task> CountAsync(bool isToday) { var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/CachingExtensions.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/CachingExtensions.cs index 80952cec2..4a0f5b9ab 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/CachingExtensions.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/CachingExtensions.cs @@ -27,6 +27,10 @@ public static class CachingExtensions { TCacheItem cacheItem; + + //return await factory.Invoke().ConfigureAwait(false); + + //todo 有问题 时间转换 坑坑坑 var result = await cache.GetAsync(key).ConfigureAwait(false); if (result == null) { diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Host/ModuleBase.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Host/ModuleBase.cs index 34c89f1ab..4324e42bd 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Host/ModuleBase.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Host/ModuleBase.cs @@ -1,10 +1,15 @@ using System; +using System.Configuration; using System.Data; using System.IO; using System.Linq; using System.Reflection; +using System.Runtime.Serialization; +using System.Text.Json; +using System.Text.Json.Serialization; using System.Text.RegularExpressions; using System.Threading.Tasks; +using DocumentFormat.OpenXml.InkML; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.DataProtection; @@ -20,6 +25,7 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; using Microsoft.OpenApi.Models; using NUglify.Helpers; +using Serilog.Formatting.Json; using StackExchange.Redis; using Swashbuckle.AspNetCore.SwaggerGen; using Volo.Abp; @@ -35,8 +41,11 @@ using Volo.Abp.Content; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.Guids; +using Volo.Abp.Json; +using Volo.Abp.Json.SystemTextJson.JsonConverters; using Volo.Abp.Localization; using Volo.Abp.Modularity; +using Volo.Abp.Timing; using Win_in.Sfs.Shared.Application; using Win_in.Sfs.Shared.Application.Contracts.ExportAndImport; using Win_in.Sfs.Shared.Domain.Shared; @@ -70,6 +79,7 @@ public abstract class ModuleBase : AbpModule where T : AbpModule ConfigureAutoApiControllers(); ConfigureSwaggerServices(); ConfigureAddCors(); + Configure(); SetFormLimit(); ConfigureExceptionHanding(); } @@ -238,6 +248,8 @@ public abstract class ModuleBase : AbpModule where T : AbpModule protected virtual void Configure() { + //todo 解决时间 + ServiceConfigurationContext.Services.AddTransient(); } protected virtual void ConfigureAddCors() @@ -440,4 +452,35 @@ public abstract class ModuleBase : AbpModule where T : AbpModule options.SendExceptionsDetailsToClients = true; }); } + + /// + /// 为了处理abp的时间存入redis 在win环境读取出来报错 + /// + public class ConvertAbpJson : IJsonSerializer + { + public T Deserialize(string jsonString, bool camelCase = true) + { + return System.Text.Json.JsonSerializer.Deserialize(jsonString, GetOptions(camelCase)); + } + + public object Deserialize(Type type, string jsonString, bool camelCase = true) + { + return System.Text.Json.JsonSerializer.Deserialize(jsonString, type, GetOptions(camelCase)); + } + + public string Serialize(object obj, bool camelCase = true, bool indented = false) + { + return System.Text.Json.JsonSerializer.Serialize(obj, GetOptions(camelCase, indented)); + } + + private System.Text.Json.JsonSerializerOptions GetOptions(bool camelCase = true, bool indented = false) + { + return new System.Text.Json.JsonSerializerOptions + { + PropertyNameCaseInsensitive = camelCase, + WriteIndented = indented, + ReferenceHandler = ReferenceHandler.IgnoreCycles + }; + } + } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs index 5967d9876..c66e42ebc 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs @@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Volo.Abp; using Win_in.Sfs.Basedata.Application.Contracts; +using Win_in.Sfs.Shared.Domain; using Win_in.Sfs.Shared.Domain.Shared; using Win_in.Sfs.Wms.Store.Application.Contracts; using Win_in.Sfs.Wms.Store.Domain; @@ -57,7 +58,7 @@ public class PurchaseOrderAppService : foreach (var purchaseOrder in addList) { purchaseOrder.CreatorId = CurrentUser.Id; - purchaseOrder.Worker = CurrentUser.Name; + purchaseOrder.Worker = CurrentUser.GetName(); var supplierDto = await _supplierAppService.GetByCodeAsync(purchaseOrder.SupplierCode).ConfigureAwait(false); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/PurchaseReceiptJobs/PurchaseReceiptJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/PurchaseReceiptJobs/PurchaseReceiptJobManager.cs index 52e915a56..63a8d4584 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/PurchaseReceiptJobs/PurchaseReceiptJobManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/PurchaseReceiptJobs/PurchaseReceiptJobManager.cs @@ -52,6 +52,8 @@ public class PurchaseReceiptJobManager : SfsJobManagerBase