The open source simple and complete warehouse management system is derived from our many years of experience in implementing erp projects. We stripped the original commercial system wms function and opened it up for free, hoping to help the majority of small and medium-sized enterprises. At present, the system supports cross-platform。
feat(Back End): Synchronize back-end code_2023-01-09 10:33
liufu096b1d95f9fc
diff --git a/backend/ModernWMS.Core/Controller/AccountController.cs b/backend/ModernWMS.Core/Controller/AccountController.csnew file mode 100644index 0000000..ab54aa1--- /dev/null+++ b/backend/ModernWMS.Core/Controller/AccountController.cs@@ -0,0 +1,138 @@+using Microsoft.AspNetCore.Authorization;+using Microsoft.AspNetCore.Mvc;+using Microsoft.Extensions.Caching.Memory;+using Microsoft.Extensions.Localization;+using Microsoft.Extensions.Logging;+using ModernWMS.Core.JWT;+using ModernWMS.Core.Models;+using ModernWMS.Core.Services;++namespace ModernWMS.Core.Controller+{+ /// <summary>+ /// account+ /// </summary>+ [Route("[controller]")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "Base")]+ public class AccountController : BaseController+ {+ /// <summary>+ /// token manger+ /// </summary>+ private readonly ITokenManager _tokenManager;+ /// <summary>+ /// Log helper+ /// </summary>+ private readonly ILogger<AccountController> _logger;++ /// <summary>+ /// cache helper+ /// </summary>+ private readonly CacheManager _cacheManager;++ /// <summary>+ /// account service class+ /// </summary>+ private readonly IAccountService _accountService;++ /// <summary>+ /// Localizer+ /// </summary>+ private readonly IStringLocalizer _stringLocalizer;+ /// <summary>+ /// Structure+ /// </summary>+ /// <param name="logger">logger helper</param>+ /// <param name="tokenManager">token manger</param>+ /// <param name="cacheManager">cache helper</param>+ /// <param name="accountService">account service class</param>+ /// <param name="stringLocalizer">Localizer</param>+ public AccountController(ILogger<AccountController> logger+ , ITokenManager tokenManager+ , CacheManager cacheManager+ , IAccountService accountService+ , IStringLocalizer stringLocalizer+ )+ {+ this._tokenManager = tokenManager;+ this._logger = logger;+ this._cacheManager = cacheManager;+ this._accountService = accountService;+ this._stringLocalizer = stringLocalizer;+ }++ #region Login++ /// <summary>+ /// login+ /// </summary>+ /// <param name="loginAccount">user's account infomation</param>+ /// <returns></returns>+ [AllowAnonymous]+ [HttpPost("/login")]+ public async Task<ResultModel<LoginOutputViewModel>> LoginAsync(LoginInputViewModel loginAccount)+ {++ var user = await _accountService.Login(loginAccount,CurrentUser);+ if (user != null)+ {+ var result = _tokenManager.GenerateToken(+ new CurrentUser+ {+ user_id = user.user_id,+ user_name = user.user_name,+ user_num = user.user_num,+ user_role = user.user_role,+ tenant_id = user.tenant_id+ }+ );+ string rt = this._tokenManager.GenerateRefreshToken();++ user.access_token = result.token;+ user.expire = result.expire;+ user.refresh_token = rt;++ await _cacheManager.TokenSet(user.user_id, "WebRefreshToken", rt, _tokenManager.GetRefreshTokenExpireMinute());++ return ResultModel<LoginOutputViewModel>.Success(user);+ }+ else+ {+ return ResultModel<LoginOutputViewModel>.Error(_stringLocalizer["login_failed"]);+ }+ }+ /// <summary>+ /// get a new token+ /// </summary>+ /// <param name="inPutViewModel">old access token and refreshtoken key</param>+ /// <returns></returns>+ [AllowAnonymous]+ [HttpPost("/refresh-token")]+ public async Task<ResultModel<string>> RefreshToken([FromBody] RefreshTokenInPutViewModel inPutViewModel)+ {+ var currentUser = this._tokenManager.GetCurrentUser(inPutViewModel.AccessToken);++ var flag = _cacheManager.Is_Token_Exist<string>(currentUser.user_id, "WebRefreshToken", _tokenManager.GetRefreshTokenExpireMinute());+ if (!flag)+ {+ return ResultModel<string>.Error("refreshtoken_failure");+ }+ else+ {+ var result = _tokenManager.GenerateToken(currentUser);+ return ResultModel<string>.Success(result.token);+ }++ }+ #endregion+ #region hello world+ [AllowAnonymous]+ [HttpPost("/hello-world")]+ public ResultModel<string> hello_world()+ {+ return ResultModel<string>.Success(_accountService.HelloWorld());+ }+ #endregion+ }+}diff --git a/backend/ModernWMS.Core/Controller/BaseController.cs b/backend/ModernWMS.Core/Controller/BaseController.csnew file mode 100644index 0000000..e213965--- /dev/null+++ b/backend/ModernWMS.Core/Controller/BaseController.cs@@ -0,0 +1,40 @@++using Microsoft.AspNetCore.Authorization;+using Microsoft.AspNetCore.Mvc;+using ModernWMS.Core.JWT;+using ModernWMS.Core.Utility;+using System.Linq;++namespace ModernWMS.Core.Controller+{+ /// <summary>+ /// base controller+ /// </summary>+ //[Authorize]+ [Produces("application/json")]+ public class BaseController : ControllerBase+ {+ /// <summary>+ /// current user+ /// </summary>+ public CurrentUser CurrentUser+ {+ get+ {+ if (User != null && User.Claims.ToList().Count > 0)+ {+ var Claim = User.Claims.First(claim => claim.Type == ClaimValueTypes.Json);+ return Claim == null ? new CurrentUser() : JsonHelper.DeserializeObject<CurrentUser>(Claim.Value);+ }+ else+ {+ return new CurrentUser();+ }+ }+ }++ public BaseController()+ {+ }+ }+}diff --git a/backend/ModernWMS.Core/DBContext/CallContext.cs b/backend/ModernWMS.Core/DBContext/CallContext.csnew file mode 100644index 0000000..845e4ad--- /dev/null+++ b/backend/ModernWMS.Core/DBContext/CallContext.cs@@ -0,0 +1,30 @@+using System.Collections.Concurrent;+using System.Threading;++namespace ModernWMS.Core.DBContext+{+ /// <summary>+ /// 当前连接的上下文+ /// </summary>+ public static class CallContext+ {+ /// <summary>+ /// 静态字典+ /// </summary>+ static ConcurrentDictionary<string, AsyncLocal<object>> state = new ConcurrentDictionary<string, AsyncLocal<object>>();+ /// <summary>+ /// 设置值+ /// </summary>+ /// <param name="name">键</param>+ /// <param name="data">值</param>+ public static void SetData(string name, object data) =>+ state.GetOrAdd(name, _ => new AsyncLocal<object>()).Value = data;+ /// <summary>+ /// 获取值+ /// </summary>+ /// <param name="name">键</param>+ /// <returns></returns>+ public static object GetData(string name) =>+ state.TryGetValue(name, out AsyncLocal<object> data) ? data.Value : null;+ }+}diff --git a/backend/ModernWMS.Core/DBContext/SqlDBContext.cs b/backend/ModernWMS.Core/DBContext/SqlDBContext.csnew file mode 100644index 0000000..5d87cd9--- /dev/null+++ b/backend/ModernWMS.Core/DBContext/SqlDBContext.cs@@ -0,0 +1,128 @@++using Microsoft.EntityFrameworkCore;+using Microsoft.EntityFrameworkCore.Infrastructure;+using Microsoft.Extensions.Logging;+using System.ComponentModel;+using System.Data;+using System.Data.Common;+using System.Reflection;+using ModernWMS.Core;+using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;++namespace ModernWMS.Core.DBContext+{+ /// <summary>+ /// SqlDBContext+ /// </summary>+ public class SqlDBContext : DbContext+ {+ /// <summary>+ /// current user's tenant_id+ /// </summary>+ public byte tenant_id { get; set; } = 1;++ /// <summary>+ /// Database+ /// </summary>+ /// <returns></returns>+ public DatabaseFacade GetDatabase() => Database;+++++ /// <summary>+ /// s+ /// </summary>+ /// <param name="options">options</param>+ public SqlDBContext(DbContextOptions options) : base(options)+ {++ }++ #region overwrite+ /// <summary>+ /// Auto Mapping Entity+ /// </summary>+ /// <param name="modelBuilder">ModelBuilder</param>+ private void MappingEntityTypes(ModelBuilder modelBuilder)+ {+ var baseType = typeof(Models.BaseModel);+ var path = AppDomain.CurrentDomain.RelativeSearchPath ?? AppDomain.CurrentDomain.BaseDirectory;+ var referencedAssemblies = System.IO.Directory.GetFiles(path, $"ModernWMS*.dll").Select(Assembly.LoadFrom).ToArray();+ var list = referencedAssemblies+ .SelectMany(a => a.DefinedTypes)+ .Select(type => type.AsType())+ .Where(x => x != baseType && baseType.IsAssignableFrom(x)).ToList();+ if (list != null && list.Any())+ {+ list.ForEach(t =>+ {+ var entityType = modelBuilder.Model.FindEntityType(t);+ if (entityType == null)+ {+ modelBuilder.Model.AddEntityType(t);+ }+ });+ }+ }+ /// <summary>+ /// overwrite OnModelCreating+ /// </summary>+ /// <param name="modelBuilder"></param>+ protected override void OnModelCreating(ModelBuilder modelBuilder)+ {+ MappingEntityTypes(modelBuilder);+/* foreach (var entityType in modelBuilder.Model.GetEntityTypes())+ {+ if (typeof(Models.IHasTenant).IsAssignableFrom(entityType.ClrType))+ {+ ConfigureGlobalFiltersMethodInfo+ .MakeGenericMethod(entityType.ClrType)+ .Invoke(this, new object[] { modelBuilder });+ }+ }*/+ base.OnModelCreating(modelBuilder);+ }++ /// <summary>+ /// create DbSet+ /// </summary>+ /// <typeparam name="T">实体</typeparam>+ /// <returns></returns>+ public virtual DbSet<T> GetDbSet<T>() where T : class+ {+ if (Model.FindEntityType(typeof(T)) != null)+ {+ return Set<T>();+ }+ else+ {+ throw new Exception($"type {typeof(T).Name} is not add into DbContext ");+ }+ }+ /// <summary>+ /// over write EnsureCreated+ /// </summary>+ /// <returns></returns>+ public virtual bool EnsureCreated()+ {+ return Database.EnsureCreated();+ }+ /// <summary>+ /// over write OnConfiguring+ /// </summary>+ /// <param name="optionsBuilder"></param>+ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)+ {+ base.OnConfiguring(optionsBuilder);+ }+++ #endregion++++++ }+}diff --git a/backend/ModernWMS.Core/DI/IDependency.cs b/backend/ModernWMS.Core/DI/IDependency.csnew file mode 100644index 0000000..649dbe0--- /dev/null+++ b/backend/ModernWMS.Core/DI/IDependency.cs@@ -0,0 +1,7 @@++namespace ModernWMS.Core.DI+{+ public interface IDependency+ {+ }+}diff --git a/backend/ModernWMS.Core/DynamicSearch/QueryCollection.cs b/backend/ModernWMS.Core/DynamicSearch/QueryCollection.csnew file mode 100644index 0000000..e882713--- /dev/null+++ b/backend/ModernWMS.Core/DynamicSearch/QueryCollection.cs@@ -0,0 +1,120 @@+using System;+using System.Collections.Generic;+using System.Collections.ObjectModel;+using System.Linq;+using System.Linq.Expressions;+using System.Reflection;+using System.Text;+using System.Threading.Tasks;++namespace ModernWMS.Core.DynamicSearch+{+ /// <summary>+ /// Dynamic Query+ /// </summary>+ public class QueryCollection : Collection<SearchObject>+ {+ /// <summary>+ /// Expression+ /// </summary>+ /// <typeparam name="T">entity</typeparam>+ /// <returns></returns>+ public static Expression<Func<T, bool>> True<T>() { return f => true; }+ /// <summary>+ /// Expression+ /// </summary>+ /// <typeparam name="T">entity</typeparam>+ /// <param name="condition">condition</param>+ /// <returns></returns>+ public Expression<Func<T, bool>> AsExpression<T>(Condition? condition = Condition.AndAlso) where T : class+ {+ if (this.Count == 0)+ {+ return True<T>();+ }+ Type targetType = typeof(T);+ TypeInfo typeInfo = targetType.GetTypeInfo();+ var parameter = Expression.Parameter(targetType, "m");+ Expression expression = null;+ Func<Expression, Expression, Expression> Append = (exp1, exp2) =>+ {+ if (exp1 == null)+ {+ return exp2;+ }+ return (condition ?? Condition.OrElse) == Condition.OrElse ? Expression.OrElse(exp1, exp2) : Expression.AndAlso(exp1, exp2);+ };+ foreach (var item in this)+ {+ var property = typeInfo.GetProperty(item.Name);+ if (property == null ||+ !property.CanRead ||+ (item.Text.Trim().Length == 0))+ {+ continue;+ }+ if (item.Text.Length == 0)+ {+ item.Text = item.Value.ToString();+ }+ Type realType = Nullable.GetUnderlyingType(property.PropertyType) ?? property.PropertyType;+ if (item.Text.Length > 0)+ {+ if (item.Type.ToUpper().Equals("DATETIMEPICKER")+ && (item.Operator == Operators.LessThanOrEqual || item.Operator == Operators.LessThan))+ {+ item.Text = Convert.ToDateTime(item.Text).ToString("yyyy-MM-dd") + " 23:59:59";+ }+ item.Value = Convert.ChangeType(item.Text, realType);+ }+ Expression<Func<object>> valueLamba = () => item.Value;+ switch (item.Operator)+ {+ case Operators.Equal:+ {+ expression = Append(expression, Expression.Equal(Expression.Property(parameter, item.Name),+ Expression.Convert(valueLamba.Body, property.PropertyType)));+ break;+ }+ case Operators.GreaterThan:+ {+ expression = Append(expression, Expression.GreaterThan(Expression.Property(parameter, item.Name),+ Expression.Convert(valueLamba.Body, property.PropertyType)));+ break;+ }+ case Operators.GreaterThanOrEqual:+ {+ expression = Append(expression, Expression.GreaterThanOrEqual(Expression.Property(parameter, item.Name),+ Expression.Convert(valueLamba.Body, property.PropertyType)));+ break;+ }+ case Operators.LessThan:+ {+ expression = Append(expression, Expression.LessThan(Expression.Property(parameter, item.Name),+ Expression.Convert(valueLamba.Body, property.PropertyType)));+ break;+ }+ case Operators.LessThanOrEqual:+ {+ expression = Append(expression, Expression.LessThanOrEqual(Expression.Property(parameter, item.Name),+ Expression.Convert(valueLamba.Body, property.PropertyType)));+ break;+ }+ case Operators.Contains:+ {+ var nullCheck = Expression.Not(Expression.Call(typeof(string), "IsNullOrEmpty", null, Expression.Property(parameter, item.Name)));+ var contains = Expression.Call(Expression.Property(parameter, item.Name), "Contains", null,+ Expression.Convert(valueLamba.Body, property.PropertyType));+ expression = Append(expression, Expression.AndAlso(nullCheck, contains));+ break;+ }+ }+ }+ if (expression == null)+ {+ return null;+ }+ return ((Expression<Func<T, bool>>)Expression.Lambda(expression, parameter));+ }+ }+}diff --git a/backend/ModernWMS.Core/DynamicSearch/QueryOptions.cs b/backend/ModernWMS.Core/DynamicSearch/QueryOptions.csnew file mode 100644index 0000000..5425beb--- /dev/null+++ b/backend/ModernWMS.Core/DynamicSearch/QueryOptions.cs@@ -0,0 +1,71 @@+using System;+using System.Collections.Generic;+using System.Linq;+using System.Text;+using System.Threading.Tasks;++namespace ModernWMS.Core.DynamicSearch+{+ /// <summary>+ /// DynamicSearch Operators+ /// </summary>+ public enum Operators+ {+ /// <summary>+ /// None+ /// </summary>+ None = 0,+ /// <summary>+ /// Equal =+ /// </summary>+ Equal = 1,+ /// <summary>+ /// GreaterThan+ /// </summary>+ GreaterThan = 2,+ /// <summary>+ /// GreaterThanOrEqual+ /// </summary>+ GreaterThanOrEqual = 3,+ /// <summary>+ /// LessThan+ /// </summary>+ LessThan = 4,+ /// <summary>+ /// LessThanOrEqual+ /// </summary>+ LessThanOrEqual = 5,+ /// <summary>+ /// Contains+ /// </summary>+ Contains = 6+ }+ /// <summary>+ /// Condition+ /// </summary>+ public enum Condition+ {+ /// <summary>+ /// OR+ /// </summary>+ OrElse = 1,+ /// <summary>+ /// AND+ /// </summary>+ AndAlso = 2+ }+ /// <summary>+ /// select item combox+ /// </summary>+ public class ComboxItem+ {+ /// <summary>+ /// value+ /// </summary>+ public string value { get; set; }+ /// <summary>+ /// text+ /// </summary>+ public string text { get; set; }+ }+}diff --git a/backend/ModernWMS.Core/DynamicSearch/SearchObject.cs b/backend/ModernWMS.Core/DynamicSearch/SearchObject.csnew file mode 100644index 0000000..7506ce7--- /dev/null+++ b/backend/ModernWMS.Core/DynamicSearch/SearchObject.cs@@ -0,0 +1,55 @@+using System;+using System.Collections.Generic;+using System.Linq;+using System.Text;+using System.Threading.Tasks;++namespace ModernWMS.Core.DynamicSearch+{+ /// <summary>+ /// SearchObject+ /// </summary>+ public class SearchObject+ {+ /// <summary>+ /// sort+ /// </summary>+ public int Sort { get; set; } = 0;++ /// <summary>+ /// label+ /// </summary>+ public string Label { get; set; } = string.Empty;++ /// <summary>+ /// name+ /// </summary>+ public string Name { get; set; } = string.Empty;++ /// <summary>+ /// type+ /// </summary>+ public string Type { get; set; } = string.Empty;++ /// <summary>+ /// operator+ /// </summary>+ public Operators Operator { get; set; } = Operators.Equal;++ /// <summary>+ /// text+ /// </summary>+ public string Text { get; set; } = string.Empty;++ /// <summary>+ /// value+ /// </summary>+ public object Value { get; set; } = new object();++ /// <summary>+ /// select item combox list+ /// </summary>+ public List<ComboxItem> comboxItem { get; set; } = new List<ComboxItem>();++ }+}diff --git a/backend/ModernWMS.Core/Extentions/JsonStringTrimConverter.cs b/backend/ModernWMS.Core/Extentions/JsonStringTrimConverter.csnew file mode 100644index 0000000..9381699--- /dev/null+++ b/backend/ModernWMS.Core/Extentions/JsonStringTrimConverter.cs@@ -0,0 +1,62 @@+using Newtonsoft.Json;+using System;++namespace ModernWMS.Core.Extentions+{+ /// <summary>+ /// JSON extentions+ /// </summary>+ public class JsonStringTrimConverter : JsonConverter+ {+ /// <summary>+ /// Determines whether this instance can convert the specified object type.+ /// </summary>+ /// <param name="objectType">Type of the object.</param>+ /// <returns></returns>+ public override bool CanConvert(Type objectType)+ {+ return objectType == typeof(string);+ }+ /// <summary>+ /// Reads the JSON representation of the object.+ /// </summary>+ /// <param name="reader"> The Newtonsoft.Json.JsonReader to read from.</param>+ /// <param name="objectType">Type of the object.</param>+ /// <param name="existingValue">The existing value of object being read.</param>+ /// <param name="serializer">The calling serializer.</param>+ /// <returns></returns>+ public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)+ {+ if (objectType == typeof(string) && reader.Value != null)+ {+ if (reader.TokenType == JsonToken.Date)+ {+ return Convert.ToDateTime(reader.Value).ToString("yyyy-MM-dd HH:mm:ss");+ }+ else+ {+ return (reader.Value as string).Trim();+ }+ }+ return reader.Value;+ }+ /// <summary>+ /// Writes the JSON representation of the object.+ /// </summary>+ /// <param name="writer">The Newtonsoft.Json.JsonWriter to write to.</param>+ /// <param name="value">The value.</param>+ /// <param name="serializer">The calling serializer.</param>+ public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)+ {+ var text = (string)value;+ if (text == null)+ {+ writer.WriteNull();+ }+ else+ {+ writer.WriteValue(text.Trim());+ }+ }+ }+}diff --git a/backend/ModernWMS.Core/Extentions/StartupExtensions.cs b/backend/ModernWMS.Core/Extentions/StartupExtensions.csnew file mode 100644index 0000000..66ce479--- /dev/null+++ b/backend/ModernWMS.Core/Extentions/StartupExtensions.cs@@ -0,0 +1,292 @@+using Microsoft.AspNetCore.Authentication;+using Microsoft.AspNetCore.Authentication.JwtBearer;+using Microsoft.AspNetCore.Builder;+using Microsoft.AspNetCore.Hosting;+using Microsoft.AspNetCore.Http;+using Microsoft.AspNetCore.Http.Features;+using Microsoft.EntityFrameworkCore;+using Pomelo.EntityFrameworkCore.MySql;+using Microsoft.Extensions.Caching.Memory;+using Microsoft.Extensions.Configuration;+using Microsoft.Extensions.DependencyInjection;+using Microsoft.Extensions.Hosting;+using Microsoft.Extensions.Logging;+using Microsoft.Extensions.Options;+using Microsoft.IdentityModel.Tokens;+using Microsoft.OpenApi.Models;+using Swashbuckle.AspNetCore.Filters;+using System.Reflection;+using System.Text;+using ModernWMS.Core.DBContext;+using System.Reflection.PortableExecutable;+using Microsoft.Extensions.Logging.Debug;+using ModernWMS.Core.Swagger;+using ModernWMS.Core.JWT;+using Newtonsoft.Json;+using Microsoft.AspNetCore.Cors.Infrastructure;+using ModernWMS.Core.Middleware;+using Microsoft.Extensions.DependencyModel;+using ModernWMS.Core.DI;+using Microsoft.Extensions.Localization;+using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;+using Microsoft.EntityFrameworkCore.Migrations.Internal;++namespace ModernWMS.Core.Extentions+{+ public static class StartupExtensions+ {+ public static void AddExtensionsService(this IServiceCollection services, IConfiguration configuration)+ {+ services.AddLocalization();+ services.AddSingleton<IStringLocalizer>((sp) =>+ {+ var sharedLocalizer = sp.GetRequiredService<IStringLocalizer<MultiLanguage>>();+ return sharedLocalizer;+ });+ services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();+ services.AddSingleton<CacheManager>();+ services.AddSingleton<IMemoryCache>(factory =>+ {+ var cache = new MemoryCache(new MemoryCacheOptions());+ return cache;+ });+ var Mysql_connection = configuration.GetConnectionString("MySqlConn");+ var SqlLite_connection = configuration.GetConnectionString("SqlLiteConn");+ var database_config = configuration.GetSection("Database")["db"];+ services.AddDbContextPool<SqlDBContext>(t =>+ {+ if(database_config == "SqlLite")+ {+ t.UseSqlite(SqlLite_connection, b => b.MigrationsAssembly("ModernWMS"));+ }+ else+ {+ t.UseMySql(Mysql_connection, new MySqlServerVersion(new Version(8, 0, 26)));+ }++ t.EnableSensitiveDataLogging();+ t.UseLoggerFactory(new LoggerFactory(new[] { new DebugLoggerProvider() }));+ }, 100); ;+ services.AddMemoryCache( );+ services.AddScoped<MultiTenancy.ITenantProvider, MultiTenancy.TenantProvider>();+ services.AddSwaggerService(configuration, AppContext.BaseDirectory);+ services.AddTokenGeneratorService(configuration);+ services.RegisterAssembly();+ services.AddControllers(c =>+ {+ c.Filters.Add(typeof(ViewModelActionFiter));+ c.MaxModelValidationErrors = 99999;+ }).ConfigureApiBehaviorOptions(o =>+ {+ o.SuppressModelStateInvalidFilter = true;+ })//format+ .AddNewtonsoftJson(options =>+ {+ options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;+ options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";+ options.SerializerSettings.Converters.Add(new JsonStringTrimConverter());+ options.SerializerSettings.Formatting = Formatting.Indented;+ options.SerializerSettings.ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver();+ }).AddDataAnnotationsLocalization(options => {+ options.DataAnnotationLocalizerProvider = (type, factory) =>+ factory.Create(typeof(ModernWMS.Core.MultiLanguage));+ }); ;++ }+ public static void UseExtensionsConfigure(this IApplicationBuilder app, IWebHostEnvironment env, IServiceProvider serviceProvider, IConfiguration configuration)+ {+ if (env.IsDevelopment())+ {+ app.UseDeveloperExceptionPage();+ }+ app.UseStaticFiles();+ app.UseSwaggerConfigure(configuration);+ app.UseRouting();+ app.UseMiddleware<ModernWMS.Core.Middleware.CorsMiddleware>();+ app.UseTokenGeneratorConfigure(configuration);+ app.UseAuthorization();+ app.UseMiddleware<GlobalExceptionMiddleware>();+ var support_languages = new[] { "zh-cn", "en-us" };+ var localization_options = new RequestLocalizationOptions()+ .SetDefaultCulture(support_languages[0])+ .AddSupportedCultures(support_languages)+ .AddSupportedUICultures(support_languages);+ app.UseRequestLocalization(localization_options);+ app.UseEndpoints(endpoints =>+ {+ endpoints.MapControllers();+ });+ }+ #region Swagger+ /// <summary>+ /// Swagger+ /// </summary>+ /// <param name="services">服务容器</param>+ /// <param name="configuration">配置文件</param>+ /// <param name="BaseDirectory">主目录</param>+ private static void AddSwaggerService(this IServiceCollection services, IConfiguration configuration, string BaseDirectory)+ {+ if (services == null)+ {+ throw new ArgumentNullException(nameof(services));+ }+ var swaggerSettings = configuration.GetSection("SwaggerSettings");++ var provider = services.Configure<SwaggerSettings>(swaggerSettings).BuildServiceProvider();+ var settings = provider.GetService<IOptions<SwaggerSettings>>()?.Value;++ if (settings != null && settings.Name.Equals("ModernWMS"))+ {+ services.AddSwaggerGen(c =>+ {+ typeof(CustomApiVersion.ApiVersions).GetEnumNames().ToList().ForEach(version =>+ {+ c.SwaggerDoc(version, new OpenApiInfo+ {+ Title = settings.ApiTitle,+ Version = settings.ApiVersion,+ Description = settings.Description+ });+ });+++ if (settings.XmlFiles != null && settings.XmlFiles.Count > 0)+ {+ settings.XmlFiles.ForEach(fileName =>+ {+ if (File.Exists(Path.Combine(BaseDirectory, fileName)))+ {+ c.IncludeXmlComments(Path.Combine(BaseDirectory, fileName), true);+ }+ });+ }++ c.OperationFilter<AddResponseHeadersFilter>();+ c.OperationFilter<AppendAuthorizeToSummaryOperationFilter>();+ c.OperationFilter<SecurityRequirementsOperationFilter>();+++ c.AddSecurityDefinition("oauth2", new OpenApiSecurityScheme+ {+ Description = "please input Bearer {token}",+ Name = "Authorization",+ In = ParameterLocation.Header,+ Type = SecuritySchemeType.ApiKey+ });+ c.SwaggerGeneratorOptions.DescribeAllParametersInCamelCase = false;++ });+ }+ }+ /// <summary>+ /// register Swagger+ /// </summary>+ /// <param name="app"></param>+ /// <param name="configuration">配置文件</param>+ private static void UseSwaggerConfigure(this IApplicationBuilder app, IConfiguration configuration)+ {++ var swaggerSettings = configuration.GetSection("SwaggerSettings");++ if (swaggerSettings != null && swaggerSettings["Name"].Equals("ModernWMS"))+ {+ app.UseSwagger();++ app.UseSwaggerUI(c =>+ {+ typeof(CustomApiVersion.ApiVersions).GetEnumNames().OrderBy(e => e).ToList().ForEach(version =>+ {+ c.SwaggerEndpoint($"/swagger/{version}/swagger.json", $"{swaggerSettings["Name"]} {version}");+ });++ c.IndexStream = () => Assembly.GetExecutingAssembly().GetManifestResourceStream("ModernWMS.Core.Swagger.index.html");+ c.RoutePrefix = "";++ });++ }+ }+ #endregion++ #region JWT+ /// <summary>+ /// register JWT+ /// </summary>+ /// <param name="services">services</param>+ /// <param name="configuration">configuration</param>+ private static void AddTokenGeneratorService(this IServiceCollection services, IConfiguration configuration)+ {++ if (services == null)+ {+ throw new ArgumentNullException(nameof(services));+ }+ var tokenSettings = configuration.GetSection("TokenSettings");+ services.Configure<TokenSettings>(tokenSettings);+ services.AddTransient<ITokenManager, TokenManager>();++ services.AddAuthentication(options =>+ {+ options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;+ options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;+ options.DefaultChallengeScheme = nameof(ApiResponseHandler);+ options.DefaultForbidScheme = nameof(ApiResponseHandler);+ }+ )+ .AddJwtBearer(options =>+ {+ options.TokenValidationParameters = new TokenValidationParameters+ {+ ValidateAudience = true,+ ValidAudience = tokenSettings["Audience"],+ ValidateIssuer = true,+ ValidIssuer = tokenSettings["Issuer"],+ ValidateLifetime = true,+ ValidateIssuerSigningKey = true,+ IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(tokenSettings["SigningKey"])),+ ClockSkew = TimeSpan.Zero+ };+ })+ .AddScheme<AuthenticationSchemeOptions, ApiResponseHandler>(nameof(ApiResponseHandler), o => { });++ }++ private static void UseTokenGeneratorConfigure(this IApplicationBuilder app, IConfiguration configuration)+ {+ app.UseAuthentication();+ }+ #endregion++ #region dynamic injection+ /// <summary>+ /// judge the dll to be injected by IDependency+ /// </summary>+ /// <param name="services">services</param>+ private static IServiceCollection RegisterAssembly(this IServiceCollection services)+ {+++ var path = AppDomain.CurrentDomain.RelativeSearchPath ?? AppDomain.CurrentDomain.BaseDirectory;+ var referencedAssemblies = System.IO.Directory.GetFiles(path, "ModernWMS*.dll").Select(Assembly.LoadFrom).ToArray();++ var types = referencedAssemblies+ .SelectMany(a => a.DefinedTypes)+ .Select(type => type.AsType())+ .Where(x => x != typeof(IDependency) && typeof(IDependency).IsAssignableFrom(x)).ToArray();+ var implementTypes = types.Where(x => x.IsClass).ToArray();+ var interfaceTypes = types.Where(x => x.IsInterface).ToArray();+ foreach (var implementType in implementTypes)+ {+ var interfaceType = interfaceTypes.FirstOrDefault(x => x.IsAssignableFrom(implementType));+ if (interfaceType != null)+ services.AddScoped(interfaceType, implementType);+ }++ services.AddScoped<Services.IAccountService, Services.AccountService>();+ return services;+ }+ #endregion+++ }+}diff --git a/backend/ModernWMS.Core/JWT/ApiResponseHandler.cs b/backend/ModernWMS.Core/JWT/ApiResponseHandler.csnew file mode 100644index 0000000..2ee735f--- /dev/null+++ b/backend/ModernWMS.Core/JWT/ApiResponseHandler.cs@@ -0,0 +1,85 @@++using Microsoft.AspNetCore.Authentication;+using Microsoft.AspNetCore.Http;+using Microsoft.Extensions.Options;+using System;+using System.Threading.Tasks;+using System.Text.Encodings.Web;+using Microsoft.Extensions.Logging;+using ModernWMS.Core.Models;+using System.Linq;+using ModernWMS.Core.Utility;+using ModernWMS.Core.JWT;+namespace ModernWMS.Core.JWT+{+ /// <summary>+ /// Custom Processing Unit+ /// </summary>+ public class ApiResponseHandler : AuthenticationHandler<AuthenticationSchemeOptions>+ {++ /// <summary>+ /// token manager+ /// </summary>+ private readonly ITokenManager _tokenManager;+ /// <summary>+ /// cache manager+ /// </summary>+ private readonly CacheManager _cacheManager;++ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="options">options</param>+ /// <param name="logger">logger</param>+ /// <param name="encoder">encoder</param>+ /// <param name="clock"></param>+ /// <param name="tokenManager">tokenManager</param>+ /// <param name="cacheManager">cacheManagerparam>+ public ApiResponseHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock+ , ITokenManager tokenManager+ , CacheManager cacheManager)+ : base(options, logger, encoder, clock)+ {+ this._tokenManager = tokenManager;+ _cacheManager = cacheManager;+ }+ /// <summary>+ /// handle authority+ /// </summary>+ /// <returns></returns>+ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()+ {+ var token = Request.Headers["Authorization"].ObjToString().Replace("Bearer ", "");+ var currentUser = this._tokenManager.GetCurrentUser(token);+ var flag = _cacheManager.Is_Token_Exist<string>(currentUser.user_id, "WebToken", _tokenManager.GetRefreshTokenExpireMinute());+ if (!flag)+ {+ return AuthenticateResult.Fail("Sorry, you don't have the authority required!");+ }+ throw new NotImplementedException();+ }+ /// <summary>+ /// authentication+ /// </summary>+ /// <param name="properties">参数</param>+ /// <returns></returns>+ protected override async Task HandleChallengeAsync(AuthenticationProperties properties)+ {+ Response.ContentType = "application/json";+ Response.StatusCode = StatusCodes.Status401Unauthorized;+ await Response.WriteAsync(JsonHelper.SerializeObject(ResultModel<object>.Error("Sorry, please sign in first!", 403)));+ }+ /// <summary>+ /// access denied+ /// </summary>+ /// <param name="properties"></param>+ /// <returns></returns>+ protected override async Task HandleForbiddenAsync(AuthenticationProperties properties)+ {+ Response.ContentType = "application/json";+ Response.StatusCode = StatusCodes.Status403Forbidden;+ await Response.WriteAsync(JsonHelper.SerializeObject(ResultModel<object>.Error("Sorry, you don't have the authority required!", 403)));+ }+ }+}diff --git a/backend/ModernWMS.Core/JWT/CacheManger.cs b/backend/ModernWMS.Core/JWT/CacheManger.csnew file mode 100644index 0000000..25538ea--- /dev/null+++ b/backend/ModernWMS.Core/JWT/CacheManger.cs@@ -0,0 +1,152 @@+using Microsoft.Extensions.Caching.Memory;+using Newtonsoft.Json.Linq;+using System;+using System.Collections;+using System.Collections.Generic;+using System.Reflection;++namespace ModernWMS.Core.JWT+{+ public class CacheManager+ {++ public static CacheManager Default = new CacheManager();++ private IMemoryCache _cache = new MemoryCache(new MemoryCacheOptions());++ public CacheManager()+ {++ }++ /// <summary>+ /// get value by key+ /// </summary>+ /// <typeparam name="T">type of value</typeparam>+ /// <param name="key">key</param>+ /// <returns></returns>+ public T Get<T>(string key)+ {+ if (string.IsNullOrWhiteSpace(key))+ throw new ArgumentNullException(nameof(key));+ T value;+ _cache.TryGetValue<T>(key, out value);+ return value;+ }+++ /// <summary>+ /// set cache+ /// </summary>+ /// <param name="key">key</param>+ /// <param name="value">value</param>+ public void Set_NotExpire<T>(string key, T value)+ {+ if (string.IsNullOrWhiteSpace(key))+ throw new ArgumentNullException(nameof(key));++ T v;+ if (_cache.TryGetValue(key, out v))+ _cache.Remove(key);+ _cache.Set(key, value);+ }++ /// <summary>+ /// set cache with expire+ /// </summary>+ /// <param name="key">key</param>+ /// <param name="value">value</param>+ public void Set_SlidingExpire<T>(string key, T value, TimeSpan span)+ {+ if (string.IsNullOrWhiteSpace(key))+ throw new ArgumentNullException(nameof(key));++ T v;+ if (_cache.TryGetValue(key, out v))+ _cache.Remove(key);+ _cache.Set(key, value, new MemoryCacheEntryOptions()+ {+ SlidingExpiration = span+ });+ }+++ public void Set_AbsoluteExpire<T>(string key, T value, TimeSpan span)+ {+ if (string.IsNullOrWhiteSpace(key))+ throw new ArgumentNullException(nameof(key));++ T v;+ if (_cache.TryGetValue(key, out v))+ _cache.Remove(key);+ _cache.Set(key, value, span);+ }++ public void Set_SlidingAndAbsoluteExpire<T>(string key, T value, TimeSpan slidingSpan, TimeSpan absoluteSpan)+ {+ if (string.IsNullOrWhiteSpace(key))+ throw new ArgumentNullException(nameof(key));++ T v;+ if (_cache.TryGetValue(key, out v))+ _cache.Remove(key);+ _cache.Set(key, value, new MemoryCacheEntryOptions()+ {+ SlidingExpiration = slidingSpan,+ AbsoluteExpiration = DateTimeOffset.Now.AddMilliseconds(absoluteSpan.TotalMilliseconds)+ });+ }++ /// <summary>+ /// remove cache by key+ /// </summary>+ /// <param name="key">key</param>+ public void Remove(string key)+ {+ if (string.IsNullOrWhiteSpace(key))+ throw new ArgumentNullException(nameof(key));++ _cache.Remove(key);+ }++ /// <summary>+ /// dispose+ /// </summary>+ public void Dispose()+ {+ if (_cache != null)+ _cache.Dispose();+ GC.SuppressFinalize(this);+ }++ #region TokenHelper+ public bool Is_Token_Exist<T>(int userID, string type, int expireMinute)+ {+ var key = $"ModernWMS_{type}_{userID}";+ if (string.IsNullOrWhiteSpace(key))+ throw new ArgumentNullException(nameof(key));+ T value;+ if (_cache.TryGetValue<T>(key, out value))+ {+ Set_SlidingExpire(key, value, TimeSpan.FromMinutes(expireMinute) );+ return true;+ }+ return false;+ }+ public async Task<bool> TokenSet(int userID, string type, string token, int expireMinute)+ {+ string key = $"ModernWMS_{type}_{userID}";+ try+ {+ Set_AbsoluteExpire(key, token, TimeSpan.FromMinutes(expireMinute));+ }+ catch+ {+ return false;+ }+ return true;+ }+ #endregion+ }+}+diff --git a/backend/ModernWMS.Core/JWT/ClaimValueTypes.cs b/backend/ModernWMS.Core/JWT/ClaimValueTypes.csnew file mode 100644index 0000000..e96f75a--- /dev/null+++ b/backend/ModernWMS.Core/JWT/ClaimValueTypes.cs@@ -0,0 +1,13 @@+namespace ModernWMS.Core.JWT+{+ /// <summary>+ /// JWT custom type+ /// </summary>+ public static class ClaimValueTypes+ {+ /// <summary>+ /// JSON+ /// </summary>+ public const string Json = "json";+ }+}diff --git a/backend/ModernWMS.Core/JWT/CurrentUser.cs b/backend/ModernWMS.Core/JWT/CurrentUser.csnew file mode 100644index 0000000..dc32b03--- /dev/null+++ b/backend/ModernWMS.Core/JWT/CurrentUser.cs@@ -0,0 +1,34 @@+using System.ComponentModel.DataAnnotations;+using System.Xml.Linq;++namespace ModernWMS.Core.JWT+{+ /// <summary>+ /// CurrentUser+ /// </summary>+ public class CurrentUser+ {+ /// <summary>+ /// user_id+ /// </summary>+ public int user_id { get; set; } = 1;+ /// <summary>+ /// user_num+ /// </summary>+ public string user_num { get; set; } = "admin";+ /// <summary>+ /// user_name+ /// </summary>+ public string user_name { get; set; } = "admin";++ /// <summary>+ /// user_role+ /// </summary>+ public string user_role { get; set; } = "admin";++ /// <summary>+ /// tenant+ /// </summary>+ public long tenant_id { get; set; } = 1;+ }+}diff --git a/backend/ModernWMS.Core/JWT/ITokenManager.cs b/backend/ModernWMS.Core/JWT/ITokenManager.csnew file mode 100644index 0000000..622b3c0--- /dev/null+++ b/backend/ModernWMS.Core/JWT/ITokenManager.cs@@ -0,0 +1,36 @@++namespace ModernWMS.Core.JWT+{+ /// <summary>+ /// token manager interface+ /// </summary>+ public interface ITokenManager+ {+ /// <summary>+ /// Method of generating AccessToken+ /// </summary>+ /// <param name="userClaims">userClaims</param>+ /// <returns></returns>+ (string token, int expire) GenerateToken(CurrentUser userClaims);+ /// <summary>+ /// Method of refreshing token+ /// </summary>+ /// <returns></returns>+ string GenerateRefreshToken();+ /// <summary>+ /// Get the minutes of refreshed token invalidation+ /// </summary>+ /// <returns></returns>+ int GetRefreshTokenExpireMinute();+ /// <summary>+ /// Get the current user information in the token+ /// </summary>+ /// <returns></returns>+ CurrentUser GetCurrentUser();+ /// <summary>+ /// Get the current user information in the token+ /// </summary>+ /// <returns></returns>+ CurrentUser GetCurrentUser(string token);+ }+}diff --git a/backend/ModernWMS.Core/JWT/TokenManager.cs b/backend/ModernWMS.Core/JWT/TokenManager.csnew file mode 100644index 0000000..b34ea1a--- /dev/null+++ b/backend/ModernWMS.Core/JWT/TokenManager.cs@@ -0,0 +1,182 @@+using Microsoft.AspNetCore.Http;+using Microsoft.Extensions.Options;+using Microsoft.IdentityModel.Tokens;+using System;+using System.Collections.Generic;+using System.IdentityModel.Tokens.Jwt;+using System.Linq;+using System.Security.Claims;+using System.Security.Cryptography;+using System.Text;+using ModernWMS.Core.Utility;++namespace ModernWMS.Core.JWT+{+ /// <summary>+ /// token manager+ /// </summary>+ public class TokenManager : ITokenManager+ {+ private readonly IOptions<TokenSettings> _tokenSettings;//token setting+ private readonly IHttpContextAccessor _accessor; // Inject IHttpContextAccessor+ /// <summary>+ /// Constructor+ /// </summary>+ /// <param name="tokenSettings">token setting s</param>+ /// <param name="accessor">Inject IHttpContextAccessor</param>+ public TokenManager(IOptions<TokenSettings> tokenSettings+ , IHttpContextAccessor accessor)+ {+ this._tokenSettings = tokenSettings;+ this._accessor = accessor;+ }+ /// <summary>+ /// Method of refreshing token+ /// </summary>+ /// <returns></returns>+ public string GenerateRefreshToken()+ {+ var randomNumber = new byte[32];++ using (var rng = RandomNumberGenerator.Create())+ {+ rng.GetBytes(randomNumber);++ return Convert.ToBase64String(randomNumber);+ }+ }+ /// <summary>+ /// Method of generating AccessToken+ /// </summary>+ /// <param name="userClaims">自定义信息</param>+ /// <returns>(token,有效分钟数)</returns>+ public (string token, int expire) GenerateToken(CurrentUser userClaims)+ {+ string token = new JwtSecurityTokenHandler().WriteToken(new JwtSecurityToken(+ issuer: _tokenSettings.Value.Issuer,+ audience: _tokenSettings.Value.Audience,+ claims: SetClaims(userClaims),+ expires: DateTime.Now.AddMinutes(_tokenSettings.Value.ExpireMinute),+ signingCredentials: new SigningCredentials(+ new SymmetricSecurityKey(Encoding.UTF8.GetBytes(GlobalConsts.SigningKey)),+ SecurityAlgorithms.HmacSha256)+ ));++ return (token, _tokenSettings.Value.ExpireMinute);+ }+ /// <summary>+ /// Get the current user information in the token+ /// </summary>+ /// <returns></returns>+ public CurrentUser GetCurrentUser()+ {+ if (_accessor.HttpContext == null)+ {+ return new CurrentUser();+ }+ var token = _accessor.HttpContext.Request.Headers["Authorization"].ObjToString();+ if (!token.StartsWith("Bearer"))+ {+ return new CurrentUser();+ }+ token = token.Replace("Bearer ", "");+ if (token.Length > 0)+ {+ var principal = new JwtSecurityTokenHandler().ValidateToken(token,+ new TokenValidationParameters+ {+ ValidateAudience = false,+ ValidateIssuer = false,+ ValidateIssuerSigningKey = true,+ IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(GlobalConsts.SigningKey)),+ ValidateLifetime = false+ },+ out var securityToken);++ if (!(securityToken is JwtSecurityToken jwtSecurityToken) ||+ !jwtSecurityToken.Header.Alg.Equals(SecurityAlgorithms.HmacSha256, StringComparison.InvariantCultureIgnoreCase))+ {+ return new CurrentUser();+ }+ var user = JsonHelper.DeserializeObject<CurrentUser>(principal.Claims.First(claim => claim.Type == ClaimValueTypes.Json).Value);+ if (user != null)+ {+ return user;+ }+ else+ {+ return new CurrentUser();+ }+ }+ else+ {+ return new CurrentUser();+ }++ }++ /// <summary>+ /// Get the current user information in the token+ /// </summary>+ /// <returns></returns>+ public CurrentUser GetCurrentUser(string token)+ {+ if (token.Length > 0)+ {+ var principal = new JwtSecurityTokenHandler().ValidateToken(token,+ new TokenValidationParameters+ {+ ValidateAudience = false,+ ValidateIssuer = false,+ ValidateIssuerSigningKey = true,+ IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(GlobalConsts.SigningKey)),+ ValidateLifetime = false+ },+ out var securityToken);++ if (!(securityToken is JwtSecurityToken jwtSecurityToken) ||+ !jwtSecurityToken.Header.Alg.Equals(SecurityAlgorithms.HmacSha256, StringComparison.InvariantCultureIgnoreCase))+ {+ return new CurrentUser();+ }+ var user = JsonHelper.DeserializeObject<CurrentUser>(principal.Claims.First(claim => claim.Type == ClaimValueTypes.Json).Value);+ if (user != null)+ {+ return user;+ }+ else+ {+ return new CurrentUser();+ }+ }+ else+ {+ return new CurrentUser();+ }++ }+ /// <summary>+ /// Method of refreshing token+ /// </summary>+ /// <returns></returns>+ public int GetRefreshTokenExpireMinute()+ {+ return _tokenSettings.Value.ExpireMinute + 1;+ }++ /// <summary>+ /// Setting Custom Information+ /// </summary>+ /// <param name="userClaims">Custom Information</param>+ /// <returns></returns>+ private static IEnumerable<Claim> SetClaims(CurrentUser userClaims)+ {+ return new List<Claim>+ {+ new Claim(ClaimTypes.Sid, Guid.NewGuid().ToString()),+ new Claim(ClaimValueTypes.Json,JsonHelper.SerializeObject(userClaims), ClaimValueTypes.Json)+ };+ }++ }+}diff --git a/backend/ModernWMS.Core/JWT/TokenSettings.cs b/backend/ModernWMS.Core/JWT/TokenSettings.csnew file mode 100644index 0000000..86ce2f2--- /dev/null+++ b/backend/ModernWMS.Core/JWT/TokenSettings.cs@@ -0,0 +1,26 @@++namespace ModernWMS.Core.JWT+{+ /// <summary>+ /// token settings+ /// </summary>+ public class TokenSettings+ {+ /// <summary>+ /// Audience+ /// </summary>+ public string Audience { get; set; }+ /// <summary>+ /// Issuer+ /// </summary>+ public string Issuer { get; set; }+ /// <summary>+ /// SigningKey+ /// </summary>+ public string SigningKey { get; set; }+ /// <summary>+ /// Expire+ /// </summary>+ public int ExpireMinute { get; set; }+ }+}diff --git a/backend/ModernWMS.Core/Middleware/CorsMiddleware.cs b/backend/ModernWMS.Core/Middleware/CorsMiddleware.csnew file mode 100644index 0000000..ae6163c--- /dev/null+++ b/backend/ModernWMS.Core/Middleware/CorsMiddleware.cs@@ -0,0 +1,61 @@+using Microsoft.AspNetCore.Http;+using System.Threading.Tasks;++namespace ModernWMS.Core.Middleware+{+ /// <summary>+ /// Cross domain middleware+ /// </summary>+ public class CorsMiddleware+ {+ #region parameter+ /// <summary>+ /// agent+ /// </summary>+ private readonly RequestDelegate _next;+ #endregion++ #region Constructor++ /// <summary>+ /// Constructor+ /// </summary>+ /// <param name="next">Delegate in next step</param>+ public CorsMiddleware(RequestDelegate next)+ {+ _next = next;+ }+ #endregion++ /// <summary>+ /// Invoke+ /// </summary>+ /// <param name="httpContext">httpContext</param>+ /// <returns></returns>+ public Task Invoke(HttpContext httpContext)+ {++ if (httpContext.Request.Method == "OPTIONS")+ {+ httpContext.Response.Headers.Add("Access-Control-Allow-Origin", httpContext.Request.Headers["Origin"]);+ httpContext.Response.Headers.Add("Access-Control-Allow-Headers", httpContext.Request.Headers["Access-Control-Request-Headers"]);+ httpContext.Response.Headers.Add("Access-Control-Allow-Methods", "PUT,POST,GET,DELETE,OPTIONS,HEAD,PATCH");+ httpContext.Response.Headers.Add("Access-Control-Allow-Credentials", "true");+ httpContext.Response.Headers.Add("Access-Control-Max-Age", "86400");+ httpContext.Response.StatusCode = StatusCodes.Status200OK;+ return Task.CompletedTask;+ }+ if (httpContext.Request.Headers["Origin"] != "")+ {+ httpContext.Response.Headers.Add("Access-Control-Allow-Origin", httpContext.Request.Headers["Origin"]);+ }++ httpContext.Response.Headers.Add("Access-Control-Allow-Headers", httpContext.Request.Headers["Access-Control-Request-Headers"]);+ httpContext.Response.Headers.Add("Access-Control-Allow-Methods", "PUT,POST,GET,DELETE,OPTIONS,HEAD,PATCH");+ httpContext.Response.Headers.Add("Access-Control-Allow-Credentials", "true");+ httpContext.Response.Headers.Add("Access-Control-Max-Age", "86400");+ return _next.Invoke(httpContext);+ }++ }+}diff --git a/backend/ModernWMS.Core/Middleware/GlobalExceptionMiddleware.cs b/backend/ModernWMS.Core/Middleware/GlobalExceptionMiddleware.csnew file mode 100644index 0000000..9df3b26--- /dev/null+++ b/backend/ModernWMS.Core/Middleware/GlobalExceptionMiddleware.cs@@ -0,0 +1,105 @@+using Microsoft.AspNetCore.Http;+using Microsoft.Extensions.Logging;+using System;+using System.Linq;+using System.Threading.Tasks;+using ModernWMS.Core.Models;+using Microsoft.Extensions.Localization;++namespace ModernWMS.Core.Middleware+{+ /// <summary>+ /// Global exception middleware+ /// </summary>+ public class GlobalExceptionMiddleware+ {+ #region parameter+ private readonly RequestDelegate next;+ private readonly ILogger<GlobalExceptionMiddleware> logger;+ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<MultiLanguage> _stringLocalizer;+ #endregion++ #region Constructor+ /// <summary>+ /// Constructor+ /// </summary>+ /// <param name="next">Delegate in next step</param>+ /// <param name="logger">log manager</param>+ /// <param name="stringLocalizer">Localizer</param>+ public GlobalExceptionMiddleware(RequestDelegate next,+ ILogger<GlobalExceptionMiddleware> logger,+ IStringLocalizer<MultiLanguage> stringLocalizer+ )+ {+ this.next = next;+ this.logger = logger;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ /// <summary>+ /// invoke+ /// </summary>+ /// <param name="context">httpcontext</param>+ /// <returns></returns>+ public async Task Invoke(HttpContext context)+ {+ try+ {+ await next.Invoke(context);+ }+ catch (Exception ex)+ {+ await WriteExceptionAsync(context, ex);+ }+ }+ /// <summary>+ /// Write Log+ /// </summary>+ /// <param name="context">httpcontext</param>+ /// <param name="e">error messasge</param>+ /// <returns></returns>+ private async Task WriteExceptionAsync(HttpContext context, Exception e)+ {+ if (e != null)+ {+ var response = context.Response;+ var message = e.InnerException == null ? e.Message : e.InnerException.Message;+ response.ContentType = "application/json";++ var ip = context.Request.Headers["X-Forwarded-For"].FirstOrDefault();+ if (string.IsNullOrEmpty(ip))+ {+ ip = context.Connection.RemoteIpAddress.ToString();+ }+ logger.LogError($"\r\n\r\nIP:{ip},Exception:{e.Message}\r\nStackTrace:{e.StackTrace}");++ string result = Utility.JsonHelper.SerializeObject(ResultModel<object>.Error(_stringLocalizer["operation_failed"]));+ await context.Response.WriteAsync(result).ConfigureAwait(false);+ }+ else+ {+ var code = context.Response.StatusCode;+ switch (code)+ {+ case 200:+ return;+ case 204:+ return;+ case 401:+ context.Response.ContentType = "application/json";+ await context.Response.WriteAsync(Utility.JsonHelper.SerializeObject(ResultModel<object>.Error("Invalid Token"))).ConfigureAwait(false);+ break;+ default:+ context.Response.ContentType = "application/json";+ await context.Response.WriteAsync(Utility.JsonHelper.SerializeObject(ResultModel<object>.Error("Unknown Error"))).ConfigureAwait(false);+ break;+ }+ }+ }++ }+}diff --git a/backend/ModernWMS.Core/Middleware/RequestResponseMiddleware.cs b/backend/ModernWMS.Core/Middleware/RequestResponseMiddleware.csnew file mode 100644index 0000000..f50ec3e--- /dev/null+++ b/backend/ModernWMS.Core/Middleware/RequestResponseMiddleware.cs@@ -0,0 +1,138 @@+using Microsoft.AspNetCore.Http;+using Microsoft.Extensions.Logging;+using Newtonsoft.Json;+using System;+using System.Diagnostics;+using System.IO;+using System.Text;+using System.Threading.Tasks;+using ModernWMS.Core.Models;++namespace ModernWMS.Core.Middleware+{+ /// <summary>+ /// Request response middleware+ /// </summary>+ public class RequestResponseMiddleware+ {+ #region parameter+ /// <summary>+ /// Delegate+ /// </summary>+ private readonly RequestDelegate _next;+ /// <summary>+ /// log manager+ /// </summary>+ private readonly ILogger<RequestResponseMiddleware> _logger;++ #endregion++ #region Constructor+ /// <summary>+ /// Constructor+ /// </summary>+ /// <param name="next">Delegate</param>+ /// <param name="logger">log manager</param>+ public RequestResponseMiddleware(RequestDelegate next+ , ILogger<RequestResponseMiddleware> logger)+ {+ _next = next;+ _logger = logger;+ }++ #endregion++ /// <summary>+ /// Invoke+ /// </summary>+ /// <param name="context">httpcontext</param>+ /// <returns></returns>+ public async Task Invoke(HttpContext context)+ {+ if (ModernWMS.Core.Utility.GlobalConsts.IsRequestResponseMiddleware)+ {+ string requestInfo = "", responseInfo = "";+ var originalBodyStream = context.Response.Body;+ var stopwach = Stopwatch.StartNew();+ try+ {++ requestInfo = await FormatRequest(context.Request);++ using (var responseBody = new MemoryStream())+ {+ context.Response.Body = responseBody;++ await _next(context);+ stopwach.Stop();++ responseInfo = await FormatResponse(context.Response);++ await responseBody.CopyToAsync(originalBodyStream);+ }+++ var logMsg = $@"request information: {requestInfo} ;time spent: {stopwach.ElapsedMilliseconds}ms";+ _logger.LogInformation(logMsg);++ }+ catch (Exception ex)+ {+ stopwach.Stop();+ if (ex != null)+ {+ var logMsg = $@"request information: {requestInfo}{Environment.NewLine}exception: {ex.ToString()}{Environment.NewLine}time spent: {stopwach.ElapsedMilliseconds}ms";++ _logger.LogError(logMsg);+ _logger.LogError(ex.ToString());++ string result = Utility.JsonHelper.SerializeObject(ResultModel<object>.Error(ex.Message));+ var bytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(result));+ await originalBodyStream.WriteAsync(bytes, 0, bytes.Length);++ }+ }+++ }+ else+ {+ await _next(context);+ }+++ }+ /// <summary>+ /// format request+ /// </summary>+ /// <param name="request">request</param>+ /// <returns></returns>+ private async Task<string> FormatRequest(HttpRequest request)+ {+ HttpRequestRewindExtensions.EnableBuffering(request);+ var body = request.Body;++ var buffer = new byte[Convert.ToInt32(request.ContentLength)];+ await request.Body.ReadAsync(buffer, 0, buffer.Length);+ var bodyAsText = Encoding.UTF8.GetString(buffer);+ body.Seek(0, SeekOrigin.Begin);+ request.Body = body;++ return $" {request.Method} {request.Scheme}://{request.Host}{request.Path} {request.QueryString} {bodyAsText}";+ }+ /// <summary>+ /// format response+ /// </summary>+ /// <param name="response">response</param>+ /// <returns></returns>+ private async Task<string> FormatResponse(HttpResponse response)+ {+ response.Body.Seek(0, SeekOrigin.Begin);+ var text = await new StreamReader(response.Body).ReadToEndAsync();+ response.Body.Seek(0, SeekOrigin.Begin);++ return $"{response.StatusCode}: {text}";+ }++ }+}diff --git a/backend/ModernWMS.Core/Middleware/ViewModelActionFiter.cs b/backend/ModernWMS.Core/Middleware/ViewModelActionFiter.csnew file mode 100644index 0000000..979fe13--- /dev/null+++ b/backend/ModernWMS.Core/Middleware/ViewModelActionFiter.cs@@ -0,0 +1,78 @@+using Microsoft.AspNetCore.Mvc;+using Microsoft.AspNetCore.Mvc.Filters;+using ModernWMS.Core.Models;+using System;+using System.Collections.Generic;+using System.Linq;+using System.Text;+using System.Threading.Tasks;++namespace ModernWMS.Core.Middleware+{+ /// <summary>+ /// ViewModelActionFiter+ /// </summary>+ public class ViewModelActionFiter : ActionFilterAttribute+ {+ /// <summary>+ /// override OnActionExecuting+ /// </summary>+ /// <param name="context">context</param>+ public override void OnActionExecuting(ActionExecutingContext context)+ {++ if (!context.ModelState.IsValid)+ {+ string method = context.HttpContext.Request.Method;+ ResultModel<object> result = new ResultModel<object>();+ StringBuilder msg = new StringBuilder();+ bool flag = false;+ foreach (var item in context.ModelState.Values)+ {+ if (method.Equals("GET"))+ {+ msg.Append($",parameter value“{item.AttemptedValue}”does not pass the verification!");+ }+ else+ {+ foreach (var error in item.Errors)+ {+ if (error.ErrorMessage.Contains("convert")+ || error.ErrorMessage.Contains("Unexpected character")+ || error.ErrorMessage.Contains("is not")+ || error.ErrorMessage.Contains("valid")+ || error.ErrorMessage.Contains("Input "))+ {+ flag = true;+ }+ else+ {+ msg.Append($",{error.ErrorMessage}");+ }+ }+ }+ }+ if (flag)+ {+ msg.Append($",The data is of incorrect type or the value exceeds the type range");+ }+ if (msg.ToString().Length > 0)+ {+ result.ErrorMessage += msg.ToString().Substring(1);+ }+ result.Code = 400;+ context.Result = new JsonResult(result, new Newtonsoft.Json.JsonSerializerSettings()+ {+ ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver(),+ Formatting = Newtonsoft.Json.Formatting.Indented,+ DateFormatString = "yyyy-MM-dd HH:mm:ss"+ });+ }+ else+ {+ base.OnActionExecuting(context);+ }++ }+ }+}diff --git a/backend/ModernWMS.Core/Models/BaseModel.cs b/backend/ModernWMS.Core/Models/BaseModel.csnew file mode 100644index 0000000..1a29aa2--- /dev/null+++ b/backend/ModernWMS.Core/Models/BaseModel.cs@@ -0,0 +1,16 @@++using System;+using System.ComponentModel.DataAnnotations;+namespace ModernWMS.Core.Models+{+ [Serializable]+ public abstract class BaseModel+ {+ /// <summary>+ /// id+ /// </summary>+ [Key]+ public int id { get; set; } = 0;++ }+}diff --git a/backend/ModernWMS.Core/Models/BatchOperationViewModel.cs b/backend/ModernWMS.Core/Models/BatchOperationViewModel.csnew file mode 100644index 0000000..4b3a280--- /dev/null+++ b/backend/ModernWMS.Core/Models/BatchOperationViewModel.cs@@ -0,0 +1,13 @@+using System;+using System.Collections.Generic;+using System.Linq;+using System.Text;+using System.Threading.Tasks;++namespace ModernWMS.Core.Models+{+ public class BatchOperationViewModel+ {+ public List<int> id_list { get; set; } = new List<int>();+ }+}diff --git a/backend/ModernWMS.Core/Models/FormSelectItem.cs b/backend/ModernWMS.Core/Models/FormSelectItem.csnew file mode 100644index 0000000..5085bc8--- /dev/null+++ b/backend/ModernWMS.Core/Models/FormSelectItem.cs@@ -0,0 +1,32 @@+using System;+using System.Collections.Generic;+using System.Linq;+using System.Text;+using System.Threading.Tasks;++namespace ModernWMS.Core.Models+{+ /// <summary>+ /// select items model+ /// </summary>+ public class FormSelectItem+ {+ /// <summary>+ /// key+ /// </summary>+ public string code { get; set; } = string.Empty;+ /// <summary>+ /// comment+ /// </summary>+ public string comments { get; set; } = string.Empty;++ /// <summary>+ /// text+ /// </summary>+ public string name { get; set; } = string.Empty;+ /// <summary>+ /// value+ /// </summary>+ public string value { get; set; } = string.Empty;+ }+}diff --git a/backend/ModernWMS.Core/Models/LoginInputViewModel.cs b/backend/ModernWMS.Core/Models/LoginInputViewModel.csnew file mode 100644index 0000000..03b1705--- /dev/null+++ b/backend/ModernWMS.Core/Models/LoginInputViewModel.cs@@ -0,0 +1,25 @@++using System.ComponentModel.DataAnnotations;+using System.Collections.Generic;+namespace ModernWMS.Core.Models+{+ /// <summary>+ /// login input viewmodel+ /// </summary>+ public class LoginInputViewModel+ {+ /// <summary>+ /// username+ /// </summary>+ [Required(ErrorMessage ="Required")]+ [Display(Name = "user_name")]+ public string user_name { get; set; } = string.Empty;+ /// <summary>+ /// password+ /// </summary>++ [Required(ErrorMessage ="Required")]+ [Display(Name = "password")]+ public string password { get; set; } = string.Empty;+ }+}diff --git a/backend/ModernWMS.Core/Models/LoginOutputViewModel.cs b/backend/ModernWMS.Core/Models/LoginOutputViewModel.csnew file mode 100644index 0000000..475b060--- /dev/null+++ b/backend/ModernWMS.Core/Models/LoginOutputViewModel.cs@@ -0,0 +1,57 @@+using System;+using System.Collections.Generic;++namespace ModernWMS.Core.Models+{+ /// <summary>+ /// LoginOutputViewModel+ /// </summary>+ public class LoginOutputViewModel+ {+ /// <summary>+ /// user's num+ /// </summary>+ public string user_num { get; set; }++ /// <summary>+ /// user's name+ /// </summary>+ public string user_name { get; set; }++ /// <summary>+ /// user's id+ /// </summary>+ public int user_id { get; set; }++ /// <summary>+ /// user's role+ /// </summary>+ public string user_role { get; set; }++ /// <summary>+ /// id of user's role+ /// </summary>+ public int userrole_id { get; set; }++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; }++ /// <summary>+ /// token expire time+ /// </summary>+ public int expire { get; set; }++ /// <summary>+ /// token+ /// </summary>+ public string access_token { get; set; }++ /// <summary>+ /// refresh token+ /// </summary>+ public string refresh_token { get; set; }++ }+}diff --git a/backend/ModernWMS.Core/Models/MultiLanguage.cs b/backend/ModernWMS.Core/Models/MultiLanguage.csnew file mode 100644index 0000000..bf0c1d7--- /dev/null+++ b/backend/ModernWMS.Core/Models/MultiLanguage.cs@@ -0,0 +1,12 @@+using System;+using System.Collections.Generic;+using System.Linq;+using System.Text;+using System.Threading.Tasks;++namespace ModernWMS.Core+{+ public class MultiLanguage+ {+ }+}diff --git a/backend/ModernWMS.Core/Models/MultiLanguage.en-us.resx b/backend/ModernWMS.Core/Models/MultiLanguage.en-us.resxnew file mode 100644index 0000000..4f79028--- /dev/null+++ b/backend/ModernWMS.Core/Models/MultiLanguage.en-us.resx@@ -0,0 +1,636 @@+<?xml version="1.0" encoding="utf-8"?>+<root>+ <!--+ Microsoft ResX Schema++ Version 2.0++ The primary goals of this format is to allow a simple XML format+ that is mostly human readable. The generation and parsing of the+ various data types are done through the TypeConverter classes+ associated with the data types.++ Example:++ ... ado.net/XML headers & schema ...+ <resheader name="resmimetype">text/microsoft-resx</resheader>+ <resheader name="version">2.0</resheader>+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">+ <value>[base64 mime encoded serialized .NET Framework object]</value>+ </data>+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>+ <comment>This is a comment</comment>+ </data>++ There are any number of "resheader" rows that contain simple+ name/value pairs.++ Each data row contains a name, and value. The row also contains a+ type or mimetype. Type corresponds to a .NET class that support+ text/value conversion through the TypeConverter architecture.+ Classes that don't support this are serialized and stored with the+ mimetype set.++ The mimetype is used for serialized objects, and tells the+ ResXResourceReader how to depersist the object. This is currently not+ extensible. For a given mimetype the value must be set accordingly:++ Note - application/x-microsoft.net.object.binary.base64 is the format+ that the ResXResourceWriter will generate, however the reader can+ read any of the formats listed below.++ mimetype: application/x-microsoft.net.object.binary.base64+ value : The object must be serialized with+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter+ : and then encoded with base64 encoding.++ mimetype: application/x-microsoft.net.object.soap.base64+ value : The object must be serialized with+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter+ : and then encoded with base64 encoding.++ mimetype: application/x-microsoft.net.object.bytearray.base64+ value : The object must be serialized into a byte array+ : using a System.ComponentModel.TypeConverter+ : and then encoded with base64 encoding.+ -->+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />+ <xsd:element name="root" msdata:IsDataSet="true">+ <xsd:complexType>+ <xsd:choice maxOccurs="unbounded">+ <xsd:element name="metadata">+ <xsd:complexType>+ <xsd:sequence>+ <xsd:element name="value" type="xsd:string" minOccurs="0" />+ </xsd:sequence>+ <xsd:attribute name="name" use="required" type="xsd:string" />+ <xsd:attribute name="type" type="xsd:string" />+ <xsd:attribute name="mimetype" type="xsd:string" />+ <xsd:attribute ref="xml:space" />+ </xsd:complexType>+ </xsd:element>+ <xsd:element name="assembly">+ <xsd:complexType>+ <xsd:attribute name="alias" type="xsd:string" />+ <xsd:attribute name="name" type="xsd:string" />+ </xsd:complexType>+ </xsd:element>+ <xsd:element name="data">+ <xsd:complexType>+ <xsd:sequence>+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />+ </xsd:sequence>+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />+ <xsd:attribute ref="xml:space" />+ </xsd:complexType>+ </xsd:element>+ <xsd:element name="resheader">+ <xsd:complexType>+ <xsd:sequence>+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />+ </xsd:sequence>+ <xsd:attribute name="name" type="xsd:string" use="required" />+ </xsd:complexType>+ </xsd:element>+ </xsd:choice>+ </xsd:complexType>+ </xsd:element>+ </xsd:schema>+ <resheader name="resmimetype">+ <value>text/microsoft-resx</value>+ </resheader>+ <resheader name="version">+ <value>2.0</value>+ </resheader>+ <resheader name="reader">+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>+ </resheader>+ <resheader name="writer">+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>+ </resheader>+ <data name="carrier" xml:space="preserve">+ <value>carrier</value>+ </data>+ <data name="departure_city" xml:space="preserve">+ <value>Departure City</value>+ </data>+ <data name="arrival_city" xml:space="preserve">+ <value>Arrival City</value>+ </data>+ <data name="price_per_weight" xml:space="preserve">+ <value>Weight Fee</value>+ </data>+ <data name="price_per_volume" xml:space="preserve">+ <value>Volume Fee</value>+ </data>+ <data name="min_payment" xml:space="preserve">+ <value>Min Payment</value>+ </data>+ <data name="creator" xml:space="preserve">+ <value>Creator</value>+ </data>+ <data name="create_time" xml:space="preserve">+ <value>Create Time</value>+ </data>+ <data name="last_update_time" xml:space="preserve">+ <value>Last Update Time</value>+ </data>+ <data name="is_valid" xml:space="preserve">+ <value>Valid</value>+ </data>+ <data name="user_num" xml:space="preserve">+ <value>User Num</value>+ </data>+ <data name="user_name" xml:space="preserve">+ <value>User Name</value>+ </data>+ <data name="user_role" xml:space="preserve">+ <value>Role</value>+ </data>+ <data name="contact_tel" xml:space="preserve">+ <value>Contact Information</value>+ </data>+ <data name="sex" xml:space="preserve">+ <value>Sex</value>+ </data>+ <data name="warehouseSetting" xml:space="preserve">+ <value>Warehouse Setting</value>+ </data>+ <data name="reservoirSetting" xml:space="preserve">+ <value>Reservoir Setting</value>+ </data>+ <data name="locationSetting" xml:space="preserve">+ <value>Location Setting</value>+ </data>+ <data name="locationSelectModal" xml:space="preserve">+ <value>Location Select Modal</value>+ </data>+ <data name="email" xml:space="preserve">+ <value>Email</value>+ </data>+ <data name="warehouse_name" xml:space="preserve">+ <value>Warehouse Name</value>+ </data>+ <data name="city" xml:space="preserve">+ <value>City</value>+ </data>+ <data name="address" xml:space="preserve">+ <value>Address</value>+ </data>+ <data name="manager" xml:space="preserve">+ <value>Manager</value>+ </data>+ <data name="area_name" xml:space="preserve">+ <value>Reservoir Name</value>+ </data>+ <data name="area_property" xml:space="preserve">+ <value>Reservoir Category</value>+ </data>+ <data name="location_name" xml:space="preserve">+ <value>Location Code</value>+ </data>+ <data name="location_length" xml:space="preserve">+ <value>Location Length</value>+ </data>+ <data name="location_width" xml:space="preserve">+ <value>Location Width</value>+ </data>+ <data name="location_heigth" xml:space="preserve">+ <value>Location Height</value>+ </data>+ <data name="location_volume" xml:space="preserve">+ <value>Location Volume</value>+ </data>+ <data name="location_load" xml:space="preserve">+ <value>Location Load</value>+ </data>+ <data name="roadway_number" xml:space="preserve">+ <value>Roadway Number</value>+ </data>+ <data name="shelf_number" xml:space="preserve">+ <value>Shelf Number</value>+ </data>+ <data name="layer_number" xml:space="preserve">+ <value>Layer Number</value>+ </data>+ <data name="tag_number" xml:space="preserve">+ <value>Tag Number</value>+ </data>+ <data name="picking_area" xml:space="preserve">+ <value>Picking Area</value>+ </data>+ <data name="stocking_area" xml:space="preserve">+ <value>Stocking Area</value>+ </data>+ <data name="receiving_area" xml:space="preserve">+ <value>Receiving Area</value>+ </data>+ <data name="return_area" xml:space="preserve">+ <value>Return Area</value>+ </data>+ <data name="defective_area" xml:space="preserve">+ <value>Defective Area</value>+ </data>+ <data name="inventory_area" xml:space="preserve">+ <value>Inventory Area</value>+ </data>+ <data name="customer_name" xml:space="preserve">+ <value>Customer Name</value>+ </data>+ <data name="supplier_name" xml:space="preserve">+ <value>Supplier Name</value>+ </data>+ <data name="role_name" xml:space="preserve">+ <value>User Role</value>+ </data>+ <data name="company_name" xml:space="preserve">+ <value>Corporate Name</value>+ </data>+ <data name="goods_owner_name" xml:space="preserve">+ <value>Owner Of Cargo</value>+ </data>+ <data name="category_name" xml:space="preserve">+ <value>Commodity category</value>+ </data>+ <data name="parent_name" xml:space="preserve">+ <value>Parent Category</value>+ </data>+ <data name="menu_name" xml:space="preserve">+ <value>Menu Name</value>+ </data>+ <data name="spu_code" xml:space="preserve">+ <value>Commodity Code</value>+ </data>+ <data name="spu_name" xml:space="preserve">+ <value>Commodity Name</value>+ </data>+ <data name="sku_code" xml:space="preserve">+ <value>Specification Code</value>+ </data>+ <data name="sku_name" xml:space="preserve">+ <value>Specification Name</value>+ </data>+ <data name="spu_description" xml:space="preserve">+ <value>Commodity Description</value>+ </data>+ <data name="bar_code" xml:space="preserve">+ <value>Specification Code</value>+ </data>+ <data name="brand" xml:space="preserve">+ <value>Brand</value>+ </data>+ <data name="unit" xml:space="preserve">+ <value>Commodity Unit</value>+ </data>+ <data name="cost" xml:space="preserve">+ <value>Commodity Cost</value>+ </data>+ <data name="price" xml:space="preserve">+ <value>Commodity Price</value>+ </data>+ <data name="origin" xml:space="preserve">+ <value>origin</value>+ </data>+ <data name="length_unit" xml:space="preserve">+ <value>Length Unit</value>+ </data>+ <data name="volume_unit" xml:space="preserve">+ <value>Volume Unit</value>+ </data>+ <data name="weight_unit" xml:space="preserve">+ <value>Weight Unit</value>+ </data>+ <data name="weight" xml:space="preserve">+ <value>Commodity Weight</value>+ </data>+ <data name="lenght" xml:space="preserve">+ <value>Commodity Length</value>+ </data>+ <data name="width" xml:space="preserve">+ <value>Commodity Width</value>+ </data>+ <data name="height" xml:space="preserve">+ <value>Commodity Height</value>+ </data>+ <data name="volume" xml:space="preserve">+ <value>Commodity Volume</value>+ </data>+ <data name="warehouse" xml:space="preserve">+ <value>Warehouse Name</value>+ </data>+ <data name="qty_available" xml:space="preserve">+ <value>Available Qty</value>+ </data>+ <data name="job_code" xml:space="preserve">+ <value>Job Code</value>+ </data>+ <data name="job_type" xml:space="preserve">+ <value>Job Type</value>+ </data>+ <data name="process_status" xml:space="preserve">+ <value>Process Status</value>+ </data>+ <data name="processor" xml:space="preserve">+ <value>Processor</value>+ </data>+ <data name="process_time" xml:space="preserve">+ <value>Process Time</value>+ </data>+ <data name="qty" xml:space="preserve">+ <value>Quantity</value>+ </data>+ <data name="is_source" xml:space="preserve">+ <value>Is Source</value>+ </data>+ <data name="target_warehouse" xml:space="preserve">+ <value>Target Warehouse</value>+ </data>+ <data name="target_location" xml:space="preserve">+ <value>Target Location</value>+ </data>+ <data name="is_update_stock" xml:space="preserve">+ <value>Is Updated Stock</value>+ </data>+ <data name="adjust_status" xml:space="preserve">+ <value>Is Updated Stock</value>+ </data>+ <data name="source" xml:space="preserve">+ <value>Source</value>+ </data>+ <data name="target" xml:space="preserve">+ <value>Target</value>+ </data>+ <data name="move_status" xml:space="preserve">+ <value>Move Status</value>+ </data>+ <data name="handler" xml:space="preserve">+ <value>Handler</value>+ </data>+ <data name="handle_time" xml:space="preserve">+ <value>Handle Time</value>+ </data>+ <data name="orig_goods_warehouse" xml:space="preserve">+ <value>Origin Warehouse</value>+ </data>+ <data name="orig_goods_location_name" xml:space="preserve">+ <value>Origin Location</value>+ </data>+ <data name="dest_googs_warehouse" xml:space="preserve">+ <value>Target Warehouse</value>+ </data>+ <data name="dest_googs_location_name" xml:space="preserve">+ <value>Target Location</value>+ </data>+ <data name="freeze" xml:space="preserve">+ <value>Freeze</value>+ </data>+ <data name="unfreeze" xml:space="preserve">+ <value>Unfreeze</value>+ </data>+ <data name="job_status" xml:space="preserve">+ <value>Job Status</value>+ </data>+ <data name="book_qty" xml:space="preserve">+ <value>Book Qty</value>+ </data>+ <data name="counted_qty" xml:space="preserve">+ <value>Actual Qty</value>+ </data>+ <data name="difference_qty" xml:space="preserve">+ <value>Difference Qty</value>+ </data>+ <data name="confirmTaking" xml:space="preserve">+ <value>Confirm Taking</value>+ </data>+ <data name="stockLocation" xml:space="preserve">+ <value>Stock Location</value>+ </data>+ <data name="stock" xml:space="preserve">+ <value>Stock</value>+ </data>+ <data name="sku_id" xml:space="preserve">+ <value>Sku Id</value>+ </data>+ <data name="qty_locked" xml:space="preserve">+ <value>Locked Quantity</value>+ </data>+ <data name="qty_frozen" xml:space="preserve">+ <value>Frozen Quantity</value>+ </data>+ <data name="qty_asn" xml:space="preserve">+ <value>Asn Quantity</value>+ </data>+ <data name="qty_to_unload" xml:space="preserve">+ <value>Unload Quantity</value>+ </data>+ <data name="qty_to_sort" xml:space="preserve">+ <value>Sort Quantity</value>+ </data>+ <data name="qty_sorted" xml:space="preserve">+ <value>Sorted Quantity</value>+ </data>+ <data name="shortage_qty" xml:space="preserve">+ <value>Shortage Quantity</value>+ </data>+ <data name="id" xml:space="preserve">+ <value>ID</value>+ </data>+ <data name="asn_no" xml:space="preserve">+ <value>Asn No</value>+ </data>+ <data name="asn_status" xml:space="preserve">+ <value>Asn Status</value>+ </data>+ <data name="spu_id" xml:space="preserve">+ <value>Spu Id</value>+ </data>+ <data name="asn_qty" xml:space="preserve">+ <value>Asn Quantity</value>+ </data>+ <data name="actual_qty" xml:space="preserve">+ <value>Actual Quantity</value>+ </data>+ <data name="sorted_qty" xml:space="preserve">+ <value>Sorted Quantity</value>+ </data>+ <data name="more_qty" xml:space="preserve">+ <value>More Quantity</value>+ </data>+ <data name="damage_qty" xml:space="preserve">+ <value>Damage Quantity</value>+ </data>+ <data name="supplier_id" xml:space="preserve">+ <value>Supplier Id</value>+ </data>+ <data name="goods_owner_id" xml:space="preserve">+ <value>Goods Owner Id</value>+ </data>+ <data name="shipment" xml:space="preserve">+ <value>Invoice</value>+ </data>+ <data name="preShipment" xml:space="preserve">+ <value>Pre Shipment</value>+ </data>+ <data name="newShipment" xml:space="preserve">+ <value>New Shipment</value>+ </data>+ <data name="goodsToBePicked" xml:space="preserve">+ <value>Goods To Be Picked</value>+ </data>+ <data name="picked" xml:space="preserve">+ <value>Picked</value>+ </data>+ <data name="toBePackaged" xml:space="preserve">+ <value>To Be Packaged</value>+ </data>+ <data name="package" xml:space="preserve">+ <value>Pack</value>+ </data>+ <data name="packaged" xml:space="preserve">+ <value>Packaged</value>+ </data>+ <data name="toBeWeighed" xml:space="preserve">+ <value>To Be Weighed</value>+ </data>+ <data name="weigh" xml:space="preserve">+ <value>Weigh</value>+ </data>+ <data name="weighed" xml:space="preserve">+ <value>Weighed</value>+ </data>+ <data name="delivery" xml:space="preserve">+ <value>Delivery</value>+ </data>+ <data name="toBeDelivered" xml:space="preserve">+ <value>To Be Delivered</value>+ </data>+ <data name="outOfWarehouse" xml:space="preserve">+ <value>Out Of Warehouse</value>+ </data>+ <data name="signIn" xml:space="preserve">+ <value>Sign In</value>+ </data>+ <data name="signedIn" xml:space="preserve">+ <value>Signed In</value>+ </data>+ <data name="dispatch_no" xml:space="preserve">+ <value>Shipment No</value>+ </data>+ <data name="dispatch_status" xml:space="preserve">+ <value>Shipment Doc Status</value>+ </data>+ <data name="detailQty" xml:space="preserve">+ <value>Quantity</value>+ </data>+ <data name="data_changed" xml:space="preserve">+ <value>The data has changed.Please refresh and retry the operation</value>+ </data>+ <data name="delete_failed" xml:space="preserve">+ <value>Delete failed</value>+ </data>+ <data name="delete_referenced" xml:space="preserve">+ <value>The data has been referenced and cannot be deleted</value>+ </data>+ <data name="delete_success" xml:space="preserve">+ <value>Delete success</value>+ </data>+ <data name="exists_entity" xml:space="preserve">+ <value>The {0}:{1} is exists</value>+ </data>+ <data name="not_exists_entity" xml:space="preserve">+ <value>The data does not exist or has been deleted</value>+ </data>+ <data name="MaxLength" xml:space="preserve">+ <value>{0} input length must less than or equal {1}</value>+ </data>+ <data name="operation_failed" xml:space="preserve">+ <value>Operation failed</value>+ </data>+ <data name="operation_success" xml:space="preserve">+ <value>Operation succeeded</value>+ </data>+ <data name="Required" xml:space="preserve">+ <value>{0} is Required</value>+ </data>+ <data name="save_failed" xml:space="preserve">+ <value>Failure</value>+ </data>+ <data name="save_success" xml:space="preserve">+ <value>Success</value>+ </data>+ <data name="status_changed" xml:space="preserve">+ <value>The status of this data has changed.Please refresh and retry the operation</value>+ </data>+ <data name="status_not_delete" xml:space="preserve">+ <value>Current status cannot be deleted</value>+ </data>+ <data name="ASN_Status_Is_Not_Pre_Delivery" xml:space="preserve">+ <value>The ASN status is not PreDelivery</value>+ </data>+ <data name="ASN_Status_Is_Not_Pre_Load" xml:space="preserve">+ <value>The ASN status is not PreLoad</value>+ </data>+ <data name="ASN_Status_Is_Not_Pre_Sort" xml:space="preserve">+ <value>The ASN status is not PreSort</value>+ </data>+ <data name="ASN_Status_Is_Not_Sorted" xml:space="preserve">+ <value>The ASN status is not Sorted</value>+ </data>+ <data name="ASN_Status_Is_Not_Sorting" xml:space="preserve">+ <value>The ASN status is not Sorting</value>+ </data>+ <data name="ASN_Status_Is_Putaway" xml:space="preserve">+ <value>The ASN status is putaway</value>+ </data>+ <data name="ASN_Total_PutAway_Qty_Greater_Than_Sorted_Qty" xml:space="preserve">+ <value>The ASN putaway's quantity greater than sorted quantity</value>+ </data>+ <data name="putaway_success" xml:space="preserve">+ <value>Putaway success</value>+ </data>+ <data name="putaway_failed" xml:space="preserve">+ <value>Putaway failed</value>+ </data>+ <data name="sorted_success" xml:space="preserve">+ <value>Sorted success</value>+ </data>+ <data name="sorted_failed" xml:space="preserve">+ <value>Sorted failed</value>+ </data>+ <data name="try_agin" xml:space="preserve">+ <value>The current operation cannot be performed. Please refresh and try again</value>+ </data>+ <data name="unpackgeqty_lessthen" xml:space="preserve">+ <value>Unpacked quantity is less than the quantity to be packed.Please refresh and try again</value>+ </data>+ <data name="unweightqty_lessthen" xml:space="preserve">+ <value>Unweighed quantity is less than the quantity to be weighed.Please refresh and try again</value>+ </data>+ <data name="login_failed" xml:space="preserve">+ <value>Login failed</value>+ </data>+ <data name="exist_location_not_delete" xml:space="preserve">+ <value>The warehouse location has been set under this warehouse area and cannot be deleted</value>+ </data>+ <data name="exist_warehousearea_not_delete" xml:space="preserve">+ <value>The warehouse area has been set under this warehouse and cannot be deleted</value>+ </data>+ <data name="dispatch_not_comfirm" xml:space="preserve">+ <value>There are un issued shipment documents</value>+ </data>+ <data name="move_not_comfirm" xml:space="preserve">+ <value>There are unconfirmed inventory movements in this location</value>+ </data>+ <data name="process_not_comfirm" xml:space="preserve">+ <value>There are unconfirmed warehouse processings</value>+ </data>+</root>\ No newline at end of filediff --git a/backend/ModernWMS.Core/Models/MultiLanguage.zh-cn.resx b/backend/ModernWMS.Core/Models/MultiLanguage.zh-cn.resxnew file mode 100644index 0000000..7658a41--- /dev/null+++ b/backend/ModernWMS.Core/Models/MultiLanguage.zh-cn.resx@@ -0,0 +1,636 @@+<?xml version="1.0" encoding="utf-8"?>+<root>+ <!--+ Microsoft ResX Schema++ Version 2.0++ The primary goals of this format is to allow a simple XML format+ that is mostly human readable. The generation and parsing of the+ various data types are done through the TypeConverter classes+ associated with the data types.++ Example:++ ... ado.net/XML headers & schema ...+ <resheader name="resmimetype">text/microsoft-resx</resheader>+ <resheader name="version">2.0</resheader>+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">+ <value>[base64 mime encoded serialized .NET Framework object]</value>+ </data>+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>+ <comment>This is a comment</comment>+ </data>++ There are any number of "resheader" rows that contain simple+ name/value pairs.++ Each data row contains a name, and value. The row also contains a+ type or mimetype. Type corresponds to a .NET class that support+ text/value conversion through the TypeConverter architecture.+ Classes that don't support this are serialized and stored with the+ mimetype set.++ The mimetype is used for serialized objects, and tells the+ ResXResourceReader how to depersist the object. This is currently not+ extensible. For a given mimetype the value must be set accordingly:++ Note - application/x-microsoft.net.object.binary.base64 is the format+ that the ResXResourceWriter will generate, however the reader can+ read any of the formats listed below.++ mimetype: application/x-microsoft.net.object.binary.base64+ value : The object must be serialized with+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter+ : and then encoded with base64 encoding.++ mimetype: application/x-microsoft.net.object.soap.base64+ value : The object must be serialized with+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter+ : and then encoded with base64 encoding.++ mimetype: application/x-microsoft.net.object.bytearray.base64+ value : The object must be serialized into a byte array+ : using a System.ComponentModel.TypeConverter+ : and then encoded with base64 encoding.+ -->+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />+ <xsd:element name="root" msdata:IsDataSet="true">+ <xsd:complexType>+ <xsd:choice maxOccurs="unbounded">+ <xsd:element name="metadata">+ <xsd:complexType>+ <xsd:sequence>+ <xsd:element name="value" type="xsd:string" minOccurs="0" />+ </xsd:sequence>+ <xsd:attribute name="name" use="required" type="xsd:string" />+ <xsd:attribute name="type" type="xsd:string" />+ <xsd:attribute name="mimetype" type="xsd:string" />+ <xsd:attribute ref="xml:space" />+ </xsd:complexType>+ </xsd:element>+ <xsd:element name="assembly">+ <xsd:complexType>+ <xsd:attribute name="alias" type="xsd:string" />+ <xsd:attribute name="name" type="xsd:string" />+ </xsd:complexType>+ </xsd:element>+ <xsd:element name="data">+ <xsd:complexType>+ <xsd:sequence>+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />+ </xsd:sequence>+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />+ <xsd:attribute ref="xml:space" />+ </xsd:complexType>+ </xsd:element>+ <xsd:element name="resheader">+ <xsd:complexType>+ <xsd:sequence>+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />+ </xsd:sequence>+ <xsd:attribute name="name" type="xsd:string" use="required" />+ </xsd:complexType>+ </xsd:element>+ </xsd:choice>+ </xsd:complexType>+ </xsd:element>+ </xsd:schema>+ <resheader name="resmimetype">+ <value>text/microsoft-resx</value>+ </resheader>+ <resheader name="version">+ <value>2.0</value>+ </resheader>+ <resheader name="reader">+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>+ </resheader>+ <resheader name="writer">+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>+ </resheader>+ <data name="carrier" xml:space="preserve">+ <value>承运商</value>+ </data>+ <data name="departure_city" xml:space="preserve">+ <value>始发城市</value>+ </data>+ <data name="arrival_city" xml:space="preserve">+ <value>到货城市</value>+ </data>+ <data name="price_per_weight" xml:space="preserve">+ <value>单公斤运费</value>+ </data>+ <data name="price_per_volume" xml:space="preserve">+ <value>单立方米运费</value>+ </data>+ <data name="min_payment" xml:space="preserve">+ <value>最小运费</value>+ </data>+ <data name="creator" xml:space="preserve">+ <value>创建人</value>+ </data>+ <data name="create_time" xml:space="preserve">+ <value>创建时间</value>+ </data>+ <data name="last_update_time" xml:space="preserve">+ <value>最后更新时间</value>+ </data>+ <data name="is_valid" xml:space="preserve">+ <value>是否有效</value>+ </data>+ <data name="user_num" xml:space="preserve">+ <value>员工编号</value>+ </data>+ <data name="user_name" xml:space="preserve">+ <value>员工名称</value>+ </data>+ <data name="user_role" xml:space="preserve">+ <value>角色</value>+ </data>+ <data name="contact_tel" xml:space="preserve">+ <value>联系方式</value>+ </data>+ <data name="sex" xml:space="preserve">+ <value>性别</value>+ </data>+ <data name="warehouseSetting" xml:space="preserve">+ <value>仓库设置</value>+ </data>+ <data name="reservoirSetting" xml:space="preserve">+ <value>库区设置</value>+ </data>+ <data name="locationSetting" xml:space="preserve">+ <value>库位设置</value>+ </data>+ <data name="locationSelectModal" xml:space="preserve">+ <value>库位选择框</value>+ </data>+ <data name="email" xml:space="preserve">+ <value>Email</value>+ </data>+ <data name="warehouse_name" xml:space="preserve">+ <value>仓库名称</value>+ </data>+ <data name="city" xml:space="preserve">+ <value>所在城市</value>+ </data>+ <data name="address" xml:space="preserve">+ <value>详细地址</value>+ </data>+ <data name="manager" xml:space="preserve">+ <value>负责人</value>+ </data>+ <data name="area_name" xml:space="preserve">+ <value>库区名称</value>+ </data>+ <data name="area_property" xml:space="preserve">+ <value>库区类型</value>+ </data>+ <data name="location_name" xml:space="preserve">+ <value>库位编码</value>+ </data>+ <data name="location_length" xml:space="preserve">+ <value>库位长</value>+ </data>+ <data name="location_width" xml:space="preserve">+ <value>库位宽</value>+ </data>+ <data name="location_heigth" xml:space="preserve">+ <value>库位高</value>+ </data>+ <data name="location_volume" xml:space="preserve">+ <value>库位容积</value>+ </data>+ <data name="location_load" xml:space="preserve">+ <value>库位承重</value>+ </data>+ <data name="roadway_number" xml:space="preserve">+ <value>巷道号</value>+ </data>+ <data name="shelf_number" xml:space="preserve">+ <value>货架号</value>+ </data>+ <data name="layer_number" xml:space="preserve">+ <value>层号</value>+ </data>+ <data name="tag_number" xml:space="preserve">+ <value>位号</value>+ </data>+ <data name="picking_area" xml:space="preserve">+ <value>拣货区</value>+ </data>+ <data name="stocking_area" xml:space="preserve">+ <value>备货区</value>+ </data>+ <data name="receiving_area" xml:space="preserve">+ <value>收货区</value>+ </data>+ <data name="return_area" xml:space="preserve">+ <value>退货区</value>+ </data>+ <data name="defective_area" xml:space="preserve">+ <value>次品区</value>+ </data>+ <data name="inventory_area" xml:space="preserve">+ <value>存货区</value>+ </data>+ <data name="customer_name" xml:space="preserve">+ <value>客户名称</value>+ </data>+ <data name="supplier_name" xml:space="preserve">+ <value>供应商名称</value>+ </data>+ <data name="role_name" xml:space="preserve">+ <value>用户角色</value>+ </data>+ <data name="company_name" xml:space="preserve">+ <value>公司名称</value>+ </data>+ <data name="goods_owner_name" xml:space="preserve">+ <value>货主名称</value>+ </data>+ <data name="category_name" xml:space="preserve">+ <value>商品类别</value>+ </data>+ <data name="parent_name" xml:space="preserve">+ <value>所属类别</value>+ </data>+ <data name="menu_name" xml:space="preserve">+ <value>菜单名称</value>+ </data>+ <data name="spu_code" xml:space="preserve">+ <value>商品编码</value>+ </data>+ <data name="spu_name" xml:space="preserve">+ <value>商品名称</value>+ </data>+ <data name="sku_code" xml:space="preserve">+ <value>规格编码</value>+ </data>+ <data name="sku_name" xml:space="preserve">+ <value>规格名称</value>+ </data>+ <data name="spu_description" xml:space="preserve">+ <value>商品描述</value>+ </data>+ <data name="bar_code" xml:space="preserve">+ <value>商品条码</value>+ </data>+ <data name="brand" xml:space="preserve">+ <value>品牌</value>+ </data>+ <data name="unit" xml:space="preserve">+ <value>商品单位</value>+ </data>+ <data name="cost" xml:space="preserve">+ <value>商品成本</value>+ </data>+ <data name="price" xml:space="preserve">+ <value>商品价格</value>+ </data>+ <data name="origin" xml:space="preserve">+ <value>产地</value>+ </data>+ <data name="length_unit" xml:space="preserve">+ <value>长度单位</value>+ </data>+ <data name="volume_unit" xml:space="preserve">+ <value>体积单位</value>+ </data>+ <data name="weight_unit" xml:space="preserve">+ <value>重量单位</value>+ </data>+ <data name="weight" xml:space="preserve">+ <value>商品重量</value>+ </data>+ <data name="lenght" xml:space="preserve">+ <value>商品长度</value>+ </data>+ <data name="width" xml:space="preserve">+ <value>商品宽度</value>+ </data>+ <data name="height" xml:space="preserve">+ <value>商品高度</value>+ </data>+ <data name="volume" xml:space="preserve">+ <value>商品体积</value>+ </data>+ <data name="warehouse" xml:space="preserve">+ <value>仓库名称</value>+ </data>+ <data name="qty_available" xml:space="preserve">+ <value>可用数量</value>+ </data>+ <data name="job_code" xml:space="preserve">+ <value>作业单号</value>+ </data>+ <data name="job_type" xml:space="preserve">+ <value>作业类型</value>+ </data>+ <data name="process_status" xml:space="preserve">+ <value>加工状态</value>+ </data>+ <data name="processor" xml:space="preserve">+ <value>操作人</value>+ </data>+ <data name="process_time" xml:space="preserve">+ <value>操作时间</value>+ </data>+ <data name="qty" xml:space="preserve">+ <value>数量</value>+ </data>+ <data name="is_source" xml:space="preserve">+ <value>是否来源商品</value>+ </data>+ <data name="target_warehouse" xml:space="preserve">+ <value>目标仓库</value>+ </data>+ <data name="target_location" xml:space="preserve">+ <value>目标库位</value>+ </data>+ <data name="is_update_stock" xml:space="preserve">+ <value>是否已更新库存</value>+ </data>+ <data name="adjust_status" xml:space="preserve">+ <value>是否已调整</value>+ </data>+ <data name="source" xml:space="preserve">+ <value>来源</value>+ </data>+ <data name="target" xml:space="preserve">+ <value>目标</value>+ </data>+ <data name="move_status" xml:space="preserve">+ <value>作业状态</value>+ </data>+ <data name="handler" xml:space="preserve">+ <value>操作人</value>+ </data>+ <data name="handle_time" xml:space="preserve">+ <value>操作时间</value>+ </data>+ <data name="orig_goods_warehouse" xml:space="preserve">+ <value>来源仓库</value>+ </data>+ <data name="orig_goods_location_name" xml:space="preserve">+ <value>来源库位</value>+ </data>+ <data name="dest_googs_warehouse" xml:space="preserve">+ <value>目标仓库</value>+ </data>+ <data name="dest_googs_location_name" xml:space="preserve">+ <value>目标库位</value>+ </data>+ <data name="freeze" xml:space="preserve">+ <value>冻结</value>+ </data>+ <data name="unfreeze" xml:space="preserve">+ <value>解冻</value>+ </data>+ <data name="job_status" xml:space="preserve">+ <value>作业状态</value>+ </data>+ <data name="book_qty" xml:space="preserve">+ <value>账面数量</value>+ </data>+ <data name="counted_qty" xml:space="preserve">+ <value>盘点数量</value>+ </data>+ <data name="difference_qty" xml:space="preserve">+ <value>差异数量</value>+ </data>+ <data name="confirmTaking" xml:space="preserve">+ <value>确认盘点</value>+ </data>+ <data name="stockLocation" xml:space="preserve">+ <value>库位列表</value>+ </data>+ <data name="stock" xml:space="preserve">+ <value>库存列表</value>+ </data>+ <data name="sku_id" xml:space="preserve">+ <value>规格标识</value>+ </data>+ <data name="qty_locked" xml:space="preserve">+ <value>锁定数量</value>+ </data>+ <data name="qty_frozen" xml:space="preserve">+ <value>冻结数量</value>+ </data>+ <data name="qty_asn" xml:space="preserve">+ <value>到货通知书数量</value>+ </data>+ <data name="qty_to_unload" xml:space="preserve">+ <value>待卸货数量</value>+ </data>+ <data name="qty_to_sort" xml:space="preserve">+ <value>待分拣数量</value>+ </data>+ <data name="qty_sorted" xml:space="preserve">+ <value>已分拣数量</value>+ </data>+ <data name="shortage_qty" xml:space="preserve">+ <value>欠货数量</value>+ </data>+ <data name="id" xml:space="preserve">+ <value>标识</value>+ </data>+ <data name="asn_no" xml:space="preserve">+ <value>到货通知书编号</value>+ </data>+ <data name="asn_status" xml:space="preserve">+ <value>到货通知书状态</value>+ </data>+ <data name="spu_id" xml:space="preserve">+ <value>商品spu标识</value>+ </data>+ <data name="asn_qty" xml:space="preserve">+ <value>到货通知书数据</value>+ </data>+ <data name="actual_qty" xml:space="preserve">+ <value>上架数量</value>+ </data>+ <data name="sorted_qty" xml:space="preserve">+ <value>分拣数量</value>+ </data>+ <data name="more_qty" xml:space="preserve">+ <value>超量数量</value>+ </data>+ <data name="damage_qty" xml:space="preserve">+ <value>破损数量</value>+ </data>+ <data name="supplier_id" xml:space="preserve">+ <value>供应商标识</value>+ </data>+ <data name="goods_owner_id" xml:space="preserve">+ <value>货主标识</value>+ </data>+ <data name="shipment" xml:space="preserve">+ <value>发货单</value>+ </data>+ <data name="preShipment" xml:space="preserve">+ <value>预发货</value>+ </data>+ <data name="newShipment" xml:space="preserve">+ <value>新发货</value>+ </data>+ <data name="goodsToBePicked" xml:space="preserve">+ <value>待拣货</value>+ </data>+ <data name="picked" xml:space="preserve">+ <value>已拣货</value>+ </data>+ <data name="toBePackaged" xml:space="preserve">+ <value>待打包</value>+ </data>+ <data name="package" xml:space="preserve">+ <value>打包</value>+ </data>+ <data name="packaged" xml:space="preserve">+ <value>已打包</value>+ </data>+ <data name="toBeWeighed" xml:space="preserve">+ <value>待称重</value>+ </data>+ <data name="weigh" xml:space="preserve">+ <value>称重</value>+ </data>+ <data name="weighed" xml:space="preserve">+ <value>已称重</value>+ </data>+ <data name="delivery" xml:space="preserve">+ <value>出库</value>+ </data>+ <data name="toBeDelivered" xml:space="preserve">+ <value>待出库</value>+ </data>+ <data name="outOfWarehouse" xml:space="preserve">+ <value>已出库</value>+ </data>+ <data name="signIn" xml:space="preserve">+ <value>签收</value>+ </data>+ <data name="signedIn" xml:space="preserve">+ <value>已签收</value>+ </data>+ <data name="dispatch_no" xml:space="preserve">+ <value>发货单号</value>+ </data>+ <data name="dispatch_status" xml:space="preserve">+ <value>发货单状态</value>+ </data>+ <data name="detailQty" xml:space="preserve">+ <value>数量</value>+ </data>+ <data name="data_changed" xml:space="preserve">+ <value>数据发生改变,请刷新后重试操作</value>+ </data>+ <data name="delete_failed" xml:space="preserve">+ <value>删除失败</value>+ </data>+ <data name="delete_referenced" xml:space="preserve">+ <value>数据已被引用,不能删除</value>+ </data>+ <data name="delete_success" xml:space="preserve">+ <value>删除成功</value>+ </data>+ <data name="exists_entity" xml:space="preserve">+ <value>{0}:{1} 已经存在</value>+ </data>+ <data name="not_exists_entity" xml:space="preserve">+ <value>数据不存在或已被删除</value>+ </data>+ <data name="MaxLength" xml:space="preserve">+ <value>{0}输入字符长度不能大于{1}个字符</value>+ </data>+ <data name="operation_failed" xml:space="preserve">+ <value>操作失败</value>+ </data>+ <data name="operation_success" xml:space="preserve">+ <value>操作成功</value>+ </data>+ <data name="Required" xml:space="preserve">+ <value>{0}必填</value>+ </data>+ <data name="save_failed" xml:space="preserve">+ <value>保存失败</value>+ </data>+ <data name="save_success" xml:space="preserve">+ <value>保存成功</value>+ </data>+ <data name="status_changed" xml:space="preserve">+ <value>当前状态已改变,请刷新后重试</value>+ </data>+ <data name="status_not_delete" xml:space="preserve">+ <value>当前状态不可删除</value>+ </data>+ <data name="ASN_Status_Is_Not_Pre_Delivery" xml:space="preserve">+ <value>ASN 状态不是待到货</value>+ </data>+ <data name="ASN_Status_Is_Not_Pre_Load" xml:space="preserve">+ <value>ASN 状态不是待卸货</value>+ </data>+ <data name="ASN_Status_Is_Not_Pre_Sort" xml:space="preserve">+ <value>ASN 状态不是待分拣</value>+ </data>+ <data name="ASN_Status_Is_Not_Sorted" xml:space="preserve">+ <value>ASN 状态不是已分拣</value>+ </data>+ <data name="ASN_Status_Is_Not_Sorting" xml:space="preserve">+ <value>ASN 尚未分拣</value>+ </data>+ <data name="ASN_Status_Is_Putaway" xml:space="preserve">+ <value>ASN 已经上架</value>+ </data>+ <data name="ASN_Total_PutAway_Qty_Greater_Than_Sorted_Qty" xml:space="preserve">+ <value>ASN 上架数量超过了分拣数量</value>+ </data>+ <data name="putaway_success" xml:space="preserve">+ <value>上架成功</value>+ </data>+ <data name="putaway_failed" xml:space="preserve">+ <value>上架失败</value>+ </data>+ <data name="sorted_success" xml:space="preserve">+ <value>确认分拣完成成功</value>+ </data>+ <data name="sorted_failed" xml:space="preserve">+ <value>确认分拣完成失败</value>+ </data>+ <data name="try_agin" xml:space="preserve">+ <value>不能进行当前操作,请刷新后重试</value>+ </data>+ <data name="unpackgeqty_lessthen" xml:space="preserve">+ <value>未打包数量小于当前操作打包数量,请刷新后重试</value>+ </data>+ <data name="unweightqty_lessthen" xml:space="preserve">+ <value>未称重数量小于当前操作称重数量,请刷新后重试</value>+ </data>+ <data name="login_failed" xml:space="preserve">+ <value>登录失败</value>+ </data>+ <data name="dispatch_not_comfirm" xml:space="preserve">+ <value>该库位存在未出库的发货单</value>+ </data>+ <data name="exist_location_not_delete" xml:space="preserve">+ <value>该库区下已设置库位,不能删除</value>+ </data>+ <data name="exist_warehousearea_not_delete" xml:space="preserve">+ <value>该仓库下已设置库区,不能删除</value>+ </data>+ <data name="move_not_comfirm" xml:space="preserve">+ <value>该库位存在未确认的库存移动</value>+ </data>+ <data name="process_not_comfirm" xml:space="preserve">+ <value>该库位存在未确认的仓内加工</value>+ </data>+</root>\ No newline at end of filediff --git a/backend/ModernWMS.Core/Models/PageData.cs b/backend/ModernWMS.Core/Models/PageData.csnew file mode 100644index 0000000..a53ba6f--- /dev/null+++ b/backend/ModernWMS.Core/Models/PageData.cs@@ -0,0 +1,24 @@+using System;+using System.Collections.Generic;+using System.Linq;+using System.Text;+using System.Threading.Tasks;++namespace ModernWMS.Core.Models+{+ /// <summary>+ /// PageData+ /// </summary>+ /// <typeparam name="T"></typeparam>+ public class PageData<T>+ {+ /// <summary>+ /// data+ /// </summary>+ public List<T> Rows { get; set; } = new List<T>(2);+ /// <summary>+ /// total rows+ /// </summary>+ public int Totals { get; set; } = 0;+ }+}diff --git a/backend/ModernWMS.Core/Models/PageSearch.cs b/backend/ModernWMS.Core/Models/PageSearch.csnew file mode 100644index 0000000..d082e39--- /dev/null+++ b/backend/ModernWMS.Core/Models/PageSearch.cs@@ -0,0 +1,30 @@+using ModernWMS.Core.DynamicSearch;++namespace ModernWMS.Core.Models+{+ /// <summary>+ /// PageSearch+ /// </summary>+ public class PageSearch+ {+ /// <summary>+ /// current page number+ /// </summary>+ public int pageIndex { get; set; } = 1;++ /// <summary>+ /// rows per page+ /// </summary>+ public int pageSize { get; set; } = 20;++ /// <summary>+ /// Custom Classification+ /// </summary>+ public string sqlTitle { get; set; } = "";++ /// <summary>+ /// search condition+ /// </summary>+ public List<SearchObject> searchObjects { get; set; } = new List<SearchObject>();+ }+}diff --git a/backend/ModernWMS.Core/Models/RefreshTokenInPutViewModel.cs b/backend/ModernWMS.Core/Models/RefreshTokenInPutViewModel.csnew file mode 100644index 0000000..7957e92--- /dev/null+++ b/backend/ModernWMS.Core/Models/RefreshTokenInPutViewModel.cs@@ -0,0 +1,22 @@+using System.ComponentModel.DataAnnotations;++namespace ModernWMS.Core.Models+{+ /// <summary>+ /// RefreshTokenInPutViewModel+ /// </summary>+ public class RefreshTokenInPutViewModel+ {+ /// <summary>+ /// old access token+ /// </summary>+ [Required(ErrorMessage = "AccessToken is Required")]+ public string AccessToken { get; set; }+ /// <summary>+ /// refresh token+ /// </summary>+ [Required(ErrorMessage = "RefreshToken is Required")]+ public string RefreshToken { get; set; }++ }+}diff --git a/backend/ModernWMS.Core/Models/ResultModel.cs b/backend/ModernWMS.Core/Models/ResultModel.csnew file mode 100644index 0000000..c75f234--- /dev/null+++ b/backend/ModernWMS.Core/Models/ResultModel.cs@@ -0,0 +1,51 @@+namespace ModernWMS.Core.Models+{+ /// <summary>+ /// http response viewmodel+ /// </summary>+ public class ResultModel<T>+ {+ /// <summary>+ /// is request success+ /// </summary>+ public bool IsSuccess { get; set; }+ /// <summary>+ /// status code+ /// </summary>+ public int Code { get; set; }+ /// <summary>+ /// error message+ /// </summary>+ public string ErrorMessage { get; set; } = "";+ /// <summary>+ /// data+ /// </summary>+ public T Data { get; set; }++ /// <summary>+ /// success+ /// </summary>+ /// <param name="data">data</param>+ /// <param name="errMsg">error message</param>+ /// <returns></returns>+ public static ResultModel<T> Success(T data, string errMsg = "")+ {+ if (data == null)+ {+ return Error("Some errors have occurred");+ }+ return new ResultModel<T> { Data = data, ErrorMessage = errMsg, IsSuccess = true, Code = 200 };+ }+ /// <summary>+ /// faild+ /// </summary>+ /// <param name="str">error message</param>+ /// <param name="code">status code</param>+ /// <param name="data">data</param>+ /// <returns></returns>+ public static ResultModel<T> Error(string str, int code = 400, T data = default)+ {+ return new ResultModel<T> { Data = data, ErrorMessage = str, IsSuccess = false, Code = code };+ }+ }+}diff --git a/backend/ModernWMS.Core/Models/UserroleEntity.cs b/backend/ModernWMS.Core/Models/UserroleEntity.csnew file mode 100644index 0000000..4cc532c--- /dev/null+++ b/backend/ModernWMS.Core/Models/UserroleEntity.cs@@ -0,0 +1,52 @@+/*+ * date:2022-12-20+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.Core.Models+{+ /// <summary>+ /// userrole entity+ /// </summary>+ [Table("userrole")]+ public class UserroleEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// role_name+ /// </summary>+ public string role_name { get; set; } = string.Empty;++ /// <summary>+ /// is_valid+ /// </summary>+ public bool is_valid { get; set; } = false;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.Core/Models/userEntity.cs b/backend/ModernWMS.Core/Models/userEntity.csnew file mode 100644index 0000000..3b342b5--- /dev/null+++ b/backend/ModernWMS.Core/Models/userEntity.cs@@ -0,0 +1,83 @@+using Microsoft.AspNetCore.Mvc.RazorPages;+using ModernWMS.Core.Utility;+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.ComponentModel.DataAnnotations.Schema;++namespace ModernWMS.Core.Models+{+ /// <summary>+ /// user entity+ /// </summary>+ [Table("user")]+ public class userEntity : BaseModel+ {++ #region property++ /// <summary>+ /// user's number+ /// </summary>+ public string user_num { get; set; } = string.Empty;++ /// <summary>+ /// user's name+ /// </summary>+ public string user_name { get; set; } = string.Empty;++ /// <summary>+ /// contact+ /// </summary>+ public string contact_tel { get; set; } = string.Empty;++ /// <summary>+ /// user's role+ /// </summary>+ public string user_role { get; set; } = string.Empty;++ /// <summary>+ /// sex+ /// </summary>+ public string sex { get; set; } = string.Empty;++ /// <summary>+ /// is_valid+ /// </summary>+ public bool is_valid { get; set; } = false;++ /// <summary>+ /// password+ /// </summary>+ public string auth_string { get; set; } = string.Empty;++ /// <summary>+ /// </summary>+ public string email { get; set; } = string.Empty;++ /// <summary>+ /// creator+ /// </summary>+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// createtime+ /// </summary>+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last update time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant+ /// </summary>+ public long tenant_id { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.Core/ModernWMS.Core.csproj b/backend/ModernWMS.Core/ModernWMS.Core.csprojnew file mode 100644index 0000000..cd4737c--- /dev/null+++ b/backend/ModernWMS.Core/ModernWMS.Core.csproj@@ -0,0 +1,53 @@+<Project Sdk="Microsoft.NET.Sdk">++ <PropertyGroup>+ <TargetFramework>net7.0</TargetFramework>+ <ImplicitUsings>enable</ImplicitUsings>+ <Nullable>enable</Nullable>+ <GenerateDocumentationFile>True</GenerateDocumentationFile>+ </PropertyGroup>++ <ItemGroup>+ <None Remove="Swagger\index.html" />+ </ItemGroup>++ <ItemGroup>+ <EmbeddedResource Include="Swagger\index.html" />+ </ItemGroup>++ <ItemGroup>+ <PackageReference Include="Mapster" Version="7.3.0" />+ <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />+ <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.1" />+ <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />+ <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />+ <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.1" />+ <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.1" />+ <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.1">+ <PrivateAssets>all</PrivateAssets>+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>+ </PackageReference>+ <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.1" />+ <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.1">+ <PrivateAssets>all</PrivateAssets>+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>+ </PackageReference>+ <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />+ <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />+ <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />+ <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />+ <PackageReference Include="Microsoft.OpenApi" Version="1.4.5" />+ <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />+ <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0-silver.1" />+ <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />+ <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.6" />+ </ItemGroup>++ <ItemGroup>+ <EmbeddedResource Update="Models\MultiLanguage.zh-cn.resx">+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>+ </EmbeddedResource>+ </ItemGroup>++</Project>diff --git a/backend/ModernWMS.Core/MultiTenancy/ITenantProvider.cs b/backend/ModernWMS.Core/MultiTenancy/ITenantProvider.csnew file mode 100644index 0000000..2cece78--- /dev/null+++ b/backend/ModernWMS.Core/MultiTenancy/ITenantProvider.cs@@ -0,0 +1,14 @@+namespace ModernWMS.Core.MultiTenancy+{+ /// <summary>+ /// TenantProvider+ /// </summary>+ public interface ITenantProvider+ {+ /// <summary>+ /// Get Current User's TenantID+ /// </summary>+ /// <returns></returns>+ byte GetCurrentTenantID();+ }+}diff --git a/backend/ModernWMS.Core/MultiTenancy/Tenant.cs b/backend/ModernWMS.Core/MultiTenancy/Tenant.csnew file mode 100644index 0000000..dd77967--- /dev/null+++ b/backend/ModernWMS.Core/MultiTenancy/Tenant.cs@@ -0,0 +1,17 @@+namespace ModernWMS.Core.MultiTenancy+{+ /// <summary>+ /// Tenant Class+ /// </summary>+ public class Tenant+ {+ /// <summary>+ /// tenant's id+ /// </summary>+ public byte tenant_id { get; set; } = 1;+ /// <summary>+ /// tenant's name+ /// </summary>+ public string tenant_name { get; set; } = "default";+ }+}diff --git a/backend/ModernWMS.Core/MultiTenancy/TenantProvider.cs b/backend/ModernWMS.Core/MultiTenancy/TenantProvider.csnew file mode 100644index 0000000..5521def--- /dev/null+++ b/backend/ModernWMS.Core/MultiTenancy/TenantProvider.cs@@ -0,0 +1,46 @@+using Microsoft.AspNetCore.Http;+using System;+using System.Collections.Generic;+using System.Text;+using System.Linq;++namespace ModernWMS.Core.MultiTenancy+{+ /// <summary>+ /// TenantProvider+ /// </summary>+ public class TenantProvider:ITenantProvider+ {+ /// <summary>+ /// Tenant+ /// </summary>+ private readonly Tenant tenant;+ /// <summary>+ /// TenantProvider+ /// </summary>+ /// <param name="accessor">注入IHttpContextAccessor</param>+ public TenantProvider(IHttpContextAccessor accessor)+ {+ if (accessor.HttpContext != null)+ {+ var headers = accessor.HttpContext.Request.Headers;+ if (headers != null && headers.Count > 0+ && headers.ContainsKey("TenantName"))+ {+ var name = headers["TenantName"].FirstOrDefault();+ }+ }+ //Default Value+ tenant = new Tenant();+ }++ /// <summary>+ /// Get Current User's TenantID+ /// </summary>+ /// <returns></returns>+ public byte GetCurrentTenantID()+ {+ return tenant.tenant_id;+ }+ }+}diff --git a/backend/ModernWMS.Core/Services/AccountService.cs b/backend/ModernWMS.Core/Services/AccountService.csnew file mode 100644index 0000000..2fc35ec--- /dev/null+++ b/backend/ModernWMS.Core/Services/AccountService.cs@@ -0,0 +1,78 @@+using System;+using System.Collections.Generic;+using System.Text;+using System.Threading.Tasks;+using ModernWMS.Core.Models;+using System.Linq;+using ModernWMS.Core.Utility;+using System.Data;+using Mapster;+using Microsoft.EntityFrameworkCore;+using Microsoft.EntityFrameworkCore.Internal;+using ModernWMS.Core.DBContext;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.JWT;++namespace ModernWMS.Core.Services+{+ /// <summary>+ /// AccountService+ /// </summary>+ public class AccountService : IAccountService+ {+ private readonly SqlDBContext _sqlDBContext;+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;++ public AccountService(SqlDBContext sqlDBContext, IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+)+ {+ _sqlDBContext = sqlDBContext;+ _stringLocalizer = stringLocalizer;+ }++ /// <summary>+ /// login+ /// </summary>+ /// <param name="loginInput"> login params viewmodel</param>+ /// <param name="currentUser"> current user</param>+ /// <returns></returns>+ public async Task<LoginOutputViewModel> Login(LoginInputViewModel loginInput, CurrentUser currentUser)+ {+ var users = await (from user in _sqlDBContext.GetDbSet<userEntity>().AsNoTracking()+ join ur in _sqlDBContext.GetDbSet<UserroleEntity>().AsNoTracking() on user.user_role equals ur.role_name+ where ur.tenant_id == user.tenant_id&&(user.user_name == loginInput.user_name || user.user_num == loginInput.user_name)+ select new {+ user_id = user.id,+ user_num = user.user_num,+ user_name = user.user_name,+ user_role = user.user_role,+ userrole_id = ur.id,+ cipher = user.auth_string,+ tenant_id = user.tenant_id+ }+ ).ToListAsync();+ string md5_password = Core.Utility.Md5Helper.Md5Encrypt32(loginInput.password);+ var result = users.FirstOrDefault(t=>t.cipher== md5_password || t.cipher == loginInput.password);+ if(result!= null)+ {+ return new LoginOutputViewModel()+ {+ user_id = result.user_id,+ user_name = result.user_name,+ user_num = result.user_num,+ user_role = result.user_role,+ userrole_id = result.userrole_id,+ tenant_id= result.tenant_id,+ };+ }+ return null;+ }++ public string HelloWorld ()+ {+ return _stringLocalizer["hello word"];+ }++ }++}diff --git a/backend/ModernWMS.Core/Services/BaseService.cs b/backend/ModernWMS.Core/Services/BaseService.csnew file mode 100644index 0000000..fd29334--- /dev/null+++ b/backend/ModernWMS.Core/Services/BaseService.cs@@ -0,0 +1,18 @@++using Mapster;+using Microsoft.EntityFrameworkCore;+using System;+using System.Collections.Generic;+using System.Linq;+using System.Linq.Expressions;+using System.Threading.Tasks;+using ModernWMS.Core.Models;+using Microsoft.Extensions.Localization;++namespace ModernWMS.Core.Services+{+ public class BaseService<TEntity> : IBaseService<TEntity> where TEntity : BaseModel+ {++ }+}diff --git a/backend/ModernWMS.Core/Services/IAccountService.cs b/backend/ModernWMS.Core/Services/IAccountService.csnew file mode 100644index 0000000..b375e74--- /dev/null+++ b/backend/ModernWMS.Core/Services/IAccountService.cs@@ -0,0 +1,24 @@+using System.Collections.Generic;+using System.Threading.Tasks;+using ModernWMS.Core.JWT;+using ModernWMS.Core.Models;++namespace ModernWMS.Core.Services+{+ /// <summary>+ /// account service interface+ /// </summary>+ public interface IAccountService+ {++ /// <summary>+ /// login+ /// </summary>+ /// <param name="loginInput">user 's account infomation</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<LoginOutputViewModel> Login(LoginInputViewModel loginInput,CurrentUser currentUser);++ string HelloWorld();+ }+}diff --git a/backend/ModernWMS.Core/Services/IBaseService.cs b/backend/ModernWMS.Core/Services/IBaseService.csnew file mode 100644index 0000000..e615a14--- /dev/null+++ b/backend/ModernWMS.Core/Services/IBaseService.cs@@ -0,0 +1,16 @@++using System;+using System.Collections.Generic;+using System.Linq;+using System.Linq.Expressions;+using System.Threading.Tasks;+using ModernWMS.Core.DI;+using ModernWMS.Core.Models;+namespace ModernWMS.Core.Services+{++ public interface IBaseService<TEntity> : IDependency where TEntity : BaseModel+ {++ }+}diff --git a/backend/ModernWMS.Core/Swagger/CustomApiVersion.cs b/backend/ModernWMS.Core/Swagger/CustomApiVersion.csnew file mode 100644index 0000000..7488a90--- /dev/null+++ b/backend/ModernWMS.Core/Swagger/CustomApiVersion.cs@@ -0,0 +1,25 @@+++namespace ModernWMS.Core.Swagger+{+ /// <summary>+ /// custom version+ /// </summary>+ public class CustomApiVersion+ {+ /// <summary>+ /// Api module+ /// </summary>+ public enum ApiVersions+ {+ /// <summary>+ /// Base+ /// </summary>+ Base,+ /// <summary>+ /// WMS+ /// </summary>+ WMS+ }+ }+}diff --git a/backend/ModernWMS.Core/Swagger/SwaggerSettings.cs b/backend/ModernWMS.Core/Swagger/SwaggerSettings.csnew file mode 100644index 0000000..b45f78b--- /dev/null+++ b/backend/ModernWMS.Core/Swagger/SwaggerSettings.cs@@ -0,0 +1,38 @@++using System.Collections.Generic;++namespace ModernWMS.Core.Swagger+{+ /// <summary>+ /// Swagger Settings+ /// </summary>+ public class SwaggerSettings+ {+ /// <summary>+ /// SwaggerDoc Name+ /// </summary>+ public string Name { get; set; }+ /// <summary>+ /// OpenApiInfo Title+ /// </summary>+ public string ApiTitle { get; set; }+ /// <summary>+ /// OpenApiInfo Version+ /// </summary>+ public string ApiVersion { get; set; }+ /// <summary>+ /// OpenApiInfo Description+ /// </summary>+ public string Description { get; set; }+ /// <summary>+ /// Whether to turn on authorization verification+ /// </summary>+ public bool SecurityDefinition { get; set; }++ /// <summary>+ /// Included XML documents+ /// </summary>+ public List<string> XmlFiles { get; set; }++ }+}diff --git a/backend/ModernWMS.Core/Swagger/index.html b/backend/ModernWMS.Core/Swagger/index.htmlnew file mode 100644index 0000000..2c8b079--- /dev/null+++ b/backend/ModernWMS.Core/Swagger/index.html@@ -0,0 +1,120 @@+<!--<script async="async" id="mini-profiler" src="/profiler/includes.min.js?v=4.1.0+c940f0f28d"+ data-version="4.1.0+c940f0f28d" data-path="/profiler/"+ data-current-id="" data-ids="" data-position="Left"+ data-authorized="true" data-max-traces="15" data-toggle-shortcut="Alt+P"+ data-trivial-milliseconds="2.0" data-ignored-duplicate-execute-types="Open,OpenAsync,Close,CloseAsync">+</script>-->++<script async="async" id="mini-profiler" src="/profiler/includes.min.js?v=4.1.0+c940f0f28d"+ data-version="4.1.0+c940f0f28d" data-path="/profiler/"+ data-current-id="4ec7c742-49d4-4eaf-8281-3c1e0efa8888" data-ids="4ec7c742-49d4-4eaf-8281-3c1e0efa8888"+ data-position="Left"+ data-authorized="true" data-max-traces="5" data-toggle-shortcut="Alt+P"+ data-trivial-milliseconds="2.0" data-ignored-duplicate-execute-types="Open,OpenAsync,Close,CloseAsync">+</script>++<!-- HTML for static distribution bundle build -->+<!DOCTYPE html>+<html lang="en">+<head>+ <meta charset="UTF-8">+ <title>%(DocumentTitle)</title>+ <meta name="viewport" content="width=device-width, initial-scale=1.0">+ <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">+ <link rel="stylesheet" type="text/css" href="./swagger-ui.css">+ <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>+ <style>++ html {+ box-sizing: border-box;+ overflow: -moz-scrollbars-vertical;+ overflow-y: scroll;+ }++ *,+ *:before,+ *:after {+ box-sizing: inherit;+ }++ body {+ margin: 0;+ background: #fafafa;+ }++ .qqgroup {+ float: right;+ }++ .info {+ float: left;+ }++ .download-contents {+ display: none;+ }+ </style>+ %(HeadContent)+</head>+<body>+ <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">+ <defs>+ <symbol viewBox="0 0 20 20" id="unlocked">+ <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>+ </symbol>+ <symbol viewBox="0 0 20 20" id="locked">+ <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z" />+ </symbol>+ <symbol viewBox="0 0 20 20" id="close">+ <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z" />+ </symbol>+ <symbol viewBox="0 0 20 20" id="large-arrow">+ <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z" />+ </symbol>+ <symbol viewBox="0 0 20 20" id="large-arrow-down">+ <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z" />+ </symbol>++ <symbol viewBox="0 0 24 24" id="jump-to">+ <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z" />+ </symbol>+ <symbol viewBox="0 0 24 24" id="expand">+ <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z" />+ </symbol>+ </defs>+ </svg>+ <div id="swagger-ui"></div>+ <!-- Workaround for https://github.com/swagger-api/swagger-editor/issues/1371 -->+ <script>+ if (window.navigator.userAgent.indexOf("Edge") > -1) {+ console.log("Removing native Edge fetch in favor of swagger-ui's polyfill")+ window.fetch = undefined;+ }+ </script>+ <script src="./swagger-ui-bundle.js"></script>+ <script src="./swagger-ui-standalone-preset.js"></script>+ <script>+ var int = null;+ window.onload = function () {+ var configObject = JSON.parse('%(ConfigObject)');+ var oauthConfigObject = JSON.parse('%(OAuthConfigObject)');++ // Apply mandatory parameters+ configObject.dom_id = "#swagger-ui";+ configObject.presets = [SwaggerUIBundle.presets.apis, SwaggerUIStandalonePreset];+ configObject.layout = "StandaloneLayout";++ // If oauth2RedirectUrl isn't specified, use the built-in default+ if (!configObject.hasOwnProperty("oauth2RedirectUrl"))+ configObject.oauth2RedirectUrl = window.location.href.replace("index.html", "oauth2-redirect.html");++ // Build a system+ const ui = SwaggerUIBundle(configObject);++ // Apply OAuth config+ ui.initOAuth(oauthConfigObject);++ }+ </script>+</body>+</html>diff --git a/backend/ModernWMS.Core/Utility/GlobalConsts.cs b/backend/ModernWMS.Core/Utility/GlobalConsts.csnew file mode 100644index 0000000..73eedce--- /dev/null+++ b/backend/ModernWMS.Core/Utility/GlobalConsts.cs@@ -0,0 +1,31 @@+namespace ModernWMS.Core.Utility+{+ /// <summary>+ /// global constant+ /// </summary>+ public static class GlobalConsts+ {++ /// <summary>+ /// is Swagger enable+ /// </summary>+ public static bool IsEnabledSwagger = true;++ /// <summary>+ /// Is RequestResponseMiddleware enable+ /// </summary>+ public static bool IsRequestResponseMiddleware = true;++ /// <summary>+ /// token cipher+ /// </summary>+ public const string SigningKey = "ModernWMS_SigningKey";++ /// <summary>+ /// Password will expire every 30 days from last password change.+ /// </summary>+ public static int PasswordExpireDays = 30;+++ }+}diff --git a/backend/ModernWMS.Core/Utility/JsonHelper.cs b/backend/ModernWMS.Core/Utility/JsonHelper.csnew file mode 100644index 0000000..9549466--- /dev/null+++ b/backend/ModernWMS.Core/Utility/JsonHelper.cs@@ -0,0 +1,63 @@++using System.Data;+using Newtonsoft.Json;++namespace ModernWMS.Core.Utility+{+ /// <summary>+ /// JSON Helper+ /// </summary>+ public static class JsonHelper+ {+ #region JSON Helper++ /// <summary>+ /// Deserialize+ /// </summary>+ /// <typeparam name="T"></typeparam>+ /// <param name="json"></param>+ /// <returns></returns>+ public static T DeserializeObject<T>(string json) where T : class+ {+ return JsonConvert.DeserializeObject<T>(json);+ }++ /// <summary>+ /// Serialize+ /// </summary>+ /// <param name="obj">data</param>+ /// <returns></returns>+ public static string SerializeObject(object obj)+ {+ return JsonConvert.SerializeObject(obj+ , new JsonSerializerSettings()+ {+ ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver(),+ Formatting = Formatting.Indented,+ DateFormatString = "yyyy-MM-dd HH:mm:ss"+ });+ }++ /// <summary>+ /// Serialize to DataTable+ /// </summary>+ /// <param name="table">data</param>+ /// <param name="replaceNullToEmpty">""</param>+ /// <returns></returns>+ public static string SerializeDataTable(DataTable table,bool replaceNullToEmpty = false)+ {+ string json = JsonConvert.SerializeObject(table+ , new JsonSerializerSettings()+ {+ DateFormatString = "yyyy-MM-dd HH:mm:ss"+ });+ if (replaceNullToEmpty)+ {+ json = json.Replace("null", "\"\"");+ }+ return json;+ }+ #endregion++ }+}diff --git a/backend/ModernWMS.Core/Utility/Md5Helper.cs b/backend/ModernWMS.Core/Utility/Md5Helper.csnew file mode 100644index 0000000..8bc45e6--- /dev/null+++ b/backend/ModernWMS.Core/Utility/Md5Helper.cs@@ -0,0 +1,32 @@++using System.Security.Cryptography;+using System.Text;++namespace ModernWMS.Core.Utility+{+ /// <summary>+ /// md5 Helper+ /// </summary>+ public static class Md5Helper+ {+ /// <summary>+ /// 32bit UTF8 MD5 Encrypt+ /// </summary>+ /// <param name="plaintext">明文</param>+ /// <returns></returns>+ public static string Md5Encrypt32(string plaintext)+ {+ string pwd = string.Empty;+ if (!string.IsNullOrEmpty(plaintext) && !string.IsNullOrWhiteSpace(plaintext))+ {+ MD5 md5 = MD5.Create();+ byte[] s = md5.ComputeHash(Encoding.UTF8.GetBytes(plaintext));+ foreach (var item in s)+ {+ pwd = string.Concat(pwd, item.ToString("x2"));+ }+ }+ return pwd;+ }+ }+}diff --git a/backend/ModernWMS.Core/Utility/ModelConvertHelper.cs b/backend/ModernWMS.Core/Utility/ModelConvertHelper.csnew file mode 100644index 0000000..0a4c0c7--- /dev/null+++ b/backend/ModernWMS.Core/Utility/ModelConvertHelper.cs@@ -0,0 +1,106 @@++using System;+using System.Collections.Generic;+using System.Data;+using System.Reflection;++namespace ModernWMS.Core.Utility+{+ /// <summary>+ /// dataTable convert to model+ /// </summary>+ /// <typeparam name="T">model</typeparam>+ public static class ModelConvertHelper<T> where T : new()+ {+ /// <summary>+ /// dataTable convert to model list+ /// </summary>+ /// <param name="dt">数据表</param>+ /// <returns></returns>+ public static List<T> ConvertToModel(DataTable dt)+ {+ List<T> ts = new List<T>();++ Type type = typeof(T);+ string tempName = "";++ foreach (DataRow dr in dt.Rows)+ {+ T t = new T();+ string colvalue = "";+ try+ {+ PropertyInfo[] propertys = t.GetType().GetProperties();+ foreach (PropertyInfo pi in propertys)+ {+ tempName = pi.Name;+ if (dt.Columns.Contains(tempName))+ {+ if (!pi.CanWrite)+ {+ continue;+ }+ string TypeName = pi.PropertyType.FullName;+ string value = dr[tempName] == DBNull.Value ? "" : Convert.ToString(dr[tempName]);+ colvalue = value;+ if (pi.PropertyType.Name.ToLower().Contains("datetime"))+ {+ pi.SetValue(t, string.IsNullOrEmpty(value) ? Convert.ToDateTime("1900-01-01") : Convert.ChangeType(value, pi.PropertyType), null);+ }+ else if (pi.PropertyType.Name.ToLower().Contains("double"))+ {+ if (string.IsNullOrEmpty(value))+ {+ pi.SetValue(t, 0M);+ }+ else+ {+ pi.SetValue(t, string.IsNullOrEmpty(value) ? Convert.ToDouble(0) : Convert.ChangeType(value, pi.PropertyType), null);+ }+ }+ else if (pi.PropertyType.Name.ToLower().Contains("decimal"))+ {+ if (string.IsNullOrEmpty(value))+ {+ pi.SetValue(t, 0M);+ }+ else+ {+ pi.SetValue(t, string.IsNullOrEmpty(value) ? Convert.ToDecimal(0) : Convert.ChangeType(value, pi.PropertyType), null);+ }+ }+ else if (pi.PropertyType.Name.ToLower().Contains("int"))+ {+ pi.SetValue(t, string.IsNullOrEmpty(value) ? 0 : Convert.ChangeType(value, pi.PropertyType), null);+ }+ else if (pi.PropertyType.Name.ToLower().Contains("bool"))+ {+ pi.SetValue(t, string.IsNullOrEmpty(value) ? false : Convert.ChangeType(value, pi.PropertyType), null);+ }+ else if (pi.PropertyType.Name.ToLower().Contains("string"))+ {+ pi.SetValue(t, string.IsNullOrEmpty(value) ? "" : Convert.ChangeType(value, pi.PropertyType), null);+ }+ else if (!pi.PropertyType.IsGenericType)+ {+ pi.SetValue(t, string.IsNullOrEmpty(value) ? null : Convert.ChangeType(value, pi.PropertyType), null);+ }+ else+ {+ Type genericTypeDefinition = pi.PropertyType.GetGenericTypeDefinition();+ if (genericTypeDefinition == typeof(Nullable<>))+ {+ pi.SetValue(t, string.IsNullOrEmpty(value) ? null : Convert.ChangeType(value, Nullable.GetUnderlyingType(pi.PropertyType)), null);+ }+ }+ }+ }+ ts.Add(t);+ }+ catch (Exception ) { }+ }+ return ts;+ }++ }+}diff --git a/backend/ModernWMS.Core/Utility/UtilConvert.cs b/backend/ModernWMS.Core/Utility/UtilConvert.csnew file mode 100644index 0000000..1093aaa--- /dev/null+++ b/backend/ModernWMS.Core/Utility/UtilConvert.cs@@ -0,0 +1,285 @@+using System;+using System.Collections;+using System.Collections.Generic;+using System.Data;+using System.Text;++namespace ModernWMS.Core.Utility+{+ /// <summary>+ /// convert utility+ /// </summary>+ public static class UtilConvert+ {+ #region object convert function+ /// <summary>+ /// object convert to int+ /// </summary>+ /// <param name="thisValue">value</param>+ /// <returns></returns>+ public static int ObjToInt(this object thisValue)+ {+ int reval = 0;+ if (thisValue == null)+ {+ return 0;+ }+ if (string.IsNullOrEmpty(thisValue.ToString()))+ {+ return 0;+ }+ if (thisValue != DBNull.Value && int.TryParse(thisValue.ToString(), out reval))+ {+ return reval;+ }+ return reval;+ }+ /// <summary>+ /// object convert to int+ /// </summary>+ /// <param name="thisValue">value</param>+ /// <param name="errorValue">value when error occured</param>+ /// <returns></returns>+ public static int ObjToInt(this object thisValue, int errorValue)+ {++ if (thisValue == null)+ {+ return errorValue;+ }+ if (string.IsNullOrEmpty(thisValue.ToString()))+ {+ return 0;+ }+ if (thisValue != DBNull.Value && int.TryParse(thisValue.ToString(), out int reval))+ {+ return reval;+ }+ return errorValue;+ }+ /// <summary>+ /// object convert to double+ /// </summary>+ /// <param name="thisValue">value</param>+ /// <returns></returns>+ public static double ObjToDouble(this object thisValue)+ {+ if (string.IsNullOrEmpty(thisValue.ToString()))+ {+ return 0;+ }+ if (thisValue != DBNull.Value && double.TryParse(thisValue.ToString(), out double reval))+ {+ return reval;+ }+ return 0;+ }+ /// <summary>+ /// object convert to double+ /// </summary>+ /// <param name="thisValue">value</param>+ /// <param name="errorValue">value when error occured</param>+ /// <returns></returns>+ public static double ObjToDouble(this object thisValue, double errorValue)+ {+ if (string.IsNullOrEmpty(thisValue.ToString()))+ {+ return 0;+ }+ if (thisValue != DBNull.Value && double.TryParse(thisValue.ToString(), out double reval))+ {+ return reval;+ }+ return errorValue;+ }+ /// <summary>+ /// object convert to string+ /// </summary>+ /// <param name="thisValue">value</param>+ /// <returns></returns>+ public static string ObjToString(this object thisValue)+ {+ if (thisValue != null) return thisValue.ToString().Trim();+ return "";+ }+ /// <summary>+ /// object convert to string+ /// </summary>+ /// <param name="thisValue">value</param>+ /// <param name="errorValue">value when error occured</param>+ /// <returns></returns>+ public static string ObjToString(this object thisValue, string errorValue)+ {+ if (thisValue != null) return thisValue.ToString().Trim();+ return errorValue;+ }+ /// <summary>+ /// object convert to decimal+ /// </summary>+ /// <param name="thisValue">value</param>+ /// <returns></returns>+ public static decimal ObjToDecimal(this object thisValue)+ {+ if (string.IsNullOrEmpty(thisValue.ToString()))+ {+ return 0;+ }+ if (thisValue != DBNull.Value && decimal.TryParse(thisValue.ToString(), out decimal reval))+ {+ return reval;+ }+ return 0;+ }+ /// <summary>+ /// object convert to decimal+ /// </summary>+ /// <param name="thisValue">value</param>+ /// <param name="errorValue">value when error occured</param>+ /// <returns></returns>+ public static decimal ObjToDecimal(this object thisValue, decimal errorValue)+ {+ if (string.IsNullOrEmpty(thisValue.ToString()))+ {+ return 0;+ }+ if (thisValue != DBNull.Value && decimal.TryParse(thisValue.ToString(), out decimal reval))+ {+ return reval;+ }+ return errorValue;+ }+ /// <summary>+ /// object convert to date+ /// </summary>+ /// <param name="thisValue">value</param>+ /// <returns></returns>+ public static DateTime ObjToDate(this object thisValue)+ {+ DateTime reval = Convert.ToDateTime("1900-01-01");+ if (thisValue != null && thisValue != DBNull.Value && DateTime.TryParse(thisValue.ToString(), out reval))+ {+ reval = Convert.ToDateTime(thisValue);+ }+ return reval;+ }+ /// <summary>+ /// object convert to date+ /// </summary>+ /// <param name="thisValue">value</param>+ /// <param name="errorValue">value when error occured</param>+ /// <returns></returns>+ public static DateTime ObjToDate(this object thisValue, DateTime errorValue)+ {+ DateTime reval;+ if (thisValue != null && thisValue != DBNull.Value && DateTime.TryParse(thisValue.ToString(), out reval))+ {+ return reval;+ }+ return errorValue;+ }++ /// <summary>+ /// object convert to bool+ /// </summary>+ /// <param name="thisValue">value</param>+ /// <returns></returns>+ public static bool ObjToBool(this object thisValue)+ {+ bool reval = false;+ if (thisValue != null && thisValue != DBNull.Value && bool.TryParse(thisValue.ToString(), out reval))+ {+ return reval;+ }+ return reval;+ }+ #endregion++ #region compare function+ /// <summary>+ /// less than+ /// </summary>+ /// <param name="thisValue">thisValue</param>+ /// <param name="compareValue">compareValue</param>+ /// <returns></returns>+ public static bool IsLessThan(this object thisValue,double compareValue)+ {+ return Convert.ToDouble(thisValue) < compareValue;+ }+ /// <summary>+ /// less than or equal+ /// </summary>+ /// <param name="thisValue">thisValue</param>+ /// <param name="compareValue">compareValue</param>+ /// <returns></returns>+ public static bool IsLessThanOrEqual(this object thisValue, double compareValue)+ {+ return Convert.ToDouble(thisValue) <= compareValue;+ }+ /// <summary>+ /// greater than+ /// </summary>+ /// <param name="thisValue">当前值</param>+ /// <param name="compareValue">比较值</param>+ /// <returns></returns>+ public static bool IsGreaterThan(this object thisValue, double compareValue)+ {+ return Convert.ToDouble(thisValue) > compareValue;+ }+ /// <summary>+ /// greater than or equal+ /// </summary>+ /// <param name="thisValue">thisValue</param>+ /// <param name="compareValue">compareValue</param>+ /// <returns></returns>+ public static bool IsGreaterThanOrEqual(this object thisValue, double compareValue)+ {+ return Convert.ToDouble(thisValue) >= compareValue;+ }+ /// <summary>+ /// less then+ /// </summary>+ /// <param name="thisValue">thisValue</param>+ /// <param name="compareValue">compareValue</param>+ /// <returns></returns>+ public static bool IsLessThan(this object thisValue, DateTime compareValue)+ {+ return Convert.ToDateTime(thisValue) < compareValue;+ }+ /// <summary>+ /// less than or equal+ /// </summary>+ /// <param name="thisValue">thisValue</param>+ /// <param name="compareValue">compareValue</param>+ /// <returns></returns>+ public static bool IsLessThanOrEqual(this object thisValue, DateTime compareValue)+ {+ return Convert.ToDateTime(thisValue) <= compareValue;+ }+ /// <summary>+ /// less then+ /// </summary>+ /// <param name="thisValue">thisValue</param>+ /// <param name="compareValue">compareValue</param>+ /// <returns></returns>+ public static bool IsGreaterThan(this object thisValue, DateTime compareValue)+ {+ return Convert.ToDateTime(thisValue) > compareValue;+ }+ /// <summary>+ /// ess than or equal+ /// </summary>+ /// <param name="thisValue">thisValue</param>+ /// <param name="compareValue">compareValue</param>+ /// <returns></returns>+ public static bool IsGreaterThanOrEqual(this object thisValue, DateTime compareValue)+ {+ return Convert.ToDateTime(thisValue) >= compareValue;+ }+ #endregion++ /// <summary>+ /// default min date+ /// </summary>+ public static DateTime MinDate => Convert.ToDateTime("1900-01-01");+ }+}diff --git a/backend/ModernWMS.WMS/Controllers/Asn/AsnController.cs b/backend/ModernWMS.WMS/Controllers/Asn/AsnController.csnew file mode 100644index 0000000..8e67187--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/Asn/AsnController.cs@@ -0,0 +1,326 @@+/*+ * date:2022-12-22+ * developer:AMo+ */+ using Microsoft.AspNetCore.Mvc;+ using ModernWMS.Core.Controller;+ using ModernWMS.Core.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;+using ModernWMS.Core.JWT;++namespace ModernWMS.WMS.Controllers+{+ /// <summary>+ /// asn controller+ /// </summary>+ [Route("asn")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "WMS")]+ public class AsnController : BaseController+ {+ #region Args++ /// <summary>+ /// asn Service+ /// </summary>+ private readonly IAsnService _asnService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="asnService">asn Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public AsnController(+ IAsnService asnService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._asnService = asnService;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search, sqlTitle input asn_status:0 ~ 4+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("list")]+ public async Task<ResultModel<PageData<AsnViewModel>>> PageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _asnService.PageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<AsnViewModel>>.Success(new PageData<AsnViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }++ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<AsnViewModel>> GetAsync(int id)+ {+ var data = await _asnService.GetAsync(id);+ if (data != null && data.id > 0)+ {+ return ResultModel<AsnViewModel>.Success(data);+ }+ else+ {+ return ResultModel<AsnViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(AsnViewModel viewModel)+ {+ var (id, msg) = await _asnService.AddAsync(viewModel, CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> UpdateAsync(AsnViewModel viewModel)+ {+ var (flag, msg) = await _asnService.UpdateAsync(viewModel);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _asnService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// Bulk modify Goodsowner+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut("bulk-modify-goods-owner")]+ public async Task<ResultModel<bool>> BulkModifyGoodsownerAsync(AsnBulkModifyGoodsOwnerViewModel viewModel)+ {+ var (flag, msg) = await _asnService.BulkModifyGoodsownerAsync(viewModel);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ #endregion++ #region Flow Api+ /// <summary>+ /// Confirm Delivery+ /// change the asn_status from 0 to 1+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpPut("confirm/{id}")]+ public async Task<ResultModel<string>> ConfirmAsync(int id)+ {+ var (flag, msg) = await _asnService.ConfirmAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// Cancel confirm, change asn_status 1 to 0+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpPut("confirm-cancel/{id}")]+ public async Task<ResultModel<string>> ConfirmCancelAsync(int id)+ {+ var (flag, msg) = await _asnService.ConfirmCancelAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// Unload+ /// change the asn_status from 1 to 2+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpPut("unload/{id}")]+ public async Task<ResultModel<string>> UnloadAsync(int id)+ {+ var (flag, msg) = await _asnService.UnloadAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// Cancel unload+ /// change the asn_status from 2 to 1+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpPut("unload-cancel/{id}")]+ public async Task<ResultModel<string>> UnloadCancelAsync(int id)+ {+ var (flag, msg) = await _asnService.UnloadCancelAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// sorting, add a new asnsort record and update asn sorted_qty+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut("sorting")]+ public async Task<ResultModel<string>> SortingAsync(AsnsortInputViewModel viewModel)+ {+ var (flag, msg) = await _asnService.SortingAsync(viewModel, CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// Sorted+ /// change the asn_status from 2 to 3+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpPut("sorted/{id}")]+ public async Task<ResultModel<string>> SortedAsync(int id)+ {+ var (flag, msg) = await _asnService.SortedAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// Cancel sorted+ /// change the asn_status from 3 to 2+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpPut("sorted-cancel/{id}")]+ public async Task<ResultModel<string>> SortedCancelAsync(int id)+ {+ var (flag, msg) = await _asnService.SortedCancelAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// PutAway+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut("putaway")]+ public async Task<ResultModel<string>> PutAwayAsync(AsnPutAwayInputViewModel viewModel)+ {+ var (flag, msg) = await _asnService.PutAwayAsync(viewModel, CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ #endregion+ }+}+diff --git a/backend/ModernWMS.WMS/Controllers/Customer/CustomerController.cs b/backend/ModernWMS.WMS/Controllers/Customer/CustomerController.csnew file mode 100644index 0000000..62b3a38--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/Customer/CustomerController.cs@@ -0,0 +1,179 @@+using Microsoft.AspNetCore.Mvc;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.Controller;+using ModernWMS.Core.JWT;+using ModernWMS.Core.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;++namespace ModernWMS.WMS.Controllers+{+ /// <summary>+ /// customer controller+ /// </summary>+ [Route("customer")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "Base")]+ public class CustomerController : BaseController+ {+ #region Args++ /// <summary>+ /// customer Service+ /// </summary>+ private readonly ICustomerService _customerService;+ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;++ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="customerService">customer Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public CustomerController(+ ICustomerService customerService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._customerService = customerService;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("list")]+ public async Task<ResultModel<PageData<CustomerViewModel>>> PageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _customerService.PageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<CustomerViewModel>>.Success(new PageData<CustomerViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns>args</returns>+ [HttpGet("all")]+ public async Task<ResultModel<List<CustomerViewModel>>> GetAllAsync()+ {+ var data = await _customerService.GetAllAsync(CurrentUser);+ if (data.Any())+ {+ return ResultModel<List<CustomerViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<CustomerViewModel>>.Success(new List<CustomerViewModel>());+ }+ }++ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<CustomerViewModel>> GetAsync(int id)+ {+ var data = await _customerService.GetAsync(id);+ if (data != null && data.id > 0)+ {+ return ResultModel<CustomerViewModel>.Success(data);+ }+ else+ {+ return ResultModel<CustomerViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(CustomerViewModel viewModel)+ {+ var (id, msg) = await _customerService.AddAsync(viewModel, CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> UpdateAsync(CustomerViewModel viewModel)+ {+ var (flag, msg) = await _customerService.UpdateAsync(viewModel);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _customerService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ #region Import+ /// <summary>+ /// import customers by excel+ /// </summary>+ /// <param name="input">excel data</param>+ /// <returns></returns>+ [HttpPost("excel")]+ public async Task<ResultModel<List<CustomerImportViewModel>>> ExcelAsync(List<CustomerImportViewModel> input)+ {+ var (flag, errorData) = await _customerService.ExcelAsync(input, CurrentUser);+ if (flag)+ {+ return ResultModel<List<CustomerImportViewModel>>.Success(errorData);+ }+ else+ {+ return ResultModel<List<CustomerImportViewModel>>.Error("", 400, errorData);+ }+ }+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Controllers/Dispatchlist/DispatchlistController.cs b/backend/ModernWMS.WMS/Controllers/Dispatchlist/DispatchlistController.csnew file mode 100644index 0000000..ddf9ab1--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/Dispatchlist/DispatchlistController.cs@@ -0,0 +1,343 @@+/*+ * date:2022-12-27+ * developer:NoNo+ */+ using Microsoft.AspNetCore.Mvc;+ using ModernWMS.Core.Controller;+ using ModernWMS.Core.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;+namespace ModernWMS.WMS.Controllers+{+ /// <summary>+ /// dispatchlist controller+ /// </summary>+ [Route("dispatchlist")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "WMS")]+ public class DispatchlistController : BaseController+ {+ #region Args++ /// <summary>+ /// dispatchlist Service+ /// </summary>+ private readonly IDispatchlistService _dispatchlistService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="dispatchlistService">dispatchlist Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public DispatchlistController(+ IDispatchlistService dispatchlistService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dispatchlistService = dispatchlistService;+ this._stringLocalizer= stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("list")]+ public async Task<ResultModel<PageData<DispatchlistViewModel>>> PageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _dispatchlistService.PageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<DispatchlistViewModel>>.Success(new PageData<DispatchlistViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }+ /// <summary>+ /// advanced dispatch order page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("advanced-list")]+ public async Task<ResultModel<PageData<PreDispatchlistViewModel>>> AdvancedDispatchlistPageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _dispatchlistService.AdvancedDispatchlistPageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<PreDispatchlistViewModel>>.Success(new PageData<PreDispatchlistViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<string>> AddAsync(List<DispatchlistAddViewModel> viewModel)+ {+ var (flag, msg) = await _dispatchlistService.AddAsync(viewModel,CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ /// <summary>+ /// update dispatchlist with same dispatch_no+ /// </summary>+ /// <param name="viewModel">viewModel</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<string>> UpdateAsycn(List<DispatchlistViewModel> viewModel)+ {+ var (flag, msg) = await _dispatchlistService.UpdateAsycn(viewModel, CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ /// <summary>+ /// get dispatchlist by dispatch_no+ /// </summary>+ /// <param name="dispatch_no">dispatch_no</param>+ /// <returns></returns>+ [HttpGet("by-dispatch_no")]+ public async Task<ResultModel<List<DispatchlistViewModel>>> GetByDispatchlistNo(string dispatch_no)+ {+ var datas = await _dispatchlistService.GetByDispatchlistNo(dispatch_no, CurrentUser);+ return ResultModel<List<DispatchlistViewModel>>.Success(datas);+ }+ /// <summary>+ /// get Dispatchlist details with available stock+ /// </summary>+ /// <param name="dispatch_no">dispatch_no</param>+ /// <returns></returns>+ [HttpGet("confirm-check")]+ public async Task<ResultModel<List<DispatchlistConfirmDetailViewModel>>> ConfirmOrderCheck(string dispatch_no)+ {+ var datas = await _dispatchlistService.ConfirmOrderCheck(dispatch_no, CurrentUser);+ return ResultModel<List<DispatchlistConfirmDetailViewModel>>.Success(datas);+ }++ /// <summary>+ /// get pick list by dispatch_id+ /// </summary>+ /// <param name="dispatch_id">dispatch_id</param>+ /// <returns></returns>+ [HttpGet("pick-list")]+ public async Task<ResultModel<List<DispatchpicklistViewModel>>> GetPickListByDispatchID(int dispatch_id)+ {+ var datas = await _dispatchlistService.GetPickListByDispatchID(dispatch_id);+ return ResultModel<List<DispatchpicklistViewModel>>.Success(datas);+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="dispatch_no">dispatch_no</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(string dispatch_no)+ {+ var (flag, msg) = await _dispatchlistService.DeleteAsync(dispatch_no,CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ /// <summary>+ /// Confirm orders and create dispatchpicklist+ /// </summary>+ /// <param name="viewModels">viewModels</param>+ /// <returns></returns>+ [HttpPost("confirm-order")]+ public async Task<ResultModel<string >> ConfirmOrder(List<DispatchlistConfirmDetailViewModel> viewModels)+ {+ var (flag, msg) = await _dispatchlistService.ConfirmOrder(viewModels, CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ /// <summary>+ /// confirm dispatchpicklist picked by dispatch_no+ /// </summary>+ /// <param name="dispatch_no">viewModels</param>+ /// <returns></returns>+ [HttpPut("confirm-pick-dispatchlistno")]+ public async Task<ResultModel<string>> ConfirmPickByDispatchNo(string dispatch_no)+ {+ var (flag, msg) = await _dispatchlistService.ConfirmPickByDispatchNo(dispatch_no, CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// package dispatchpicklist+ /// </summary>+ /// <param name="viewModels">viewModels</param>+ /// <returns></returns>+ [HttpPost("package")]+ public async Task<ResultModel<string>> Package(List<DispatchlistPackageViewModel> viewModels)+ {+ var (flag, msg) = await _dispatchlistService.Package(viewModels, CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// weight dispatchpicklist+ /// </summary>+ /// <param name="viewModels">viewModels</param>+ /// <returns></returns>+ [HttpPost("weight")]+ public async Task<ResultModel<string>> Weight(List<DispatchlistWeightViewModel> viewModels)+ {+ var (flag, msg) = await _dispatchlistService.Weight(viewModels, CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// dispatchpicklist outbound delivery+ /// </summary>+ /// <param name="viewModels">viewModels</param>+ /// <returns></returns>+ [HttpPost("delivery")]+ public async Task<ResultModel<string>> Delivery(List<DispatchlistDeliveryViewModel> viewModels)+ {+ var (flag, msg) = await _dispatchlistService.Delivery(viewModels, CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// set dispatchlist freightfee+ /// </summary>+ /// <param name="viewModels">viewModels</param>+ /// <returns></returns>+ [HttpPost("freightfee")]+ public async Task<ResultModel<string>> SetFreightfee(List<DispatchlistFreightfeeViewModel> viewModels)+ {+ var (flag, msg) = await _dispatchlistService.SetFreightfee(viewModels);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// sign for arrival+ /// </summary>+ /// <param name="viewModels">viewModels</param>+ /// <returns></returns>+ [HttpPost("sign")]+ public async Task<ResultModel<string>> SignForArrival(List<DispatchlistSignViewModel> viewModels)+ {+ var (flag, msg) = await _dispatchlistService.SignForArrival(viewModels);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ /// <summary>+ /// cancel order opration+ /// </summary>+ /// <param name="viewModel">viewModel</param>+ /// <returns></returns>+ [HttpPost("cancel-order")]+ public async Task<ResultModel<string>> CancelOrderOpration(CancelOrderOprationViewModel viewModel)+ {+ var (flag, msg) = await _dispatchlistService.CancelOrderOpration(viewModel,CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ /// <summary>+ /// cancel dispatchlist detail opration+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpPut("cancel-order")]+ public async Task<ResultModel<string>> CancelDispatchlistDetailOpration(int id)+ {+ var (flag, msg) = await _dispatchlistService.CancelDispatchlistDetailOpration(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ #endregion++ }+ }+diff --git a/backend/ModernWMS.WMS/Controllers/Freightfee/FreightfeeController.cs b/backend/ModernWMS.WMS/Controllers/Freightfee/FreightfeeController.csnew file mode 100644index 0000000..058fe86--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/Freightfee/FreightfeeController.cs@@ -0,0 +1,182 @@+/*+ * date:2022-12-22+ * developer:NoNo+ */+ using Microsoft.AspNetCore.Mvc;+ using ModernWMS.Core.Controller;+ using ModernWMS.Core.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;+namespace ModernWMS.WMS.Controllers+{+ /// <summary>+ /// freightfee controller+ /// </summary>+ [Route("freightfee")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "Base")]+ public class FreightfeeController : BaseController+ {+ #region Args++ /// <summary>+ /// freightfee Service+ /// </summary>+ private readonly IFreightfeeService _freightfeeService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="freightfeeService">freightfee Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public FreightfeeController(+ IFreightfeeService freightfeeService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._freightfeeService = freightfeeService;+ this._stringLocalizer= stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("list")]+ public async Task<ResultModel<PageData<FreightfeeViewModel>>> PageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _freightfeeService.PageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<FreightfeeViewModel>>.Success(new PageData<FreightfeeViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }++ /// <summary>+ /// get all records+ /// </summary>+ /// <returns>args</returns>+ [HttpGet("all")]+ public async Task<ResultModel<List<FreightfeeViewModel>>> GetAllAsync()+ {+ var data = await _freightfeeService.GetAllAsync(CurrentUser);+ if (data.Any())+ {+ return ResultModel<List<FreightfeeViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<FreightfeeViewModel>>.Success(new List<FreightfeeViewModel>());+ }+ }++ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<FreightfeeViewModel>> GetAsync(int id)+ {+ var data = await _freightfeeService.GetAsync(id);+ if (data!=null)+ {+ return ResultModel<FreightfeeViewModel>.Success(data);+ }+ else+ {+ return ResultModel<FreightfeeViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(FreightfeeViewModel viewModel)+ {+ var (id, msg) = await _freightfeeService.AddAsync(viewModel,CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> UpdateAsync(FreightfeeViewModel viewModel)+ {+ var (flag, msg) = await _freightfeeService.UpdateAsync(viewModel);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _freightfeeService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// import freight fee by excel+ /// </summary>+ /// <param name="excel_datas">excel datas</param>+ /// <returns></returns>+ [HttpPost("excel")]+ public async Task<ResultModel<string>> ExcelAsync(List<FreightfeeExcelmportViewModel> excel_datas)+ {+ var (flag, msg) = await _freightfeeService.ExcelAsync(excel_datas, CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ }+ }+diff --git a/backend/ModernWMS.WMS/Controllers/GoodsOwner/GoodsownerController.cs b/backend/ModernWMS.WMS/Controllers/GoodsOwner/GoodsownerController.csnew file mode 100644index 0000000..af4df5b--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/GoodsOwner/GoodsownerController.cs@@ -0,0 +1,179 @@+using Microsoft.AspNetCore.Mvc;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.Controller;+using ModernWMS.Core.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;+using ModernWMS.WMS.Services;++namespace ModernWMS.WMS.Controllers+{+ /// <summary>+ /// goodsowner controller+ /// </summary>+ [Route("goodsowner")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "Base")]+ public class GoodsownerController : BaseController+ {+ #region Args++ /// <summary>+ /// goodsowner Service+ /// </summary>+ private readonly IGoodsownerService _goodsownerService;+ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;++ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="goodsownerService">goodsowner Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public GoodsownerController(+ IGoodsownerService goodsownerService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._goodsownerService = goodsownerService;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("list")]+ public async Task<ResultModel<PageData<GoodsownerViewModel>>> PageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _goodsownerService.PageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<GoodsownerViewModel>>.Success(new PageData<GoodsownerViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns>args</returns>+ [HttpGet("all")]+ public async Task<ResultModel<List<GoodsownerViewModel>>> GetAllAsync()+ {+ var data = await _goodsownerService.GetAllAsync(CurrentUser);+ if (data.Any())+ {+ return ResultModel<List<GoodsownerViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<GoodsownerViewModel>>.Success(new List<GoodsownerViewModel>());+ }+ }++ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<GoodsownerViewModel>> GetAsync(int id)+ {+ var data = await _goodsownerService.GetAsync(id);+ if (data != null && data.id > 0)+ {+ return ResultModel<GoodsownerViewModel>.Success(data);+ }+ else+ {+ return ResultModel<GoodsownerViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(GoodsownerViewModel viewModel)+ {+ var (id, msg) = await _goodsownerService.AddAsync(viewModel, CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> UpdateAsync(GoodsownerViewModel viewModel)+ {+ var (flag, msg) = await _goodsownerService.UpdateAsync(viewModel);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _goodsownerService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ #region Import+ /// <summary>+ /// import goodsowners by excel+ /// </summary>+ /// <param name="input">excel data</param>+ /// <returns></returns>+ [HttpPost("excel")]+ public async Task<ResultModel<List<GoodsownerImportViewModel>>> ExcelAsync(List<GoodsownerImportViewModel> input)+ {+ var (flag, errorData) = await _goodsownerService.ExcelAsync(input, CurrentUser);+ if (flag)+ {+ return ResultModel<List<GoodsownerImportViewModel>>.Success(errorData);+ }+ else+ {+ return ResultModel<List<GoodsownerImportViewModel>>.Error("", 400, errorData);+ }+ }+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Controllers/Goodslocation/GoodslocationController.cs b/backend/ModernWMS.WMS/Controllers/Goodslocation/GoodslocationController.csnew file mode 100644index 0000000..998d90d--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/Goodslocation/GoodslocationController.cs@@ -0,0 +1,174 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+ using Microsoft.AspNetCore.Mvc;+ using ModernWMS.Core.Controller;+ using ModernWMS.Core.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;+namespace ModernWMS.WMS.Controllers+{+ /// <summary>+ /// goodslocation controller+ /// </summary>+ [Route("goodslocation")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "Base")]+ public class GoodslocationController : BaseController+ {+ #region Args++ /// <summary>+ /// goodslocation Service+ /// </summary>+ private readonly IGoodslocationService _goodslocationService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="goodslocationService">goodslocation Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public GoodslocationController(+ IGoodslocationService goodslocationService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._goodslocationService = goodslocationService;+ this._stringLocalizer= stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// get select items+ /// </summary>+ /// <returns></returns>+ [HttpGet("location-by-warehouseare_id")]+ public async Task<ResultModel<List<FormSelectItem>>> GetSelectItemsAsnyc(int warehousearea_id)+ {+ var datas = await _goodslocationService.GetGoodslocationByWarehouse_area_id(warehousearea_id, CurrentUser);+ return ResultModel<List<FormSelectItem>>.Success(datas);+ }++ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("list")]+ public async Task<ResultModel<PageData<GoodslocationViewModel>>> PageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _goodslocationService.PageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<GoodslocationViewModel>>.Success(new PageData<GoodslocationViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }++ /// <summary>+ /// get all records+ /// </summary>+ /// <returns>args</returns>+ [HttpGet("all")]+ public async Task<ResultModel<List<GoodslocationViewModel>>> GetAllAsync()+ {+ var data = await _goodslocationService.GetAllAsync(CurrentUser);+ if (data.Any())+ {+ return ResultModel<List<GoodslocationViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<GoodslocationViewModel>>.Success(new List<GoodslocationViewModel>());+ }+ }++ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<GoodslocationViewModel>> GetAsync(int id)+ {+ var data = await _goodslocationService.GetAsync(id);+ if (data!=null)+ {+ return ResultModel<GoodslocationViewModel>.Success(data);+ }+ else+ {+ return ResultModel<GoodslocationViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(GoodslocationViewModel viewModel)+ {+ var (id, msg) = await _goodslocationService.AddAsync(viewModel,CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> UpdateAsync(GoodslocationViewModel viewModel)+ {+ var (flag, msg) = await _goodslocationService.UpdateAsync(viewModel, CurrentUser);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _goodslocationService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ }+ }+diff --git a/backend/ModernWMS.WMS/Controllers/Rolemenu/RolemenuController.cs b/backend/ModernWMS.WMS/Controllers/Rolemenu/RolemenuController.csnew file mode 100644index 0000000..afc5baf--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/Rolemenu/RolemenuController.cs@@ -0,0 +1,181 @@+/*+ * date:2022-12-20+ * developer:AMo+ */+ using Microsoft.AspNetCore.Mvc;+ using ModernWMS.Core.Controller;+ using ModernWMS.Core.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;++ namespace ModernWMS.WMS.Controllers+ {+ /// <summary>+ /// rolemenu controller+ /// </summary>+ [Route("rolemenu")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "Base")]+ public class RolemenuController : BaseController+ {+ #region Args++ /// <summary>+ /// rolemenu Service+ /// </summary>+ private readonly IRolemenuService _rolemenuService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="rolemenuService">rolemenu Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public RolemenuController(+ IRolemenuService rolemenuService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._rolemenuService = rolemenuService;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// Get menu's authority by user role id+ /// </summary>+ /// <param name="userrole_id">user role id</param>+ /// <returns></returns>+ [HttpGet("authority")]+ public async Task<ResultModel<List<MenuViewModel>>> GetMenusByRoleId(int userrole_id)+ {+ var data = await _rolemenuService.GetMenusByRoleId(userrole_id);+ if (data.Any())+ {+ return ResultModel<List<MenuViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<MenuViewModel>>.Success(new List<MenuViewModel>());+ }+ }+ /// <summary>+ /// get all records+ /// </summary>+ /// <returns>args</returns>+ [HttpGet("all")]+ public async Task<ResultModel<List<RolemenuListViewModel>>> GetAllAsync()+ {+ var data = await _rolemenuService.GetAllAsync(CurrentUser);+ if (data.Any())+ {+ return ResultModel<List<RolemenuListViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<RolemenuListViewModel>>.Success(new List<RolemenuListViewModel>());+ }+ }+ /// <summary>+ /// Get all menus+ /// </summary>+ /// <returns></returns>+ [HttpGet("menus")]+ public async Task<ResultModel<List<MenuViewModel>>> GetAllMenusAsync()+ {+ var data = await _rolemenuService.GetAllMenusAsync(CurrentUser);+ if (data.Any())+ {+ return ResultModel<List<MenuViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<MenuViewModel>>.Success(new List<MenuViewModel>());+ }+ }+ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<RolemenuBothViewModel>> GetAsync(int userrole_id)+ {+ var data = await _rolemenuService.GetAsync(userrole_id);+ if (data != null && data.userrole_id > 0)+ {+ return ResultModel<RolemenuBothViewModel>.Success(data);+ }+ else+ {+ return ResultModel<RolemenuBothViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(RolemenuBothViewModel viewModel)+ {+ var (id, msg) = await _rolemenuService.AddAsync(viewModel, CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> UpdateAsync(RolemenuBothViewModel viewModel)+ {+ var (flag, msg) = await _rolemenuService.UpdateAsync(viewModel, CurrentUser);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="userrole_id">userrole id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int userrole_id)+ {+ var (flag, msg) = await _rolemenuService.DeleteAsync(userrole_id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ }+ }+diff --git a/backend/ModernWMS.WMS/Controllers/Sku/CategoryController.cs b/backend/ModernWMS.WMS/Controllers/Sku/CategoryController.csnew file mode 100644index 0000000..0d3199a--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/Sku/CategoryController.cs@@ -0,0 +1,147 @@+/*+ * date:2022-12-20+ * developer:AMo+ */+using Microsoft.AspNetCore.Mvc;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.Controller;+using ModernWMS.Core.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;++namespace ModernWMS.WMS.Controllers+{+ /// <summary>+ /// category controller+ /// </summary>+ [Route("category")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "Base")]+ public class CategoryController : BaseController+ {+ #region Args++ /// <summary>+ /// category Service+ /// </summary>+ private readonly ICategoryService _categoryService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="categoryService">category Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public CategoryController(+ ICategoryService categoryService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._categoryService = categoryService;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// get all records+ /// </summary>+ /// <returns>args</returns>+ [HttpGet("all")]+ public async Task<ResultModel<List<CategoryViewModel>>> GetAllAsync()+ {+ var data = await _categoryService.GetAllAsync(CurrentUser);+ if (data.Any())+ {+ return ResultModel<List<CategoryViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<CategoryViewModel>>.Success(new List<CategoryViewModel>());+ }+ }++ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<CategoryViewModel>> GetAsync(int id)+ {+ var data = await _categoryService.GetAsync(id);+ if (data != null)+ {+ return ResultModel<CategoryViewModel>.Success(data);+ }+ else+ {+ return ResultModel<CategoryViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(CategoryViewModel viewModel)+ {+ var (id, msg) = await _categoryService.AddAsync(viewModel, CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> UpdateAsync(CategoryViewModel viewModel)+ {+ var (flag, msg) = await _categoryService.UpdateAsync(viewModel);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _categoryService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ }+}+diff --git a/backend/ModernWMS.WMS/Controllers/Sku/SpuController.cs b/backend/ModernWMS.WMS/Controllers/Sku/SpuController.csnew file mode 100644index 0000000..c94678f--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/Sku/SpuController.cs@@ -0,0 +1,164 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+ using Microsoft.AspNetCore.Mvc;+ using ModernWMS.Core.Controller;+ using ModernWMS.Core.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;++namespace ModernWMS.WMS.Controllers+{+ /// <summary>+ /// spu controller+ /// </summary>+ [Route("spu")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "Base")]+ public class SpuController : BaseController+ {+ #region Args++ /// <summary>+ /// spu Service+ /// </summary>+ private readonly ISpuService _spuService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="spuService">spu Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public SpuController(+ ISpuService spuService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._spuService = spuService;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("list")]+ public async Task<ResultModel<PageData<SpuBothViewModel>>> PageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _spuService.PageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<SpuBothViewModel>>.Success(new PageData<SpuBothViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }+ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<SpuBothViewModel>> GetAsync(int id)+ {+ var data = await _spuService.GetAsync(id);+ if (data != null && data.id > 0)+ {+ return ResultModel<SpuBothViewModel>.Success(data);+ }+ else+ {+ return ResultModel<SpuBothViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }++ /// <summary>+ /// get sku info by sku_id+ /// </summary>+ /// <param name="sku_id">sku_id</param>+ /// <returns></returns>+ [HttpGet("sku")]+ public async Task<ResultModel<SkuDetailViewModel>> GetSkuAsync(int sku_id)+ {+ var data = await _spuService.GetSkuAsync(sku_id);+ if (data != null && data.sku_id > 0)+ {+ return ResultModel<SkuDetailViewModel>.Success(data);+ }+ else+ {+ return ResultModel<SkuDetailViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(SpuBothViewModel viewModel)+ {+ var (id, msg) = await _spuService.AddAsync(viewModel, CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> UpdateAsync(SpuBothViewModel viewModel)+ {+ var (flag, msg) = await _spuService.UpdateAsync(viewModel);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _spuService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ }+}+diff --git a/backend/ModernWMS.WMS/Controllers/Stock/StockController.cs b/backend/ModernWMS.WMS/Controllers/Stock/StockController.csnew file mode 100644index 0000000..4ecf4f8--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/Stock/StockController.cs@@ -0,0 +1,122 @@+/*+ * date:2022-12-22+ * developer:NoNo+ */+ using Microsoft.AspNetCore.Mvc;+ using ModernWMS.Core.Controller;+ using ModernWMS.Core.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;++ namespace ModernWMS.WMS.Controllers+ {+ /// <summary>+ /// stock controller+ /// </summary>+ [Route("stock")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "WMS")]+ public class StockController : BaseController+ {+ #region Args++ /// <summary>+ /// stock Service+ /// </summary>+ private readonly IStockService _stockService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="stockService">stock Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public StockController(+ IStockService stockService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._stockService = stockService;+ this._stringLocalizer= stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// stock details page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("stock-list")]+ public async Task<ResultModel<PageData<StockManagementViewModel>>> StockPageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _stockService.StockPageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<StockManagementViewModel>>.Success(new PageData<StockManagementViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }+ /// <summary>+ /// location stock page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("location-list")]+ public async Task<ResultModel<PageData<LocationStockManagementViewModel>>> LocationStockPageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _stockService.LocationStockPageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<LocationStockManagementViewModel>>.Success(new PageData<LocationStockManagementViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }++ /// <summary>+ /// page search select+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("select")]+ public async Task<ResultModel<PageData<StockViewModel>>> SelectPageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _stockService.SelectPageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<StockViewModel>>.Success(new PageData<StockViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }++ /// <summary>+ /// sku page search select+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("sku-select")]+ public async Task<ResultModel<PageData<SkuSelectViewModel>>> SkuSelectPageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _stockService.SkuSelectPageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<SkuSelectViewModel>>.Success(new PageData<SkuSelectViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }+ #endregion++ }+ }+diff --git a/backend/ModernWMS.WMS/Controllers/Stockadjust/StockadjustController.cs b/backend/ModernWMS.WMS/Controllers/Stockadjust/StockadjustController.csnew file mode 100644index 0000000..9439c6c--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/Stockadjust/StockadjustController.cs@@ -0,0 +1,72 @@+/*+ * date:2022-12-26+ * developer:NoNo+ */+ using Microsoft.AspNetCore.Mvc;+ using ModernWMS.Core.Controller;+ using ModernWMS.Core.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;+namespace ModernWMS.WMS.Controllers+{+ /// <summary>+ /// stockadjust controller+ /// </summary>+ [Route("stockadjust")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "WMS")]+ public class StockadjustController : BaseController+ {+ #region Args++ /// <summary>+ /// stockadjust Service+ /// </summary>+ private readonly IStockadjustService _stockadjustService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="stockadjustService">stockadjust Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public StockadjustController(+ IStockadjustService stockadjustService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._stockadjustService = stockadjustService;+ this._stringLocalizer= stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("list")]+ public async Task<ResultModel<PageData<StockadjustViewModel>>> PageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _stockadjustService.PageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<StockadjustViewModel>>.Success(new PageData<StockadjustViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }++ #endregion++ }+ }+diff --git a/backend/ModernWMS.WMS/Controllers/Stockfreeze/StockfreezeController.cs b/backend/ModernWMS.WMS/Controllers/Stockfreeze/StockfreezeController.csnew file mode 100644index 0000000..e68be05--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/Stockfreeze/StockfreezeController.cs@@ -0,0 +1,164 @@+/*+ * date:2022-12-26+ * developer:NoNo+ */+ using Microsoft.AspNetCore.Mvc;+ using ModernWMS.Core.Controller;+ using ModernWMS.Core.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;++ namespace ModernWMS.WMS.Controllers+ {+ /// <summary>+ /// stockfreeze controller+ /// </summary>+ [Route("stockfreeze")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "WMS")]+ public class StockfreezeController : BaseController+ {+ #region Args++ /// <summary>+ /// stockfreeze Service+ /// </summary>+ private readonly IStockfreezeService _stockfreezeService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="stockfreezeService">stockfreeze Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public StockfreezeController(+ IStockfreezeService stockfreezeService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._stockfreezeService = stockfreezeService;+ this._stringLocalizer= stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("list")]+ public async Task<ResultModel<PageData<StockfreezeViewModel>>> PageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _stockfreezeService.PageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<StockfreezeViewModel>>.Success(new PageData<StockfreezeViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }++ /// <summary>+ /// get all records+ /// </summary>+ /// <returns>args</returns>+ [HttpGet("all")]+ public async Task<ResultModel<List<StockfreezeViewModel>>> GetAllAsync()+ {+ var data = await _stockfreezeService.GetAllAsync(CurrentUser);+ if (data.Any())+ {+ return ResultModel<List<StockfreezeViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<StockfreezeViewModel>>.Success(new List<StockfreezeViewModel>());+ }+ }++ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<StockfreezeViewModel>> GetAsync(int id)+ {+ var data = await _stockfreezeService.GetAsync(id);+ if (data!=null)+ {+ return ResultModel<StockfreezeViewModel>.Success(data);+ }+ else+ {+ return ResultModel<StockfreezeViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(StockfreezeViewModel viewModel)+ {+ var (id, msg) = await _stockfreezeService.AddAsync(viewModel,CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> UpdateAsync(StockfreezeViewModel viewModel)+ {+ var (flag, msg) = await _stockfreezeService.UpdateAsync(viewModel);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _stockfreezeService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ }+ }+diff --git a/backend/ModernWMS.WMS/Controllers/Stockmove/StockmoveController.cs b/backend/ModernWMS.WMS/Controllers/Stockmove/StockmoveController.csnew file mode 100644index 0000000..3c91263--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/Stockmove/StockmoveController.cs@@ -0,0 +1,164 @@+/*+ * date:2022-12-27+ * developer:NoNo+ */+ using Microsoft.AspNetCore.Mvc;+ using ModernWMS.Core.Controller;+ using ModernWMS.Core.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;++ namespace ModernWMS.WMS.Controllers+ {+ /// <summary>+ /// stockmove controller+ /// </summary>+ [Route("stockmove")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "WMS")]+ public class StockmoveController : BaseController+ {+ #region Args++ /// <summary>+ /// stockmove Service+ /// </summary>+ private readonly IStockmoveService _stockmoveService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="stockmoveService">stockmove Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public StockmoveController(+ IStockmoveService stockmoveService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._stockmoveService = stockmoveService;+ this._stringLocalizer= stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("list")]+ public async Task<ResultModel<PageData<StockmoveViewModel>>> PageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _stockmoveService.PageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<StockmoveViewModel>>.Success(new PageData<StockmoveViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }++ /// <summary>+ /// get all records+ /// </summary>+ /// <returns>args</returns>+ [HttpGet("all")]+ public async Task<ResultModel<List<StockmoveViewModel>>> GetAllAsync()+ {+ var data = await _stockmoveService.GetAllAsync(CurrentUser);+ if (data.Any())+ {+ return ResultModel<List<StockmoveViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<StockmoveViewModel>>.Success(new List<StockmoveViewModel>());+ }+ }++ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<StockmoveViewModel>> GetAsync(int id)+ {+ var data = await _stockmoveService.GetAsync(id);+ if (data!=null)+ {+ return ResultModel<StockmoveViewModel>.Success(data);+ }+ else+ {+ return ResultModel<StockmoveViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(StockmoveViewModel viewModel)+ {+ var (id, msg) = await _stockmoveService.AddAsync(viewModel,CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// confirm move+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> Confirm(int id)+ {+ var (flag, msg) = await _stockmoveService.Confirm(id,CurrentUser);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _stockmoveService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ }+ }+diff --git a/backend/ModernWMS.WMS/Controllers/Stockprocess/StockprocessController.cs b/backend/ModernWMS.WMS/Controllers/Stockprocess/StockprocessController.csnew file mode 100644index 0000000..818431b--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/Stockprocess/StockprocessController.cs@@ -0,0 +1,201 @@+/*+ * date:2022-12-23+ * developer:NoNo+ */+ using Microsoft.AspNetCore.Mvc;+ using ModernWMS.Core.Controller;+ using ModernWMS.Core.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;++ namespace ModernWMS.WMS.Controllers+ {+ /// <summary>+ /// stockprocess controller+ /// </summary>+ [Route("stockprocess")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "WMS")]+ public class StockprocessController : BaseController+ {+ #region Args++ /// <summary>+ /// stockprocess Service+ /// </summary>+ private readonly IStockprocessService _stockprocessService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="stockprocessService">stockprocess Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public StockprocessController(+ IStockprocessService stockprocessService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._stockprocessService = stockprocessService;+ this._stringLocalizer= stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("list")]+ public async Task<ResultModel<PageData<StockprocessGetViewModel>>> PageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _stockprocessService.PageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<StockprocessGetViewModel>>.Success(new PageData<StockprocessGetViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }++ /// <summary>+ /// get all records+ /// </summary>+ /// <returns>args</returns>+ [HttpGet("all")]+ public async Task<ResultModel<List<StockprocessGetViewModel>>> GetAllAsync()+ {+ var data = await _stockprocessService.GetAllAsync(CurrentUser);+ if (data.Any())+ {+ return ResultModel<List<StockprocessGetViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<StockprocessGetViewModel>>.Success(new List<StockprocessGetViewModel>());+ }+ }++ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<StockprocessWithDetailViewModel>> GetAsync(int id)+ {+ var data = await _stockprocessService.GetAsync(id);+ if (data!=null)+ {+ return ResultModel<StockprocessWithDetailViewModel>.Success(data);+ }+ else+ {+ return ResultModel<StockprocessWithDetailViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(StockprocessViewModel viewModel)+ {+ var (id, msg) = await _stockprocessService.AddAsync(viewModel,CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> UpdateAsync(StockprocessViewModel viewModel)+ {+ var (flag, msg) = await _stockprocessService.UpdateAsync(viewModel);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _stockprocessService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ /// <summary>+ /// confirm processing+ /// </summary>+ /// <param name="id"></param>+ /// <returns></returns>+ [HttpPut("process-confirm")]+ public async Task<ResultModel<string>> ConfirmProcess(int id)+ {+ var (flag, msg) = await _stockprocessService.ConfirmProcess(id,CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// confirm adjustment+ /// </summary>+ /// <param name="id"></param>+ /// <returns></returns>+ [HttpPut("adjustment-confirm")]+ public async Task<ResultModel<string>> ConfirmAdjustment(int id)+ {+ var (flag, msg) = await _stockprocessService.ConfirmAdjustment(id, CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ }+ }+diff --git a/backend/ModernWMS.WMS/Controllers/Stocktaking/StocktakingController.cs b/backend/ModernWMS.WMS/Controllers/Stocktaking/StocktakingController.csnew file mode 100644index 0000000..6700ecf--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/Stocktaking/StocktakingController.cs@@ -0,0 +1,165 @@+/*+ * date:2022-12-30+ * developer:AMo+ */+ using Microsoft.AspNetCore.Mvc;+ using ModernWMS.Core.Controller;+ using ModernWMS.Core.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;++ namespace ModernWMS.WMS.Controllers+ {+ /// <summary>+ /// stocktaking controller+ /// </summary>+ [Route("stocktaking")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "WMS")]+ public class StocktakingController : BaseController+ {+ #region Args++ /// <summary>+ /// stocktaking Service+ /// </summary>+ private readonly IStocktakingService _stocktakingService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="stocktakingService">stocktaking Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public StocktakingController(+ IStocktakingService stocktakingService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._stocktakingService = stocktakingService;+ this._stringLocalizer= stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("list")]+ public async Task<ResultModel<PageData<StocktakingViewModel>>> PageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _stocktakingService.PageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<StocktakingViewModel>>.Success(new PageData<StocktakingViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }++ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<StocktakingViewModel>> GetAsync(int id)+ {+ var data = await _stocktakingService.GetAsync(id);+ if (data!=null)+ {+ return ResultModel<StocktakingViewModel>.Success(data);+ }+ else+ {+ return ResultModel<StocktakingViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(StocktakingBasicViewModel viewModel)+ {+ var (id, msg) = await _stocktakingService.AddAsync(viewModel,CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// Confirm a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> PutAsync(StocktakingConfirmViewModel viewModel)+ {+ var (flag, msg) = await _stocktakingService.PutAsync(viewModel, CurrentUser);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// confrim a record and change stock and add to stockadjust+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpPut("adjustment-confirm")]+ public async Task<ResultModel<bool>> ConfirmAsync(int id)+ {+ var (flag, msg) = await _stocktakingService.ConfirmAsync(id, CurrentUser);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _stocktakingService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ }+ }+diff --git a/backend/ModernWMS.WMS/Controllers/Warehouse/WarehouseController.cs b/backend/ModernWMS.WMS/Controllers/Warehouse/WarehouseController.csnew file mode 100644index 0000000..181d800--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/Warehouse/WarehouseController.cs@@ -0,0 +1,195 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+ using Microsoft.AspNetCore.Mvc;+ using ModernWMS.Core.Controller;+ using ModernWMS.Core.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;+using ModernWMS.WMS.Services;++namespace ModernWMS.WMS.Controllers+{+ /// <summary>+ /// warehouse controller+ /// </summary>+ [Route("warehouse")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "Base")]+ public class WarehouseController : BaseController+ {+ #region Args++ /// <summary>+ /// warehouse Service+ /// </summary>+ private readonly IWarehouseService _warehouseService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="warehouseService">warehouse Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public WarehouseController(+ IWarehouseService warehouseService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._warehouseService = warehouseService;+ this._stringLocalizer= stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// get select items+ /// </summary>+ /// <returns></returns>+ [HttpGet("select-item")]+ public async Task<ResultModel<List<FormSelectItem>>> GetSelectItemsAsnyc()+ {+ var datas = await _warehouseService.GetSelectItemsAsnyc(CurrentUser);+ return ResultModel<List<FormSelectItem>>.Success(datas);+ }++ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("list")]+ public async Task<ResultModel<PageData<WarehouseViewModel>>> PageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _warehouseService.PageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<WarehouseViewModel>>.Success(new PageData<WarehouseViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }++ /// <summary>+ /// get all records+ /// </summary>+ /// <returns>args</returns>+ [HttpGet("all")]+ public async Task<ResultModel<List<WarehouseViewModel>>> GetAllAsync()+ {+ var data = await _warehouseService.GetAllAsync(CurrentUser);+ if (data.Any())+ {+ return ResultModel<List<WarehouseViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<WarehouseViewModel>>.Success(new List<WarehouseViewModel>());+ }+ }++ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<WarehouseViewModel>> GetAsync(int id)+ {+ var data = await _warehouseService.GetAsync(id);+ if (data!=null)+ {+ return ResultModel<WarehouseViewModel>.Success(data);+ }+ else+ {+ return ResultModel<WarehouseViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(WarehouseViewModel viewModel)+ {+ var (id, msg) = await _warehouseService.AddAsync(viewModel,CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> UpdateAsync(WarehouseViewModel viewModel)+ {+ var (flag, msg) = await _warehouseService.UpdateAsync(viewModel,CurrentUser);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _warehouseService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// import warehouses by excel+ /// </summary>+ /// <param name="excel_datas">excel datas</param>+ /// <returns></returns>+ [HttpPost("excel")]+ public async Task<ResultModel<string>> ExcelAsync(List<WarehouseExcelImportViewModel> excel_datas)+ {+ var (flag, msg) = await _warehouseService.ExcelAsync(excel_datas, CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ }+ }+diff --git a/backend/ModernWMS.WMS/Controllers/Warehousearea/WarehouseareaController.cs b/backend/ModernWMS.WMS/Controllers/Warehousearea/WarehouseareaController.csnew file mode 100644index 0000000..843f058--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/Warehousearea/WarehouseareaController.cs@@ -0,0 +1,174 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+ using Microsoft.AspNetCore.Mvc;+ using ModernWMS.Core.Controller;+ using ModernWMS.Core.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;+namespace ModernWMS.WMS.Controllers+{+ /// <summary>+ /// warehousearea controller+ /// </summary>+ [Route("warehousearea")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "Base")]+ public class WarehouseareaController : BaseController+ {+ #region Args++ /// <summary>+ /// warehousearea Service+ /// </summary>+ private readonly IWarehouseareaService _warehouseareaService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="warehouseareaService">warehousearea Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public WarehouseareaController(+ IWarehouseareaService warehouseareaService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._warehouseareaService = warehouseareaService;+ this._stringLocalizer= stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// get warehousearea select items by warehouse_id+ /// </summary>+ /// <returns></returns>+ [HttpGet("areas-by-warehouse_id")]+ public async Task<ResultModel<List<FormSelectItem>>> GetSelectItemsAsnyc(int warehouse_id)+ {+ var datas = await _warehouseareaService.GetWarehouseareaByWarehouse_id(warehouse_id,CurrentUser);+ return ResultModel<List<FormSelectItem>>.Success(datas);+ }++ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("list")]+ public async Task<ResultModel<PageData<WarehouseareaViewModel>>> PageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _warehouseareaService.PageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<WarehouseareaViewModel>>.Success(new PageData<WarehouseareaViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }++ /// <summary>+ /// get all records+ /// </summary>+ /// <returns>args</returns>+ [HttpGet("all")]+ public async Task<ResultModel<List<WarehouseareaViewModel>>> GetAllAsync(int warehouse_id)+ {+ var data = await _warehouseareaService.GetAllAsync( warehouse_id, CurrentUser);+ if (data.Any())+ {+ return ResultModel<List<WarehouseareaViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<WarehouseareaViewModel>>.Success(new List<WarehouseareaViewModel>());+ }+ }++ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<WarehouseareaViewModel>> GetAsync(int id)+ {+ var data = await _warehouseareaService.GetAsync(id);+ if (data!=null)+ {+ return ResultModel<WarehouseareaViewModel>.Success(data);+ }+ else+ {+ return ResultModel<WarehouseareaViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(WarehouseareaViewModel viewModel)+ {+ var (id, msg) = await _warehouseareaService.AddAsync(viewModel,CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> UpdateAsync(WarehouseareaViewModel viewModel)+ {+ var (flag, msg) = await _warehouseareaService.UpdateAsync(viewModel,CurrentUser);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _warehouseareaService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ }+ }+diff --git a/backend/ModernWMS.WMS/Controllers/company/CompanyController.cs b/backend/ModernWMS.WMS/Controllers/company/CompanyController.csnew file mode 100644index 0000000..cddab20--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/company/CompanyController.cs@@ -0,0 +1,142 @@+using Microsoft.AspNetCore.Mvc;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.Controller;+using ModernWMS.Core.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;++namespace ModernWMS.WMS.Controllers+{+ /// <summary>+ /// company controller+ /// </summary>+ [Route("company")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "Base")]+ public class CompanyController: BaseController+ {+ #region Args++ /// <summary>+ /// company Service+ /// </summary>+ private readonly ICompanyService _companyService;+ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;++ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="companyService">company Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public CompanyController(+ ICompanyService companyService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._companyService = companyService;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns>args</returns>+ [HttpGet("all")]+ public async Task<ResultModel<List<CompanyViewModel>>> GetAllAsync()+ {+ var data = await _companyService.GetAllAsync(CurrentUser);+ if (data.Any())+ {+ return ResultModel<List<CompanyViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<CompanyViewModel>>.Success(new List<CompanyViewModel>());+ }+ }++ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<CompanyViewModel>> GetAsync(int id)+ {+ var data = await _companyService.GetAsync(id);+ if (data != null && data.id > 0)+ {+ return ResultModel<CompanyViewModel>.Success(data);+ }+ else+ {+ return ResultModel<CompanyViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(CompanyViewModel viewModel)+ {+ var (id, msg) = await _companyService.AddAsync(viewModel, CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> UpdateAsync(CompanyViewModel viewModel)+ {+ var (flag, msg) = await _companyService.UpdateAsync(viewModel);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _companyService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Controllers/supplier/SupplierController.cs b/backend/ModernWMS.WMS/Controllers/supplier/SupplierController.csnew file mode 100644index 0000000..063a1e3--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/supplier/SupplierController.cs@@ -0,0 +1,183 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+ using Microsoft.AspNetCore.Mvc;+ using ModernWMS.Core.Controller;+ using ModernWMS.Core.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;++namespace ModernWMS.WMS.Controllers+{+ /// <summary>+ /// supplier controller+ /// </summary>+ [Route("supplier")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "Base")]+ public class SupplierController : BaseController+ {+ #region Args++ /// <summary>+ /// supplier Service+ /// </summary>+ private readonly ISupplierService _supplierService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="supplierService">supplier Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public SupplierController(+ ISupplierService supplierService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._supplierService = supplierService;+ this._stringLocalizer= stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("list")]+ public async Task<ResultModel<PageData<SupplierViewModel>>> PageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _supplierService.PageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<SupplierViewModel>>.Success(new PageData<SupplierViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }++ /// <summary>+ /// get all records+ /// </summary>+ /// <returns>args</returns>+ [HttpGet("all")]+ public async Task<ResultModel<List<SupplierViewModel>>> GetAllAsync()+ {+ var data = await _supplierService.GetAllAsync(CurrentUser);+ if (data.Any())+ {+ return ResultModel<List<SupplierViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<SupplierViewModel>>.Success(new List<SupplierViewModel>());+ }+ }++ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<SupplierViewModel>> GetAsync(int id)+ {+ var data = await _supplierService.GetAsync(id);+ if (data!=null)+ {+ return ResultModel<SupplierViewModel>.Success(data);+ }+ else+ {+ return ResultModel<SupplierViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(SupplierViewModel viewModel)+ {+ var (id, msg) = await _supplierService.AddAsync(viewModel,CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> UpdateAsync(SupplierViewModel viewModel)+ {+ var (flag, msg) = await _supplierService.UpdateAsync(viewModel, CurrentUser);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _supplierService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }++ /// <summary>+ /// import suppliers by excel+ /// </summary>+ /// <param name="excel_datas">excel datas</param>+ /// <returns></returns>+ [HttpPost("excel")]+ public async Task<ResultModel<string>> ExcelAsync(List<SupplierExcelImportViewModel> excel_datas)+ {+ var (flag, msg) = await _supplierService.ExcelAsync(excel_datas, CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ }+ }+diff --git a/backend/ModernWMS.WMS/Controllers/user/UserController.cs b/backend/ModernWMS.WMS/Controllers/user/UserController.csnew file mode 100644index 0000000..4cd02e9--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/user/UserController.cs@@ -0,0 +1,248 @@+/*+ * date:2022-12-20+ * developer:NoNo+ */+using Microsoft.AspNetCore.Mvc;+using ModernWMS.Core.Controller;+using ModernWMS.Core.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;+using Microsoft.Extensions.Localization;+using Microsoft.AspNetCore.Authorization;++namespace ModernWMS.WMS.Controllers+{+ /// <summary>+ /// user controller+ /// </summary>+ [Route("user")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "Base")]+ public class UserController : BaseController+ {+ #region Args++ /// <summary>+ /// user Service+ /// </summary>+ private readonly IUserService _userService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="userService">user Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public UserController(+ IUserService userService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._userService = userService;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// get select items+ /// </summary>+ /// <returns></returns>+ [HttpGet("select-item")]+ public async Task<ResultModel<List<FormSelectItem>>> GetSelectItemsAsnyc()+ {+ var datas = await _userService.GetSelectItemsAsnyc(CurrentUser);+ return ResultModel<List<FormSelectItem>>.Success(datas);+ }+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <returns></returns>+ [HttpPost("list")]+ public async Task<ResultModel<PageData<UserViewModel>>> PageAsync(PageSearch pageSearch)+ {+ var (data, totals) = await _userService.PageAsync(pageSearch, CurrentUser);++ return ResultModel<PageData<UserViewModel>>.Success(new PageData<UserViewModel>+ {+ Rows = data,+ Totals = totals+ });+ }++ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns>args</returns>+ [HttpGet("all")]+ public async Task<ResultModel<List<UserViewModel>>> GetAllAsync()+ {+ var data = await _userService.GetAllAsync(CurrentUser);+ if (data.Any())+ {+ return ResultModel<List<UserViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<UserViewModel>>.Success(new List<UserViewModel>());+ }+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<UserViewModel>> GetAsync(int id)+ {+ var data = await _userService.GetAsync(id);+ if (data != null)+ {+ return ResultModel<UserViewModel>.Success(data);+ }+ else+ {+ return ResultModel<UserViewModel>.Error(_stringLocalizer["not_exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(UserViewModel viewModel)+ {+ viewModel.creator = CurrentUser.user_name;+ var (id, msg) = await _userService.AddAsync(viewModel, CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }+ /// <summary>+ /// register a new tenant+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [AllowAnonymous]+ [HttpPost("register")]+ public async Task<ResultModel<string>> Register(RegisterViewModel viewModel)+ {+ var (flag, msg) = await _userService.Register(viewModel);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ /// <summary>+ /// import users by excel+ /// </summary>+ /// <param name="excel_datas">excel datas</param>+ /// <returns></returns>+ [HttpPost("excel")]+ public async Task<ResultModel<string>> ExcelAsync(List<UserExcelImportViewModel> excel_datas)+ {+ var (flag, msg) = await _userService.ExcelAsync(excel_datas, CurrentUser);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> UpdateAsync(UserViewModel viewModel)+ {+ var (flag, msg) = await _userService.UpdateAsync(viewModel, CurrentUser);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _userService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ /// <summary>+ /// reset password+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <returns></returns>+ [HttpPost("reset-pwd")]+ public async Task<ResultModel<string>> ResetPwd(BatchOperationViewModel viewModel)+ {+ var (flag, msg) = await _userService.ResetPwd(viewModel);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ /// <summary>+ /// change password+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <returns></returns>+ [HttpPost("change-pwd")]+ public async Task<ResultModel<string>> ChangePwd(UserChangePwdViewModel viewModel)+ {+ var (flag, msg) = await _userService.ChangePwd(viewModel);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ }+}+diff --git a/backend/ModernWMS.WMS/Controllers/userrole/UserroleController.cs b/backend/ModernWMS.WMS/Controllers/userrole/UserroleController.csnew file mode 100644index 0000000..f6efad4--- /dev/null+++ b/backend/ModernWMS.WMS/Controllers/userrole/UserroleController.cs@@ -0,0 +1,163 @@+/*+ * date:2022-12-20+ * developer:NoNo+ */+ using Microsoft.AspNetCore.Mvc;+ using ModernWMS.Core.Controller;+ using ModernWMS.Core.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;++ namespace ModernWMS.WMS.Controllers+ {+ /// <summary>+ /// userrole controller+ /// </summary>+ [Route("userrole")]+ [ApiController]+ [ApiExplorerSettings(GroupName = "Base")]+ public class UserroleController : BaseController+ {+ #region Args++ /// <summary>+ /// userrole Service+ /// </summary>+ private readonly IUserroleService _userroleService;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ /// <param name="userroleService">userrole Service</param>+ /// <param name="stringLocalizer">Localizer</param>+ public UserroleController(+ IUserroleService userroleService+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._userroleService = userroleService;+ this._stringLocalizer= stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// save all records+ /// </summary>+ /// <param name="viewModels">viewmodel</param>+ /// <returns></returns>+ [HttpPost("save")]+ public async Task<ResultModel<string>> SaveAllAsync(List<UserroleViewModel> viewModels)+ {+ var (flag,msg) = await _userroleService.BulkSaveAsync(viewModels, CurrentUser);+ if(flag)+ {+ return ResultModel<string>.Success(msg);+ }+ return ResultModel<string>.Error(msg);+ }++ /// <summary>+ /// get all records+ /// </summary>+ /// <returns>args</returns>+ [HttpGet("all")]+ public async Task<ResultModel<List<UserroleViewModel>>> GetAllAsync()+ {+ var data = await _userroleService.GetAllAsync(CurrentUser);+ if (data.Any())+ {+ return ResultModel<List<UserroleViewModel>>.Success(data);+ }+ else+ {+ return ResultModel<List<UserroleViewModel>>.Success(new List<UserroleViewModel>());+ }+ }++ /// <summary>+ /// get a record by id+ /// </summary>+ /// <returns>args</returns>+ [HttpGet]+ public async Task<ResultModel<UserroleViewModel>> GetAsync(int id)+ {+ var data = await _userroleService.GetAsync(id);+ if (data!=null)+ {+ return ResultModel<UserroleViewModel>.Success(data);+ }+ else+ {+ return ResultModel<UserroleViewModel>.Error(_stringLocalizer["exists_entity"]);+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPost]+ public async Task<ResultModel<int>> AddAsync(UserroleViewModel viewModel)+ {+ var (id, msg) = await _userroleService.AddAsync(viewModel,CurrentUser);+ if (id > 0)+ {+ return ResultModel<int>.Success(id);+ }+ else+ {+ return ResultModel<int>.Error(msg);+ }+ }++ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ [HttpPut]+ public async Task<ResultModel<bool>> UpdateAsync(UserroleViewModel viewModel)+ {+ var (flag, msg) = await _userroleService.UpdateAsync(viewModel, CurrentUser);+ if (flag)+ {+ return ResultModel<bool>.Success(flag);+ }+ else+ {+ return ResultModel<bool>.Error(msg, 400, flag);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ [HttpDelete]+ public async Task<ResultModel<string>> DeleteAsync(int id)+ {+ var (flag, msg) = await _userroleService.DeleteAsync(id);+ if (flag)+ {+ return ResultModel<string>.Success(msg);+ }+ else+ {+ return ResultModel<string>.Error(msg);+ }+ }+ #endregion++ }+ }+diff --git a/backend/ModernWMS.WMS/Entities/Models/Asn/AsnEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Asn/AsnEntity.csnew file mode 100644index 0000000..9fa1a3a--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Asn/AsnEntity.cs@@ -0,0 +1,132 @@+/*+ * date:2022-12-22+ * developer:AMo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// asn entity+ /// </summary>+ [Table("asn")]+ public class AsnEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// asn_no+ /// </summary>+ public string asn_no { get; set; } = string.Empty;++ /// <summary>+ /// asn_status+ /// </summary>+ public byte asn_status { get; set; } = 0;++ /// <summary>+ /// spu_id+ /// </summary>+ public int spu_id { get; set; } = 0;++ /// <summary>+ /// sku_id+ /// </summary>+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// asn_qty+ /// </summary>+ public int asn_qty { get; set; } = 0;++ /// <summary>+ /// actual_qty+ /// </summary>+ public int actual_qty { get; set; } = 0;++ /// <summary>+ /// sorted_qty+ /// </summary>+ public int sorted_qty { get; set; } = 0;++ /// <summary>+ /// shortage_qty+ /// </summary>+ public int shortage_qty { get; set; } = 0;++ /// <summary>+ /// more_qty+ /// </summary>+ public int more_qty { get; set; } = 0;++ /// <summary>+ /// damage_qty+ /// </summary>+ public int damage_qty { get; set; } = 0;++ /// <summary>+ /// weight+ /// </summary>+ public decimal weight { get; set; } = 0;++ /// <summary>+ /// volume+ /// </summary>+ public decimal volume { get; set; } = 0;++ /// <summary>+ /// supplier_id+ /// </summary>+ public int supplier_id { get; set; } = 0;++ /// <summary>+ /// supplier_name+ /// </summary>+ public string supplier_name { get; set; } = string.Empty;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// goods_owner_name+ /// </summary>+ public string goods_owner_name { get; set; } = string.Empty;++ /// <summary>+ /// creator+ /// </summary>+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = DateTime.Now;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = DateTime.Now;++ /// <summary>+ /// is_valid+ /// </summary>+ public bool is_valid { get; set; } = true;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 1;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Asn/AsnsortEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Asn/AsnsortEntity.csnew file mode 100644index 0000000..78aa2e6--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Asn/AsnsortEntity.cs@@ -0,0 +1,59 @@+/*+ * date:2022-12-30+ * developer:AMo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// asnsort entity+ /// </summary>+ [Table("asnsort")]+ public class AsnsortEntity : BaseModel+ {+ #region Property++ /// <summary>+ /// asn_id+ /// </summary>+ public int asn_id { get; set; } = 0;++ /// <summary>+ /// sorted_qty+ /// </summary>+ public int sorted_qty { get; set; } = 0;++ /// <summary>+ /// creator+ /// </summary>+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = DateTime.Now;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = DateTime.Now;++ /// <summary>+ /// is_valid+ /// </summary>+ public bool is_valid { get; set; } = true;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 1;++ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Customer/CustomerEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Customer/CustomerEntity.csnew file mode 100644index 0000000..bc229f3--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Customer/CustomerEntity.cs@@ -0,0 +1,69 @@+using ModernWMS.Core.Models;+using System.ComponentModel.DataAnnotations.Schema;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// customer entity+ /// </summary>+ [Table("customer")]+ public class CustomerEntity : BaseModel+ {+ #region Property+ /// <summary>+ /// customer name+ /// </summary>+ public string customer_name { get; set; } = string.Empty;++ /// <summary>+ /// city+ /// </summary>+ public string city { get; set; } = string.Empty;++ /// <summary>+ /// address+ /// </summary>+ public string address { get; set; } = string.Empty;++ /// <summary>+ /// </summary>+ public string email { get; set; } = string.Empty;++ /// <summary>+ /// manager+ /// </summary>+ public string manager { get; set; } = string.Empty;++ /// <summary>+ /// contact tel+ /// </summary>+ public string contact_tel { get; set; } = string.Empty;++ /// <summary>+ /// creator+ /// </summary>+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create time+ /// </summary>+ public DateTime create_time { get; set; } = DateTime.Now;++ /// <summary>+ /// last update time+ /// </summary>+ public DateTime last_update_time { get; set; } = DateTime.Now;++ /// <summary>+ /// valid+ /// </summary>+ public bool is_valid { get; set; } = true;++ /// <summary>+ /// the tenant id+ /// </summary>+ public long tenant_id { get; set; } = 1;+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Dispatchlist/DispatchlistEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Dispatchlist/DispatchlistEntity.csnew file mode 100644index 0000000..4dcb4d8--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Dispatchlist/DispatchlistEntity.cs@@ -0,0 +1,183 @@+/*+ * date:2022-12-22+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// dispatchlist entity+ /// </summary>+ [Table("dispatchlist")]+ public class DispatchlistEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// dispatch_no+ /// </summary>+ public string dispatch_no { get; set; } = string.Empty;++ /// <summary>+ /// dispatch_status+ /// </summary>+ public byte dispatch_status { get; set; } = 0;++ /// <summary>+ /// customer_id+ /// </summary>+ public int customer_id { get; set; } = 0;++ /// <summary>+ /// customer_name+ /// </summary>+ public string customer_name { get; set; } = string.Empty;++ /// <summary>+ /// sku_id+ /// </summary>+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// qty+ /// </summary>+ public int qty { get; set; } = 0;++ /// <summary>+ /// weight+ /// </summary>+ public decimal weight { get; set; } = 0;++ /// <summary>+ /// volume+ /// </summary>+ public decimal volume { get; set; } = 0;++ /// <summary>+ /// creator+ /// </summary>+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// damage_qty+ /// </summary>+ public int damage_qty { get; set; } = 0;++ /// <summary>+ /// lock_qty+ /// </summary>+ public int lock_qty { get; set; } = 0;++ /// <summary>+ /// picked_qty+ /// </summary>+ public int picked_qty { get; set; } = 0;++ /// <summary>+ /// intrasit_qty+ /// </summary>+ public int intrasit_qty { get; set; } = 0;++ /// <summary>+ /// package_qty+ /// </summary>+ public int package_qty { get; set; } = 0;++ /// <summary>+ /// weighing_qty+ /// </summary>+ public int weighing_qty { get; set; } = 0;++ /// <summary>+ /// actual_qty+ /// </summary>+ public int actual_qty { get; set; } = 0;++ /// <summary>+ /// sign_qty+ /// </summary>+ public int sign_qty { get; set; } = 0;++ /// <summary>+ /// package_no+ /// </summary>+ public string package_no { get; set; } = string.Empty;++ /// <summary>+ /// package_person+ /// </summary>+ public string package_person { get; set; } = string.Empty;++ /// <summary>+ /// package_time+ /// </summary>+ public DateTime package_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// weighing_no+ /// </summary>+ public string weighing_no { get; set; } = string.Empty;++ /// <summary>+ /// weighing_person+ /// </summary>+ public string weighing_person { get; set; } = string.Empty;++ /// <summary>+ /// weighing_weight+ /// </summary>+ public decimal weighing_weight { get; set; } = 0;++ /// <summary>+ /// waybill_no+ /// </summary>+ public string waybill_no { get; set; } = string.Empty;++ /// <summary>+ /// carrier+ /// </summary>+ public string carrier { get; set; } = string.Empty;++ /// <summary>+ /// freightfee+ /// </summary>+ public decimal freightfee { get; set; } = 0;++ /// <summary>+ /// last_update_time+ /// </summary>+ [ConcurrencyCheck]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 0;+++ #endregion+++ #region detail table++ /// <summary>+ /// detail table+ /// </summary>+ public List<DispatchpicklistEntity> detailList { get; set; } = new List<DispatchpicklistEntity>(2);++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Dispatchlist/DispatchpicklistEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Dispatchlist/DispatchpicklistEntity.csnew file mode 100644index 0000000..e7affb3--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Dispatchlist/DispatchpicklistEntity.cs@@ -0,0 +1,76 @@+/*+ * date:2022-12-22+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// dispatchpicklist entity+ /// </summary>+ [Table("dispatchpicklist")]+ public class DispatchpicklistEntity : BaseModel+ {+ #region foreign table++ /// <summary>+ /// foreign table+ /// </summary>+ [ForeignKey("dispatchlist_id")]+ public DispatchlistEntity Dispatchlist { get; set; }++ #endregion++ #region Property++ /// <summary>+ /// dispatchlist_id+ /// </summary>+ public int dispatchlist_id { get; set; } = 0;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// goods_location_id+ /// </summary>+ public int goods_location_id { get; set; } = 0;++ /// <summary>+ /// sku_id+ /// </summary>+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// pick_qty+ /// </summary>+ public int pick_qty { get; set; } = 0;++ /// <summary>+ /// picked_qty+ /// </summary>+ public int picked_qty { get; set; } = 0;++ /// <summary>+ /// is_update_stock+ /// </summary>+ public bool is_update_stock { get; set; } = false;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Freightfee/FreightfeeEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Freightfee/FreightfeeEntity.csnew file mode 100644index 0000000..9685932--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Freightfee/FreightfeeEntity.cs@@ -0,0 +1,82 @@+/*+ * date:2022-12-22+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// freightfee entity+ /// </summary>+ [Table("freightfee")]+ public class FreightfeeEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// carrier+ /// </summary>+ public string carrier { get; set; } = string.Empty;++ /// <summary>+ /// departure_city+ /// </summary>+ public string departure_city { get; set; } = string.Empty;++ /// <summary>+ /// arrival_city+ /// </summary>+ public string arrival_city { get; set; } = string.Empty;++ /// <summary>+ /// price_per_weight+ /// </summary>+ public decimal price_per_weight { get; set; } = 0;++ /// <summary>+ /// price_per_volume+ /// </summary>+ public decimal price_per_volume { get; set; } = 0;++ /// <summary>+ /// min_payment+ /// </summary>+ public decimal min_payment { get; set; } = 0;++ /// <summary>+ /// creator+ /// </summary>+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// is_valid+ /// </summary>+ public bool is_valid { get; set; } = false;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/GoodsOwner/GoodsownerEntity.cs b/backend/ModernWMS.WMS/Entities/Models/GoodsOwner/GoodsownerEntity.csnew file mode 100644index 0000000..6307513--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/GoodsOwner/GoodsownerEntity.cs@@ -0,0 +1,64 @@+using ModernWMS.Core.Models;+using System.ComponentModel.DataAnnotations.Schema;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// goods owner entity+ /// </summary>+ [Table("goodsowner")]+ public class GoodsownerEntity : BaseModel+ {+ #region Property+ /// <summary>+ /// goods owner name+ /// </summary>+ public string goods_owner_name { get; set; } = string.Empty;++ /// <summary>+ /// city+ /// </summary>+ public string city { get; set; } = string.Empty;++ /// <summary>+ /// address+ /// </summary>+ public string address { get; set; } = string.Empty;++ /// <summary>+ /// manager+ /// </summary>+ public string manager { get; set; } = string.Empty;++ /// <summary>+ /// contact tel+ /// </summary>+ public string contact_tel { get; set; } = string.Empty;++ /// <summary>+ /// creator+ /// </summary>+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create time+ /// </summary>+ public DateTime create_time { get; set; } = DateTime.Now;++ /// <summary>+ /// last update time+ /// </summary>+ public DateTime last_update_time { get; set; } = DateTime.Now;++ /// <summary>+ /// valid+ /// </summary>+ public bool is_valid { get; set; } = true;++ /// <summary>+ /// the tenant id+ /// </summary>+ public long tenant_id { get; set; } = 1;+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Goodslocation/GoodslocationEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Goodslocation/GoodslocationEntity.csnew file mode 100644index 0000000..dcc56c4--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Goodslocation/GoodslocationEntity.cs@@ -0,0 +1,122 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// goodslocation entity+ /// </summary>+ [Table("goodslocation")]+ public class GoodslocationEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// warehouse_id+ /// </summary>+ public int warehouse_id { get; set; } = 0;++ /// <summary>+ /// warehouse_name+ /// </summary>+ public string warehouse_name { get; set; } = string.Empty;++ /// <summary>+ /// warehouse_area_name+ /// </summary>+ public string warehouse_area_name { get; set; } = string.Empty;++ /// <summary>+ /// warehouse_area_property+ /// </summary>+ public byte warehouse_area_property { get; set; } = 0;++ /// <summary>+ /// location_name+ /// </summary>+ public string location_name { get; set; } = string.Empty;++ /// <summary>+ /// location_length+ /// </summary>+ public decimal location_length { get; set; } = 0;++ /// <summary>+ /// location_width+ /// </summary>+ public decimal location_width { get; set; } = 0;++ /// <summary>+ /// location_heigth+ /// </summary>+ public decimal location_heigth { get; set; } = 0;++ /// <summary>+ /// location_volume+ /// </summary>+ public decimal location_volume { get; set; } = 0;++ /// <summary>+ /// location_load+ /// </summary>+ public decimal location_load { get; set; } = 0;++ /// <summary>+ /// roadway_number+ /// </summary>+ public string roadway_number { get; set; } = string.Empty;++ /// <summary>+ /// shelf_number+ /// </summary>+ public string shelf_number { get; set; } = string.Empty;++ /// <summary>+ /// layer_number+ /// </summary>+ public string layer_number { get; set; } = string.Empty;++ /// <summary>+ /// tag_number+ /// </summary>+ public string tag_number { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// is_valid+ /// </summary>+ public bool is_valid { get; set; } = false;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 0;++ /// <summary>+ /// warehouse_area_id+ /// </summary>+ public int warehouse_area_id { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Rolemenu/MenuEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Rolemenu/MenuEntity.csnew file mode 100644index 0000000..0bb4d2b--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Rolemenu/MenuEntity.cs@@ -0,0 +1,54 @@+using ModernWMS.Core.Models;+using System.ComponentModel.DataAnnotations.Schema;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// menu entity+ /// </summary>+ [Table("menu")]+ public class MenuEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// menu_name+ /// </summary>+ public string menu_name { get; set; } = string.Empty;++ /// <summary>+ /// module+ /// </summary>+ public string module { get; set; } = string.Empty;++ /// <summary>+ /// vue_path+ /// </summary>+ public string vue_path { get; set; } = string.Empty;++ /// <summary>+ /// vue_path_detail+ /// </summary>+ public string vue_path_detail { get; set; } = string.Empty;++ /// <summary>+ /// vue_directory+ /// </summary>+ public string vue_directory { get; set; } = string.Empty;++ /// <summary>+ /// sort+ /// </summary>+ public int sort { get; set; } = 0;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 1;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Rolemenu/RolemenuEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Rolemenu/RolemenuEntity.csnew file mode 100644index 0000000..c7d8d13--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Rolemenu/RolemenuEntity.cs@@ -0,0 +1,57 @@+/*+ * date:2022-12-20+ * developer:AMo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// rolemenu entity+ /// </summary>+ [Table("rolemenu")]+ public class RolemenuEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// userrole_id+ /// </summary>+ public int userrole_id { get; set; } = 0;++ /// <summary>+ /// menu_id+ /// </summary>+ public int menu_id { get; set; } = 0;++ /// <summary>+ /// authority+ /// </summary>+ public byte authority { get; set; } = 1;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 1;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Sku/CategoryEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Sku/CategoryEntity.csnew file mode 100644index 0000000..83d5203--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Sku/CategoryEntity.cs@@ -0,0 +1,59 @@+/*+ * date:2022-12-20+ * developer:AMo+ */+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;+using System.ComponentModel.DataAnnotations.Schema;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// category entity+ /// </summary>+ [Table("category")]+ public class CategoryEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// category_name+ /// </summary>+ public string category_name { get; set; } = string.Empty;++ /// <summary>+ /// parent_id+ /// </summary>+ public int parent_id { get; set; } = 0;++ /// <summary>+ /// creator+ /// </summary>+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// is_valid+ /// </summary>+ public bool is_valid { get; set; } = true;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 1;+++ #endregion++ }+}\ No newline at end of filediff --git a/backend/ModernWMS.WMS/Entities/Models/Sku/SkuEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Sku/SkuEntity.csnew file mode 100644index 0000000..fe4aa02--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Sku/SkuEntity.cs@@ -0,0 +1,100 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// sku entity+ /// </summary>+ [Table("sku")]+ public class SkuEntity : BaseModel+ {+ #region navigational properties+ /// <summary>+ /// navigational properties+ /// </summary>+ [ForeignKey("spu_id")]+ public SpuEntity Spu { get; set; }++ #endregion++ #region Property++ /// <summary>+ /// spu_id+ /// </summary>+ public int spu_id { get; set; } = 0;++ /// <summary>+ /// sku_code+ /// </summary>+ public string sku_code { get; set; } = string.Empty;++ /// <summary>+ /// sku_name+ /// </summary>+ public string sku_name { get; set; } = string.Empty;++ /// <summary>+ /// weight+ /// </summary>+ public decimal weight { get; set; } = 0;++ /// <summary>+ /// lenght+ /// </summary>+ public decimal lenght { get; set; } = 0;++ /// <summary>+ /// width+ /// </summary>+ public decimal width { get; set; } = 0;++ /// <summary>+ /// height+ /// </summary>+ public decimal height { get; set; } = 0;++ /// <summary>+ /// volume+ /// </summary>+ public decimal volume { get; set; } = 0;++ /// <summary>+ /// unit+ /// </summary>+ public string unit { get; set; } = string.Empty;++ /// <summary>+ /// cost+ /// </summary>+ public decimal cost { get; set; } = 0;++ /// <summary>+ /// price+ /// </summary>+ public decimal price { get; set; } = 0;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;+++ #endregion++ }+}\ No newline at end of filediff --git a/backend/ModernWMS.WMS/Entities/Models/Sku/SpuEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Sku/SpuEntity.csnew file mode 100644index 0000000..f5f3f54--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Sku/SpuEntity.cs@@ -0,0 +1,118 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// spu entity+ /// </summary>+ [Table("spu")]+ public class SpuEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// spu_code+ /// </summary>+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// category_id+ /// </summary>+ public int category_id { get; set; } = 0;++ /// <summary>+ /// spu_description+ /// </summary>+ public string spu_description { get; set; } = string.Empty;++ /// <summary>+ /// bar_code+ /// </summary>+ public string bar_code { get; set; } = string.Empty;++ /// <summary>+ /// supplier_id+ /// </summary>+ public int supplier_id { get; set; } = 0;++ /// <summary>+ /// supplier_name+ /// </summary>+ public string supplier_name { get; set; } = string.Empty;++ /// <summary>+ /// brand+ /// </summary>+ public string brand { get; set; } = string.Empty;++ /// <summary>+ /// origin+ /// </summary>+ public string origin { get; set; } = string.Empty;++ /// <summary>+ /// length_unit+ /// </summary>+ public byte length_unit { get; set; } = 0;++ /// <summary>+ /// volume_unit+ /// </summary>+ public byte volume_unit { get; set; } = 0;++ /// <summary>+ /// weight_unit+ /// </summary>+ public byte weight_unit { get; set; } = 0;++ /// <summary>+ /// creator+ /// </summary>+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = DateTime.Now;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = DateTime.Now;++ /// <summary>+ /// is_valid+ /// </summary>+ public bool is_valid { get; set; } = true;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 1;+++ #endregion++ #region details+ /// <summary>+ /// sku+ /// </summary>+ public List<SkuEntity> detailList { get; set; } = new List<SkuEntity>();+ #endregion+ }+}\ No newline at end of filediff --git a/backend/ModernWMS.WMS/Entities/Models/Stock/StockEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Stock/StockEntity.csnew file mode 100644index 0000000..c9d3512--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Stock/StockEntity.cs@@ -0,0 +1,63 @@+/*+ * date:2022-12-22+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// stock entity+ /// </summary>+ [Table("stock")]+ public class StockEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// sku_id+ /// </summary>+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// goods_location_id+ /// </summary>+ public int goods_location_id { get; set; } = 0;++ /// <summary>+ /// qty+ /// </summary>+ public int qty { get; set; } = 0;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// is_freeze+ /// </summary>+ public bool is_freeze { get; set; } = false;++ /// <summary>+ /// last_update_time+ /// </summary>+ [ConcurrencyCheck]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Stockadjust/StockadjustEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Stockadjust/StockadjustEntity.csnew file mode 100644index 0000000..7ae8fd4--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Stockadjust/StockadjustEntity.cs@@ -0,0 +1,87 @@+/*+ * date:2022-12-26+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// stockadjust entity+ /// </summary>+ [Table("stockadjust")]+ public class StockadjustEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// job_code+ /// </summary>+ public string job_code { get; set; } = string.Empty;++ /// <summary>+ /// sku_id+ /// </summary>+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// goods_location_id+ /// </summary>+ public int goods_location_id { get; set; } = 0;++ /// <summary>+ /// qty+ /// </summary>+ public int qty { get; set; } = 0;++ /// <summary>+ /// creator+ /// </summary>+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 0;++ /// <summary>+ /// is_update_stock+ /// </summary>+ public bool is_update_stock { get; set; } = false;++ /// <summary>+ /// job_type+ /// </summary>+ public byte job_type { get; set; } = 0;++ /// <summary>+ /// source_table_id+ /// </summary>+ public int source_table_id { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Stockfreeze/StockfreezeEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Stockfreeze/StockfreezeEntity.csnew file mode 100644index 0000000..dfe13b3--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Stockfreeze/StockfreezeEntity.cs@@ -0,0 +1,72 @@+/*+ * date:2022-12-26+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// stockfreeze entity+ /// </summary>+ [Table("stockfreeze")]+ public class StockfreezeEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// job_code+ /// </summary>+ public string job_code { get; set; } = string.Empty;++ /// <summary>+ /// job_type+ /// </summary>+ public bool job_type { get; set; } = false;++ /// <summary>+ /// sku_id+ /// </summary>+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// goods_location_id+ /// </summary>+ public int goods_location_id { get; set; } = 0;++ /// <summary>+ /// handler+ /// </summary>+ public string handler { get; set; } = string.Empty;++ /// <summary>+ /// operate_time+ /// </summary>+ public DateTime handle_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Stockmove/StockmoveEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Stockmove/StockmoveEntity.csnew file mode 100644index 0000000..67d0384--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Stockmove/StockmoveEntity.cs@@ -0,0 +1,92 @@+/*+ * date:2022-12-27+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// stockmove entity+ /// </summary>+ [Table("stockmove")]+ public class StockmoveEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// job_code+ /// </summary>+ public string job_code { get; set; } = string.Empty;++ /// <summary>+ /// move_status+ /// </summary>+ public byte move_status { get; set; } = 0;++ /// <summary>+ /// sku_id+ /// </summary>+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// orig_goods_location_id+ /// </summary>+ public int orig_goods_location_id { get; set; } = 0;++ /// <summary>+ /// dest_googs_location_id+ /// </summary>+ public int dest_googs_location_id { get; set; } = 0;++ /// <summary>+ /// qty+ /// </summary>+ public int qty { get; set; } = 0;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// handler+ /// </summary>+ public string handler { get; set; } = string.Empty;++ /// <summary>+ /// handle_time+ /// </summary>+ public DateTime handle_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// creator+ /// </summary>+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Stockprocess/StockprocessEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Stockprocess/StockprocessEntity.csnew file mode 100644index 0000000..8471325--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Stockprocess/StockprocessEntity.cs@@ -0,0 +1,82 @@+/*+ * date:2022-12-23+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// stockprocess entity+ /// </summary>+ [Table("stockprocess")]+ public class StockprocessEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// job_code+ /// </summary>+ public string job_code { get; set; } = string.Empty;++ /// <summary>+ /// job_type+ /// </summary>+ public bool job_type { get; set; } = false;++ /// <summary>+ /// process_status+ /// </summary>+ public bool process_status { get; set; } = false;++ /// <summary>+ /// processor+ /// </summary>+ public string processor { get; set; } = string.Empty;++ /// <summary>+ /// process_time+ /// </summary>+ public DateTime process_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// creator+ /// </summary>+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 0;+++ #endregion+++ #region detail table++ /// <summary>+ /// detail table+ /// </summary>+ public List<StockprocessdetailEntity> detailList { get; set; } = new List<StockprocessdetailEntity>(2);++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Stockprocess/StockprocessdetailEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Stockprocess/StockprocessdetailEntity.csnew file mode 100644index 0000000..9efbf6a--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Stockprocess/StockprocessdetailEntity.cs@@ -0,0 +1,79 @@+/*+ * date:2022-12-23+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// stockprocessdetail entity+ /// </summary>+ [Table("stockprocessdetail")]+ public class StockprocessdetailEntity : BaseModel+ {+ #region foreign table++ /// <summary>+ /// foreign table+ /// </summary>+ [ForeignKey("stock_process_id")]+ public StockprocessEntity Stockprocess { get; set; }++ #endregion++ #region Property++ /// <summary>+ /// stock_process_id+ /// </summary>+ public int stock_process_id { get; set; } = 0;++ /// <summary>+ /// sku_id+ /// </summary>+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// goods_location_id+ /// </summary>+ public int goods_location_id { get; set; } = 0;++ /// <summary>+ /// qty+ /// </summary>+ public int qty { get; set; } = 0;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 0;++ /// <summary>+ /// is_source+ /// </summary>+ public bool is_source { get; set; } = false;++ /// <summary>+ /// is_update_stock+ /// </summary>+ public bool is_update_stock { get; set; } = false;+ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Stocktaking/StocktakingEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Stocktaking/StocktakingEntity.csnew file mode 100644index 0000000..d709f74--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Stocktaking/StocktakingEntity.cs@@ -0,0 +1,96 @@+/*+ * date:2022-12-30+ * developer:AMo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// stocktaking entity+ /// </summary>+ [Table("stocktaking")]+ public class StocktakingEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// job_code+ /// </summary>+ public string job_code { get; set; } = string.Empty;++ /// <summary>+ /// job_status+ /// </summary>+ public bool job_status { get; set; } = false;++ /// <summary>+ /// sku_id+ /// </summary>+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// goods_location_id+ /// </summary>+ public int goods_location_id { get; set; } = 0;++ /// <summary>+ /// book_qty+ /// </summary>+ public int book_qty { get; set; } = 0;++ /// <summary>+ /// counted_qty+ /// </summary>+ public int counted_qty { get; set; } = 0;++ /// <summary>+ /// difference_qty+ /// </summary>+ public int difference_qty { get; set; } = 0;++ /// <summary>+ /// creator+ /// </summary>+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = DateTime.Now;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = DateTime.Now;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 1;++ /// <summary>+ /// handler+ /// </summary>+ public string handler { get; set; } = string.Empty;++ /// <summary>+ /// handle_time+ /// </summary>+ public DateTime handle_time { get; set; } = UtilConvert.MinDate;++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Warehouse/WarehouseEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Warehouse/WarehouseEntity.csnew file mode 100644index 0000000..317378e--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Warehouse/WarehouseEntity.cs@@ -0,0 +1,82 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// warehouse entity+ /// </summary>+ [Table("warehouse")]+ public class WarehouseEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// warehouse_name+ /// </summary>+ public string warehouse_name { get; set; } = string.Empty;++ /// <summary>+ /// city+ /// </summary>+ public string city { get; set; } = string.Empty;++ /// <summary>+ /// address+ /// </summary>+ public string address { get; set; } = string.Empty;++ /// <summary>+ /// </summary>+ public string email { get; set; } = string.Empty;++ /// <summary>+ /// manager+ /// </summary>+ public string manager { get; set; } = string.Empty;++ /// <summary>+ /// contact_tel+ /// </summary>+ public string contact_tel { get; set; } = string.Empty;++ /// <summary>+ /// creator+ /// </summary>+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// is_valid+ /// </summary>+ public bool is_valid { get; set; } = false;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/Warehousearea/WarehouseareaEntity.cs b/backend/ModernWMS.WMS/Entities/Models/Warehousearea/WarehouseareaEntity.csnew file mode 100644index 0000000..a1583ef--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/Warehousearea/WarehouseareaEntity.cs@@ -0,0 +1,67 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// warehousearea entity+ /// </summary>+ [Table("warehousearea")]+ public class WarehouseareaEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// warehouse_id+ /// </summary>+ public int warehouse_id { get; set; } = 0;++ /// <summary>+ /// area_name+ /// </summary>+ public string area_name { get; set; } = string.Empty;++ /// <summary>+ /// parent_id+ /// </summary>+ public int parent_id { get; set; } = 0;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// is_valid+ /// </summary>+ public bool is_valid { get; set; } = false;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 0;++ /// <summary>+ /// area_property+ /// </summary>+ public byte area_property { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/company/CompanyEntity.cs b/backend/ModernWMS.WMS/Entities/Models/company/CompanyEntity.csnew file mode 100644index 0000000..3318742--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/company/CompanyEntity.cs@@ -0,0 +1,52 @@+using ModernWMS.Core.Models;+using System.ComponentModel.DataAnnotations.Schema;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// company entity+ /// </summary>+ [Table("company")]+ public class CompanyEntity: BaseModel+ {+ /// <summary>+ /// company's Name+ /// </summary>+ public string company_name { get; set; } = string.Empty;++ /// <summary>+ /// city+ /// </summary>+ public string city { get; set; } = string.Empty;++ /// <summary>+ /// address+ /// </summary>+ public string address { get; set; } = string.Empty;++ /// <summary>+ /// manager+ /// </summary>+ public string manager { get; set; } = string.Empty;++ /// <summary>+ /// contact tel+ /// </summary>+ public string contact_tel { get; set; } = string.Empty;++ /// <summary>+ /// create time+ /// </summary>+ public DateTime create_time { get; set; } = DateTime.Now;++ /// <summary>+ /// last update time+ /// </summary>+ public DateTime last_update_time { get; set; } = DateTime.Now;++ /// <summary>+ /// the tenant id+ /// </summary>+ public long tenant_id { get; set; } = 1;+ }+}diff --git a/backend/ModernWMS.WMS/Entities/Models/supplier/SupplierEntity.cs b/backend/ModernWMS.WMS/Entities/Models/supplier/SupplierEntity.csnew file mode 100644index 0000000..d498cd4--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/Models/supplier/SupplierEntity.cs@@ -0,0 +1,82 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations.Schema;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Models;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.Models+{+ /// <summary>+ /// supplier entity+ /// </summary>+ [Table("supplier")]+ public class SupplierEntity : BaseModel+ {++ #region Property++ /// <summary>+ /// supplier_name+ /// </summary>+ public string supplier_name { get; set; } = string.Empty;++ /// <summary>+ /// city+ /// </summary>+ public string city { get; set; } = string.Empty;++ /// <summary>+ /// address+ /// </summary>+ public string address { get; set; } = string.Empty;++ /// <summary>+ /// </summary>+ public string email { get; set; } = string.Empty;++ /// <summary>+ /// manager+ /// </summary>+ public string manager { get; set; } = string.Empty;++ /// <summary>+ /// contact_tel+ /// </summary>+ public string contact_tel { get; set; } = string.Empty;++ /// <summary>+ /// creator+ /// </summary>+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// is_valid+ /// </summary>+ public bool is_valid { get; set; } = false;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Asn/AsnBulkModifyGoodsOwnerViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Asn/AsnBulkModifyGoodsOwnerViewModel.csnew file mode 100644index 0000000..38dd018--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Asn/AsnBulkModifyGoodsOwnerViewModel.cs@@ -0,0 +1,48 @@+/*+ * date:2022-12-22+ * developer:AMo+ */+using System.ComponentModel.DataAnnotations;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// asn bulk modify goods owner input view model+ /// </summary>+ public class AsnBulkModifyGoodsOwnerViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public AsnBulkModifyGoodsOwnerViewModel()+ {++ }+ #endregion++ #region Property++ /// <summary>+ /// goods_owner_id+ /// </summary>+ [Display(Name = "goods_owner_id")]+ [Required(ErrorMessage = "Required")]+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// goods_owner_name+ /// </summary>+ [Display(Name = "goods_owner_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string goods_owner_name { get; set; } = string.Empty;++ /// <summary>+ /// selected asn id+ /// </summary>+ public List<int> idList { get; set; } = new List<int>();++ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Asn/AsnViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Asn/AsnViewModel.csnew file mode 100644index 0000000..a997a8c--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Asn/AsnViewModel.cs@@ -0,0 +1,218 @@+/*+ * date:2022-12-22+ * developer:AMo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// asn viewModel+ /// </summary>+ public class AsnViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public AsnViewModel()+ {++ }+ #endregion++ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// asn_no+ /// </summary>+ [Display(Name = "asn_no")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string asn_no { get; set; } = string.Empty;++ /// <summary>+ /// asn_status+ /// </summary>+ [Display(Name = "asn_status")]+ public byte asn_status { get; set; } = 0;++ /// <summary>+ /// spu_id+ /// </summary>+ [Display(Name = "spu_id")]+ [Required(ErrorMessage = "Required")]+ public int spu_id { get; set; } = 0;++ /// <summary>+ /// spu_code+ /// </summary>+ [Display(Name = "spu_code")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ [Display(Name = "spu_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(200, ErrorMessage = "MaxLength")]+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// sku_id+ /// </summary>+ [Display(Name = "sku_id")]+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// sku_code+ /// </summary>+ [Display(Name = "sku_code")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string sku_code { get; set; } = string.Empty;++ /// <summary>+ /// sku_name+ /// </summary>+ [Display(Name = "sku_name")]+ [MaxLength(200, ErrorMessage = "MaxLength")]+ public string sku_name { get; set; } = string.Empty;++ /// <summary>+ /// origin+ /// </summary>+ [Display(Name = "origin")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string origin { get; set; } = string.Empty;++ /// <summary>+ /// length_unit (0=毫米、1=厘米、2=分米、3=米)+ /// </summary>+ [Display(Name = "length_unit")]+ public byte length_unit { get; set; } = 0;++ /// <summary>+ /// volume_unit (0=立方厘米、1=立方分米、2=立方米)+ /// </summary>+ [Display(Name = "volume_unit")]+ public byte volume_unit { get; set; } = 0;++ /// <summary>+ /// weight_unit (0=毫克、1=克、2=千克)+ /// </summary>+ [Display(Name = "weight_unit")]+ public byte weight_unit { get; set; } = 0;++ /// <summary>+ /// asn_qty+ /// </summary>+ [Display(Name = "asn_qty")]+ public int asn_qty { get; set; } = 0;++ /// <summary>+ /// actual_qty+ /// </summary>+ [Display(Name = "actual_qty")]+ public int actual_qty { get; set; } = 0;++ /// <summary>+ /// sorted_qty+ /// </summary>+ [Display(Name = "sorted_qty")]+ public int sorted_qty { get; set; } = 0;++ /// <summary>+ /// shortage_qty+ /// </summary>+ [Display(Name = "shortage_qty")]+ public int shortage_qty { get; set; } = 0;++ /// <summary>+ /// more_qty+ /// </summary>+ [Display(Name = "more_qty")]+ public int more_qty { get; set; } = 0;++ /// <summary>+ /// damage_qty+ /// </summary>+ [Display(Name = "damage_qty")]+ public int damage_qty { get; set; } = 0;++ /// <summary>+ /// weight+ /// </summary>+ [Display(Name = "weight")]+ public decimal weight { get; set; } = 0;++ /// <summary>+ /// volume+ /// </summary>+ [Display(Name = "volume")]+ public decimal volume { get; set; } = 0;++ /// <summary>+ /// supplier_id+ /// </summary>+ [Display(Name = "supplier_id")]+ public int supplier_id { get; set; } = 0;++ /// <summary>+ /// supplier_name+ /// </summary>+ [Display(Name = "supplier_name")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string supplier_name { get; set; } = string.Empty;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ [Display(Name = "goods_owner_id")]+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// goods_owner_name+ /// </summary>+ [Display(Name = "goods_owner_name")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string goods_owner_name { get; set; } = string.Empty;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ public DateTime create_time { get; set; } = DateTime.Now;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ public DateTime last_update_time { get; set; } = DateTime.Now;++ /// <summary>+ /// is_valid+ /// </summary>+ [Display(Name = "is_valid")]+ public bool is_valid { get; set; } = true;++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Asn/Flow/AsnFlowInputViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Asn/Flow/AsnFlowInputViewModel.csnew file mode 100644index 0000000..63c2cb3--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Asn/Flow/AsnFlowInputViewModel.cs@@ -0,0 +1,36 @@+/*+ * date:2022-12-22+ * developer:AMo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// asn flow input viewModel+ /// </summary>+ public class AsnFlowInputViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public AsnFlowInputViewModel()+ {++ }+ #endregion++ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Asn/Flow/AsnPutAwayInputViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Asn/Flow/AsnPutAwayInputViewModel.csnew file mode 100644index 0000000..20c45e5--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Asn/Flow/AsnPutAwayInputViewModel.cs@@ -0,0 +1,48 @@+/*+ * date:2022-12-30+ * developer:AMo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// asn put away input viewModel+ /// </summary>+ public class AsnPutAwayInputViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public AsnPutAwayInputViewModel()+ {++ }+ #endregion++ #region Property++ /// <summary>+ /// asn_id+ /// </summary>+ [Display(Name = "asn_id")]+ public int asn_id { get; set; } = 0;++ /// <summary>+ /// goods_location_id+ /// </summary>+ [Display(Name = "goods_location_id")]+ public int goods_location_id { get; set; } = 0;++ /// <summary>+ /// putaway_qty+ /// </summary>+ [Display(Name = "putaway_qty")]+ public int putaway_qty { get; set; } = 0;++ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Asn/Flow/AsnsortInputViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Asn/Flow/AsnsortInputViewModel.csnew file mode 100644index 0000000..0bf1181--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Asn/Flow/AsnsortInputViewModel.cs@@ -0,0 +1,42 @@+/*+ * date:2022-12-30+ * developer:AMo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// asn sorting input viewModel+ /// </summary>+ public class AsnsortInputViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public AsnsortInputViewModel()+ {++ }+ #endregion++ #region Property++ /// <summary>+ /// asn_id+ /// </summary>+ [Display(Name = "asn_id")]+ public int asn_id { get; set; } = 0;++ /// <summary>+ /// sorted_qty+ /// </summary>+ [Display(Name = "sorted_qty")]+ public int sorted_qty { get; set; } = 0;++ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Customer/CustomerImportViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Customer/CustomerImportViewModel.csnew file mode 100644index 0000000..16ed8e6--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Customer/CustomerImportViewModel.cs@@ -0,0 +1,80 @@+/*+ * date:2023-01-04+ * developer:AMo+ */+using System.ComponentModel.DataAnnotations;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// customer import view model+ /// </summary>+ public class CustomerImportViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public CustomerImportViewModel()+ {++ }+ #endregion++ #region Property++ /// <summary>+ /// customer's name+ /// </summary>+ [Display(Name = "customer_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string customer_name { get; set; } = string.Empty;++ /// <summary>+ /// city+ /// </summary>+ [Display(Name = "city")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string city { get; set; } = string.Empty;++ /// <summary>+ /// address+ /// </summary>+ [Display(Name = "address")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string address { get; set; } = string.Empty;++ /// <summary>+ /// manager+ /// </summary>+ [Display(Name = "manager")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string manager { get; set; } = string.Empty;++ /// <summary>+ /// </summary>+ [Display(Name = "email")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string email { get; set; } = string.Empty;++ /// <summary>+ /// contact tel+ /// </summary>+ [Display(Name = "contact_tel")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string contact_tel { get; set; } = string.Empty;++ /// <summary>+ /// _XID+ /// </summary>+ public string _XID { get; set; } = string.Empty;++ /// <summary>+ /// error message+ /// </summary>+ public string errorMsg { get; set; } = string.Empty;+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Customer/CustomerViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Customer/CustomerViewModel.csnew file mode 100644index 0000000..7e36946--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Customer/CustomerViewModel.cs@@ -0,0 +1,102 @@+/*+ * date:2023-01-04+ * developer:AMo+ */+using System.ComponentModel.DataAnnotations;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// customer view model+ /// </summary>+ public class CustomerViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public CustomerViewModel()+ {++ }+ #endregion++ #region Property++ /// <summary>+ /// primary key+ /// </summary>+ public int id { get; set; } = 0;++ /// <summary>+ /// customer's name+ /// </summary>+ [Display(Name = "customer_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string customer_name { get; set; } = string.Empty;++ /// <summary>+ /// city+ /// </summary>+ [Display(Name = "city")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string city { get; set; } = string.Empty;++ /// <summary>+ /// address+ /// </summary>+ [Display(Name = "address")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string address { get; set; } = string.Empty;++ /// <summary>+ /// manager+ /// </summary>+ [Display(Name = "manager")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string manager { get; set; } = string.Empty;++ /// <summary>+ /// </summary>+ [Display(Name = "email")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string email { get; set; } = string.Empty;++ /// <summary>+ /// contact tel+ /// </summary>+ [Display(Name = "contact_tel")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string contact_tel { get; set; } = string.Empty;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = DateTime.Now;++ /// <summary>+ /// last update time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = DateTime.Now;++ /// <summary>+ /// valid+ /// </summary>+ [Display(Name = "is_valid")]+ public bool is_valid { get; set; } = true;+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/CancelOrderOprationViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/CancelOrderOprationViewModel.csnew file mode 100644index 0000000..64d5aae--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/CancelOrderOprationViewModel.cs@@ -0,0 +1,36 @@+using System;+using System.Collections.Generic;+using System.Linq;+using System.Text;+using System.Threading.Tasks;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// what should be inputed when canceling order opration+ /// </summary>+ public class CancelOrderOprationViewModel+ {+ #region constructor+ /// <summary>+ /// CancleOrderOprationViewModel+ /// </summary>+ public CancelOrderOprationViewModel()+ {++ }+ #endregion+ #region Property+ /// <summary>+ /// dispatch_no+ /// </summary>+ public string dispatch_no { get; set; } = string.Empty;++ /// <summary>+ /// dispatch_status+ /// </summary>+ public int dispatch_status { get; set; } = 0;++ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistAddViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistAddViewModel.csnew file mode 100644index 0000000..2eba038--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistAddViewModel.cs@@ -0,0 +1,59 @@+/*+ * date:2022-12-29+ * developer:NoNo+ */+using System;+using System.Collections.Generic;+using System.Linq;+using System.Text;+using System.Threading.Tasks;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// add dispatchlist viewmodel+ /// </summary>+ public class DispatchlistAddViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public DispatchlistAddViewModel()+ {++ }+ #endregion+ #region Property+ /// <summary>+ /// customer_id+ /// </summary>+ public int customer_id { get; set; } = 0;++ /// <summary>+ /// customer_name+ /// </summary>+ public string customer_name { get; set; } = string.Empty;++ /// <summary>+ /// sku_id+ /// </summary>+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// qty+ /// </summary>+ public int qty { get; set; } = 0;++ /// <summary>+ /// weight+ /// </summary>+ public decimal weight { get; set; } = 0;++ /// <summary>+ /// volume+ /// </summary>+ public decimal volume { get; set; } = 0;+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistConfirmDetailViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistConfirmDetailViewModel.csnew file mode 100644index 0000000..e5eab5e--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistConfirmDetailViewModel.cs@@ -0,0 +1,111 @@++using ModernWMS.Core.Utility;+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.Linq;+using System.Text;+using System.Threading.Tasks;+using System.Xml.Linq;++namespace ModernWMS.WMS.Entities.ViewModels+{+ public class DispatchlistConfirmDetailViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public DispatchlistConfirmDetailViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int dispatchlist_id { get; set; } = 0;++ /// <summary>+ /// dispatch_no+ /// </summary>+ [Display(Name = "dispatch_no")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string dispatch_no { get; set; } = string.Empty;++ /// <summary>+ /// dispatch_status+ /// </summary>+ [Display(Name = "dispatch_status")]+ public byte dispatch_status { get; set; } = 0;++ /// <summary>+ /// customer_id+ /// </summary>+ [Display(Name = "customer_id")]+ public int customer_id { get; set; } = 0;++ /// <summary>+ /// customer_name+ /// </summary>+ [Display(Name = "customer_name")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string customer_name { get; set; } = string.Empty;++ /// <summary>+ /// sku_id+ /// </summary>+ [Display(Name = "sku_id")]+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// qty+ /// </summary>+ [Display(Name = "qty")]+ public int qty { get; set; } = 0;++ /// <summary>+ /// spu_code+ /// </summary>+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// spu_description+ /// </summary>+ public string spu_description { get; set; } = string.Empty;++ /// <summary>+ /// bar_code+ /// </summary>+ public string bar_code { get; set; } = string.Empty;++ /// <summary>+ /// sku_code+ /// </summary>+ public string sku_code { get; set; } = string.Empty;++ /// <summary>+ /// quantity available+ /// </summary>+ public int qty_available { get; set; } = 0;++ /// <summary>+ /// confirm order+ /// </summary>+ public bool confirm { get; set; } = false;++ /// <summary>+ /// pick list+ /// </summary>+ public List<DispatchlistConfirmPickDetailViewModel> pick_list { get; set; } = new List<DispatchlistConfirmPickDetailViewModel>();+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistConfirmPickDetailViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistConfirmPickDetailViewModel.csnew file mode 100644index 0000000..d5c1d94--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistConfirmPickDetailViewModel.cs@@ -0,0 +1,74 @@+using System;+using System.Collections.Generic;+using System.Linq;+using System.Text;+using System.Threading.Tasks;++namespace ModernWMS.WMS.Entities.ViewModels+{+ public class DispatchlistConfirmPickDetailViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public DispatchlistConfirmPickDetailViewModel()+ {++ }+ #endregion+ #region Property+ /// <summary>+ /// stock_id+ /// </summary>+ public int stock_id { get; set; } = 0;++ /// <summary>+ /// dispatchlist_id+ /// </summary>+ public int dispatchlist_id { get; set; } = 0;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// goods_owner_name+ /// </summary>+ public string goods_owner_name { get; set; } = string.Empty;++ /// <summary>+ /// goods_location_id+ /// </summary>+ public int goods_location_id { get; set; } = 0;++ /// <summary>+ /// warehouse_name+ /// </summary>+ public string warehouse_name { get; set; } = string.Empty;++ /// <summary>+ /// location_name+ /// </summary>+ public string location_name { get; set; } = string.Empty;++ /// <summary>+ /// warehouse_area_name+ /// </summary>+ public string warehouse_area_name { get; set; } = string.Empty;+++ /// <summary>+ /// quantity available+ /// </summary>+ public int qty_available { get; set; } = 0;++ /// <summary>+ /// pick_qty+ /// </summary>+ public int pick_qty { get; set; } = 0;++ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistDeliveryViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistDeliveryViewModel.csnew file mode 100644index 0000000..87fda87--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistDeliveryViewModel.cs@@ -0,0 +1,49 @@+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.Linq;+using System.Text;+using System.Threading.Tasks;+using System.Xml.Linq;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// DispatchlistStockOutViewModel+ /// </summary>+ public class DispatchlistDeliveryViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public DispatchlistDeliveryViewModel()+ {++ }+ #endregion+ #region Property+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// dispatch_no+ /// </summary>+ [Display(Name = "dispatch_no")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string dispatch_no { get; set; } = string.Empty;++ /// <summary>+ /// dispatch_status+ /// </summary>+ [Display(Name = "dispatch_status")]+ public byte dispatch_status { get; set; } = 0;++ /// <summary>+ /// picked_qty+ /// </summary>+ [Display(Name = "picked_qty")]+ public int picked_qty { get; set; } = 0;+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistDetailViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistDetailViewModel.csnew file mode 100644index 0000000..21dd0db--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistDetailViewModel.cs@@ -0,0 +1,230 @@+using ModernWMS.Core.Utility;+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.Linq;+using System.Text;+using System.Threading.Tasks;+using System.Xml.Linq;++namespace ModernWMS.WMS.Entities.ViewModels+{+ public class DispatchlistDetailViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public DispatchlistDetailViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// dispatch_no+ /// </summary>+ [Display(Name = "dispatch_no")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string dispatch_no { get; set; } = string.Empty;++ /// <summary>+ /// dispatch_status+ /// </summary>+ [Display(Name = "dispatch_status")]+ public byte dispatch_status { get; set; } = 0;++ /// <summary>+ /// customer_id+ /// </summary>+ [Display(Name = "customer_id")]+ public int customer_id { get; set; } = 0;++ /// <summary>+ /// customer_name+ /// </summary>+ [Display(Name = "customer_name")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string customer_name { get; set; } = string.Empty;++ /// <summary>+ /// sku_id+ /// </summary>+ [Display(Name = "sku_id")]+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// qty+ /// </summary>+ [Display(Name = "qty")]+ public int qty { get; set; } = 0;++ /// <summary>+ /// weight+ /// </summary>+ [Display(Name = "weight")]+ public decimal weight { get; set; } = 0;++ /// <summary>+ /// volume+ /// </summary>+ [Display(Name = "volume")]+ public decimal volume { get; set; } = 0;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// damage_qty+ /// </summary>+ [Display(Name = "damage_qty")]+ public int damage_qty { get; set; } = 0;++ /// <summary>+ /// lock_qty+ /// </summary>+ [Display(Name = "lock_qty")]+ public int lock_qty { get; set; } = 0;++ /// <summary>+ /// picked_qty+ /// </summary>+ [Display(Name = "picked_qty")]+ public int picked_qty { get; set; } = 0;++ /// <summary>+ /// intrasit_qty+ /// </summary>+ [Display(Name = "intrasit_qty")]+ public int intrasit_qty { get; set; } = 0;++ /// <summary>+ /// package_qty+ /// </summary>+ [Display(Name = "package_qty")]+ public int package_qty { get; set; } = 0;++ /// <summary>+ /// weighing_qty+ /// </summary>+ [Display(Name = "weighing_qty")]+ public int weighing_qty { get; set; } = 0;++ /// <summary>+ /// actual_qty+ /// </summary>+ [Display(Name = "actual_qty")]+ public int actual_qty { get; set; } = 0;++ /// <summary>+ /// sign_qty+ /// </summary>+ [Display(Name = "sign_qty")]+ public int sign_qty { get; set; } = 0;++ /// <summary>+ /// package_no+ /// </summary>+ [Display(Name = "package_no")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string package_no { get; set; } = string.Empty;++ /// <summary>+ /// package_person+ /// </summary>+ [Display(Name = "package_person")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string package_person { get; set; } = string.Empty;++ /// <summary>+ /// package_time+ /// </summary>+ [Display(Name = "package_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime package_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// weighing_no+ /// </summary>+ [Display(Name = "weighing_no")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string weighing_no { get; set; } = string.Empty;++ /// <summary>+ /// weighing_person+ /// </summary>+ [Display(Name = "weighing_person")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string weighing_person { get; set; } = string.Empty;++ /// <summary>+ /// weighing_weight+ /// </summary>+ [Display(Name = "weighing_weight")]+ public decimal weighing_weight { get; set; } = 0;++ /// <summary>+ /// waybill_no+ /// </summary>+ [Display(Name = "waybill_no")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string waybill_no { get; set; } = string.Empty;++ /// <summary>+ /// carrier+ /// </summary>+ [Display(Name = "carrier")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string carrier { get; set; } = string.Empty;++ /// <summary>+ /// freightfee+ /// </summary>+ [Display(Name = "freightfee")]+ public decimal freightfee { get; set; } = 0;++ /// <summary>+ /// spu_code+ /// </summary>+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// spu_description+ /// </summary>+ public string spu_description { get; set; } = string.Empty;++ /// <summary>+ /// bar_code+ /// </summary>+ public string bar_code { get; set; } = string.Empty;++ /// <summary>+ /// sku_code+ /// </summary>+ public string sku_code { get; set; } = string.Empty;+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistFreightfeeViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistFreightfeeViewModel.csnew file mode 100644index 0000000..661596c--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistFreightfeeViewModel.cs@@ -0,0 +1,61 @@+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.Linq;+using System.Text;+using System.Threading.Tasks;+using System.Xml.Linq;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// DispatchlistFreightfeeViewModel+ /// </summary>+ public class DispatchlistFreightfeeViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public DispatchlistFreightfeeViewModel()+ {++ }+ #endregion+ #region Property+ [Display(Name = "id")]+ public int id { get; set; } = 0;+ /// <summary>+ /// dispatch_no+ /// </summary>+ [Display(Name = "dispatch_no")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string dispatch_no { get; set; } = string.Empty;++ /// <summary>+ /// dispatch_status+ /// </summary>+ [Display(Name = "dispatch_status")]+ public byte dispatch_status { get; set; } = 0;++ /// <summary>+ /// freightfee_id+ /// </summary>+ [Display(Name = "freightfee_id")]+ public int freightfee_id { get; set; } = 0;++ /// <summary>+ /// carrier+ /// </summary>+ [Display(Name = "carrier")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string carrier { get; set; } = string.Empty;++ /// <summary>+ /// waybill_no+ /// </summary>+ public string waybill_no { get; set; } = string.Empty;+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistPackageViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistPackageViewModel.csnew file mode 100644index 0000000..c3a29f7--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistPackageViewModel.cs@@ -0,0 +1,53 @@+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.Linq;+using System.Text;+using System.Threading.Tasks;+using System.Xml.Linq;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// DispatchlistPackageViewModel+ /// </summary>+ public class DispatchlistPackageViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public DispatchlistPackageViewModel()+ {++ }+ #endregion+ #region Property+ [Display(Name = "id")]+ public int id { get; set; } = 0;+ /// <summary>+ /// dispatch_no+ /// </summary>+ [Display(Name = "dispatch_no")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string dispatch_no { get; set; } = string.Empty;++ /// <summary>+ /// dispatch_status+ /// </summary>+ [Display(Name = "dispatch_status")]+ public byte dispatch_status { get; set; } = 0;+ /// <summary>+ /// package_qty+ /// </summary>+ [Display(Name = "package_qty")]+ public int package_qty { get; set; } = 0;++ /// <summary>+ /// picked_qty+ /// </summary>+ [Display(Name = "picked_qty")]+ public int picked_qty { get; set; } = 0;+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistSignViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistSignViewModel.csnew file mode 100644index 0000000..47f9f30--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistSignViewModel.cs@@ -0,0 +1,48 @@+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.Linq;+using System.Text;+using System.Threading.Tasks;+using System.Xml.Linq;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// DispatchlistSignViewModel+ /// </summary>+ public class DispatchlistSignViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public DispatchlistSignViewModel()+ {++ }+ #endregion+ #region Property+ [Display(Name = "id")]+ public int id { get; set; } = 0;+ /// <summary>+ /// dispatch_no+ /// </summary>+ [Display(Name = "dispatch_no")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string dispatch_no { get; set; } = string.Empty;++ /// <summary>+ /// dispatch_status+ /// </summary>+ [Display(Name = "dispatch_status")]+ public byte dispatch_status { get; set; } = 0;++ /// <summary>+ /// damage_qty+ /// </summary>+ public int damage_qty { get; set; } = 0;++ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistViewModel.csnew file mode 100644index 0000000..efac5d3--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistViewModel.cs@@ -0,0 +1,281 @@+/*+ * date:2022-12-22+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// dispatchlist viewModel+ /// </summary>+ public class DispatchlistViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public DispatchlistViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// dispatch_no+ /// </summary>+ [Display(Name = "dispatch_no")]+ [MaxLength(32,ErrorMessage = "MaxLength")]+ public string dispatch_no { get; set; } = string.Empty;++ /// <summary>+ /// dispatch_status+ /// </summary>+ [Display(Name = "dispatch_status")]+ public byte dispatch_status { get; set; } = 0;++ /// <summary>+ /// customer_id+ /// </summary>+ [Display(Name = "customer_id")]+ public int customer_id { get; set; } = 0;++ /// <summary>+ /// customer_name+ /// </summary>+ [Display(Name = "customer_name")]+ [MaxLength(256,ErrorMessage = "MaxLength")]+ public string customer_name { get; set; } = string.Empty;++ /// <summary>+ /// sku_id+ /// </summary>+ [Display(Name = "sku_id")]+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// qty+ /// </summary>+ [Display(Name = "qty")]+ public int qty { get; set; } = 0;++ /// <summary>+ /// weight+ /// </summary>+ [Display(Name = "weight")]+ public decimal weight { get; set; } = 0;++ /// <summary>+ /// volume+ /// </summary>+ [Display(Name = "volume")]+ public decimal volume { get; set; } = 0;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64,ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// damage_qty+ /// </summary>+ [Display(Name = "damage_qty")]+ public int damage_qty { get; set; } = 0;++ /// <summary>+ /// lock_qty+ /// </summary>+ [Display(Name = "lock_qty")]+ public int lock_qty { get; set; } = 0;++ /// <summary>+ /// picked_qty+ /// </summary>+ [Display(Name = "picked_qty")]+ public int picked_qty { get; set; } = 0;++ /// <summary>+ /// unpicked_qty+ /// </summary>+ [Display(Name = "unpicked_qty")]+ public int unpicked_qty { get; set; } = 0;++ /// <summary>+ /// intrasit_qty+ /// </summary>+ [Display(Name = "intrasit_qty")]+ public int intrasit_qty { get; set; } = 0;++ /// <summary>+ /// package_qty+ /// </summary>+ [Display(Name = "package_qty")]+ public int package_qty { get; set; } = 0;++ /// <summary>+ /// unpackage_qty+ /// </summary>+ [Display(Name = "unpackage_qty")]+ public int unpackage_qty { get; set; } = 0;++ /// <summary>+ /// weighing_qty+ /// </summary>+ [Display(Name = "weighing_qty")]+ public int weighing_qty { get; set; } = 0;++ /// <summary>+ /// weighing_qty+ /// </summary>+ [Display(Name = "unweighing_qty")]+ public int unweighing_qty { get; set; } = 0;++ /// <summary>+ /// actual_qty+ /// </summary>+ [Display(Name = "actual_qty")]+ public int actual_qty { get; set; } = 0;++ /// <summary>+ /// sign_qty+ /// </summary>+ [Display(Name = "sign_qty")]+ public int sign_qty { get; set; } = 0;++ /// <summary>+ /// package_no+ /// </summary>+ [Display(Name = "package_no")]+ [MaxLength(32,ErrorMessage = "MaxLength")]+ public string package_no { get; set; } = string.Empty;++ /// <summary>+ /// package_person+ /// </summary>+ [Display(Name = "package_person")]+ [MaxLength(64,ErrorMessage = "MaxLength")]+ public string package_person { get; set; } = string.Empty;++ /// <summary>+ /// package_time+ /// </summary>+ [Display(Name = "package_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime package_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// weighing_no+ /// </summary>+ [Display(Name = "weighing_no")]+ [MaxLength(32,ErrorMessage = "MaxLength")]+ public string weighing_no { get; set; } = string.Empty;++ /// <summary>+ /// weighing_person+ /// </summary>+ [Display(Name = "weighing_person")]+ [MaxLength(64,ErrorMessage = "MaxLength")]+ public string weighing_person { get; set; } = string.Empty;++ /// <summary>+ /// weighing_weight+ /// </summary>+ [Display(Name = "weighing_weight")]+ public decimal weighing_weight { get; set; } = 0;++ /// <summary>+ /// waybill_no+ /// </summary>+ [Display(Name = "waybill_no")]+ [MaxLength(64,ErrorMessage = "MaxLength")]+ public string waybill_no { get; set; } = string.Empty;++ /// <summary>+ /// carrier+ /// </summary>+ [Display(Name = "carrier")]+ [MaxLength(256,ErrorMessage = "MaxLength")]+ public string carrier { get; set; } = string.Empty;++ /// <summary>+ /// freightfee+ /// </summary>+ [Display(Name = "freightfee")]+ public decimal freightfee { get; set; } = 0;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ [Display(Name = "tenant_id")]+ public long tenant_id { get; set; } = 0;+++ /// <summary>+ /// spu_code+ /// </summary>+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// sku_code+ /// </summary>+ public string sku_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_description+ /// </summary>+ public string spu_description { get; set; } = string.Empty;++ /// <summary>+ /// bar_code+ /// </summary>+ public string bar_code { get; set; } = string.Empty;++ /// <summary>+ /// volume_unit+ /// </summary>+ public byte volume_unit { get; set; } = 0;++ /// <summary>+ /// weight_unit+ /// </summary>+ public byte weight_unit { get; set; } = 0;++ /// <summary>+ /// length_unit+ /// </summary>+ public byte length_unit { get; set; } = 0;+ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistWeightViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistWeightViewModel.csnew file mode 100644index 0000000..777c93c--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchlistWeightViewModel.cs@@ -0,0 +1,60 @@+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.Linq;+using System.Text;+using System.Threading.Tasks;+using System.Xml.Linq;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// DispatchlistWeightViewModel+ /// </summary>+ public class DispatchlistWeightViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public DispatchlistWeightViewModel()+ {++ }+ #endregion+ #region Property+ [Display(Name = "id")]+ public int id { get; set; } = 0;+ /// <summary>+ /// dispatch_no+ /// </summary>+ [Display(Name = "dispatch_no")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string dispatch_no { get; set; } = string.Empty;++ /// <summary>+ /// dispatch_status+ /// </summary>+ [Display(Name = "dispatch_status")]+ public byte dispatch_status { get; set; } = 0;++ /// <summary>+ /// weighing_qty+ /// </summary>+ [Display(Name = "weighing_qty")]+ public int weighing_qty { get; set; } = 0;++ /// <summary>+ /// weighing_weight+ /// </summary>+ [Display(Name = "weighing_weight")]+ public decimal weighing_weight { get; set; } = 0;++ /// <summary>+ /// picked_qty+ /// </summary>+ [Display(Name = "picked_qty")]+ public int picked_qty { get; set; } = 0;+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchpicklistViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchpicklistViewModel.csnew file mode 100644index 0000000..c842922--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/DispatchpicklistViewModel.cs@@ -0,0 +1,123 @@+/*+ * date:2022-12-22+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// dispatchpicklist viewModel+ /// </summary>+ public class DispatchpicklistViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public DispatchpicklistViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// dispatchlist_id+ /// </summary>+ [Display(Name = "dispatchlist_id")]+ public int dispatchlist_id { get; set; } = 0;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ [Display(Name = "goods_owner_id")]+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// goods_location_id+ /// </summary>+ [Display(Name = "goods_location_id")]+ public int goods_location_id { get; set; } = 0;++ /// <summary>+ /// sku_id+ /// </summary>+ [Display(Name = "sku_id")]+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// pick_qty+ /// </summary>+ [Display(Name = "pick_qty")]+ public int pick_qty { get; set; } = 0;++ /// <summary>+ /// picked_qty+ /// </summary>+ [Display(Name = "picked_qty")]+ public int picked_qty { get; set; } = 0;++ /// <summary>+ /// spu_code+ /// </summary>+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// spu_description+ /// </summary>+ public string spu_description { get; set; } = string.Empty;++ /// <summary>+ /// bar_code+ /// </summary>+ public string bar_code { get; set; } = string.Empty;++ /// <summary>+ /// sku_code+ /// </summary>+ public string sku_code { get; set; } = string.Empty;++ /// <summary>+ /// goods owner name+ /// </summary>+ public string goods_owner_name { get; set; } = string.Empty;++ /// <summary>+ /// warehouse_name+ /// </summary>+ public string warehouse_name { get; set; } = string.Empty;++ /// <summary>+ /// warehouse_area_name+ /// </summary>+ public string warehouse_area_name { get; set; } = string.Empty;++ /// <summary>+ /// warehouse_area_property+ /// </summary>+ public byte warehouse_area_property { get; set; } = 0;++ /// <summary>+ /// location_name+ /// </summary>+ public string location_name { get; set; } = string.Empty;++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/PreDispatchlistViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/PreDispatchlistViewModel.csnew file mode 100644index 0000000..4ff80a9--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Dispatchlist/PreDispatchlistViewModel.cs@@ -0,0 +1,87 @@+using ModernWMS.Core.Utility;+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.Linq;+using System.Text;+using System.Threading.Tasks;+using System.Xml.Linq;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// Advance Dispatchlist viewModel+ /// </summary>+ public class PreDispatchlistViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public PreDispatchlistViewModel()+ {++ }+ #endregion+ #region Property+ /// <summary>+ /// dispatch_no+ /// </summary>+ [Display(Name = "dispatch_no")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string dispatch_no { get; set; } = string.Empty;++ /// <summary>+ /// dispatch_status+ /// </summary>+ [Display(Name = "dispatch_status")]+ public byte dispatch_status { get; set; } = 0;++ /// <summary>+ /// customer_id+ /// </summary>+ [Display(Name = "customer_id")]+ public int customer_id { get; set; } = 0;++ /// <summary>+ /// customer_name+ /// </summary>+ [Display(Name = "customer_name")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string customer_name { get; set; } = string.Empty;++ /// <summary>+ /// qty+ /// </summary>+ [Display(Name = "qty")]+ public int qty { get; set; } = 0;++ /// <summary>+ /// weight+ /// </summary>+ [Display(Name = "weight")]+ public decimal weight { get; set; } = 0;++ /// <summary>+ /// volume+ /// </summary>+ [Display(Name = "volume")]+ public decimal volume { get; set; } = 0;++ /// <summary>+ /// tenant_id+ /// </summary>+ public long tenant_id { get; set; } = 0;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Freightfee/FreightfeeExcelmportViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Freightfee/FreightfeeExcelmportViewModel.csnew file mode 100644index 0000000..2633aef--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Freightfee/FreightfeeExcelmportViewModel.cs@@ -0,0 +1,76 @@+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.Linq;+using System.Text;+using System.Threading.Tasks;+using System.Xml.Linq;++namespace ModernWMS.WMS.Entities.ViewModels+{+ public class FreightfeeExcelmportViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public FreightfeeExcelmportViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// carrier+ /// </summary>+ [Display(Name = "carrier")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string carrier { get; set; } = string.Empty;++ /// <summary>+ /// departure_city+ /// </summary>+ [Display(Name = "departure_city")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string departure_city { get; set; } = string.Empty;++ /// <summary>+ /// arrival_city+ /// </summary>+ [Display(Name = "arrival_city")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string arrival_city { get; set; } = string.Empty;++ /// <summary>+ /// price_per_weight+ /// </summary>+ [Display(Name = "price_per_weight")]+ [Required(ErrorMessage = "Required")]+ public decimal price_per_weight { get; set; } = 0;++ /// <summary>+ /// price_per_volume+ /// </summary>+ [Display(Name = "price_per_volume")]+ [Required(ErrorMessage = "Required")]+ public decimal price_per_volume { get; set; } = 0;++ /// <summary>+ /// min_payment+ /// </summary>+ [Display(Name = "min_payment")]+ [Required(ErrorMessage = "Required")]+ public decimal min_payment { get; set; } = 0;+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Freightfee/FreightfeeViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Freightfee/FreightfeeViewModel.csnew file mode 100644index 0000000..5f3361d--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Freightfee/FreightfeeViewModel.cs@@ -0,0 +1,116 @@+/*+ * date:2022-12-22+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// freightfee viewModel+ /// </summary>+ public class FreightfeeViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public FreightfeeViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// carrier+ /// </summary>+ [Display(Name = "carrier")]+ [MaxLength(256,ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string carrier { get; set; } = string.Empty;++ /// <summary>+ /// departure_city+ /// </summary>+ [Display(Name = "departure_city")]+ [MaxLength(128,ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string departure_city { get; set; } = string.Empty;++ /// <summary>+ /// arrival_city+ /// </summary>+ [Display(Name = "arrival_city")]+ [MaxLength(128,ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string arrival_city { get; set; } = string.Empty;++ /// <summary>+ /// price_per_weight+ /// </summary>+ [Display(Name = "price_per_weight")]+ [Required(ErrorMessage = "Required")]+ public decimal price_per_weight { get; set; } = 0;++ /// <summary>+ /// price_per_volume+ /// </summary>+ [Display(Name = "price_per_volume")]+ [Required(ErrorMessage = "Required")]+ public decimal price_per_volume { get; set; } = 0;++ /// <summary>+ /// min_payment+ /// </summary>+ [Display(Name = "min_payment")]+ [Required(ErrorMessage = "Required")]+ public decimal min_payment { get; set; } = 0;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64,ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// is_valid+ /// </summary>+ [Display(Name = "is_valid")]+ public bool is_valid { get; set; } =true;++ /// <summary>+ /// tenant_id+ /// </summary>+ [Display(Name = "tenant_id")]+ public long tenant_id { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/GoodsOwner/GoodsownerImportViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/GoodsOwner/GoodsownerImportViewModel.csnew file mode 100644index 0000000..efd4784--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/GoodsOwner/GoodsownerImportViewModel.cs@@ -0,0 +1,71 @@+using System.ComponentModel.DataAnnotations;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// goods owner view model+ /// </summary>+ public class GoodsownerImportViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public GoodsownerImportViewModel()+ {++ }+ #endregion++ #region Property++ /// <summary>+ /// goods owner's name+ /// </summary>+ [Display(Name = "goods_owner_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string goods_owner_name { get; set; } = string.Empty;++ /// <summary>+ /// city+ /// </summary>+ [Display(Name = "city")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string city { get; set; } = string.Empty;++ /// <summary>+ /// address+ /// </summary>+ [Display(Name = "address")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string address { get; set; } = string.Empty;++ /// <summary>+ /// manager+ /// </summary>+ [Display(Name = "manager")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string manager { get; set; } = string.Empty;++ /// <summary>+ /// contact tel+ /// </summary>+ [Display(Name = "contact_tel")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string contact_tel { get; set; } = string.Empty;++ /// <summary>+ /// _XID+ /// </summary>+ public string _XID { get; set; } = string.Empty;++ /// <summary>+ /// error message+ /// </summary>+ public string errorMsg { get; set; } = string.Empty;+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/GoodsOwner/GoodsownerViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/GoodsOwner/GoodsownerViewModel.csnew file mode 100644index 0000000..7c248ae--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/GoodsOwner/GoodsownerViewModel.cs@@ -0,0 +1,91 @@+using System.ComponentModel.DataAnnotations;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// goods owner view model+ /// </summary>+ public class GoodsownerViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public GoodsownerViewModel()+ {++ }+ #endregion++ #region Property++ /// <summary>+ /// primary key+ /// </summary>+ public int id { get; set; } = 0;++ /// <summary>+ /// goods owner's name+ /// </summary>+ [Display(Name = "goods_owner_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string goods_owner_name { get; set; } = string.Empty;++ /// <summary>+ /// city+ /// </summary>+ [Display(Name = "city")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string city { get; set; } = string.Empty;++ /// <summary>+ /// address+ /// </summary>+ [Display(Name = "address")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string address { get; set; } = string.Empty;++ /// <summary>+ /// manager+ /// </summary>+ [Display(Name = "manager")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string manager { get; set; } = string.Empty;++ /// <summary>+ /// contact tel+ /// </summary>+ [Display(Name = "contact_tel")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string contact_tel { get; set; } = string.Empty;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = DateTime.Now;++ /// <summary>+ /// last update time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = DateTime.Now;++ /// <summary>+ /// valid+ /// </summary>+ [Display(Name = "is_valid")]+ public bool is_valid { get; set; } = true;+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Goodslocation/GoodslocationViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Goodslocation/GoodslocationViewModel.csnew file mode 100644index 0000000..0343c59--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Goodslocation/GoodslocationViewModel.cs@@ -0,0 +1,165 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// goodslocation viewModel+ /// </summary>+ public class GoodslocationViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public GoodslocationViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// warehouse_id+ /// </summary>+ [Display(Name = "warehouse_id")]+ public int warehouse_id { get; set; } = 0;++ /// <summary>+ /// warehouse_name+ /// </summary>+ [Display(Name = "warehouse_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(32,ErrorMessage = "MaxLength")]+ public string warehouse_name { get; set; } = string.Empty;++ /// <summary>+ /// warehouse_area_name+ /// </summary>+ [Display(Name = "warehouse_area_name")]+ [MaxLength(32,ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string warehouse_area_name { get; set; } = string.Empty;++ /// <summary>+ /// warehouse_area_property+ /// </summary>+ [Display(Name = "warehouse_area_property")]+ [Required(ErrorMessage = "Required")]+ public byte warehouse_area_property { get; set; } = 0;++ /// <summary>+ /// location_name+ /// </summary>+ [Display(Name = "location_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(64,ErrorMessage = "MaxLength")]+ public string location_name { get; set; } = string.Empty;++ /// <summary>+ /// location_length+ /// </summary>+ [Display(Name = "location_length")]+ public decimal location_length { get; set; } = 0;++ /// <summary>+ /// location_width+ /// </summary>+ [Display(Name = "location_width")]+ public decimal location_width { get; set; } = 0;++ /// <summary>+ /// location_heigth+ /// </summary>+ [Display(Name = "location_heigth")]+ public decimal location_heigth { get; set; } = 0;++ /// <summary>+ /// location_volume+ /// </summary>+ [Display(Name = "location_volume")]+ public decimal location_volume { get; set; } = 0;++ /// <summary>+ /// location_load+ /// </summary>+ [Display(Name = "location_load")]+ public decimal location_load { get; set; } = 0;++ /// <summary>+ /// roadway_number+ /// </summary>+ [Display(Name = "roadway_number")]+ [MaxLength(10,ErrorMessage = "MaxLength")]+ public string roadway_number { get; set; } = string.Empty;++ /// <summary>+ /// shelf_number+ /// </summary>+ [Display(Name = "shelf_number")]+ [MaxLength(10,ErrorMessage = "MaxLength")]+ public string shelf_number { get; set; } = string.Empty;++ /// <summary>+ /// layer_number+ /// </summary>+ [Display(Name = "layer_number")]+ [MaxLength(10,ErrorMessage = "MaxLength")]+ public string layer_number { get; set; } = string.Empty;++ /// <summary>+ /// tag_number+ /// </summary>+ [Display(Name = "tag_number")]+ [MaxLength(10,ErrorMessage = "MaxLength")]+ public string tag_number { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// is_valid+ /// </summary>+ [Display(Name = "is_valid")]+ public bool is_valid { get; set; } =true;++ /// <summary>+ /// tenant_id+ /// </summary>+ [Display(Name = "tenant_id")]+ public long tenant_id { get; set; } = 0;++ /// <summary>+ /// warehouse_area_id+ /// </summary>+ [Display(Name = "warehouse_area_id")]+ public int warehouse_area_id { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Rolemenu/MenuViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Rolemenu/MenuViewModel.csnew file mode 100644index 0000000..f553021--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Rolemenu/MenuViewModel.cs@@ -0,0 +1,51 @@+/*+ * date:2022-12-20+ * developer:AMo+ */+using System.ComponentModel.DataAnnotations;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// menu viewModel+ /// </summary>+ public class MenuViewModel+ {++ /// <summary>+ /// id+ /// </summary>+ public int id { get; set; } = 0;++ /// <summary>+ /// menu_name+ /// </summary>+ public string menu_name { get; set; } = string.Empty;++ /// <summary>+ /// module+ /// </summary>+ public string module { get; set; } = string.Empty;++ /// <summary>+ /// vue_path+ /// </summary>+ public string vue_path { get; set; } = string.Empty;++ /// <summary>+ /// vue_path_detail+ /// </summary>+ public string vue_path_detail { get; set; } = string.Empty;++ /// <summary>+ /// vue_directory+ /// </summary>+ public string vue_directory { get; set; } = string.Empty;++ /// <summary>+ /// sort+ /// </summary>+ public int sort { get; set; } = 0;++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Rolemenu/RolemenuBothViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Rolemenu/RolemenuBothViewModel.csnew file mode 100644index 0000000..ac7ff83--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Rolemenu/RolemenuBothViewModel.cs@@ -0,0 +1,51 @@+/*+ * date:2022-12-20+ * developer:AMo+ */+using System.ComponentModel.DataAnnotations;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// rolemenu viewModel+ /// </summary>+ public class RolemenuBothViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public RolemenuBothViewModel()+ {++ }+ #endregion++ #region Property++ /// <summary>+ /// userrole_id+ /// </summary>+ [Display(Name = "userrole_id")]+ [Required(ErrorMessage = "Required")]+ public int userrole_id { get; set; } = 0;++ /// <summary>+ /// role_name+ /// </summary>+ [Display(Name = "role_name")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string role_name { get; set; } = string.Empty;++ /// <summary>+ /// role valid+ /// </summary>+ public bool is_valid { get; set; } = true;++ /// <summary>+ /// menu details+ /// </summary>+ public List<RolemenuViewModel> detailList { get; set; } = new List<RolemenuViewModel>();+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Rolemenu/RolemenuListViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Rolemenu/RolemenuListViewModel.csnew file mode 100644index 0000000..bc4e57e--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Rolemenu/RolemenuListViewModel.cs@@ -0,0 +1,56 @@+/*+ * date:2022-12-20+ * developer:AMo+ */+using ModernWMS.Core.Utility;+using System.ComponentModel.DataAnnotations;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// rolemenu list viewModel+ /// </summary>+ public class RolemenuListViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public RolemenuListViewModel()+ {++ }+ #endregion++ #region Property++ /// <summary>+ /// userrole_id+ /// </summary>+ public int userrole_id { get; set; } = 0;++ /// <summary>+ /// role_name+ /// </summary>+ public string role_name { get; set; } = string.Empty;+++ /// <summary>+ /// role valid+ /// </summary>+ public bool is_valid { get; set; } = true;+++ /// <summary>+ /// create_time+ /// </summary>+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Rolemenu/RolemenuViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Rolemenu/RolemenuViewModel.csnew file mode 100644index 0000000..39ea08b--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Rolemenu/RolemenuViewModel.cs@@ -0,0 +1,55 @@+/*+ * date:2022-12-20+ * developer:AMo+ */+using System.ComponentModel.DataAnnotations;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// rolemenu viewModel+ /// </summary>+ public class RolemenuViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public RolemenuViewModel()+ {++ }+ #endregion++ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// menu_id+ /// </summary>+ [Display(Name = "menu_id")]+ public int menu_id { get; set; } = 0;++ /// <summary>+ /// menu_name+ /// </summary>+ [Display(Name = "menu_name")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string menu_name { get; set; } = string.Empty;++ /// <summary>+ /// authority+ /// </summary>+ [Display(Name = "authority")]+ public byte authority { get; set; } = 1;++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Sku/CategoryViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Sku/CategoryViewModel.csnew file mode 100644index 0000000..bd11a30--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Sku/CategoryViewModel.cs@@ -0,0 +1,77 @@+/*+ * date:2022-12-20+ * developer:AMo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// category viewModel+ /// </summary>+ public class CategoryViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public CategoryViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// category_name+ /// </summary>+ [Display(Name = "category_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string category_name { get; set; } = string.Empty;++ /// <summary>+ /// parent_id+ /// </summary>+ [Display(Name = "parent_id")]+ public int parent_id { get; set; } = 0;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// is_valid+ /// </summary>+ [Display(Name = "is_valid")]+ public bool is_valid { get; set; } = true;++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Sku/SkuDetailViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Sku/SkuDetailViewModel.csnew file mode 100644index 0000000..4a396dd--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Sku/SkuDetailViewModel.cs@@ -0,0 +1,195 @@+/*+ * date:2-23-01-05+ * developer:NoNo+ */++using System.ComponentModel.DataAnnotations;+using System.Xml.Linq;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// spu with sku viewModel+ /// </summary>+ public class SkuDetailViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public SkuDetailViewModel()+ {++ }+ #endregion++ #region Property++ /// <summary>+ /// spu_id+ /// </summary>+ [Display(Name = "spu_id")]+ public int spu_id { get; set; } = 0;++ /// <summary>+ /// spu_code+ /// </summary>+ [Display(Name = "spu_code")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ [Display(Name = "spu_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(200, ErrorMessage = "MaxLength")]+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// category_id+ /// </summary>+ [Display(Name = "category_id")]+ public int category_id { get; set; } = 0;++ /// <summary>+ /// category_name+ /// </summary>+ [Display(Name = "category_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string category_name { get; set; } = string.Empty;++ /// <summary>+ /// spu_description+ /// </summary>+ [Display(Name = "spu_description")]+ [MaxLength(1000, ErrorMessage = "MaxLength")]+ public string spu_description { get; set; } = string.Empty;++ /// <summary>+ /// bar_code+ /// </summary>+ [Display(Name = "bar_code")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string bar_code { get; set; } = string.Empty;++ /// <summary>+ /// supplier_id+ /// </summary>+ [Display(Name = "supplier_id")]+ public int supplier_id { get; set; } = 0;++ /// <summary>+ /// supplier_name+ /// </summary>+ [Display(Name = "supplier_name")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string supplier_name { get; set; } = string.Empty;++ /// <summary>+ /// brand+ /// </summary>+ [Display(Name = "brand")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string brand { get; set; } = string.Empty;++ /// <summary>+ /// origin+ /// </summary>+ [Display(Name = "origin")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string origin { get; set; } = string.Empty;++ /// <summary>+ /// length_unit (0=毫米、1=厘米、2=分米、3=米)+ /// </summary>+ [Display(Name = "length_unit")]+ public byte length_unit { get; set; } = 0;++ /// <summary>+ /// volume_unit (0=立方厘米、1=立方分米、2=立方米)+ /// </summary>+ [Display(Name = "volume_unit")]+ public byte volume_unit { get; set; } = 0;++ /// <summary>+ /// weight_unit (0=毫克、1=克、2=千克)+ /// </summary>+ [Display(Name = "weight_unit")]+ public byte weight_unit { get; set; } = 0;++ /// <summary>+ /// sku_id+ /// </summary>+ [Display(Name = "sku_id")]+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// sku_code+ /// </summary>+ [Display(Name = "sku_code")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string sku_code { get; set; } = string.Empty;++ /// <summary>+ /// sku_name+ /// </summary>+ [Display(Name = "sku_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(200, ErrorMessage = "MaxLength")]+ public string sku_name { get; set; } = string.Empty;++ /// <summary>+ /// weight+ /// </summary>+ [Display(Name = "weight")]+ public decimal weight { get; set; } = 0;++ /// <summary>+ /// lenght+ /// </summary>+ [Display(Name = "lenght")]+ public decimal lenght { get; set; } = 0;++ /// <summary>+ /// width+ /// </summary>+ [Display(Name = "width")]+ public decimal width { get; set; } = 0;++ /// <summary>+ /// height+ /// </summary>+ [Display(Name = "height")]+ public decimal height { get; set; } = 0;++ /// <summary>+ /// volume+ /// </summary>+ [Display(Name = "volume")]+ public decimal volume { get; set; } = 0;++ /// <summary>+ /// unit+ /// </summary>+ [Display(Name = "unit")]+ [MaxLength(5, ErrorMessage = "MaxLength")]+ public string unit { get; set; } = string.Empty;++ /// <summary>+ /// cost+ /// </summary>+ [Display(Name = "cost")]+ public decimal cost { get; set; } = 0;++ /// <summary>+ /// price+ /// </summary>+ [Display(Name = "price")]+ public decimal price { get; set; } = 0;+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Sku/SkuSelectViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Sku/SkuSelectViewModel.csnew file mode 100644index 0000000..3899115--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Sku/SkuSelectViewModel.cs@@ -0,0 +1,73 @@+using System;+using System.Collections.Generic;+using System.Linq;+using System.Text;+using System.Threading.Tasks;+using System.Xml.Linq;++namespace ModernWMS.WMS.Entities.ViewModels+{+ public class SkuSelectViewModel+ {+ public SkuSelectViewModel()+ {++ }++ /// <summary>+ /// sku_id+ /// </summary>+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// spu_id+ /// </summary>+ public int spu_id { get; set; } = 0;++ /// <summary>+ /// spu_code+ /// </summary>+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// sku_code+ /// </summary>+ public string sku_code { get; set; } = string.Empty;++ /// <summary>+ /// sku_name+ /// </summary>+ public string sku_name { get; set; } = string.Empty;+++ /// <summary>+ /// supplier_id+ /// </summary>+ public int supplier_id { get; set; } = 0;++ /// <summary>+ /// supplier_name+ /// </summary>+ public string supplier_name { get; set; } = string.Empty;++ /// <summary>+ /// brand+ /// </summary>+ public string brand { get; set; } = string.Empty;++ /// <summary>+ /// origin+ /// </summary>+ public string origin { get; set; } = string.Empty;++ /// <summary>+ /// unit+ /// </summary>+ public string unit { get; set; } = string.Empty;+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Sku/SkuViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Sku/SkuViewModel.csnew file mode 100644index 0000000..cdb1980--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Sku/SkuViewModel.cs@@ -0,0 +1,122 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// sku viewModel+ /// </summary>+ public class SkuViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public SkuViewModel()+ {++ }+ #endregion++ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// spu_id+ /// </summary>+ [Display(Name = "spu_id")]+ public int spu_id { get; set; } = 0;++ /// <summary>+ /// sku_code+ /// </summary>+ [Display(Name = "sku_code")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string sku_code { get; set; } = string.Empty;++ /// <summary>+ /// sku_name+ /// </summary>+ [Display(Name = "sku_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(200, ErrorMessage = "MaxLength")]+ public string sku_name { get; set; } = string.Empty;++ /// <summary>+ /// weight+ /// </summary>+ [Display(Name = "weight")]+ public decimal weight { get; set; } = 0;++ /// <summary>+ /// lenght+ /// </summary>+ [Display(Name = "lenght")]+ public decimal lenght { get; set; } = 0;++ /// <summary>+ /// width+ /// </summary>+ [Display(Name = "width")]+ public decimal width { get; set; } = 0;++ /// <summary>+ /// height+ /// </summary>+ [Display(Name = "height")]+ public decimal height { get; set; } = 0;++ /// <summary>+ /// volume+ /// </summary>+ [Display(Name = "volume")]+ public decimal volume { get; set; } = 0;++ /// <summary>+ /// unit+ /// </summary>+ [Display(Name = "unit")]+ [MaxLength(5, ErrorMessage = "MaxLength")]+ public string unit { get; set; } = string.Empty;++ /// <summary>+ /// cost+ /// </summary>+ [Display(Name = "cost")]+ public decimal cost { get; set; } = 0;++ /// <summary>+ /// price+ /// </summary>+ [Display(Name = "price")]+ public decimal price { get; set; } = 0;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = DateTime.Now;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = DateTime.Now;+ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Sku/SpuBothViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Sku/SpuBothViewModel.csnew file mode 100644index 0000000..afe0df1--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Sku/SpuBothViewModel.cs@@ -0,0 +1,30 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// spu with sku viewModel+ /// </summary>+ public class SpuBothViewModel : SpuViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public SpuBothViewModel()+ {++ }+ #endregion++ #region details+ /// <summary>+ /// sku+ /// </summary>+ public List<SkuViewModel> detailList { get; set; } = new List<SkuViewModel>();+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Sku/SpuViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Sku/SpuViewModel.csnew file mode 100644index 0000000..6c820ca--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Sku/SpuViewModel.cs@@ -0,0 +1,153 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// spu viewModel+ /// </summary>+ public class SpuViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public SpuViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// spu_code+ /// </summary>+ [Display(Name = "spu_code")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ [Display(Name = "spu_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(200, ErrorMessage = "MaxLength")]+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// category_id+ /// </summary>+ [Display(Name = "category_id")]+ public int category_id { get; set; } = 0;++ /// <summary>+ /// category_name+ /// </summary>+ [Display(Name = "category_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string category_name { get; set; } = string.Empty;++ /// <summary>+ /// spu_description+ /// </summary>+ [Display(Name = "spu_description")]+ [MaxLength(1000, ErrorMessage = "MaxLength")]+ public string spu_description { get; set; } = string.Empty;++ /// <summary>+ /// bar_code+ /// </summary>+ [Display(Name = "bar_code")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string bar_code { get; set; } = string.Empty;++ /// <summary>+ /// supplier_id+ /// </summary>+ [Display(Name = "supplier_id")]+ public int supplier_id { get; set; } = 0;++ /// <summary>+ /// supplier_name+ /// </summary>+ [Display(Name = "supplier_name")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string supplier_name { get; set; } = string.Empty;++ /// <summary>+ /// brand+ /// </summary>+ [Display(Name = "brand")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string brand { get; set; } = string.Empty;++ /// <summary>+ /// origin+ /// </summary>+ [Display(Name = "origin")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string origin { get; set; } = string.Empty;++ /// <summary>+ /// length_unit (0=毫米、1=厘米、2=分米、3=米)+ /// </summary>+ [Display(Name = "length_unit")]+ public byte length_unit { get; set; } = 0;++ /// <summary>+ /// volume_unit (0=立方厘米、1=立方分米、2=立方米)+ /// </summary>+ [Display(Name = "volume_unit")]+ public byte volume_unit { get; set; } = 0;++ /// <summary>+ /// weight_unit (0=毫克、1=克、2=千克)+ /// </summary>+ [Display(Name = "weight_unit")]+ public byte weight_unit { get; set; } = 0;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = DateTime.Now;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = DateTime.Now;++ /// <summary>+ /// is_valid+ /// </summary>+ [Display(Name = "is_valid")]+ public bool is_valid { get; set; } = true;++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Stock/LocationStockManagementViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Stock/LocationStockManagementViewModel.csnew file mode 100644index 0000000..343148b--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Stock/LocationStockManagementViewModel.cs@@ -0,0 +1,71 @@+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.Linq;+using System.Text;+using System.Threading.Tasks;+using System.Xml.Linq;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// goods location stock management viewmodel+ /// </summary>+ public class LocationStockManagementViewModel+ {+ /// <summary>+ /// warehouse_name+ /// </summary>+ public string warehouse_name { get; set; } = string.Empty;++ /// <summary>+ /// location_name+ /// </summary>+ public string location_name { get; set; } = string.Empty;++ /// <summary>+ /// spu_code+ /// </summary>+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// sku_id+ /// </summary>+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// sku_code+ /// </summary>+ public string sku_code { get; set; } = string.Empty;++ /// <summary>+ /// sku_name+ /// </summary>+ public string sku_name { get; set; } = string.Empty;++ /// <summary>+ /// quantity+ /// </summary>+ public int qty { get; set; } = 0;++ /// <summary>+ /// quantity available+ /// </summary>+ public int qty_available { get; set; } = 0;++ /// <summary>+ /// quantity locked+ /// </summary>+ public int qty_locked { get; set; } = 0;++ /// <summary>+ /// quantity frozen+ /// </summary>+ public int qty_frozen { get; set; } = 0;+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Stock/StockManagementViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Stock/StockManagementViewModel.csnew file mode 100644index 0000000..93ecbd7--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Stock/StockManagementViewModel.cs@@ -0,0 +1,91 @@+using System;+using System.Collections.Generic;+using System.Linq;+using System.Text;+using System.Threading.Tasks;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// StockManagementViewModel+ /// </summary>+ public class StockManagementViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public StockManagementViewModel()+ {++ }+ #endregion+ #region Property+ /// <summary>+ /// spu_code+ /// </summary>+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// sku_code+ /// </summary>+ public string sku_code { get; set; } = string.Empty;++ /// <summary>+ /// sku_id+ /// </summary>+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// quantity+ /// </summary>+ public int qty { get; set; } = 0;++ /// <summary>+ /// quantity available+ /// </summary>+ public int qty_available { get; set; } = 0;++ /// <summary>+ /// quantity locked+ /// </summary>+ public int qty_locked { get; set; } = 0;++ /// <summary>+ /// quantity frozen+ /// </summary>+ public int qty_frozen { get; set; } = 0;++ /// <summary>+ /// asn qty+ /// </summary>+ public int qty_asn { get; set; } = 0;++ /// <summary>+ /// qty to be unloaded+ /// </summary>+ public int qty_to_unload { get; set; } = 0;++ /// <summary>+ /// qty to be sorted+ /// </summary>+ public int qty_to_sort { get; set; } = 0;++ /// <summary>+ /// qty sorted+ /// </summary>+ public int qty_sorted { get; set; } = 0;++ /// <summary>+ /// shortage qty+ /// </summary>+ public int shortage_qty { get; set; } = 0;+ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Stock/StockViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Stock/StockViewModel.csnew file mode 100644index 0000000..5aceca8--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Stock/StockViewModel.cs@@ -0,0 +1,125 @@+/*+ * date:2022-12-22+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// stock viewModel+ /// </summary>+ public class StockViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public StockViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// sku_id+ /// </summary>+ [Display(Name = "sku_id")]+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// goods_location_id+ /// </summary>+ [Display(Name = "goods_location_id")]+ public int goods_location_id { get; set; } = 0;++ /// <summary>+ /// qty+ /// </summary>+ [Display(Name = "qty")]+ public int qty { get; set; } = 0;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ [Display(Name = "goods_owner_id")]+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// is_freeze+ /// </summary>+ [Display(Name = "is_freeze")]+ public bool is_freeze { get; set; } = true;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ [Display(Name = "tenant_id")]+ public long tenant_id { get; set; } = 0;++ /// <summary>+ /// warehouse_name+ /// </summary>+ public string warehouse_name { get; set; } = string.Empty;++ /// <summary>+ /// location_name+ /// </summary>+ public string location_name { get; set; } = string.Empty;++ /// <summary>+ /// spu_code+ /// </summary>+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// sku_code+ /// </summary>+ public string sku_code { get; set; } = string.Empty;++ /// <summary>+ /// sku_name+ /// </summary>+ public string sku_name { get; set; } = string.Empty;++ /// <summary>+ /// unit+ /// </summary>+ public string unit { get; set; } = string.Empty;++ /// <summary>+ /// qty_available+ /// </summary>+ [Display(Name = "qty_available")]+ public int qty_available { get; set; } = 0;++ /// <summary>+ /// goods owner name+ /// </summary>+ public string goods_owner_name { get; set; } = string.Empty;+ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Stockadjust/StockadjustViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Stockadjust/StockadjustViewModel.csnew file mode 100644index 0000000..c8e076c--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Stockadjust/StockadjustViewModel.cs@@ -0,0 +1,149 @@+/*+ * date:2022-12-26+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// stockadjust viewModel+ /// </summary>+ public class StockadjustViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public StockadjustViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// job_type+ /// </summary>+ [Display(Name = "job_type")]+ public byte job_type { get; set; } = 0;++ /// <summary>+ /// job_code+ /// </summary>+ [Display(Name = "job_code")]+ [MaxLength(32,ErrorMessage = "MaxLength")]+ public string job_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_code+ /// </summary>+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// sku_id+ /// </summary>+ [Display(Name = "sku_id")]+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// sku_code+ /// </summary>+ public string sku_code { get; set; } = string.Empty;++ /// <summary>+ /// sku_name+ /// </summary>+ public string sku_name { get; set; } = string.Empty;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ [Display(Name = "goods_owner_id")]+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// goods owner's name+ /// </summary>+ public string goods_owner_name { get; set; } = string.Empty;++ /// <summary>+ /// goods_location_id+ /// </summary>+ [Display(Name = "goods_location_id")]+ public int goods_location_id { get; set; } = 0;++ /// <summary>+ /// warehouse_name+ /// </summary>+ public string warehouse_name { get; set; } = string.Empty;++ /// <summary>+ /// location_name+ /// </summary>+ public string location_name { get; set; } = string.Empty;++ /// <summary>+ /// qty+ /// </summary>+ [Display(Name = "qty")]+ public int qty { get; set; } = 0;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64,ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ [Display(Name = "tenant_id")]+ public long tenant_id { get; set; } = 0;++ /// <summary>+ /// is_update_stock+ /// </summary>+ [Display(Name = "is_update_stock")]+ public bool is_update_stock { get; set; } =false;++ /// <summary>+ /// source_table_id+ /// </summary>+ [Display(Name = "source_table_id")]+ public int source_table_id { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Stockfreeze/StockfreezeViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Stockfreeze/StockfreezeViewModel.csnew file mode 100644index 0000000..4de60e5--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Stockfreeze/StockfreezeViewModel.cs@@ -0,0 +1,119 @@+/*+ * date:2022-12-26+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// stockfreeze viewModel+ /// </summary>+ public class StockfreezeViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public StockfreezeViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// job_code+ /// </summary>+ [Display(Name = "job_code")]+ [MaxLength(32,ErrorMessage = "MaxLength")]+ public string job_code { get; set; } = string.Empty;++ /// <summary>+ /// job_type+ /// </summary>+ [Display(Name = "job_type")]+ public bool job_type { get; set; } =true;++ /// <summary>+ /// sku_id+ /// </summary>+ [Display(Name = "sku_id")]+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ [Display(Name = "goods_owner_id")]+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// goods_location_id+ /// </summary>+ [Display(Name = "goods_location_id")]+ public int goods_location_id { get; set; } = 0;++ /// <summary>+ /// operator+ /// </summary>+ [Display(Name = "handler")]+ [MaxLength(64,ErrorMessage = "MaxLength")]+ public string handler { get; set; } = string.Empty;++ /// <summary>+ /// operate_time+ /// </summary>+ [Display(Name = "handle_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime handle_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ [Display(Name = "tenant_id")]+ public long tenant_id { get; set; } = 0;++ /// <summary>+ /// warehouse_name+ /// </summary>+ public string warehouse_name { get; set; } = string.Empty;++ /// <summary>+ /// location_name+ /// </summary>+ public string location_name { get; set; } = string.Empty;++ /// <summary>+ /// spu_code+ /// </summary>+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// sku_code+ /// </summary>+ public string sku_code { get; set; } = string.Empty;+ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Stockmove/StockmoveViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Stockmove/StockmoveViewModel.csnew file mode 100644index 0000000..a336461--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Stockmove/StockmoveViewModel.cs@@ -0,0 +1,160 @@+/*+ * date:2022-12-27+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// stockmove viewModel+ /// </summary>+ public class StockmoveViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public StockmoveViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// job_code+ /// </summary>+ [Display(Name = "job_code")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string job_code { get; set; } = string.Empty;++ /// <summary>+ /// move_status+ /// </summary>+ [Display(Name = "move_status")]+ public byte move_status { get; set; } = 0;++ /// <summary>+ /// sku_id+ /// </summary>+ [Display(Name = "sku_id")]+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// orig_goods_location_id+ /// </summary>+ [Display(Name = "orig_goods_location_id")]+ public int orig_goods_location_id { get; set; } = 0;++ /// <summary>+ /// dest_googs_location_id+ /// </summary>+ [Display(Name = "dest_googs_location_id")]+ public int dest_googs_location_id { get; set; } = 0;++ /// <summary>+ /// qty+ /// </summary>+ [Display(Name = "qty")]+ public int qty { get; set; } = 0;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ [Display(Name = "goods_owner_id")]+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// handler+ /// </summary>+ [Display(Name = "handler")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string handler { get; set; } = string.Empty;++ /// <summary>+ /// handle_time+ /// </summary>+ [Display(Name = "handle_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime handle_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ [Display(Name = "tenant_id")]+ public long tenant_id { get; set; } = 0;++ /// <summary>+ /// origin warehouse+ /// </summary>+ public string orig_goods_warehouse { get; set; } = string.Empty;++ /// <summary>+ /// origin location_name+ /// </summary>+ public string orig_goods_location_name { get; set; } = string.Empty;++ /// <summary>+ /// destination warehouse+ /// </summary>+ public string dest_googs_warehouse { get; set; } = string.Empty;++ /// <summary>+ /// destination location_name+ /// </summary>+ public string dest_googs_location_name { get; set; } = string.Empty;++ /// <summary>+ /// spu_code+ /// </summary>+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// sku_code+ /// </summary>+ public string sku_code { get; set; } = string.Empty;++ /// <summary>+ /// sku_name+ /// </summary>+ public string sku_name { get; set; } = string.Empty;+ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Stockprocess/StockprocessGetViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Stockprocess/StockprocessGetViewModel.csnew file mode 100644index 0000000..fc1a6be--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Stockprocess/StockprocessGetViewModel.cs@@ -0,0 +1,103 @@+/*+ * date:2022-12-23+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// stockprocess viewModel without details+ /// </summary>+ public class StockprocessGetViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public StockprocessGetViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// job_code+ /// </summary>+ [Display(Name = "job_code")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string job_code { get; set; } = string.Empty;++ /// <summary>+ /// job_type+ /// </summary>+ [Display(Name = "job_type")]+ public bool job_type { get; set; } = true;++ /// <summary>+ /// process_status+ /// </summary>+ [Display(Name = "process_status")]+ public bool process_status { get; set; } = true;++ /// <summary>+ /// processor+ /// </summary>+ [Display(Name = "processor")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string processor { get; set; } = string.Empty;++ /// <summary>+ /// process_time+ /// </summary>+ [Display(Name = "process_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime process_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ [Display(Name = "tenant_id")]+ public long tenant_id { get; set; } = 0;++ /// <summary>+ /// adjust_status+ /// </summary>+ public bool adjust_status { get; set; } = true;+ #endregion++++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Stockprocess/StockprocessViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Stockprocess/StockprocessViewModel.csnew file mode 100644index 0000000..4c83e15--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Stockprocess/StockprocessViewModel.cs@@ -0,0 +1,106 @@+/*+ * date:2022-12-23+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// stockprocess viewModel+ /// </summary>+ public class StockprocessViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public StockprocessViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// job_code+ /// </summary>+ [Display(Name = "job_code")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string job_code { get; set; } = string.Empty;++ /// <summary>+ /// job_type+ /// </summary>+ [Display(Name = "job_type")]+ public bool job_type { get; set; } = true;++ /// <summary>+ /// process_status+ /// </summary>+ [Display(Name = "process_status")]+ public bool process_status { get; set; } = true;++ /// <summary>+ /// processor+ /// </summary>+ [Display(Name = "processor")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string processor { get; set; } = string.Empty;++ /// <summary>+ /// process_time+ /// </summary>+ [Display(Name = "process_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime process_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ [Display(Name = "tenant_id")]+ public long tenant_id { get; set; } = 0;+++ #endregion++ #region detail table++ /// <summary>+ /// detail table+ /// </summary>+ public List<StockprocessdetailViewModel> detailList { get; set; } = new List<StockprocessdetailViewModel>(2);+ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Stockprocess/StockprocessWithDetailViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Stockprocess/StockprocessWithDetailViewModel.csnew file mode 100644index 0000000..d890c9f--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Stockprocess/StockprocessWithDetailViewModel.cs@@ -0,0 +1,109 @@+using ModernWMS.Core.Utility;+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.Linq;+using System.Text;+using System.Threading.Tasks;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// get Stockprocess with+ /// </summary>+ public class StockprocessWithDetailViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public StockprocessWithDetailViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// job_code+ /// </summary>+ [Display(Name = "job_code")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string job_code { get; set; } = string.Empty;++ /// <summary>+ /// job_type+ /// </summary>+ [Display(Name = "job_type")]+ public bool job_type { get; set; } = true;++ /// <summary>+ /// process_status+ /// </summary>+ [Display(Name = "process_status")]+ public bool process_status { get; set; } = true;++ /// <summary>+ /// processor+ /// </summary>+ [Display(Name = "processor")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string processor { get; set; } = string.Empty;++ /// <summary>+ /// process_time+ /// </summary>+ [Display(Name = "process_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime process_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ [Display(Name = "tenant_id")]+ public long tenant_id { get; set; } = 0;++ /// <summary>+ /// adjust_status+ /// </summary>+ public bool adjust_status { get; set; } = true;++ #endregion+ /// <summary>+ /// source detail table+ /// </summary>+ public List<StockprocessdetailViewModel> source_detail_list { get; set; } = new List<StockprocessdetailViewModel>(2);+ /// <summary>+ /// target detail table+ /// </summary>+ public List<StockprocessdetailViewModel> target_detail_list { get; set; } = new List<StockprocessdetailViewModel>(2);+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Stockprocess/StockprocessdetailViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Stockprocess/StockprocessdetailViewModel.csnew file mode 100644index 0000000..7c8f44d--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Stockprocess/StockprocessdetailViewModel.cs@@ -0,0 +1,115 @@+/*+ * date:2022-12-23+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// stockprocessdetail viewModel+ /// </summary>+ public class StockprocessdetailViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public StockprocessdetailViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// stock_process_id+ /// </summary>+ [Display(Name = "stock_process_id")]+ public int stock_process_id { get; set; } = 0;++ /// <summary>+ /// sku_id+ /// </summary>+ [Display(Name = "sku_id")]+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ [Display(Name = "goods_owner_id")]+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// goods_location_id+ /// </summary>+ [Display(Name = "goods_location_id")]+ public int goods_location_id { get; set; } = 0;++ /// <summary>+ /// qty+ /// </summary>+ [Display(Name = "qty")]+ public int qty { get; set; } = 0;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ [Display(Name = "tenant_id")]+ public long tenant_id { get; set; } = 0;++ /// <summary>+ /// is_source+ /// </summary>+ [Display(Name = "is_source")]+ public bool is_source { get; set; } = true;++ /// <summary>+ /// spu_code+ /// </summary>+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// sku_code+ /// </summary>+ public string sku_code { get; set; } = string.Empty;++ /// <summary>+ /// unit+ /// </summary>+ public string unit { get; set; } = string.Empty;++ /// <summary>+ /// is_update_stock+ /// </summary>+ public bool is_update_stock { get; set; } = false;++ /// <summary>+ /// goods location name+ /// </summary>+ public string location_name { get; set; } = string.Empty;+ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Stocktaking/StocktakingBasicViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Stocktaking/StocktakingBasicViewModel.csnew file mode 100644index 0000000..6c33d58--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Stocktaking/StocktakingBasicViewModel.cs@@ -0,0 +1,88 @@+/*+ * date:2022-12-30+ * developer:AMo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// stocktaking basic viewModel+ /// </summary>+ public class StocktakingBasicViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public StocktakingBasicViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// spu_code+ /// </summary>+ public string spu_code { get; set; } = string.Empty;++ /// <summary>+ /// spu_name+ /// </summary>+ public string spu_name { get; set; } = string.Empty;++ /// <summary>+ /// sku_id+ /// </summary>+ [Display(Name = "sku_id")]+ public int sku_id { get; set; } = 0;++ /// <summary>+ /// sku_code+ /// </summary>+ public string sku_code { get; set; } = string.Empty;++ /// <summary>+ /// sku_name+ /// </summary>+ public string sku_name { get; set; } = string.Empty;++ /// <summary>+ /// goods_owner_id+ /// </summary>+ [Display(Name = "goods_owner_id")]+ public int goods_owner_id { get; set; } = 0;++ /// <summary>+ /// goods owner's name+ /// </summary>+ public string goods_owner_name { get; set; } = string.Empty;++ /// <summary>+ /// goods_location_id+ /// </summary>+ [Display(Name = "goods_location_id")]+ public int goods_location_id { get; set; } = 0;++ /// <summary>+ /// warehouse_name+ /// </summary>+ public string warehouse_name { get; set; } = string.Empty;++ /// <summary>+ /// location_name+ /// </summary>+ public string location_name { get; set; } = string.Empty;++ /// <summary>+ /// book_qty+ /// </summary>+ [Display(Name = "book_qty")]+ public int book_qty { get; set; } = 0;++ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Stocktaking/StocktakingConfirmViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Stocktaking/StocktakingConfirmViewModel.csnew file mode 100644index 0000000..d1a80a8--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Stocktaking/StocktakingConfirmViewModel.cs@@ -0,0 +1,42 @@+/*+ * date:2022-12-30+ * developer:AMo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// stocktaking confirm counted_qty viewModel+ /// </summary>+ public class StocktakingConfirmViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public StocktakingConfirmViewModel()+ {++ }+ #endregion++ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// counted_qty+ /// </summary>+ [Display(Name = "counted_qty")]+ public int counted_qty { get; set; } = 0;++ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Stocktaking/StocktakingViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Stocktaking/StocktakingViewModel.csnew file mode 100644index 0000000..2e9f7e5--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Stocktaking/StocktakingViewModel.cs@@ -0,0 +1,99 @@+/*+ * date:2022-12-30+ * developer:AMo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// stocktaking viewModel+ /// </summary>+ public class StocktakingViewModel : StocktakingBasicViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public StocktakingViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// job_code+ /// </summary>+ [Display(Name = "job_code")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ public string job_code { get; set; } = string.Empty;++ /// <summary>+ /// job_status+ /// </summary>+ [Display(Name = "job_status")]+ public bool job_status { get; set; } = false;++ /// <summary>+ /// adjust_status+ /// </summary>+ public bool adjust_status { get; set; } = false;++ /// <summary>+ /// counted_qty+ /// </summary>+ [Display(Name = "counted_qty")]+ public int counted_qty { get; set; } = 0;++ /// <summary>+ /// difference_qty+ /// </summary>+ [Display(Name = "difference_qty")]+ public int difference_qty { get; set; } = 0;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// handler+ /// </summary>+ [Display(Name = "handler")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string handler { get; set; } = string.Empty;++ /// <summary>+ /// handle_time+ /// </summary>+ [Display(Name = "handle_time")]+ public DateTime handle_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/User/RegisterViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/User/RegisterViewModel.csnew file mode 100644index 0000000..c89cf2b--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/User/RegisterViewModel.cs@@ -0,0 +1,46 @@+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.Linq;+using System.Text;+using System.Threading.Tasks;+using System.Xml.Linq;++namespace ModernWMS.WMS.Entities.ViewModels+{+ public class RegisterViewModel+ {+ public RegisterViewModel()+ {++ }+ /// <summary>+ /// user's name+ /// </summary>+ [Display(Name = "user_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string user_name { get; set; } = string.Empty;++ /// <summary>+ /// sex+ /// </summary>+ public string sex { get; set; } = string.Empty;++ /// <summary>+ /// password+ /// </summary>+ [Display(Name = "password")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string auth_string { get; set; } = string.Empty;++ /// <summary>+ /// </summary>+ [Display(Name = "email")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string email { get; set; } = string.Empty;+++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/User/UserChangePwdViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/User/UserChangePwdViewModel.csnew file mode 100644index 0000000..ff44bd3--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/User/UserChangePwdViewModel.cs@@ -0,0 +1,36 @@+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.Linq;+using System.Text;+using System.Threading.Tasks;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// what user input when changing password+ /// </summary>+ public class UserChangePwdViewModel+ {+ /// <summary>+ /// user's id+ /// </summary>+ public int id { get; set; } = 0;++ /// <summary>+ /// old password+ /// </summary>+ [Required(ErrorMessage = "Required")]+ [Display(Name = "old password")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string old_password { get; set; } = string.Empty;++ /// <summary>+ /// new password+ /// </summary>+ [Required(ErrorMessage = "Required")]+ [Display(Name = "new password")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string new_password { get; set; } = string.Empty;+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/User/UserExcelImportViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/User/UserExcelImportViewModel.csnew file mode 100644index 0000000..78d339d--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/User/UserExcelImportViewModel.cs@@ -0,0 +1,74 @@+/*+ * date:2022-12-20+ * developer:NoNo+ */+using ModernWMS.Core.Utility;+using System;+using System.ComponentModel.DataAnnotations;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// user import by excel cols viewmodel+ /// </summary>+ public class UserExcelImportViewModel+ {+ /// <summary>+ /// user's number+ /// </summary>+ [Display(Name = "user_num")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(128, ErrorMessage = "MaxLength")]++ public string user_num { get; set; } = string.Empty;++ /// <summary>+ /// user's name+ /// </summary>+ [Display(Name = "user_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string user_name { get; set; } = string.Empty;++ /// <summary>+ /// contact+ /// </summary>+ [Display(Name = "contact_tel")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string contact_tel { get; set; } = string.Empty;++ /// <summary>+ /// user's role+ /// </summary>+ [Display(Name = "user_role")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string user_role { get; set; } = string.Empty;++ /// <summary>+ /// sex+ /// </summary>+ [Display(Name = "sex")]+ [MaxLength(10, ErrorMessage = "MaxLength")]+ public string sex { get; set; } = string.Empty;++ /// <summary>+ /// is_valid+ /// </summary>+ [Display(Name = "is_valid")]+ public bool is_valid { get; set; } = false;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// tenant+ /// </summary>+ [Display(Name = "tenant")]+ public long tenant_id { get; set; } = 0;+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/User/UserViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/User/UserViewModel.csnew file mode 100644index 0000000..6aca893--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/User/UserViewModel.cs@@ -0,0 +1,107 @@+using ModernWMS.Core.Utility;+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.Linq;+using System.Text;+using System.Threading.Tasks;++namespace ModernWMS.WMS.Entities.ViewModels+{+ public class UserViewModel+ {+ #region constructor+ public UserViewModel()+ {++ }+ #endregion+ #region property++ /// <summary>+ /// primary key+ /// </summary>+ public int id { get; set; } = 0;++ /// <summary>+ /// user's number+ /// </summary>+ [Display(Name ="user_num")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(128, ErrorMessage = "MaxLength")]++ public string user_num { get; set; } = string.Empty;++ /// <summary>+ /// user's name+ /// </summary>+ [Display(Name = "user_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string user_name { get; set; } = string.Empty;++ /// <summary>+ /// contact+ /// </summary>+ [Display(Name = "contact_tel")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string contact_tel { get; set; } = string.Empty;++ /// <summary>+ /// user's role+ /// </summary>+ [Display(Name = "user_role")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string user_role { get; set; } = string.Empty;++ /// <summary>+ /// sex+ /// </summary>+ [Display(Name = "sex")]+ [MaxLength(10, ErrorMessage = "MaxLength")]+ public string sex { get; set; } = string.Empty;++ /// <summary>+ /// is_valid+ /// </summary>+ [Display(Name = "is_valid")]+ public bool is_valid { get; set; } = false;++ /// <summary>+ /// password+ /// </summary>+ [Display(Name = "password")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string auth_string { get; set; } = string.Empty;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// createtime+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last update time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant+ /// </summary>+ [Display(Name = "tenant")]+ public long tenant_id { get; set; } = 0;++ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Warehouse/WarehouseExcelImportViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Warehouse/WarehouseExcelImportViewModel.csnew file mode 100644index 0000000..813e1c5--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Warehouse/WarehouseExcelImportViewModel.cs@@ -0,0 +1,76 @@+using ModernWMS.Core.Utility;+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.Linq;+using System.Text;+using System.Threading.Tasks;+using System.Xml.Linq;++namespace ModernWMS.WMS.Entities.ViewModels+{+ public class WarehouseExcelImportViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public WarehouseExcelImportViewModel()+ {++ }+ #endregion+ #region Property+++ /// <summary>+ /// warehouse_name+ /// </summary>+ [Display(Name = "warehouse_name")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string warehouse_name { get; set; } = string.Empty;++ /// <summary>+ /// city+ /// </summary>+ [Display(Name = "city")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string city { get; set; } = string.Empty;++ /// <summary>+ /// address+ /// </summary>+ [Display(Name = "address")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string address { get; set; } = string.Empty;++ /// <summary>+ /// </summary>+ [Display(Name = "email")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string email { get; set; } = string.Empty;++ /// <summary>+ /// manager+ /// </summary>+ [Display(Name = "manager")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string manager { get; set; } = string.Empty;++ /// <summary>+ /// contact_tel+ /// </summary>+ [Display(Name = "contact_tel")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string contact_tel { get; set; } = string.Empty;+++++ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Warehouse/WarehouseViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Warehouse/WarehouseViewModel.csnew file mode 100644index 0000000..a504f0b--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Warehouse/WarehouseViewModel.cs@@ -0,0 +1,116 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// warehouse viewModel+ /// </summary>+ public class WarehouseViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public WarehouseViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// warehouse_name+ /// </summary>+ [Display(Name = "warehouse_name")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ [Required(ErrorMessage ="Required")]+ public string warehouse_name { get; set; } = string.Empty;++ /// <summary>+ /// city+ /// </summary>+ [Display(Name = "city")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string city { get; set; } = string.Empty;++ /// <summary>+ /// address+ /// </summary>+ [Display(Name = "address")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string address { get; set; } = string.Empty;++ /// <summary>+ /// </summary>+ [Display(Name = "email")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string email { get; set; } = string.Empty;++ /// <summary>+ /// manager+ /// </summary>+ [Display(Name = "manager")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string manager { get; set; } = string.Empty;++ /// <summary>+ /// contact_tel+ /// </summary>+ [Display(Name = "contact_tel")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string contact_tel { get; set; } = string.Empty;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// is_valid+ /// </summary>+ [Display(Name = "is_valid")]+ public bool is_valid { get; set; } = true;++ /// <summary>+ /// tenant_id+ /// </summary>+ [Display(Name = "tenant_id")]+ public long tenant_id { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/Warehousearea/WarehouseareaViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/Warehousearea/WarehouseareaViewModel.csnew file mode 100644index 0000000..ba48ab7--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/Warehousearea/WarehouseareaViewModel.cs@@ -0,0 +1,99 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// warehousearea viewModel+ /// </summary>+ public class WarehouseareaViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public WarehouseareaViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// warehouse_id+ /// </summary>+ [Display(Name = "warehouse_id")]+ public int warehouse_id { get; set; } = 0;+++ /// <summary>+ /// warehouse_name+ /// </summary>+ [Display(Name = "warehouse_name")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string warehouse_name { get; set; } = string.Empty;++ /// <summary>+ /// area_name+ /// </summary>+ [Display(Name = "area_name")]+ [MaxLength(32, ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string area_name { get; set; } = string.Empty;++ /// <summary>+ /// parent_id+ /// </summary>+ [Display(Name = "parent_id")]+ public int parent_id { get; set; } = 0;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// is_valid+ /// </summary>+ [Display(Name = "is_valid")]+ public bool is_valid { get; set; } = true;++ /// <summary>+ /// tenant_id+ /// </summary>+ [Display(Name = "tenant_id")]+ public long tenant_id { get; set; } = 0;++ /// <summary>+ /// area_property+ /// </summary>+ [Display(Name = "area_property")]+ public byte area_property { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/company/CompanyViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/company/CompanyViewModel.csnew file mode 100644index 0000000..2b1b660--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/company/CompanyViewModel.cs@@ -0,0 +1,80 @@+using System.ComponentModel.DataAnnotations;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// Company+ /// </summary>+ public class CompanyViewModel+ {+ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public CompanyViewModel()+ {++ }+ #endregion++ #region Property++ /// <summary>+ /// primary key+ /// </summary>+ public int id { get; set; } = 0;++ /// <summary>+ /// company's Name+ /// </summary>+ [Display(Name = "company_name")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(256,ErrorMessage = "MaxLength")]+ public string company_name { get; set; } = string.Empty;++ /// <summary>+ /// city+ /// </summary>+ [Display(Name = "city")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string city { get; set; } = string.Empty;++ /// <summary>+ /// address+ /// </summary>+ [Display(Name = "address")]+ [Required(ErrorMessage = "Required")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string address { get; set; } = string.Empty;++ /// <summary>+ /// manager+ /// </summary>+ [Display(Name = "manager")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string manager { get; set; } = string.Empty;++ /// <summary>+ /// contact tel+ /// </summary>+ [Display(Name = "contact_tel")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string contact_tel { get; set; } = string.Empty;++ /// <summary>+ /// create time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = DateTime.Now;++ /// <summary>+ /// last update time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = DateTime.Now;+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/supplier/SupplierExcelImportViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/supplier/SupplierExcelImportViewModel.csnew file mode 100644index 0000000..7af1dfd--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/supplier/SupplierExcelImportViewModel.cs@@ -0,0 +1,69 @@+using System;+using System.Collections.Generic;+using System.ComponentModel.DataAnnotations;+using System.Linq;+using System.Text;+using System.Threading.Tasks;+using System.Xml.Linq;++namespace ModernWMS.WMS.Entities.ViewModels+{+ public class SupplierExcelImportViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public SupplierExcelImportViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// supplier_name+ /// </summary>+ [Display(Name = "supplier_name")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string supplier_name { get; set; } = string.Empty;++ /// <summary>+ /// city+ /// </summary>+ [Display(Name = "city")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string city { get; set; } = string.Empty;++ /// <summary>+ /// address+ /// </summary>+ [Display(Name = "address")]+ [MaxLength(256, ErrorMessage = "MaxLength")]+ public string address { get; set; } = string.Empty;++ /// <summary>+ /// </summary>+ [Display(Name = "email")]+ [MaxLength(128, ErrorMessage = "MaxLength")]+ public string email { get; set; } = string.Empty;++ /// <summary>+ /// manager+ /// </summary>+ [Display(Name = "manager")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string manager { get; set; } = string.Empty;++ /// <summary>+ /// contact_tel+ /// </summary>+ [Display(Name = "contact_tel")]+ [MaxLength(64, ErrorMessage = "MaxLength")]+ public string contact_tel { get; set; } = string.Empty;+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/supplier/SupplierViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/supplier/SupplierViewModel.csnew file mode 100644index 0000000..bf91935--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/supplier/SupplierViewModel.cs@@ -0,0 +1,114 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// supplier viewModel+ /// </summary>+ public class SupplierViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public SupplierViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// supplier_name+ /// </summary>+ [Display(Name = "supplier_name")]+ [MaxLength(256,ErrorMessage = "MaxLength")]+ [Required(ErrorMessage = "Required")]+ public string supplier_name { get; set; } = string.Empty;++ /// <summary>+ /// city+ /// </summary>+ [Display(Name = "city")]+ [MaxLength(128,ErrorMessage = "MaxLength")]+ public string city { get; set; } = string.Empty;++ /// <summary>+ /// address+ /// </summary>+ [Display(Name = "address")]+ [MaxLength(256,ErrorMessage = "MaxLength")]+ public string address { get; set; } = string.Empty;++ /// <summary>+ /// </summary>+ [Display(Name = "email")]+ [MaxLength(128,ErrorMessage = "MaxLength")]+ public string email { get; set; } = string.Empty;++ /// <summary>+ /// manager+ /// </summary>+ [Display(Name = "manager")]+ [MaxLength(64,ErrorMessage = "MaxLength")]+ public string manager { get; set; } = string.Empty;++ /// <summary>+ /// contact_tel+ /// </summary>+ [Display(Name = "contact_tel")]+ [MaxLength(64,ErrorMessage = "MaxLength")]+ public string contact_tel { get; set; } = string.Empty;++ /// <summary>+ /// creator+ /// </summary>+ [Display(Name = "creator")]+ [MaxLength(64,ErrorMessage = "MaxLength")]+ public string creator { get; set; } = string.Empty;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// is_valid+ /// </summary>+ [Display(Name = "is_valid")]+ public bool is_valid { get; set; } =true;++ /// <summary>+ /// tenant_id+ /// </summary>+ [Display(Name = "tenant_id")]+ public long tenant_id { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/Entities/ViewModels/userrole/UserroleViewModel.cs b/backend/ModernWMS.WMS/Entities/ViewModels/userrole/UserroleViewModel.csnew file mode 100644index 0000000..cbfe7c3--- /dev/null+++ b/backend/ModernWMS.WMS/Entities/ViewModels/userrole/UserroleViewModel.cs@@ -0,0 +1,71 @@+/*+ * date:2022-12-20+ * developer:NoNo+ */+using System;+using System.ComponentModel.DataAnnotations;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Entities.ViewModels+{+ /// <summary>+ /// userrole viewModel+ /// </summary>+ public class UserroleViewModel+ {++ #region constructor+ /// <summary>+ /// constructor+ /// </summary>+ public UserroleViewModel()+ {++ }+ #endregion+ #region Property++ /// <summary>+ /// id+ /// </summary>+ [Display(Name = "id")]+ public int id { get; set; } = 0;++ /// <summary>+ /// role_name+ /// </summary>+ [Display(Name = "role_name")]+ [MaxLength(32,ErrorMessage = "MaxLength")]+ public string role_name { get; set; } = string.Empty;++ /// <summary>+ /// is_valid+ /// </summary>+ [Display(Name = "is_valid")]+ public bool is_valid { get; set; } = false;++ /// <summary>+ /// create_time+ /// </summary>+ [Display(Name = "create_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime create_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// last_update_time+ /// </summary>+ [Display(Name = "last_update_time")]+ [DataType(DataType.DateTime, ErrorMessage = "DataType_DateTime")]+ public DateTime last_update_time { get; set; } = UtilConvert.MinDate;++ /// <summary>+ /// tenant_id+ /// </summary>+ [Display(Name = "tenant_id")]+ public long tenant_id { get; set; } = 0;+++ #endregion++ }+}diff --git a/backend/ModernWMS.WMS/IServices/Asn/IAsnService.cs b/backend/ModernWMS.WMS/IServices/Asn/IAsnService.csnew file mode 100644index 0000000..92f8781--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/Asn/IAsnService.cs@@ -0,0 +1,128 @@+/*+ * date:2022-12-22+ * developer:AMo+ */+using Microsoft.EntityFrameworkCore;+using ModernWMS.Core.JWT;+using ModernWMS.Core.Models;+using ModernWMS.Core.Services;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;++namespace ModernWMS.WMS.IServices+{+ /// <summary>+ /// Interface of AsnService+ /// </summary>+ public interface IAsnService : IBaseService<AsnEntity>+ {+ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(List<AsnViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser);++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">primary key</param>+ /// <returns></returns>+ Task<AsnViewModel> GetAsync(int id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(AsnViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(AsnViewModel viewModel);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);++ /// <summary>+ /// Bulk modify Goodsowner+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> BulkModifyGoodsownerAsync(AsnBulkModifyGoodsOwnerViewModel viewModel);+ #endregion++ #region Flow Api+ /// <summary>+ /// Confirm Delivery+ /// change the asn_status from 0 to 1+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> ConfirmAsync(int id);++ /// <summary>+ /// Cancel confirm, change asn_status 1 to 0+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> ConfirmCancelAsync(int id);++ /// <summary>+ /// Unload+ /// change the asn_status from 1 to 2+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UnloadAsync(int id);++ /// <summary>+ /// Cancel unload+ /// change the asn_status from 2 to 1+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UnloadCancelAsync(int id);++ /// <summary>+ /// sorting, add a new asnsort record and update asn sorted_qty+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> SortingAsync(AsnsortInputViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// Sorted+ /// change the asn_status from 2 to 3+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> SortedAsync(int id);++ /// <summary>+ /// Cancel sorted+ /// change the asn_status from 3 to 2+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> SortedCancelAsync(int id);++ /// <summary>+ /// PutAway+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> PutAwayAsync(AsnPutAwayInputViewModel viewModel, CurrentUser currentUser);+ #endregion+ }+}+diff --git a/backend/ModernWMS.WMS/IServices/Customer/ICustomerService.cs b/backend/ModernWMS.WMS/IServices/Customer/ICustomerService.csnew file mode 100644index 0000000..9deae66--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/Customer/ICustomerService.cs@@ -0,0 +1,66 @@+using ModernWMS.Core.JWT;+using ModernWMS.Core.Models;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;++namespace ModernWMS.WMS.IServices+{+ /// <summary>+ /// Interface of CustomerService+ /// </summary>+ public interface ICustomerService : IBaseService<CustomerEntity>+ {+ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(List<CustomerViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser);+ /// <summary>+ /// Get all records+ /// </summary>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<List<CustomerViewModel>> GetAllAsync(CurrentUser currentUser);+ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<CustomerViewModel> GetAsync(int id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(CustomerViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(CustomerViewModel viewModel);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);+ #endregion++ #region Import+ /// <summary>+ /// import customers by excel+ /// </summary>+ /// <param name="input">excel data</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(bool flag, List<CustomerImportViewModel> errorData)> ExcelAsync(List<CustomerImportViewModel> input, CurrentUser currentUser);+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/IServices/Dispatchlist/IDispatchlistService.cs b/backend/ModernWMS.WMS/IServices/Dispatchlist/IDispatchlistService.csnew file mode 100644index 0000000..0b05c11--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/Dispatchlist/IDispatchlistService.cs@@ -0,0 +1,155 @@+/*+ * date:2022-12-27+ * developer:NoNo+ */+ using ModernWMS.Core.Services;+ using ModernWMS.Core.Models;+ using ModernWMS.Core.JWT;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;+namespace ModernWMS.WMS.IServices+{+ /// <summary>+ /// Interface of DispatchlistService+ /// </summary>+ public interface IDispatchlistService : IBaseService<DispatchlistEntity>+ {+ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(List<DispatchlistViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser);++ /// <summary>+ /// advanced dispatch order page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(List<PreDispatchlistViewModel> data, int totals)> AdvancedDispatchlistPageAsync(PageSearch pageSearch, CurrentUser currentUser);++ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> AddAsync(List<DispatchlistAddViewModel> viewModel, CurrentUser currentUser);++ /// <summary>+ /// Dispatchlist details with available stock+ /// </summary>+ /// <param name="dispatch_no">dispatch_no</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<List<DispatchlistConfirmDetailViewModel>> ConfirmOrderCheck(string dispatch_no, CurrentUser currentUser);++ /// <summary>+ /// get dispatchlist by dispatch_no+ /// </summary>+ /// <param name="dispatch_no"></param>+ /// <param name="currentUser"></param>+ /// <returns></returns>+ Task<List<DispatchlistViewModel>> GetByDispatchlistNo(string dispatch_no, CurrentUser currentUser);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="dispatch_no">dispatch_no</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(string dispatch_no, CurrentUser currentUser);++ /// <summary>+ /// update dispatchlist with same dispatch_no+ /// </summary>+ /// <param name="viewModels"></param>+ /// <param name="currentUser"></param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsycn(List<DispatchlistViewModel> viewModels, CurrentUser currentUser);++ /// <summary>+ /// Confirm orders and create dispatchpicklist+ /// </summary>+ /// <param name="viewModels">viewModels</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> ConfirmOrder(List<DispatchlistConfirmDetailViewModel> viewModels, CurrentUser currentUser);++ /// <summary>+ /// confirm dispatchpicklist picked by dispatch_no+ /// </summary>+ /// <param name="dispatch_no">dispatch_no</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> ConfirmPickByDispatchNo(string dispatch_no, CurrentUser currentUser);++ /// <summary>+ /// package+ /// </summary>+ /// <param name="viewModels">viewModels</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ /// <exception cref="NotSupportedException"></exception>+ Task<(bool flag, string msg)> Package(List<DispatchlistPackageViewModel> viewModels, CurrentUser currentUser);++ /// <summary>+ /// weight+ /// </summary>+ /// <param name="viewModels">viewModels</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ /// <exception cref="NotSupportedException"></exception>+ Task<(bool flag, string msg)> Weight(List<DispatchlistWeightViewModel> viewModels, CurrentUser currentUser);++ /// <summary>+ /// dispatchpicklist outbound delivery+ /// </summary>+ /// <param name="viewModels">viewModels</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ /// <exception cref="NotSupportedException"></exception>+ Task<(bool flag, string msg)> Delivery(List<DispatchlistDeliveryViewModel> viewModels, CurrentUser currentUser);++ /// <summary>+ /// set dispatchlist freightfee+ /// </summary>+ /// <param name="viewModels"></param>+ /// <returns></returns>+ Task<(bool flag, string msg)> SetFreightfee(List<DispatchlistFreightfeeViewModel> viewModels);++ /// <summary>+ /// sign for arrival+ /// </summary>+ /// <param name="viewModels">viewModels</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> SignForArrival(List<DispatchlistSignViewModel> viewModels);++ /// <summary>+ /// get pick list by dispatch_id+ /// </summary>+ /// <param name="dispatch_id">dispatch_id</param>+ /// <returns></returns>+ Task<List<DispatchpicklistViewModel>> GetPickListByDispatchID(int dispatch_id);++ /// <summary>+ /// cancel order opration+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> CancelOrderOpration(CancelOrderOprationViewModel viewModel, CurrentUser currentUser);++ /// <summary>+ /// cancel dispatchlist detail opration+ /// </summary>+ /// <param name="id">dispatchlist_id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> CancelDispatchlistDetailOpration(int id);+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/IServices/Freightfee/IFreightfeeService.cs b/backend/ModernWMS.WMS/IServices/Freightfee/IFreightfeeService.csnew file mode 100644index 0000000..bbb2707--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/Freightfee/IFreightfeeService.cs@@ -0,0 +1,68 @@+/*+ * date:2022-12-22+ * developer:NoNo+ */+ using ModernWMS.Core.Services;+ using ModernWMS.Core.Models;+ using ModernWMS.Core.JWT;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;++ namespace ModernWMS.WMS.IServices+ {+ /// <summary>+ /// Interface of FreightfeeService+ /// </summary>+ public interface IFreightfeeService : IBaseService<FreightfeeEntity>+ {+ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(List<FreightfeeViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser);+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ Task<List<FreightfeeViewModel>> GetAllAsync(CurrentUser currentUser);+ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">primary key</param>+ /// <returns></returns>+ Task<FreightfeeViewModel> GetAsync(int id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(FreightfeeViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(FreightfeeViewModel viewModel);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);++ /// <summary>+ /// import freightfee by excel+ /// </summary>+ /// <param name="datas">excel datas</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> ExcelAsync(List<FreightfeeExcelmportViewModel> datas, CurrentUser currentUser);+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/IServices/GoodsOwner/IGoodsownerService.cs b/backend/ModernWMS.WMS/IServices/GoodsOwner/IGoodsownerService.csnew file mode 100644index 0000000..f72fd1f--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/GoodsOwner/IGoodsownerService.cs@@ -0,0 +1,66 @@+using ModernWMS.Core.JWT;+using ModernWMS.Core.Models;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;++namespace ModernWMS.WMS.IServices+{+ /// <summary>+ /// Interface of GoodsownerService+ /// </summary>+ public interface IGoodsownerService : IBaseService<GoodsownerEntity>+ {+ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(List<GoodsownerViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser);+ /// <summary>+ /// Get all records+ /// </summary>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<List<GoodsownerViewModel>> GetAllAsync(CurrentUser currentUser);+ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<GoodsownerViewModel> GetAsync(int id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(GoodsownerViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(GoodsownerViewModel viewModel);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);+ #endregion++ #region Import+ /// <summary>+ /// import goodsowners by excel+ /// </summary>+ /// <param name="input">excel data</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(bool flag, List<GoodsownerImportViewModel> errorData)> ExcelAsync(List<GoodsownerImportViewModel> input, CurrentUser currentUser);+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/IServices/Goodslocation/IGoodslocationService.cs b/backend/ModernWMS.WMS/IServices/Goodslocation/IGoodslocationService.csnew file mode 100644index 0000000..c88a8e7--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/Goodslocation/IGoodslocationService.cs@@ -0,0 +1,70 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+ using ModernWMS.Core.Services;+ using ModernWMS.Core.Models;+ using ModernWMS.Core.JWT;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;++ namespace ModernWMS.WMS.IServices+ {+ /// <summary>+ /// Interface of GoodslocationService+ /// </summary>+ public interface IGoodslocationService : IBaseService<GoodslocationEntity>+ {+ #region Api+ /// <summary>+ /// get goodslocation of the warehousearea by warehouse_id and warehousearea_id+ /// </summary>+ /// <param name="warehousearea_id">warehousearea's id</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<List<FormSelectItem>> GetGoodslocationByWarehouse_area_id(int warehousearea_id, CurrentUser currentUser);++ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(List<GoodslocationViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser);+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ Task<List<GoodslocationViewModel>> GetAllAsync(CurrentUser currentUser);+ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">primary key</param>+ /// <returns></returns>+ Task<GoodslocationViewModel> GetAsync(int id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(GoodslocationViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(GoodslocationViewModel viewModel, CurrentUser currentUser);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);++ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/IServices/Rolemenu/IRolemenuService.cs b/backend/ModernWMS.WMS/IServices/Rolemenu/IRolemenuService.csnew file mode 100644index 0000000..e1dd33e--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/Rolemenu/IRolemenuService.cs@@ -0,0 +1,66 @@+using ModernWMS.Core.JWT;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;++namespace ModernWMS.WMS.IServices+{+ /// <summary>+ /// Interface of RolemenuService+ /// </summary>+ public interface IRolemenuService : IBaseService<RolemenuEntity>+ {+ #region Api+ /// <summary>+ /// Get all records+ /// </summary>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<List<RolemenuListViewModel>> GetAllAsync(CurrentUser currentUser);++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="userrole_id">userrole id</param>+ /// <returns></returns>+ Task<RolemenuBothViewModel> GetAsync(int userrole_id);++ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(RolemenuBothViewModel viewModel, CurrentUser currentUser);++ /// <summary>+ /// Get all menus+ /// </summary>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<List<MenuViewModel>> GetAllMenusAsync(CurrentUser currentUser);++ /// <summary>+ /// Get menu's authority by user role id+ /// </summary>+ /// <param name="userrole_id">user role id</param>+ /// <returns></returns>+ Task<List<MenuViewModel>> GetMenusByRoleId(int userrole_id);++ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(RolemenuBothViewModel viewModel, CurrentUser currentUser);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="userrole_id">userrole id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int userrole_id);+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/IServices/Sku/ICategoryService.cs b/backend/ModernWMS.WMS/IServices/Sku/ICategoryService.csnew file mode 100644index 0000000..594f401--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/Sku/ICategoryService.cs@@ -0,0 +1,53 @@+/*+ * date:2022-12-20+ * developer:AMo+ */+using ModernWMS.Core.JWT;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;++namespace ModernWMS.WMS.IServices+{+ /// <summary>+ /// Interface of CategoryService+ /// </summary>+ public interface ICategoryService : IBaseService<CategoryEntity>+ {+ #region Api+ /// <summary>+ /// Get all records+ /// </summary>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<List<CategoryViewModel>> GetAllAsync(CurrentUser currentUser);+ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">primary key</param>+ /// <returns></returns>+ Task<CategoryViewModel> GetAsync(int id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(CategoryViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(CategoryViewModel viewModel);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);+ #endregion+ }+}+diff --git a/backend/ModernWMS.WMS/IServices/Sku/ISpuService.cs b/backend/ModernWMS.WMS/IServices/Sku/ISpuService.csnew file mode 100644index 0000000..1b065fb--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/Sku/ISpuService.cs@@ -0,0 +1,61 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+using ModernWMS.Core.JWT;+using ModernWMS.Core.Models;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;++ namespace ModernWMS.WMS.IServices+ {+ /// <summary>+ /// Interface of SpuService+ /// </summary>+ public interface ISpuService : IBaseService<SpuEntity>+ {+ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(List<SpuBothViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser);+ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">primary key</param>+ /// <returns></returns>+ Task<SpuBothViewModel> GetAsync(int id);+ /// <summary>+ /// get sku info by sku_id+ /// </summary>+ /// <param name="sku_id">sku_id</param>+ /// <returns></returns>+ Task<SkuDetailViewModel> GetSkuAsync(int sku_id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(SpuBothViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(SpuBothViewModel viewModel);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/IServices/Stock/IStockService.cs b/backend/ModernWMS.WMS/IServices/Stock/IStockService.csnew file mode 100644index 0000000..f97b0c8--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/Stock/IStockService.cs@@ -0,0 +1,51 @@+/*+ * date:2022-12-22+ * developer:NoNo+ */+ using ModernWMS.Core.Services;+ using ModernWMS.Core.Models;+ using ModernWMS.Core.JWT;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;+namespace ModernWMS.WMS.IServices+{+ /// <summary>+ /// Interface of StockService+ /// </summary>+ public interface IStockService : IBaseService<StockEntity>+ {+ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(List<StockManagementViewModel> data, int totals)> StockPageAsync(PageSearch pageSearch, CurrentUser currentUser);+ /// <summary>+ /// location stock page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(List<LocationStockManagementViewModel> data, int totals)> LocationStockPageAsync(PageSearch pageSearch, CurrentUser currentUser);++ /// <summary>+ /// page search select+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(List<StockViewModel> data, int totals)> SelectPageAsync(PageSearch pageSearch, CurrentUser currentUser);++ /// <summary>+ /// sku page search select+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(List<SkuSelectViewModel> data, int totals)> SkuSelectPageAsync(PageSearch pageSearch, CurrentUser currentUser);+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/IServices/Stockadjust/IStockadjustService.cs b/backend/ModernWMS.WMS/IServices/Stockadjust/IStockadjustService.csnew file mode 100644index 0000000..ea98ecc--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/Stockadjust/IStockadjustService.cs@@ -0,0 +1,68 @@+/*+ * date:2022-12-26+ * developer:NoNo+ */+ using ModernWMS.Core.Services;+ using ModernWMS.Core.Models;+ using ModernWMS.Core.JWT;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;++ namespace ModernWMS.WMS.IServices+ {+ /// <summary>+ /// Interface of StockadjustService+ /// </summary>+ public interface IStockadjustService : IBaseService<StockadjustEntity>+ {+ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(List<StockadjustViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser);+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ Task<List<StockadjustViewModel>> GetAllAsync(CurrentUser currentUser);+ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">primary key</param>+ /// <returns></returns>+ Task<StockadjustViewModel> GetAsync(int id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(StockadjustViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(StockadjustViewModel viewModel);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);+++ /// <summary>+ /// confirm adjustment+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> ConfirmAdjustment(int id);+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/IServices/Stockfreeze/IStockfreezeService.cs b/backend/ModernWMS.WMS/IServices/Stockfreeze/IStockfreezeService.csnew file mode 100644index 0000000..0f8d900--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/Stockfreeze/IStockfreezeService.cs@@ -0,0 +1,60 @@+/*+ * date:2022-12-26+ * developer:NoNo+ */+ using ModernWMS.Core.Services;+ using ModernWMS.Core.Models;+ using ModernWMS.Core.JWT;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;++ namespace ModernWMS.WMS.IServices+ {+ /// <summary>+ /// Interface of StockfreezeService+ /// </summary>+ public interface IStockfreezeService : IBaseService<StockfreezeEntity>+ {+ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(List<StockfreezeViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser);+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ Task<List<StockfreezeViewModel>> GetAllAsync(CurrentUser currentUser);+ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">primary key</param>+ /// <returns></returns>+ Task<StockfreezeViewModel> GetAsync(int id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(StockfreezeViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(StockfreezeViewModel viewModel);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/IServices/Stockmove/IStockmoveService.cs b/backend/ModernWMS.WMS/IServices/Stockmove/IStockmoveService.csnew file mode 100644index 0000000..a166a3d--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/Stockmove/IStockmoveService.cs@@ -0,0 +1,60 @@+/*+ * date:2022-12-27+ * developer:NoNo+ */+ using ModernWMS.Core.Services;+ using ModernWMS.Core.Models;+ using ModernWMS.Core.JWT;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;++ namespace ModernWMS.WMS.IServices+ {+ /// <summary>+ /// Interface of StockmoveService+ /// </summary>+ public interface IStockmoveService : IBaseService<StockmoveEntity>+ {+ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(List<StockmoveViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser);+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ Task<List<StockmoveViewModel>> GetAllAsync(CurrentUser currentUser);+ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">primary key</param>+ /// <returns></returns>+ Task<StockmoveViewModel> GetAsync(int id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(StockmoveViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// confirm move+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> Confirm(int id, CurrentUser currentUser);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/IServices/Stockprocess/IStockprocessService.cs b/backend/ModernWMS.WMS/IServices/Stockprocess/IStockprocessService.csnew file mode 100644index 0000000..fd7de78--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/Stockprocess/IStockprocessService.cs@@ -0,0 +1,76 @@+/*+ * date:2022-12-23+ * developer:NoNo+ */+ using ModernWMS.Core.Services;+ using ModernWMS.Core.Models;+ using ModernWMS.Core.JWT;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;++ namespace ModernWMS.WMS.IServices+ {+ /// <summary>+ /// Interface of StockprocessService+ /// </summary>+ public interface IStockprocessService : IBaseService<StockprocessEntity>+ {+ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(List<StockprocessGetViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser);+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ Task<List<StockprocessGetViewModel>> GetAllAsync(CurrentUser currentUser);+ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">primary key</param>+ /// <returns></returns>+ Task<StockprocessWithDetailViewModel> GetAsync(int id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(StockprocessViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(StockprocessViewModel viewModel);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);++ /// <summary>+ /// confirm processing+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> ConfirmProcess(int id, CurrentUser currentUser);+++ /// <summary>+ /// confirm adjustment+ /// </summary>+ /// <param name="id">id</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> ConfirmAdjustment(int id, CurrentUser currentUser);+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/IServices/Stocktaking/IStocktakingService.cs b/backend/ModernWMS.WMS/IServices/Stocktaking/IStocktakingService.csnew file mode 100644index 0000000..c2ce239--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/Stocktaking/IStocktakingService.cs@@ -0,0 +1,66 @@+/*+ * date:2022-12-30+ * developer:AMo+ */+using ModernWMS.Core.JWT;+using ModernWMS.Core.Models;+using ModernWMS.Core.Services;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;++ namespace ModernWMS.WMS.IServices+ {+ /// <summary>+ /// Interface of StocktakingService+ /// </summary>+ public interface IStocktakingService : IBaseService<StocktakingEntity>+ {+ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(List<StocktakingViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser);++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">primary key</param>+ /// <returns></returns>+ Task<StocktakingViewModel> GetAsync(int id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(StocktakingBasicViewModel viewModel, CurrentUser currentUser);++ /// <summary>+ /// update counted_qty+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> PutAsync(StocktakingConfirmViewModel viewModel, CurrentUser currentUser);++ /// <summary>+ /// confrim a record and change stock and add to stockadjust+ /// </summary>+ /// <param name="id">id</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> ConfirmAsync(int id, CurrentUser currentUser);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/IServices/Warehouse/IWarehouseService.cs b/backend/ModernWMS.WMS/IServices/Warehouse/IWarehouseService.csnew file mode 100644index 0000000..2532a00--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/Warehouse/IWarehouseService.cs@@ -0,0 +1,75 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+ using ModernWMS.Core.Services;+ using ModernWMS.Core.Models;+ using ModernWMS.Core.JWT;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;++ namespace ModernWMS.WMS.IServices+ {+ /// <summary>+ /// Interface of WarehouseService+ /// </summary>+ public interface IWarehouseService : IBaseService<WarehouseEntity>+ {+ #region Api+ /// <summary>+ /// get select items+ /// </summary>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<List<FormSelectItem>> GetSelectItemsAsnyc(CurrentUser currentUser);+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(List<WarehouseViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser);+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ Task<List<WarehouseViewModel>> GetAllAsync(CurrentUser currentUser);+ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">primary key</param>+ /// <returns></returns>+ Task<WarehouseViewModel> GetAsync(int id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(WarehouseViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(WarehouseViewModel viewModel, CurrentUser currentUser);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);++ /// <summary>+ /// import warehouses by excel+ /// </summary>+ /// <param name="datas">excel datas</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> ExcelAsync(List<WarehouseExcelImportViewModel> datas, CurrentUser currentUser);+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/IServices/Warehousearea/IWarehouseareaService.cs b/backend/ModernWMS.WMS/IServices/Warehousearea/IWarehouseareaService.csnew file mode 100644index 0000000..9abcd65--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/Warehousearea/IWarehouseareaService.cs@@ -0,0 +1,69 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+ using ModernWMS.Core.Services;+ using ModernWMS.Core.Models;+ using ModernWMS.Core.JWT;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;++ namespace ModernWMS.WMS.IServices+ {+ /// <summary>+ /// Interface of WarehouseareaService+ /// </summary>+ public interface IWarehouseareaService : IBaseService<WarehouseareaEntity>+ {+ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(List<WarehouseareaViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser);+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ Task<List<WarehouseareaViewModel>> GetAllAsync(int warehouse_id, CurrentUser currentUser);+ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">primary key</param>+ /// <returns></returns>+ Task<WarehouseareaViewModel> GetAsync(int id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(WarehouseareaViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(WarehouseareaViewModel viewModel, CurrentUser currentUser);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);++ /// <summary>+ /// get warehouseareas of the warehouse by warehouse_id+ /// </summary>+ /// <param name="warehouse_id">warehouse's id</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<List<FormSelectItem>> GetWarehouseareaByWarehouse_id(int warehouse_id, CurrentUser currentUser);+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/IServices/company/ICompanyService.cs b/backend/ModernWMS.WMS/IServices/company/ICompanyService.csnew file mode 100644index 0000000..262d774--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/company/ICompanyService.cs@@ -0,0 +1,48 @@+using ModernWMS.Core.JWT;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;++namespace ModernWMS.WMS.IServices+{+ /// <summary>+ /// Interface of CompanyService+ /// </summary>+ public interface ICompanyService : IBaseService<CompanyEntity>+ {+ #region Api+ /// <summary>+ /// Get all records+ /// </summary>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<List<CompanyViewModel>> GetAllAsync(CurrentUser currentUser);+ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<CompanyViewModel> GetAsync(int id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(CompanyViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(CompanyViewModel viewModel);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/IServices/supplier/ISupplierService.cs b/backend/ModernWMS.WMS/IServices/supplier/ISupplierService.csnew file mode 100644index 0000000..a404513--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/supplier/ISupplierService.cs@@ -0,0 +1,68 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+using ModernWMS.Core.JWT;+using ModernWMS.Core.Models;+using ModernWMS.Core.Services;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;+namespace ModernWMS.WMS.IServices+{+ /// <summary>+ /// Interface of SupplierService+ /// </summary>+ public interface ISupplierService : IBaseService<SupplierEntity>+ {+ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(List<SupplierViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser);+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ Task<List<SupplierViewModel>> GetAllAsync(CurrentUser currentUser);+ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">primary key</param>+ /// <returns></returns>+ Task<SupplierViewModel> GetAsync(int id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(SupplierViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(SupplierViewModel viewModel, CurrentUser currentUser);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);++ /// <summary>+ /// import suppliers by excel+ /// </summary>+ /// <param name="datas">excel datas</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> ExcelAsync(List<SupplierExcelImportViewModel> datas, CurrentUser currentUser);+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/IServices/user/IUserService.cs b/backend/ModernWMS.WMS/IServices/user/IUserService.csnew file mode 100644index 0000000..9f40fb0--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/user/IUserService.cs@@ -0,0 +1,95 @@+/*+ * date:2022-12-20+ * developer:NoNo+ */+ using ModernWMS.Core.Services;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.Core.Models;+using ModernWMS.Core.JWT;++namespace ModernWMS.WMS.IServices+{+ /// <summary>+ /// Interface of UserService+ /// </summary>+ public interface IUserService : IBaseService<userEntity>+ {+ #region Api+ /// <summary>+ /// get select items+ /// </summary>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<List<FormSelectItem>> GetSelectItemsAsnyc(CurrentUser currentUser);+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(List<UserViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser);+ /// <summary>+ /// Get all datas+ /// </summary>+ /// <returns></returns>+ Task<List<UserViewModel>> GetAllAsync(CurrentUser currentUser);+ /// <summary>+ /// Get a data by id+ /// </summary>+ /// <param name="id">primary key</param>+ /// <returns></returns>+ Task<UserViewModel> GetAsync(int id);+ /// <summary>+ /// add a new data+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(UserViewModel viewModel, CurrentUser currentUser);+ /// <summary>+ /// update a data+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(UserViewModel viewModel, CurrentUser currentUser);++ /// <summary>+ /// delete a data+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);++ /// <summary>+ /// import users by excel+ /// </summary>+ /// <param name="datas">excel datas</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> ExcelAsync(List<UserExcelImportViewModel> datas,CurrentUser currentUser);++ /// <summary>+ /// reset password+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <returns></returns>+ Task<(bool, string)> ResetPwd(BatchOperationViewModel viewModel);++ /// <summary>+ /// change password+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> ChangePwd(UserChangePwdViewModel viewModel);++ /// <summary>+ /// register a new tenant+ /// </summary>+ /// <param name="viewModel">viewModel</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> Register(RegisterViewModel viewModel);+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/IServices/userrole/IUserroleService.cs b/backend/ModernWMS.WMS/IServices/userrole/IUserroleService.csnew file mode 100644index 0000000..2e0bfdc--- /dev/null+++ b/backend/ModernWMS.WMS/IServices/userrole/IUserroleService.cs@@ -0,0 +1,60 @@+/*+ * date:2022-12-20+ * developer:NoNo+ */+using ModernWMS.Core.JWT;+using ModernWMS.Core.Services;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.Core.Models;+ namespace ModernWMS.WMS.IServices+ {+ /// <summary>+ /// Interface of UserroleService+ /// </summary>+ public interface IUserroleService : IBaseService<UserroleEntity>+ {+ #region Api+ /// <summary>+ /// bulk save records+ /// </summary>+ /// <param name="viewModels">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> BulkSaveAsync(List<UserroleViewModel> viewModels, CurrentUser currentUser);+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ Task<List<UserroleViewModel>> GetAllAsync(CurrentUser currentUser);+ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">primary key</param>+ /// <returns></returns>+ Task<UserroleViewModel> GetAsync(int id);+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>>+ /// <param name="currentUser">current user</param>>+ /// <returns></returns>+ Task<(int id, string msg)> AddAsync(UserroleViewModel viewModel,CurrentUser currentUser);+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> UpdateAsync(UserroleViewModel viewModel, CurrentUser currentUser);++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ Task<(bool flag, string msg)> DeleteAsync(int id);+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/ModernWMS.WMS.csproj b/backend/ModernWMS.WMS/ModernWMS.WMS.csprojnew file mode 100644index 0000000..c24705c--- /dev/null+++ b/backend/ModernWMS.WMS/ModernWMS.WMS.csproj@@ -0,0 +1,14 @@+<Project Sdk="Microsoft.NET.Sdk">++ <PropertyGroup>+ <TargetFramework>net7.0</TargetFramework>+ <ImplicitUsings>enable</ImplicitUsings>+ <Nullable>enable</Nullable>+ <GenerateDocumentationFile>True</GenerateDocumentationFile>+ </PropertyGroup>++ <ItemGroup>+ <ProjectReference Include="..\ModernWMS.Core\ModernWMS.Core.csproj" />+ </ItemGroup>++</Project>diff --git a/backend/ModernWMS.WMS/Services/Asn/AsnService.cs b/backend/ModernWMS.WMS/Services/Asn/AsnService.csnew file mode 100644index 0000000..282b66d--- /dev/null+++ b/backend/ModernWMS.WMS/Services/Asn/AsnService.cs@@ -0,0 +1,656 @@+/*+ * date:2022-12-22+ * developer:AMo+ */+using Mapster;+using Microsoft.EntityFrameworkCore;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.DBContext;+using ModernWMS.Core.DynamicSearch;+using ModernWMS.Core.JWT;+using ModernWMS.Core.Models;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;++namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// Asn Service+ /// </summary>+ public class AsnService : BaseService<AsnEntity>, IAsnService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Asn constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public AsnService(+ SqlDBContext dBContext+ , IStringLocalizer<Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search, sqlTitle input asn_status:0 ~ 4+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<AsnViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ Byte asn_status = 255;+ if (pageSearch.sqlTitle.ToLower().Contains("asn_status"))+ {+ asn_status = Convert.ToByte(pageSearch.sqlTitle.Trim().ToLower().Replace("asn_status","").Replace(":", "").Replace(":", "").Replace("=", ""));+ asn_status = asn_status.Equals(4) ? (Byte)255 : asn_status;+ }+ var Spus = _dBContext.GetDbSet<SpuEntity>();+ var Skus = _dBContext.GetDbSet<SkuEntity>();+ var Asns = _dBContext.GetDbSet<AsnEntity>();+ var query = from m in Asns.AsNoTracking()+ join p in Spus.AsNoTracking() on m.spu_id equals p.id+ join k in Skus.AsNoTracking() on m.sku_id equals k.id+ where m.tenant_id == currentUser.tenant_id+ && (asn_status == 255 || m.asn_status == asn_status)+ select new AsnViewModel+ {+ id = m.id,+ asn_no = m.asn_no,+ asn_status = m.asn_status,+ spu_id = m.spu_id,+ spu_code = p.spu_code,+ spu_name = p.spu_name,+ sku_id = m.sku_id,+ sku_code = k.sku_code,+ sku_name = k.sku_name,+ origin = p.origin,+ length_unit = p.length_unit,+ volume_unit = p.volume_unit,+ weight_unit = p.weight_unit,+ asn_qty = m.asn_qty,+ actual_qty = m.actual_qty,+ sorted_qty = m.sorted_qty,+ shortage_qty = m.shortage_qty,+ more_qty = m.more_qty,+ damage_qty = m.damage_qty,+ weight = k.weight * m.asn_qty,+ volume = k.volume * m.asn_qty,+ supplier_id = m.supplier_id,+ supplier_name = m.supplier_name,+ goods_owner_id = m.goods_owner_id,+ goods_owner_name = m.goods_owner_name,+ creator = m.creator,+ create_time = m.create_time,+ last_update_time = m.last_update_time,+ is_valid = m.is_valid+ };+ query = query.Where(queries.AsExpression<AsnViewModel>());+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.create_time)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list, totals);+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <returns></returns>+ public async Task<AsnViewModel> GetAsync(int id)+ {+ var Spus = _dBContext.GetDbSet<SpuEntity>();+ var Skus = _dBContext.GetDbSet<SkuEntity>();+ var Asns = _dBContext.GetDbSet<AsnEntity>();+ var query = from m in Asns.AsNoTracking()+ join p in Spus.AsNoTracking() on m.spu_id equals p.id+ join k in Skus.AsNoTracking() on m.sku_id equals k.id+ select new AsnViewModel+ {+ id = m.id,+ asn_no = m.asn_no,+ asn_status = m.asn_status,+ spu_id = m.spu_id,+ spu_code = p.spu_code,+ spu_name = p.spu_name,+ sku_id = m.sku_id,+ sku_code = k.sku_code,+ sku_name = k.sku_name,+ origin = p.origin,+ length_unit = p.length_unit,+ volume_unit = p.volume_unit,+ weight_unit = p.weight_unit,+ asn_qty = m.asn_qty,+ actual_qty = m.actual_qty,+ sorted_qty = m.sorted_qty,+ shortage_qty = m.shortage_qty,+ more_qty = m.more_qty,+ damage_qty = m.damage_qty,+ weight = m.weight,+ volume = m.volume,+ supplier_id = m.supplier_id,+ supplier_name = m.supplier_name,+ goods_owner_id = m.goods_owner_id,+ goods_owner_name = m.goods_owner_name,+ creator = m.creator,+ create_time = m.create_time,+ last_update_time = m.last_update_time,+ is_valid = m.is_valid+ };+ var data = await query.FirstOrDefaultAsync(t => t.id.Equals(id));+ return data ?? new AsnViewModel();+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(AsnViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<AsnEntity>();+ var entity = viewModel.Adapt<AsnEntity>();+ entity.id = 0;+ entity.asn_no = await GetOrderCode(currentUser);+ entity.creator = currentUser.user_name;+ entity.create_time = DateTime.Now;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ entity.is_valid = viewModel.is_valid;+ await DbSet.AddAsync(entity);+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }++ /// <summary>+ /// get next code number+ /// </summary>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<string> GetOrderCode(CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<AsnEntity>();+ string code = "";+ string date = DateTime.Now.ToString("yyyy" + "MM" + "dd");+ string maxNo = await DbSet.AsNoTracking().Where(t => t.tenant_id.Equals(currentUser.tenant_id)).MaxAsync(t => t.asn_no);+ if (string.IsNullOrEmpty(maxNo))+ {+ code = date + "-0001";+ }+ else+ {+ try+ {+ string maxDate = maxNo[..8];+ string maxDateNo = maxNo[9..];+ if (date == maxDate)+ {+ int.TryParse(maxDateNo, out int dd);+ int newDateNo = dd + 1;+ code = date + "-" + newDateNo.ToString("0000");+ }+ else+ {+ code = date + "-0001";+ }+ }+ catch+ {+ code = date + "-0001";+ }+ }++ return code;+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(AsnViewModel viewModel)+ {+ var DbSet = _dBContext.GetDbSet<AsnEntity>();+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ entity.id = viewModel.id;+ entity.asn_no = viewModel.asn_no;+ entity.spu_id = viewModel.spu_id;+ entity.sku_id = viewModel.sku_id;+ entity.asn_qty = viewModel.asn_qty;+ entity.weight = viewModel.weight;+ entity.volume = viewModel.volume;+ entity.supplier_id = viewModel.supplier_id;+ entity.supplier_name = viewModel.supplier_name;+ entity.goods_owner_id = viewModel.goods_owner_id;+ entity.goods_owner_name = viewModel.goods_owner_name;+ entity.is_valid = viewModel.is_valid;+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ var Asns = _dBContext.GetDbSet<AsnEntity>();+ var entity = await Asns.FirstOrDefaultAsync(t => t.id.Equals(id));+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ if (entity.asn_status.Equals(0))+ {+ Asns.Remove(entity);+ }+ else if (entity.asn_status.Equals(8))+ {+ return (false, _stringLocalizer["asn_had_putaway"]);+ }+ else+ {+ entity.asn_status = (byte)(entity.asn_status - 1);+ }+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }++ /// <summary>+ /// Bulk modify Goodsowner+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> BulkModifyGoodsownerAsync(AsnBulkModifyGoodsOwnerViewModel viewModel)+ {+ var Asns = _dBContext.GetDbSet<AsnEntity>();+ var entities = await Asns.Where(t => viewModel.idList.Contains(t.id)).ToListAsync();+ //需要什么限制?+ entities.ForEach(t =>+ {+ t.goods_owner_id = viewModel.goods_owner_id;+ t.goods_owner_name = viewModel.goods_owner_name;+ t.last_update_time = DateTime.Now;+ });+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ #endregion++ #region Flow Api+ /// <summary>+ /// Confirm Delivery+ /// change the asn_status from 0 to 1+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> ConfirmAsync(int id)+ {+ var Asns = _dBContext.GetDbSet<AsnEntity>();+ var entity = await Asns.FirstOrDefaultAsync(t => t.id == id);+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ else if (entity.asn_status > 0)+ {+ return (false, $"{entity.asn_no}{_stringLocalizer["ASN_Status_Is_Not_Pre_Delivery"]}");+ }+ entity.asn_status = 1;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["confirm_success"]);+ }+ else+ {+ return (false, _stringLocalizer["confirm_failed"]);+ }+ }+ /// <summary>+ /// Cancel confirm, change asn_status 1 to 0+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> ConfirmCancelAsync(int id)+ {+ var Asns = _dBContext.GetDbSet<AsnEntity>();+ var entity = await Asns.FirstOrDefaultAsync(t => t.id == id);+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ else if (entity.asn_status != (byte)1)+ {+ return (false, $"{entity.asn_no}{_stringLocalizer["ASN_Status_Is_Not_Pre_Delivery"]}");+ }+ entity.asn_status = 0;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }++ /// <summary>+ /// Unload+ /// change the asn_status from 1 to 2+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UnloadAsync(int id)+ {+ var Asns = _dBContext.GetDbSet<AsnEntity>();+ var entity = await Asns.FirstOrDefaultAsync(t => t.id == id);+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ else if (entity.asn_status > 1)+ {+ return (false, $"{entity.asn_no}{_stringLocalizer["ASN_Status_Is_Not_Pre_Load"]}");+ }+ entity.asn_status = 2;+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["confirm_success"]);+ }+ else+ {+ return (false, _stringLocalizer["confirm_failed"]);+ }+ }++ /// <summary>+ /// Cancel unload+ /// change the asn_status from 2 to 1+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UnloadCancelAsync(int id)+ {+ var Asns = _dBContext.GetDbSet<AsnEntity>();+ var entity = await Asns.FirstOrDefaultAsync(t => t.id == id);+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ else if (entity.asn_status != (byte)2)+ {+ return (false, $"{entity.asn_no}{_stringLocalizer["ASN_Status_Is_Not_Pre_Load"]}");+ }+ entity.asn_status = 1;+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// sorting, add a new asnsort record and update asn sorted_qty+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> SortingAsync(AsnsortInputViewModel viewModel, CurrentUser currentUser)+ {+ var Asns = _dBContext.GetDbSet<AsnEntity>();+ var Asnsorts = _dBContext.GetDbSet<AsnsortEntity>();++ var entity = await Asns.FirstOrDefaultAsync(t => t.id == viewModel.asn_id);+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ else if (entity.asn_status != 2)+ {+ return (false, $"{entity.asn_no}{_stringLocalizer["ASN_Status_Is_Not_Pre_Sort"]}");+ }+ await Asnsorts.AddAsync(new AsnsortEntity+ {+ id = 0,+ asn_id = viewModel.asn_id,+ sorted_qty = viewModel.sorted_qty,+ create_time = DateTime.Now,+ creator = currentUser.user_name,+ is_valid = true,+ last_update_time = DateTime.Now, tenant_id = currentUser.tenant_id+ });+ entity.sorted_qty += viewModel.sorted_qty;+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// Sorted+ /// change the asn_status from 2 to 3+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> SortedAsync(int id)+ {+ var Asns = _dBContext.GetDbSet<AsnEntity>();+ var entity = await Asns.FirstOrDefaultAsync(t => t.id == id);+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ else if (entity.sorted_qty < 1)+ {+ return (false, $"{entity.asn_no}{_stringLocalizer["ASN_Status_Is_Not_Sorting"]}");+ }+ entity.asn_status = 3;+ if (entity.sorted_qty > entity.asn_qty)+ {+ entity.more_qty = entity.sorted_qty - entity.asn_qty;+ }+ else if (entity.sorted_qty < entity.asn_qty)+ {+ entity.shortage_qty = entity.asn_qty - entity.sorted_qty;+ }+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["sorted_success"]);+ }+ else+ {+ return (false, _stringLocalizer["sorted_failed"]);+ }+ }++ /// <summary>+ /// Cancel sorted+ /// change the asn_status from 3 to 2+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> SortedCancelAsync(int id)+ {+ var Asns = _dBContext.GetDbSet<AsnEntity>();+ var entity = await Asns.FirstOrDefaultAsync(t => t.id == id);+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ else if (entity.actual_qty > 0)+ {+ return (false, $"{entity.asn_no}{_stringLocalizer["ASN_Status_Is_Putaway"]}");+ }+ else if (entity.sorted_qty < 1)+ {+ return (false, $"{entity.asn_no}{_stringLocalizer["ASN_Status_Is_Not_Sorting"]}");+ }+ entity.asn_status = 2;+ entity.sorted_qty = 0;+ entity.more_qty = 0;+ entity.shortage_qty = 0;+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ var Asnsorts = _dBContext.GetDbSet<AsnsortEntity>();+ await Asnsorts.Where(t => t.asn_id.Equals(id)).ExecuteDeleteAsync();+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// PutAway+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> PutAwayAsync(AsnPutAwayInputViewModel viewModel, CurrentUser currentUser)+ {+ var Asns = _dBContext.GetDbSet<AsnEntity>();++ var Goodslocations = _dBContext.GetDbSet<GoodslocationEntity>();+ var Location = await Goodslocations.FirstOrDefaultAsync(t => t.id.Equals(viewModel.goods_location_id));+ if (Location == null)+ {+ return (false, string.Format(_stringLocalizer["Required"], _stringLocalizer["location_name"]));+ }++ var entity = await Asns.FirstOrDefaultAsync(t => t.id == viewModel.asn_id);+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ else if (entity.asn_status != 3)+ {+ return (false, $"{entity.asn_no}{_stringLocalizer["ASN_Status_Is_Not_Sorted"]}");+ }+ else if (entity.actual_qty + viewModel.putaway_qty > entity.sorted_qty)+ {+ return (false, $"{entity.asn_no}{_stringLocalizer["ASN_Total_PutAway_Qty_Greater_Than_Sorted_Qty"]}");+ }+ entity.actual_qty += viewModel.putaway_qty;+ if (Location.warehouse_area_property.Equals(5))+ {+ entity.damage_qty += viewModel.putaway_qty;+ }+ if (entity.actual_qty.Equals(entity.sorted_qty))+ {+ entity.asn_status = 4;+ }++ entity.last_update_time = DateTime.Now;+ var Stocks = _dBContext.GetDbSet<StockEntity>();+ var stockEntity = await Stocks.FirstOrDefaultAsync(t => t.sku_id.Equals(entity.sku_id) && t.goods_location_id.Equals(viewModel.goods_location_id));+ if (stockEntity == null)+ {+ stockEntity = new StockEntity+ {+ sku_id = entity.sku_id,+ goods_location_id = viewModel.goods_location_id,+ goods_owner_id = entity.goods_owner_id,+ qty = viewModel.putaway_qty,+ is_freeze = false,+ last_update_time = DateTime.Now,+ tenant_id = currentUser.tenant_id,+ id = 0+ };+ await Stocks.AddAsync(stockEntity);+ }+ else+ {+ stockEntity.qty += viewModel.putaway_qty;+ stockEntity.last_update_time = DateTime.Now;+ }+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["putaway_success"]);+ }+ else+ {+ return (false, _stringLocalizer["putaway_failed"]);+ }+ }+ #endregion+ }+}+diff --git a/backend/ModernWMS.WMS/Services/Customer/CustomerService.cs b/backend/ModernWMS.WMS/Services/Customer/CustomerService.csnew file mode 100644index 0000000..af9df62--- /dev/null+++ b/backend/ModernWMS.WMS/Services/Customer/CustomerService.cs@@ -0,0 +1,249 @@+using Mapster;+using Microsoft.EntityFrameworkCore;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.DBContext;+using ModernWMS.Core.DynamicSearch;+using ModernWMS.Core.JWT;+using ModernWMS.Core.Models;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;+using System.Linq;++namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// customer Service+ /// </summary>+ public class CustomerService : BaseService<CustomerEntity>, ICustomerService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localization+ /// </summary>+ private readonly IStringLocalizer<Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// company service constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localization</param>+ public CustomerService(+ SqlDBContext dBContext+ , IStringLocalizer<Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<CustomerViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var DbSet = _dBContext.GetDbSet<CustomerEntity>();+ var query = DbSet.AsNoTracking()+ .Where(t => t.tenant_id.Equals(currentUser.tenant_id))+ .Where(queries.AsExpression<CustomerEntity>());+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.create_time)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list.Adapt<List<CustomerViewModel>>(), totals);+ }+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ public async Task<List<CustomerViewModel>> GetAllAsync(CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<CustomerEntity>();+ var data = await DbSet.AsNoTracking().Where(t => t.tenant_id == currentUser.tenant_id)+ .OrderByDescending(t => t.create_time).ToListAsync();+ return data.Adapt<List<CustomerViewModel>>();+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<CustomerViewModel> GetAsync(int id)+ {+ var entity = await _dBContext.GetDbSet<CustomerEntity>().AsNoTracking().FirstOrDefaultAsync(t => t.id.Equals(id));+ if (entity != null)+ {+ return entity.Adapt<CustomerViewModel>();+ }+ else+ {+ return new CustomerViewModel();+ }+ }++ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(CustomerViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<CustomerEntity>();+ if (await DbSet.AnyAsync(t => t.tenant_id.Equals(currentUser.tenant_id) && t.customer_name.Equals(viewModel.customer_name)))+ {+ return (0, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["customer_name"], viewModel.customer_name));+ }+ var entity = viewModel.Adapt<CustomerEntity>();+ entity.id = 0;+ entity.creator = currentUser.user_name;+ entity.create_time = DateTime.Now;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ await DbSet.AddAsync(entity);+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(CustomerViewModel viewModel)+ {+ var DbSet = _dBContext.GetDbSet<CustomerEntity>();+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ if (await DbSet.AnyAsync(t => !t.id.Equals(viewModel.id) && t.tenant_id.Equals(entity.tenant_id) && t.customer_name.Equals(viewModel.customer_name)))+ {+ return (false, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["customer_name"], viewModel.customer_name));+ }+ entity.customer_name = viewModel.customer_name;+ entity.city = viewModel.city;+ entity.address = viewModel.address;+ entity.email = viewModel.email;+ entity.manager = viewModel.manager;+ entity.contact_tel = viewModel.contact_tel;+ entity.is_valid = viewModel.is_valid;+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ var Dispatchlists = _dBContext.GetDbSet<DispatchlistEntity>();+ if(await Dispatchlists.AsNoTracking().AnyAsync(t => t.customer_id.Equals(id)))+ {+ return (false, _stringLocalizer["delete_referenced"]);+ }+ var qty = await _dBContext.GetDbSet<CustomerEntity>().Where(t => t.id.Equals(id)).ExecuteDeleteAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }+ #endregion++ #region Import+ /// <summary>+ /// import customers by excel+ /// </summary>+ /// <param name="input">excel data</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(bool flag, List<CustomerImportViewModel> errorData)> ExcelAsync(List<CustomerImportViewModel> input, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<CustomerEntity>();+ var existsDatas = await DbSet.AsNoTracking().Where(t => t.tenant_id.Equals(currentUser.tenant_id)).Select(t => new { t.customer_name}).ToListAsync();+ input.ForEach(async t =>+ {+ t.errorMsg = string.Empty;+ if (existsDatas.Any(d => d.customer_name.Equals(t.customer_name)))+ {+ t.errorMsg = string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["customer_name"], t.customer_name);+ }+ else+ {+ await DbSet.AddAsync(new CustomerEntity+ {+ customer_name = t.customer_name,+ city = t.city,+ address = t.address,+ email = t.email,+ manager = t.manager,+ contact_tel = t.contact_tel,+ creator = currentUser.user_name,+ create_time = DateTime.Now,+ last_update_time = DateTime.Now,+ is_valid = true,+ tenant_id = currentUser.tenant_id+ });+ }+ });+ if (input.Any(t => t.errorMsg.Length > 0))+ {+ return (false, input.Where(t => t.errorMsg.Length > 0).ToList());+ }+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, new List<CustomerImportViewModel>());+ }+ else+ {+ return (false, new List<CustomerImportViewModel>());+ }+ }++ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Services/Dispatchlist/DispatchlistService.cs b/backend/ModernWMS.WMS/Services/Dispatchlist/DispatchlistService.csnew file mode 100644index 0000000..70c85e0--- /dev/null+++ b/backend/ModernWMS.WMS/Services/Dispatchlist/DispatchlistService.cs@@ -0,0 +1,1412 @@+/*+ * date:2022-12-27+ * developer:NoNo+ */+using Mapster;+using Microsoft.AspNetCore.Mvc;+using Microsoft.EntityFrameworkCore;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.DBContext;+using ModernWMS.Core.DynamicSearch;+using ModernWMS.Core.JWT;+using ModernWMS.Core.Models;+using ModernWMS.Core.Services;+using ModernWMS.Core.Utility;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;+using System.Collections.Generic;++namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// Dispatchlist Service+ /// </summary>+ public class DispatchlistService : BaseService<DispatchlistEntity>, IDispatchlistService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Dispatchlist constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public DispatchlistService(+ SqlDBContext dBContext+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<DispatchlistViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var DbSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var query = from d in DbSet.AsNoTracking()+ join sku in _dBContext.GetDbSet<SkuEntity>().AsNoTracking() on d.sku_id equals sku.id+ join spu in _dBContext.GetDbSet<SpuEntity>().AsNoTracking() on sku.spu_id equals spu.id+ select new DispatchlistViewModel+ {+ id = d.id,+ dispatch_no = d.dispatch_no,+ dispatch_status = d.dispatch_status,+ customer_id = d.customer_id,+ customer_name = d.customer_name,+ sku_id = d.sku_id,+ qty = d.qty,+ weight = d.weight,+ volume = d.volume,+ creator = d.creator,+ create_time = d.create_time,+ damage_qty = d.damage_qty,+ lock_qty = d.lock_qty,+ picked_qty = d.picked_qty,+ intrasit_qty = d.intrasit_qty,+ package_qty = d.package_qty,+ unpackage_qty = d.picked_qty - d.package_qty,+ weighing_qty = d.weighing_qty,+ unweighing_qty = d.picked_qty - d.weighing_qty,+ actual_qty = d.actual_qty,+ sign_qty = d.sign_qty,+ package_no = d.package_no,+ package_person = d.package_person,+ package_time = d.package_time,+ weighing_no = d.weighing_no,+ weighing_person = d.weighing_person,+ weighing_weight = d.weighing_weight,+ waybill_no = d.waybill_no,+ carrier = d.carrier,+ freightfee = d.freightfee,+ last_update_time = d.last_update_time,+ tenant_id = d.tenant_id,+ sku_code = sku.sku_code,+ spu_code = spu.spu_code,+ spu_description = spu.spu_description,+ spu_name = spu.spu_name,+ bar_code = spu.bar_code,+ unpicked_qty = d.qty - d.picked_qty,+ length_unit = spu.length_unit,+ volume_unit = spu.volume_unit,+ weight_unit = spu.weight_unit+ };+ query = query.Where(t => t.tenant_id.Equals(currentUser.tenant_id))+ .Where(queries.AsExpression<DispatchlistViewModel>());+ if (pageSearch.sqlTitle.Contains("dispatch_status"))+ {+ var dispatch_status = Convert.ToByte(pageSearch.sqlTitle.Trim().ToLower().Replace("dispatch_status", "").Replace(":", "").Replace(":", "").Replace("=", ""));+ query = query.Where(t => t.dispatch_status.Equals(dispatch_status));+ }+ else if (pageSearch.sqlTitle.Equals("to_package"))+ {+ query = query.Where(t => (t.picked_qty == t.qty && (t.dispatch_status.Equals(3)) || (t.package_qty < t.picked_qty && t.dispatch_status.Equals(5))));+ }+ else if (pageSearch.sqlTitle.Equals("to_weight"))+ {+ query = query.Where(t => t.picked_qty == t.qty && (t.dispatch_status.Equals(3) || (t.weighing_qty < t.picked_qty && t.dispatch_status.Equals(4))));+ }+ else if (pageSearch.sqlTitle.Equals("to_delivery"))+ {+ query = query.Where(t => t.picked_qty == t.qty && (t.dispatch_status.Equals(3) || t.dispatch_status.Equals(4) || t.dispatch_status.Equals(5)));+ }+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.create_time)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list, totals);+ }+ /// <summary>+ /// get dispatchlist by dispatch_no+ /// </summary>+ /// <param name="dispatch_no"></param>+ /// <param name="currentUser"></param>+ /// <returns></returns>+ public async Task<List<DispatchlistViewModel>> GetByDispatchlistNo(string dispatch_no, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var datas = await (from d in DbSet.AsNoTracking()+ join sku in _dBContext.GetDbSet<SkuEntity>().AsNoTracking() on d.sku_id equals sku.id+ join spu in _dBContext.GetDbSet<SpuEntity>().AsNoTracking() on sku.spu_id equals spu.id+ where d.dispatch_no == dispatch_no && d.tenant_id == currentUser.tenant_id+ select new DispatchlistViewModel+ {+ id = d.id,+ dispatch_no = d.dispatch_no,+ dispatch_status = d.dispatch_status,+ customer_id = d.customer_id,+ customer_name = d.customer_name,+ sku_id = d.sku_id,+ qty = d.qty,+ weight = d.weight,+ volume = d.volume,+ creator = d.creator,+ create_time = d.create_time,+ damage_qty = d.damage_qty,+ lock_qty = d.lock_qty,+ picked_qty = d.picked_qty,+ intrasit_qty = d.intrasit_qty,+ package_qty = d.package_qty,+ unpackage_qty = d.picked_qty - d.package_qty,+ weighing_qty = d.weighing_qty,+ unweighing_qty = d.picked_qty - d.weighing_qty,+ actual_qty = d.actual_qty,+ sign_qty = d.sign_qty,+ package_no = d.package_no,+ package_person = d.package_person,+ package_time = d.package_time,+ weighing_no = d.weighing_no,+ weighing_person = d.weighing_person,+ weighing_weight = d.weighing_weight,+ waybill_no = d.waybill_no,+ carrier = d.carrier,+ freightfee = d.freightfee,+ last_update_time = d.last_update_time,+ tenant_id = d.tenant_id,+ sku_code = sku.sku_code,+ spu_code = spu.spu_code,+ spu_description = spu.spu_description,+ spu_name = spu.spu_name,+ bar_code = spu.bar_code,+ unpicked_qty = d.qty - d.picked_qty+ }).ToListAsync();+ return datas;+ }+ /// <summary>+ /// update dispatchlist with same dispatch_no+ /// </summary>+ /// <param name="viewModels"></param>+ /// <param name="currentUser"></param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsycn(List<DispatchlistViewModel> viewModels, CurrentUser currentUser)+ {+ var DBSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var dispatch_no = viewModels.FirstOrDefault().dispatch_no;+ var dispatch_status = viewModels.FirstOrDefault().dispatch_status;+ var entities = await (DBSet.Where(t => t.dispatch_no == dispatch_no && t.tenant_id == currentUser.tenant_id)).ToListAsync();+ var delete_id_list = new List<int>();+ var sku_id_list = viewModels.Select(t => t.sku_id).ToList();+ var skus = await (_dBContext.GetDbSet<SkuEntity>().AsNoTracking().Where(t => sku_id_list.Contains(t.id))).ToListAsync();+ if (entities.Any(t => t.dispatch_status != 1 && t.dispatch_status != 0))+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ foreach (var vm in viewModels)+ {+ if (vm.id < 0)+ {+ var entity = entities.FirstOrDefault(t => t.id == -vm.id);+ if (entity == null)+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ DBSet.Remove(entity);+ delete_id_list.Add(entity.id);+ }+ else if (vm.id > 0)+ {+ var entity = entities.FirstOrDefault(t => t.id == vm.id);+ if (entity == null)+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ entity.sku_id = vm.sku_id;+ entity.qty = vm.qty;+ entity.last_update_time = DateTime.Now;+ var sku = skus.FirstOrDefault(t => t.id == entity.sku_id);+ if (sku != null)+ {+ entity.volume = sku.volume * entity.qty;+ entity.weight = sku.weight * entity.qty;+ }+ }+ else if (vm.id == 0)+ {+ var entity = new DispatchlistEntity+ {+ id = 0,+ dispatch_no = dispatch_no,+ creator = currentUser.user_name,+ create_time = DateTime.Now,+ last_update_time = DateTime.Now,+ dispatch_status = dispatch_status,+ sku_id = vm.sku_id,+ qty = vm.qty++ };+ var sku = skus.FirstOrDefault(t => t.id == entity.sku_id);+ if (sku != null)+ {+ entity.volume = sku.volume * entity.qty;+ entity.weight = sku.weight * entity.qty;+ }+ entities.Add(entity);+ DBSet.Add(entity);+ }+ }+ var repeat_skus_id_list = entities.Where(t => !delete_id_list.Contains(t.id)).GroupBy(t => t.sku_id).Select(t => new { t.Key, cnt = t.Count() }).Where(t => t.cnt > 1).Select(t => t.Key).ToList();+ if (repeat_skus_id_list.Count > 0)+ {+ var repeat_skus = (skus.Where(t => repeat_skus_id_list.Contains(t.id)).Select(t => t.sku_code).ToList());+ var msg = "";+ foreach (var sku in repeat_skus)+ {+ msg += string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["sku_code"], sku);+ }+ return (false, msg);+ }+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// get pick list by dispatch_id+ /// </summary>+ /// <param name="dispatch_id">dispatch_id</param>+ /// <returns></returns>+ public async Task<List<DispatchpicklistViewModel>> GetPickListByDispatchID(int dispatch_id)+ {+ var datas = await (from dpl in _dBContext.GetDbSet<DispatchpicklistEntity>().AsNoTracking()+ join sku in _dBContext.GetDbSet<SkuEntity>().AsNoTracking() on dpl.sku_id equals sku.id+ join spu in _dBContext.GetDbSet<SpuEntity>().AsNoTracking() on sku.spu_id equals spu.id+ join owner in _dBContext.GetDbSet<GoodsownerEntity>().AsNoTracking() on dpl.goods_owner_id equals owner.id into o_left+ from owner in o_left.DefaultIfEmpty()+ join location in _dBContext.GetDbSet<GoodslocationEntity>().AsNoTracking() on dpl.goods_location_id equals location.id+ where dpl.dispatchlist_id == dispatch_id+ select new DispatchpicklistViewModel+ {+ id = dpl.id,+ dispatchlist_id = dpl.dispatchlist_id,+ goods_owner_id = dpl.goods_owner_id,+ goods_location_id = dpl.goods_location_id,+ sku_id = dpl.sku_id,+ pick_qty = dpl.pick_qty,+ picked_qty = dpl.picked_qty,+ goods_owner_name = owner.goods_owner_name == null ? "" : owner.goods_owner_name,+ sku_code = sku.sku_code,+ spu_code = spu.spu_code,+ spu_description = spu.spu_description,+ spu_name = spu.spu_name,+ bar_code = spu.bar_code,+ location_name = location.location_name,+ warehouse_area_name = location.warehouse_area_name,+ warehouse_area_property = location.warehouse_area_property,+ warehouse_name = location.warehouse_name,+ }).ToListAsync();+ return datas;+ }++ /// <summary>+ /// advanced dispatch order page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<PreDispatchlistViewModel> data, int totals)> AdvancedDispatchlistPageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var DbSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var query = from d in DbSet.AsNoTracking().Where(t => t.tenant_id.Equals(currentUser.tenant_id))+ join sku in _dBContext.GetDbSet<SkuEntity>().AsNoTracking() on d.sku_id equals sku.id+ join spu in _dBContext.GetDbSet<SpuEntity>().AsNoTracking() on sku.spu_id equals spu.id+ group new { d, spu } by new { d.dispatch_no, d.dispatch_status, d.customer_id, d.customer_name, d.creator }+ into dg+ select new PreDispatchlistViewModel+ {+ dispatch_no = dg.Key.dispatch_no,+ dispatch_status = dg.Key.dispatch_status,+ customer_id = dg.Key.customer_id,+ customer_name = dg.Key.customer_name,+ qty = dg.Sum(t => t.d.qty),+ volume = dg.Sum(t =>t.spu.volume_unit==1? t.d.volume:(t.spu.volume_unit==0?t.d.volume/1000:t.d.volume*1000)),+ weight = dg.Sum(t =>t.spu.weight_unit==0?t.d.weight/1000000:(t.spu.weight_unit==1? t.d.weight/1000:t.d.weight)),+ creator = dg.Key.creator,+ };+ query = query.Where(queries.AsExpression<PreDispatchlistViewModel>());+ if (pageSearch.sqlTitle.Contains("dispatch_status"))+ {+ var dispatch_status = Convert.ToByte(pageSearch.sqlTitle.Trim().ToLower().Replace("dispatch_status", "").Replace(":", "").Replace(":", "").Replace("=", ""));+ query = query.Where(t => t.dispatch_status.Equals(dispatch_status));+ }+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.dispatch_no)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list, totals);+ }+ /// <summary>+ /// Get dispatchlist by dispatch_no+ /// </summary>+ /// <returns></returns>+ public async Task<List<DispatchlistDetailViewModel>> GetAllAsync(string dispatch_no, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var Spus = _dBContext.GetDbSet<SpuEntity>();+ var Skus = _dBContext.GetDbSet<SkuEntity>();+ var data = await (from dl in DbSet.AsNoTracking()+ join sku in Skus.AsNoTracking() on dl.sku_id equals sku.id+ join spu in Spus.AsNoTracking() on sku.spu_id equals spu.id+ where dl.dispatch_no == dispatch_no && dl.tenant_id == currentUser.tenant_id+ select new DispatchlistDetailViewModel+ {+ id = dl.id,+ dispatch_no = dl.dispatch_no,+ sku_code = sku.sku_code,+ spu_code = spu.spu_code,+ spu_description = spu.spu_description,+ spu_name = spu.spu_name,+ bar_code = spu.bar_code,+ dispatch_status = dl.dispatch_status,+ customer_id = dl.customer_id,+ customer_name = dl.customer_name,+ sku_id = dl.sku_id,+ qty = dl.qty,+ weight = dl.weight,+ volume = dl.volume,+ creator = dl.creator,+ create_time = dl.create_time,+ damage_qty = dl.damage_qty,+ lock_qty = dl.lock_qty,+ picked_qty = dl.picked_qty,+ intrasit_qty = dl.intrasit_qty,+ package_qty = dl.package_qty,+ weighing_qty = dl.weighing_qty,+ actual_qty = dl.actual_qty,+ sign_qty = dl.sign_qty,+ package_no = dl.package_no,+ package_person = dl.package_person,+ package_time = dl.package_time,+ weighing_no = dl.weighing_no,+ weighing_person = dl.weighing_person,+ weighing_weight = dl.weighing_weight,+ waybill_no = dl.waybill_no,+ carrier = dl.carrier,+ freightfee = dl.freightfee,+ }+ ).ToListAsync();+ return data.Adapt<List<DispatchlistDetailViewModel>>();+ }++ /// <summary>+ /// add a new Dispatchlist+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> AddAsync(List<DispatchlistAddViewModel> viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var entities = viewModel.Adapt<List<DispatchlistEntity>>();+ var sku_id_list = entities.Select(t => t.sku_id).ToList();+ var skus = await _dBContext.GetDbSet<SkuEntity>().Where(t => sku_id_list.Contains(t.id)).ToListAsync();+ var dispatch_no = await GetOrderCode(currentUser);+ foreach (var entity in entities)+ {+ var sku = skus.FirstOrDefault(t => t.id == entity.sku_id);+ entity.id = 0;+ entity.create_time = DateTime.Now;+ entity.creator = currentUser.user_name;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ if (sku != null)+ {+ entity.volume = entity.qty * sku.volume;+ entity.weight = entity.qty * sku.weight;+ }+ entity.dispatch_no = dispatch_no;+ }+ await DbSet.AddRangeAsync(entities);+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }++ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="dispatch_no">dispatch_no</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(string dispatch_no, CurrentUser currentUser)+ {+ var entities = await _dBContext.GetDbSet<DispatchlistEntity>().Where(t => t.dispatch_no.Equals(dispatch_no) && t.tenant_id == currentUser.tenant_id).ToListAsync();+ if (entities.Any(t => t.dispatch_status > 1))+ {+ return (false, _stringLocalizer["status_not_delete"]);+ }+ _dBContext.GetDbSet<DispatchlistEntity>().RemoveRange(entities);+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }++ /// <summary>+ /// Dispatchlist details with available stock+ /// </summary>+ /// <param name="dispatch_no">dispatch_no</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<List<DispatchlistConfirmDetailViewModel>> ConfirmOrderCheck(string dispatch_no, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var dispatchpick_DBSet = _dBContext.GetDbSet<DispatchpicklistEntity>();+ var stock_DbSet = _dBContext.GetDbSet<StockEntity>();+ var asn_DBSet = _dBContext.GetDbSet<AsnEntity>();+ var dispatch_DBSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var sku_DBSet = _dBContext.GetDbSet<SkuEntity>().AsNoTracking();+ var spu_DBSet = _dBContext.GetDbSet<SpuEntity>().AsNoTracking();+ var processdetail_DBSet = _dBContext.GetDbSet<StockprocessdetailEntity>().AsNoTracking();+ var move_DBSet = _dBContext.GetDbSet<StockmoveEntity>();+ var owner_DBSet = _dBContext.GetDbSet<GoodsownerEntity>();+ var location_DBSet = _dBContext.GetDbSet<GoodslocationEntity>();+ var stock_group_datas = from stock in stock_DbSet.AsNoTracking()+ join gl in _dBContext.GetDbSet<GoodslocationEntity>().AsNoTracking() on stock.goods_location_id equals gl.id+ group stock by new { stock.id, stock.sku_id, stock.goods_location_id, stock.goods_owner_id } into sg+ select new+ {+ stock_id = sg.Key.id,+ goods_owner_id = sg.Key.goods_owner_id,+ sku_id = sg.Key.sku_id,+ goods_location_id = sg.Key.goods_location_id,+ qty_frozen = sg.Where(t => t.is_freeze == true).Sum(e => e.qty),+ qty = sg.Sum(t => t.qty)+ };+ var dispatch_group_datas = from dp in DbSet.AsNoTracking()+ join dpp in dispatchpick_DBSet.AsNoTracking() on dp.id equals dpp.dispatchlist_id+ where dp.dispatch_status > 1 && dp.dispatch_status < 6+ group dpp by new { dpp.sku_id, dpp.goods_location_id, dpp.goods_owner_id } into dg+ select new+ {+ goods_owner_id = dg.Key.goods_owner_id,+ sku_id = dg.Key.sku_id,+ goods_location_id = dg.Key.goods_location_id,+ qty_locked = dg.Sum(t => t.pick_qty)+ };+ var process_locked_group_datas = from pd in processdetail_DBSet+ where pd.is_update_stock == false+ group pd by new { pd.sku_id, pd.goods_location_id, pd.goods_owner_id } into pdg+ select new+ {+ goods_owner_id = pdg.Key.goods_owner_id,+ sku_id = pdg.Key.sku_id,+ goods_location_id = pdg.Key.goods_location_id,+ qty_locked = pdg.Sum(t => t.qty)+ };+ var move_locked_group_datas = from m in move_DBSet.AsNoTracking()+ where m.move_status == 0+ group m by new { m.sku_id, m.orig_goods_location_id, m.goods_owner_id } into mg+ select new+ {+ goods_owner_id = mg.Key.goods_owner_id,+ sku_id = mg.Key.sku_id,+ goods_location_id = mg.Key.orig_goods_location_id,+ qty_locked = mg.Sum(t => t.qty)+ };+ var datas = await (from dl in DbSet+ join sg in stock_group_datas on dl.sku_id equals sg.sku_id into sg_left+ from sg in sg_left.DefaultIfEmpty()+ join dp in dispatch_group_datas on new { sg.sku_id, sg.goods_location_id, sg.goods_owner_id } equals new { dp.sku_id, dp.goods_location_id, dp.goods_owner_id } into dp_left+ from dp in dp_left.DefaultIfEmpty()+ join pl in process_locked_group_datas on new { sg.sku_id, sg.goods_location_id, sg.goods_owner_id } equals new { pl.sku_id, pl.goods_location_id, pl.goods_owner_id } into pl_left+ from pl in pl_left.DefaultIfEmpty()+ join m in move_locked_group_datas on new { sg.sku_id, sg.goods_location_id, sg.goods_owner_id } equals new { m.sku_id, m.goods_location_id, m.goods_owner_id } into m_left+ from m in m_left.DefaultIfEmpty()+ join sku in sku_DBSet on dl.sku_id equals sku.id+ join spu in spu_DBSet on sku.spu_id equals spu.id+ join owner in owner_DBSet.AsNoTracking() on sg.goods_owner_id equals owner.id into owner_left+ from owner in owner_left.DefaultIfEmpty()+ join gl in location_DBSet.Where(t=>t.warehouse_area_property != 5).AsNoTracking() on sg.goods_location_id equals gl.id into gl_left+ from gl in gl_left.DefaultIfEmpty()+ where dl.dispatch_no == dispatch_no && dl.tenant_id == currentUser.tenant_id && (dl.dispatch_status == 0 || dl.dispatch_status == 1)+ select new+ {+ stock_id = sg.stock_id == null ? 0 : sg.stock_id,+ goods_owner_name = owner.goods_owner_name == null ? "" : owner.goods_owner_name,+ goods_location_id = sg.goods_location_id == null ? 0 : sg.goods_location_id,+ goods_owner_id = sg.goods_owner_id == null ? 0 : sg.goods_owner_id,+ spu_name = spu.spu_name,+ spu_code = spu.spu_code,+ sku_code = sku.sku_code,+ qty_available = (sg.qty == null ? 0 : sg.qty) - (sg.qty_frozen == null ? 0 : sg.qty_frozen) - (dp.qty_locked == null ? 0 : dp.qty_locked) - (pl.qty_locked == null ? 0 : pl.qty_locked) - (m.qty_locked == null ? 0 : m.qty_locked),+ qty = dl.qty,+ sku_id = dl.sku_id,+ id = dl.id,+ spu_description = spu.spu_description,+ dispatch_status = dl.dispatch_status,+ bar_code = spu.bar_code,+ customer_id = dl.customer_id,+ customer_name = dl.customer_name,+ dispatch_no = dl.dispatch_no,+ location_name = gl.location_name == null ? "" : gl.location_name,+ warehouse_area_name = gl.warehouse_area_name == null ? "" : gl.warehouse_area_name,+ warehouse_name = gl.warehouse_name == null ? "" : gl.warehouse_name+ }).ToListAsync();+ var res = (from d in datas+ group d by new+ {+ d.spu_name,+ d.spu_code,+ d.sku_code,+ d.qty,+ d.sku_id,+ d.id,+ d.spu_description,+ d.dispatch_status,+ d.bar_code,+ d.customer_id,+ d.customer_name,+ d.dispatch_no,+ }+ into dg+ select new DispatchlistConfirmDetailViewModel+ {+ dispatchlist_id = dg.Key.id,+ sku_id = dg.Key.sku_id,+ dispatch_no = dg.Key.dispatch_no,+ sku_code = dg.Key.sku_code,+ spu_code = dg.Key.spu_code,+ dispatch_status = dg.Key.dispatch_status,+ spu_description = dg.Key.spu_description,+ spu_name = dg.Key.spu_name,+ bar_code = dg.Key.bar_code,+ customer_id = dg.Key.customer_id,+ customer_name = dg.Key.customer_name,+ qty = dg.Key.qty,+ qty_available = dg.Sum(t => t.qty_available),+ confirm = dg.Key.qty > dg.Sum(t => t.qty_available) ? false : true+ }).ToList();+ foreach (var r in res)+ {+ var picklist = (from d in datas.Where(t => t.sku_id == r.sku_id && t.stock_id > 0).OrderBy(o => o.qty_available)+ select new DispatchlistConfirmPickDetailViewModel+ {+ stock_id = d.stock_id,+ dispatchlist_id = r.dispatchlist_id,+ goods_location_id = d.goods_location_id,+ qty_available = d.qty_available,+ goods_owner_id = d.goods_owner_id,+ goods_owner_name = d.goods_owner_name,+ location_name = d.location_name,+ warehouse_area_name = d.warehouse_area_name,+ warehouse_name = d.warehouse_name,+ pick_qty = 0+ }+ ).OrderByDescending(o => o.qty_available).ToList();+ int pick_qty = 0;+ foreach (var pick in picklist)+ {+ if (pick_qty >= r.qty)+ {+ break;+ }+ pick.pick_qty = (r.qty <= (pick_qty + pick.qty_available)) ? (r.qty - pick_qty) : pick.qty_available;+ pick_qty += pick.pick_qty;+ }+ r.pick_list = picklist.Where(t=>t.qty_available>0).ToList();+ }++ return res;++ }++ /// <summary>+ /// Confirm orders and create dispatchpicklist+ /// </summary>+ /// <param name="viewModels">viewModels</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> ConfirmOrder(List<DispatchlistConfirmDetailViewModel> viewModels, CurrentUser currentUser)+ {+ var DBSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var dispatchlist_id_list = viewModels.Select(t => t.dispatchlist_id).ToList();+ var dispatchlist_datas = await DBSet.Where(t => dispatchlist_id_list.Contains(t.id)).ToListAsync();+ var pick_DBSet = _dBContext.GetDbSet<DispatchpicklistEntity>();+ var stock_DBSet = _dBContext.GetDbSet<StockEntity>();+ var pick_datas = new List<DispatchpicklistEntity>();+ var stock_id_list = new List<int>();+ var processdetail_DBSet = _dBContext.GetDbSet<StockprocessdetailEntity>().AsNoTracking();+ var move_DBSet = _dBContext.GetDbSet<StockmoveEntity>();+ var new_dispatchlists = new List<DispatchlistEntity>();+ var topick_viewmodels = new List<StockViewModel>();+ var sku_id_list = viewModels.Select(t => t.sku_id).ToList();+ foreach (var vm in viewModels.Where(t => t.confirm == true).ToList())+ {+ stock_id_list.AddRange(vm.pick_list.Where(t => t.pick_qty > 0).Select(t => t.stock_id).ToList());+ }++ foreach (var vm in viewModels)+ {+ var d = dispatchlist_datas.Where(t => t.id == vm.dispatchlist_id).FirstOrDefault();+ if (d == null)+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ if (vm.confirm == true)+ {+ d.dispatch_status = 2;+ d.last_update_time = DateTime.Now;+ d.lock_qty = vm.pick_list.Sum(t => t.pick_qty);+ foreach (var p in vm.pick_list.Where(t => t.pick_qty > 0).ToList())+ {+ pick_datas.Add(new DispatchpicklistEntity+ {+ sku_id = vm.sku_id,+ is_update_stock = false,+ dispatchlist_id = p.dispatchlist_id,+ goods_location_id = p.goods_location_id,+ goods_owner_id = p.goods_owner_id,+ last_update_time = DateTime.Now,+ pick_qty = p.pick_qty,+ });+ topick_viewmodels.Add(new StockViewModel { id = p.stock_id, qty = p.pick_qty });+ }+ if (d.lock_qty < d.qty)+ {+ d.qty = d.lock_qty;+ new_dispatchlists.Add(new DispatchlistEntity+ {+ sku_id = vm.sku_id,+ dispatch_status = 1,+ qty = d.qty - d.lock_qty,+ tenant_id = currentUser.tenant_id+ });+ }+ }+ else+ {+ new_dispatchlists.Add(new DispatchlistEntity+ {+ sku_id = vm.sku_id,+ dispatch_status = 1,+ qty = vm.qty,+ tenant_id = currentUser.tenant_id+ });+ DBSet.Remove(d);+ }+ }+ var stock_group_datas = from stock in stock_DBSet.AsNoTracking()+ where stock_id_list.Contains(stock.id)+ group stock by new { stock.id, stock.sku_id, stock.goods_location_id, stock.goods_owner_id } into sg+ select new+ {+ stock_id = sg.Key.id,+ goods_owner_id = sg.Key.goods_owner_id,+ sku_id = sg.Key.sku_id,+ goods_location_id = sg.Key.goods_location_id,+ qty_frozen = sg.Where(t => t.is_freeze == true).Sum(e => e.qty),+ qty = sg.Sum(t => t.qty)+ };+ var dispatch_group_datas = from dp in DBSet.AsNoTracking()+ join dpp in pick_DBSet.AsNoTracking() on dp.id equals dpp.dispatchlist_id+ where dp.dispatch_status > 1 && dp.dispatch_status < 6+ group dpp by new { dpp.sku_id, dpp.goods_location_id, dpp.goods_owner_id } into dg+ select new+ {+ goods_owner_id = dg.Key.goods_owner_id,+ sku_id = dg.Key.sku_id,+ goods_location_id = dg.Key.goods_location_id,+ qty_locked = dg.Sum(t => t.pick_qty)+ };+ var process_locked_group_datas = from pd in processdetail_DBSet+ where pd.is_update_stock == false+ group pd by new { pd.sku_id, pd.goods_location_id, pd.goods_owner_id } into pdg+ select new+ {+ goods_owner_id = pdg.Key.goods_owner_id,+ sku_id = pdg.Key.sku_id,+ goods_location_id = pdg.Key.goods_location_id,+ qty_locked = pdg.Sum(t => t.qty)+ };+ var move_locked_group_datas = from m in move_DBSet.AsNoTracking()+ where m.move_status == 0+ group m by new { m.sku_id, m.orig_goods_location_id, m.goods_owner_id } into mg+ select new+ {+ goods_owner_id = mg.Key.goods_owner_id,+ sku_id = mg.Key.sku_id,+ goods_location_id = mg.Key.orig_goods_location_id,+ qty_locked = mg.Sum(t => t.qty)+ };+ var stock_datas = await (from sg in stock_group_datas+ join dp in dispatch_group_datas on new { sg.sku_id, sg.goods_location_id, sg.goods_owner_id } equals new { dp.sku_id, dp.goods_location_id, dp.goods_owner_id } into dp_left+ from dp in dp_left.DefaultIfEmpty()+ join pl in process_locked_group_datas on new { sg.sku_id, sg.goods_location_id, sg.goods_owner_id } equals new { pl.sku_id, pl.goods_location_id, pl.goods_owner_id } into pl_left+ from pl in pl_left.DefaultIfEmpty()+ join m in move_locked_group_datas on new { sg.sku_id, sg.goods_location_id, sg.goods_owner_id } equals new { m.sku_id, m.goods_location_id, m.goods_owner_id } into m_left+ from m in m_left.DefaultIfEmpty()+ select new+ {+ stock_id = sg.stock_id,+ qty_available = (sg.qty == null ? 0 : sg.qty) - (sg.qty_frozen == null ? 0 : sg.qty_frozen) - (dp.qty_locked == null ? 0 : dp.qty_locked) - (pl.qty_locked == null ? 0 : pl.qty_locked) - (m.qty_locked == null ? 0 : m.qty_locked),+ }).ToListAsync();+ var if_not_stock = (from tp in topick_viewmodels+ join s in stock_datas on tp.id equals s.stock_id+ where tp.qty > s.qty_available+ select tp).Any();+ if (if_not_stock)+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ await pick_DBSet.AddRangeAsync(pick_datas);+ var dispatch_no = await GetOrderCode(currentUser);+ var sku_datas = await _dBContext.GetDbSet<SkuEntity>().Where(t => sku_id_list.Contains(t.id)).ToListAsync();+ foreach (var nd in new_dispatchlists)+ {+ nd.dispatch_no = dispatch_no;+ nd.creator = currentUser.user_name;+ nd.create_time = DateTime.Now;+ var sku = sku_datas.FirstOrDefault(e => e.id == nd.sku_id);+ if (sku != null)+ {+ nd.weight = nd.qty * sku.weight;+ nd.volume = nd.qty * sku.volume;+ }+ };+ await DBSet.AddRangeAsync(new_dispatchlists);+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["operation_success"]);+ }+ else+ {+ return (false, _stringLocalizer["operation_failed"]);+ }+ }++ /// <summary>+ /// cancel order opration+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> CancelOrderOpration(CancelOrderOprationViewModel viewModel, CurrentUser currentUser)+ {+ var DBSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var pick_DBSet = _dBContext.GetDbSet<DispatchpicklistEntity>();+ var entities = await DBSet.Where(t => t.dispatch_no == viewModel.dispatch_no && t.tenant_id == currentUser.tenant_id && t.dispatch_status == viewModel.dispatch_status).ToListAsync();+ if (entities.Count == 0)+ {+ return (false, _stringLocalizer["status_changed"]);+ }+ var time = DateTime.Now;+ var dispatch_id_list = entities.Select(t => t.id).ToList();+ var pick_entities = await pick_DBSet.Where(t => dispatch_id_list.Contains(t.dispatchlist_id)).ToListAsync();+ if (viewModel.dispatch_status == 3)+ {+ foreach (var pick in pick_entities)+ {+ pick.picked_qty = 0;+ pick.last_update_time = time;+ }+ foreach (var entity in entities)+ {+ entity.picked_qty = 0;+ entity.last_update_time = time;+ entity.dispatch_status = 2;+ }+ }+ else if (viewModel.dispatch_status == 2)+ {+ pick_DBSet.RemoveRange(pick_entities);+ foreach (var entity in entities)+ {+ entity.lock_qty = 0;+ entity.last_update_time = time;+ entity.dispatch_status = 1;+ }+ }+ var saved = false;+ int res = 0;+ while (!saved)+ {+ try+ {+ // Attempt to save changes to the database+ res = await _dBContext.SaveChangesAsync();+ saved = true;+ }+ catch (DbUpdateConcurrencyException ex)+ {+ foreach (var entry in ex.Entries)+ {+ if (entry.Entity is DispatchlistEntity)+ {+ var proposedValues = entry.CurrentValues;+ var databaseValues = entry.GetDatabaseValues();+ if (UtilConvert.ObjToInt(databaseValues["dispatch_status"]) != viewModel.dispatch_status)+ return (false, _stringLocalizer["data_changed"]);+ // Refresh original values to bypass next concurrency check+ entry.OriginalValues.SetValues(databaseValues);+ }+ else+ {+ throw new NotSupportedException(_stringLocalizer["try_agin"]);+ }+ }+ }+ }+ if (res > 0)+ {+ return (true, _stringLocalizer["operation_success"]);+ }+ else+ {+ return (false, _stringLocalizer["operation_failed"]);+ }+ }++ /// <summary>+ /// cancel dispatchlist detail opration+ /// </summary>+ /// <param name="id">dispatchlist_id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> CancelDispatchlistDetailOpration(int id)+ {+ var DBSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var entity = await DBSet.Where(t => t.id == id).FirstOrDefaultAsync();+ var time = DateTime.Now;+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ if (entity.dispatch_status == 4)+ {+ if (entity.weighing_no == "")+ {+ entity.dispatch_status = 3;+ }+ else+ {+ entity.dispatch_status = 5;+ }+ entity.package_no = "";+ entity.package_qty = 0;+ entity.package_time = UtilConvert.MinDate;+ entity.package_person = "";+ }+ else if (entity.dispatch_status == 5)+ {+ if (entity.package_no == "")+ {+ entity.dispatch_status = 3;+ }+ else+ {+ entity.dispatch_status = 4;+ }+ entity.weighing_no = "";+ entity.weighing_qty = 0;+ entity.weighing_weight = 0;+ entity.weighing_person = "";+ }+ else+ {+ return (false, _stringLocalizer["status_changed"]);+ }+ entity.last_update_time = time;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["operation_success"]);+ }+ else+ {+ return (false, _stringLocalizer["operation_failed"]);+ }+ }++ /// <summary>+ /// confirm dispatchpicklist picked by dispatch_no+ /// </summary>+ /// <param name="dispatch_no">dispatch_no</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> ConfirmPickByDispatchNo(string dispatch_no, CurrentUser currentUser)+ {+ var DBSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var pick_DBSet = _dBContext.GetDbSet<DispatchpicklistEntity>();+ var entities = await DBSet.Where(t => t.dispatch_status == 2 && t.dispatch_no == dispatch_no && t.tenant_id == currentUser.tenant_id).ToListAsync();+ var dispatchlist_id_list = entities.Select(t => t.id).ToList();+ var pick_datas = await pick_DBSet.Where(t => dispatchlist_id_list.Contains(t.dispatchlist_id)).ToListAsync();+ entities.ForEach(t =>+ {+ t.picked_qty = t.lock_qty;+ t.dispatch_status = 3;+ t.last_update_time = DateTime.Now;+ });+ pick_datas.ForEach(t =>+ {+ t.picked_qty = t.pick_qty;+ t.last_update_time = DateTime.Now;+ });+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["operation_success"]);+ }+ else+ {+ return (false, _stringLocalizer["operation_failed"]);+ }+ }++ /// <summary>+ /// package+ /// </summary>+ /// <param name="viewModels">viewModels</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ /// <exception cref="NotSupportedException"></exception>+ public async Task<(bool flag, string msg)> Package(List<DispatchlistPackageViewModel> viewModels, CurrentUser currentUser)+ {+ var DBSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var dispatchlist_id_list = viewModels.Select(t => t.id).ToList();+ var entities = await DBSet.Where(t => dispatchlist_id_list.Contains(t.id)).ToListAsync();+ var time = DateTime.Now;+ var code = GetPackageOrWeightCode();+ foreach (var vm in viewModels)+ {+ var entity = entities.FirstOrDefault(t => t.id == vm.id && t.dispatch_status == vm.dispatch_status);+ if (entity == null)+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ if ((entity.package_qty + vm.package_qty) > entity.picked_qty)+ {+ return (false, _stringLocalizer["unpackgeqty_lessthen"]);+ }+ entity.last_update_time = time;+ entity.package_person = currentUser.user_name;+ entity.package_qty += vm.package_qty;+ entity.package_time = time;+ entity.package_no = code;+ entity.dispatch_status = 4;+ }+ var saved = false;+ int res = 0;+ while (!saved)+ {+ try+ {+ // Attempt to save changes to the database+ res = await _dBContext.SaveChangesAsync();+ saved = true;+ }+ catch (DbUpdateConcurrencyException ex)+ {+ foreach (var entry in ex.Entries)+ {+ if (entry.Entity is DispatchlistEntity)+ {+ var proposedValues = entry.CurrentValues;+ var databaseValues = entry.GetDatabaseValues();+ var t_vm = viewModels.FirstOrDefault(t => t.id == UtilConvert.ObjToInt(databaseValues["id"]));+ if (t_vm == null)+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ if (UtilConvert.ObjToInt(databaseValues["package_qty"]) + t_vm.package_qty > t_vm.picked_qty)+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ else+ {+ proposedValues["package_qty"] = UtilConvert.ObjToInt(databaseValues["package_qty"]) + t_vm.package_qty;+ proposedValues["last_update_time"] = DateTime.Now;+ if (UtilConvert.ObjToInt(databaseValues["package_qty"]) + t_vm.package_qty == UtilConvert.ObjToInt(databaseValues["picked_qty"]))+ {+ proposedValues["dispatch_status"] = 4;+ }+ }+ // Refresh original values to bypass next concurrency check+ entry.OriginalValues.SetValues(databaseValues);+ }+ else+ {+ throw new NotSupportedException(_stringLocalizer["try_agin"]);+ }+ }+ }+ }+ if (res > 0)+ {+ return (true, _stringLocalizer["operation_success"]);+ }+ else+ {+ return (false, _stringLocalizer["operation_failed"]);+ }+ }++ /// <summary>+ /// weight+ /// </summary>+ /// <param name="viewModels">viewModels</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ /// <exception cref="NotSupportedException"></exception>+ public async Task<(bool flag, string msg)> Weight(List<DispatchlistWeightViewModel> viewModels, CurrentUser currentUser)+ {+ var DBSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var dispatchlist_id_list = viewModels.Select(t => t.id).ToList();+ var entities = await DBSet.Where(t => dispatchlist_id_list.Contains(t.id)).ToListAsync();+ var time = DateTime.Now;+ var code = GetPackageOrWeightCode();+ foreach (var vm in viewModels)+ {+ var entity = entities.FirstOrDefault(t => t.id == vm.id && t.dispatch_status == vm.dispatch_status);+ if (entity == null)+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ if ((entity.weighing_qty + vm.weighing_qty) > entity.picked_qty)+ {+ return (false, _stringLocalizer["unweightqty_lessthen"]);+ }+ entity.last_update_time = time;+ entity.weighing_person = currentUser.user_name;+ entity.weighing_qty += vm.weighing_qty;+ entity.weighing_weight += vm.weighing_weight;+ entity.weighing_no = code;+ entity.dispatch_status = 5;+ }+ var saved = false;+ int res = 0;+ while (!saved)+ {+ try+ {+ // Attempt to save changes to the database+ res = await _dBContext.SaveChangesAsync();+ saved = true;+ }+ catch (DbUpdateConcurrencyException ex)+ {+ foreach (var entry in ex.Entries)+ {+ if (entry.Entity is StockEntity)+ {+ var proposedValues = entry.CurrentValues;+ var databaseValues = entry.GetDatabaseValues();++ var t_vm = viewModels.FirstOrDefault(t => t.id == UtilConvert.ObjToInt(databaseValues["id"]));+ if (t_vm == null)+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ if (UtilConvert.ObjToInt(databaseValues["weighing_qty"]) + t_vm.weighing_qty > t_vm.picked_qty)+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ else+ {+ proposedValues["weighing_qty"] = UtilConvert.ObjToInt(databaseValues["weighing_qty"]) + t_vm.weighing_qty;+ proposedValues["weighing_weight"] = UtilConvert.ObjToInt(databaseValues["weighing_weight"]) + t_vm.weighing_weight;+ if (UtilConvert.ObjToInt(databaseValues["weighing_qty"]) + t_vm.weighing_qty == UtilConvert.ObjToInt(databaseValues["picked_qty"]))+ {+ proposedValues["dispatch_status"] = 5;+ }+ proposedValues["last_update_time"] = DateTime.Now;+ }+ // Refresh original values to bypass next concurrency check+ entry.OriginalValues.SetValues(databaseValues);+ }+ else+ {+ throw new NotSupportedException(_stringLocalizer["try_agin"]);+ }+ }+ }+ }+ if (res > 0)+ {+ return (true, _stringLocalizer["operation_success"]);+ }+ else+ {+ return (false, _stringLocalizer["operation_failed"]);+ }+ }++ /// <summary>+ /// dispatchpicklist outbound delivery+ /// </summary>+ /// <param name="viewModels">viewModels</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ /// <exception cref="NotSupportedException"></exception>+ public async Task<(bool flag, string msg)> Delivery(List<DispatchlistDeliveryViewModel> viewModels, CurrentUser currentUser)+ {+ var DBSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var dispatchlist_id_list = viewModels.Select(t => t.id).ToList();+ var pick_DBSet = _dBContext.GetDbSet<DispatchpicklistEntity>();+ var stock_DBSet = _dBContext.GetDbSet<StockEntity>();+ var entities = await DBSet.Where(t => dispatchlist_id_list.Contains(t.id)).ToListAsync();+ var time = DateTime.Now;+ foreach (var entity in entities)+ {+ if (entity.dispatch_status != 3 && entity.dispatch_status != 4 && entity.dispatch_status != 5)+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ entity.last_update_time = time;+ entity.dispatch_status = 6;+ entity.lock_qty = 0;+ entity.actual_qty = entity.picked_qty;+ entity.intrasit_qty = entity.picked_qty;+ }+ var pick_sql = pick_DBSet.Where(t => dispatchlist_id_list.Contains(t.dispatchlist_id));+ var pick_datas = await pick_sql.ToListAsync();+ var picks_g = pick_sql.AsNoTracking().GroupBy(e => new { e.goods_location_id, e.sku_id, e.goods_owner_id }).Select(c => new { c.Key.goods_location_id, c.Key.sku_id, c.Key.goods_owner_id, picked_qty = c.Sum(t => t.picked_qty) });+ var picks = await picks_g.ToListAsync();+ var stocks = await (from stock in stock_DBSet+ where picks_g.Any(t => t.goods_location_id == stock.goods_location_id && t.sku_id == stock.sku_id && t.goods_owner_id == stock.goods_owner_id)+ select stock).ToListAsync();+ foreach (var pick in picks)+ {+ var s = stocks.FirstOrDefault(t => t.goods_location_id == pick.goods_location_id && t.sku_id == pick.sku_id && t.goods_owner_id == pick.goods_owner_id);+ if (s == null)+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ s.qty -= pick.picked_qty;+ s.last_update_time = time;+ stock_DBSet.Update(s);+ }+ foreach (var pick in pick_datas)+ {+ pick.is_update_stock = true;+ pick.last_update_time = DateTime.Now;+ }+ var saved = false;+ int res = 0;+ while (!saved)+ {+ try+ {+ // Attempt to save changes to the database+ res = await _dBContext.SaveChangesAsync();+ saved = true;+ }+ catch (DbUpdateConcurrencyException ex)+ {+ foreach (var entry in ex.Entries)+ {+ if (entry.Entity is DispatchlistEntity)+ {+ var proposedValues = entry.CurrentValues;+ var databaseValues = entry.GetDatabaseValues();+ if (UtilConvert.ObjToInt(databaseValues["dispatch_status"]) != 3 && UtilConvert.ObjToInt(databaseValues["dispatch_status"]) != 4 && UtilConvert.ObjToInt(databaseValues["dispatch_status"]) != 5)+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ proposedValues["last_update_time"] = DateTime.Now;+ }+ else if (entry.Entity is StockEntity)+ {+ var proposedValues = entry.CurrentValues;+ var databaseValues = entry.GetDatabaseValues();+ var t_p = picks.FirstOrDefault(t => t.goods_location_id == UtilConvert.ObjToInt(databaseValues["goods_location_id"]) && t.sku_id == UtilConvert.ObjToInt(databaseValues["sku_id"]) && t.goods_owner_id == UtilConvert.ObjToInt(databaseValues["goods_owner_id"]));+ if (t_p == null)+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ proposedValues["qty"] = UtilConvert.ObjToInt(databaseValues["qty"]) - t_p.picked_qty;+ proposedValues["last_update_time"] = DateTime.Now;+ // Refresh original values to bypass next concurrency check+ entry.OriginalValues.SetValues(databaseValues);+ }+ else+ {+ throw new NotSupportedException(_stringLocalizer["try_agin"]);+ }+ }+ }+ }+ if (res > 0)+ {+ return (true, _stringLocalizer["operation_success"]);+ }+ else+ {+ return (false, _stringLocalizer["operation_failed"]);+ }+ }+ /// <summary>+ /// set dispatchlist freightfee+ /// </summary>+ /// <param name="viewModels"></param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> SetFreightfee(List<DispatchlistFreightfeeViewModel> viewModels)+ {+ var DBSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var dispatchlist_id_list = viewModels.Select(t => t.id).ToList();+ var freightfee_id_list = viewModels.Select(t => t.freightfee_id).Distinct().ToList();+ var entities = await DBSet.Where(t => dispatchlist_id_list.Contains(t.id)).ToListAsync();+ var freightfees = await _dBContext.GetDbSet<FreightfeeEntity>().Where(t => freightfee_id_list.Contains(t.id)).ToListAsync();+ var time = DateTime.Now;+ foreach (var entity in entities)+ {+ var vm = viewModels.FirstOrDefault(t => t.id == entity.id);+ if (vm != null)+ {+ var freightfee = freightfees.FirstOrDefault(t => t.id == vm.freightfee_id);+ if (freightfee != null)+ {+ entity.last_update_time = time;+ entity.carrier = freightfee.carrier;+ entity.waybill_no = vm.waybill_no;+ if (entity.weighing_no != "")+ {+ entity.freightfee = entity.weighing_weight * freightfee.price_per_weight > freightfee.min_payment ? entity.weighing_weight * freightfee.price_per_weight : freightfee.min_payment;+ }+ else+ {+ entity.freightfee = Math.Max(Math.Max(entity.weight * freightfee.price_per_weight, entity.volume * freightfee.price_per_volume), freightfee.min_payment);+ }+ }+ }+ }+ var res = await _dBContext.SaveChangesAsync();+ if (res > 0)+ {+ return (true, _stringLocalizer["operation_success"]);+ }+ else+ {+ return (false, _stringLocalizer["operation_failed"]);+ }+ }+ /// <summary>+ /// sign for arrival+ /// </summary>+ /// <param name="viewModels">viewModels</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> SignForArrival(List<DispatchlistSignViewModel> viewModels)+ {+ var DBSet = _dBContext.GetDbSet<DispatchlistEntity>();+ var dispatchlist_id_list = viewModels.Select(t => t.id).ToList();+ var entities = await DBSet.Where(t => dispatchlist_id_list.Contains(t.id)).ToListAsync();+ foreach (var entity in entities)+ {+ var vm = viewModels.FirstOrDefault(t => t.id == t.id && t.dispatch_status == entity.dispatch_status);+ if (vm == null)+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ entity.sign_qty = entity.actual_qty - vm.damage_qty;+ entity.damage_qty = vm.damage_qty;+ entity.last_update_time = DateTime.Now;+ entity.dispatch_status = 7;+ }+ var res = await _dBContext.SaveChangesAsync();+ if (res > 0)+ {+ return (true, _stringLocalizer["operation_success"]);+ }+ else+ {+ return (false, _stringLocalizer["operation_failed"]);+ }+ }+ /// <summary>+ /// get next order code number+ /// </summary>+ /// <returns></returns>+ public async Task<string> GetOrderCode(CurrentUser currentUser)+ {+ string code;+ string date = DateTime.Now.ToString("yyyy" + "MM" + "dd");+ string maxNo = await _dBContext.GetDbSet<DispatchlistEntity>().Where(t => t.tenant_id == currentUser.tenant_id).MaxAsync(t => t.dispatch_no);+ if (maxNo == null)+ {+ code = date + "-0001";+ }+ else+ {+ string maxDate = maxNo.Substring(0, 8);+ string maxDateNo = maxNo.Substring(9, 4);+ if (date == maxDate)+ {+ int.TryParse(maxDateNo, out int dd);+ int newDateNo = dd + 1;+ code = date + "-" + newDateNo.ToString("0000");+ }+ else+ {+ code = date + "-0001";+ }+ }++ return code;+ }++ /// <summary>+ /// get package or weight code+ /// </summary>+ /// <returns></returns>+ public string GetPackageOrWeightCode()+ {+ string date = DateTime.Now.ToString("yyyy" + "MM" + "dd");+ DateTime _dtStart = new DateTime(1970, 1, 1, 8, 0, 0);+ long timeStamp = Convert.ToInt32(DateTime.Now.Subtract(_dtStart).TotalSeconds);+ return date + timeStamp.ToString();+ }+ #endregion+ }+}+diff --git a/backend/ModernWMS.WMS/Services/Freightfee/FreightfeeService.cs b/backend/ModernWMS.WMS/Services/Freightfee/FreightfeeService.csnew file mode 100644index 0000000..e8974b0--- /dev/null+++ b/backend/ModernWMS.WMS/Services/Freightfee/FreightfeeService.cs@@ -0,0 +1,233 @@+/*+ * date:2022-12-22+ * developer:NoNo+ */+using Mapster;+using Microsoft.EntityFrameworkCore;+using ModernWMS.Core.DBContext;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;+using ModernWMS.Core.Models;+using ModernWMS.Core.JWT;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.DynamicSearch;+using System.Text;++namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// Freightfee Service+ /// </summary>+ public class FreightfeeService : BaseService<FreightfeeEntity>, IFreightfeeService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Freightfee constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public FreightfeeService(+ SqlDBContext dBContext+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<FreightfeeViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var DbSet = _dBContext.GetDbSet<FreightfeeEntity>();+ var query = DbSet.AsNoTracking()+ .Where(t => t.tenant_id.Equals(currentUser.tenant_id))+ .Where(queries.AsExpression<FreightfeeEntity>());+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.create_time)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list.Adapt<List<FreightfeeViewModel>>(), totals);+ }++ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ public async Task<List<FreightfeeViewModel>> GetAllAsync(CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<FreightfeeEntity>();+ var data = await DbSet.AsNoTracking().Where(t => t.tenant_id.Equals(currentUser.tenant_id)).ToListAsync();+ return data.Adapt<List<FreightfeeViewModel>>();+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <returns></returns>+ public async Task<FreightfeeViewModel> GetAsync(int id)+ {+ var DbSet = _dBContext.GetDbSet<FreightfeeEntity>();+ var entity = await DbSet.AsNoTracking().FirstOrDefaultAsync(t => t.id.Equals(id));+ if (entity == null)+ {+ return null;+ }+ return entity.Adapt<FreightfeeViewModel>();+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(FreightfeeViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<FreightfeeEntity>();+ var entity = viewModel.Adapt<FreightfeeEntity>();+ entity.id = 0;+ entity.create_time = DateTime.Now;+ entity.creator = currentUser.user_name;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ await DbSet.AddAsync(entity);+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(FreightfeeViewModel viewModel)+ {+ var DbSet = _dBContext.GetDbSet<FreightfeeEntity>();+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ entity.id = viewModel.id;+ entity.carrier = viewModel.carrier;+ entity.departure_city = viewModel.departure_city;+ entity.arrival_city = viewModel.arrival_city;+ entity.price_per_weight = viewModel.price_per_weight;+ entity.price_per_volume = viewModel.price_per_volume;+ entity.min_payment = viewModel.min_payment;+ entity.is_valid = viewModel.is_valid;+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ var qty = await _dBContext.GetDbSet<FreightfeeEntity>().Where(t => t.id.Equals(id)).ExecuteDeleteAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }++ /// <summary>+ /// import freightfee by excel+ /// </summary>+ /// <param name="datas">excel datas</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> ExcelAsync(List<FreightfeeExcelmportViewModel> datas, CurrentUser currentUser)+ {+ StringBuilder sb = new StringBuilder();+ var DbSet = _dBContext.GetDbSet<FreightfeeEntity>();+ /* var user_num_repeat_excel = datas.GroupBy(t => t.warehouse_name).Select(t => new { warehouse_name = t.Key, cnt = t.Count() }).Where(t => t.cnt > 1).ToList();+ foreach (var repeat in user_num_repeat_excel)+ {+ sb.AppendLine(string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["warehouse_name"], repeat.warehouse_name));+ }+ if (user_num_repeat_excel.Count > 1)+ {+ return (false, sb.ToString());+ }++ var user_num_repeat_exists = await DbSet.Where(t => datas.Select(t => t.warehouse_name).ToList().Contains(t.warehouse_name)).Select(t => t.warehouse_name).ToListAsync();+ foreach (var repeat in user_num_repeat_exists)+ {+ sb.AppendLine(string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["warehouse_name"], repeat));+ }+ if (user_num_repeat_exists.Count > 1)+ {+ return (false, sb.ToString());+ }*/++ var entities = datas.Adapt<List<FreightfeeEntity>>();+ entities.ForEach(t =>+ {+ t.creator = currentUser.user_name;+ t.tenant_id = currentUser.tenant_id;+ t.create_time = DateTime.Now;+ t.last_update_time = DateTime.Now;+ t.is_valid = true;+ });+ await DbSet.AddRangeAsync(entities);+ var res = await _dBContext.SaveChangesAsync();+ if (res > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ return (false, _stringLocalizer["save_failed"]);+ }+ #endregion+ }+}+diff --git a/backend/ModernWMS.WMS/Services/GoodsOwner/GoodsownerService.cs b/backend/ModernWMS.WMS/Services/GoodsOwner/GoodsownerService.csnew file mode 100644index 0000000..7dcc404--- /dev/null+++ b/backend/ModernWMS.WMS/Services/GoodsOwner/GoodsownerService.cs@@ -0,0 +1,242 @@+using Mapster;+using Microsoft.EntityFrameworkCore;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.DBContext;+using ModernWMS.Core.DynamicSearch;+using ModernWMS.Core.JWT;+using ModernWMS.Core.Models;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;++namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// Goods owner Service+ /// </summary>+ public class GoodsownerService : BaseService<GoodsownerEntity>, IGoodsownerService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localization+ /// </summary>+ private readonly IStringLocalizer<Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// company service constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localization</param>+ public GoodsownerService(+ SqlDBContext dBContext+ , IStringLocalizer<Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<GoodsownerViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var DbSet = _dBContext.GetDbSet<GoodsownerEntity>();+ var query = DbSet.AsNoTracking()+ .Where(t => t.tenant_id.Equals(currentUser.tenant_id))+ .Where(queries.AsExpression<GoodsownerEntity>());+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.create_time)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list.Adapt<List<GoodsownerViewModel>>(), totals);+ }+ /// <summary>+ /// Get all records+ /// </summary>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<List<GoodsownerViewModel>> GetAllAsync(CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<GoodsownerEntity>();+ var data = await DbSet.AsNoTracking().Where(t => t.tenant_id == currentUser.tenant_id)+ .OrderByDescending(t => t.create_time).ToListAsync();+ return data.Adapt<List<GoodsownerViewModel>>();+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<GoodsownerViewModel> GetAsync(int id)+ {+ var entity = await _dBContext.GetDbSet<GoodsownerEntity>().AsNoTracking().FirstOrDefaultAsync(t => t.id.Equals(id));+ if (entity != null)+ {+ return entity.Adapt<GoodsownerViewModel>();+ }+ else+ {+ return new GoodsownerViewModel();+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(GoodsownerViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<GoodsownerEntity>();+ if (await DbSet.AnyAsync(t => t.tenant_id.Equals(currentUser.tenant_id) && t.goods_owner_name.Equals(viewModel.goods_owner_name)))+ {+ return (0, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["goods_owner_name"], viewModel.goods_owner_name));+ }+ var entity = viewModel.Adapt<GoodsownerEntity>();+ entity.id = 0;+ entity.creator = currentUser.user_name;+ entity.create_time = DateTime.Now;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ await DbSet.AddAsync(entity);+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(GoodsownerViewModel viewModel)+ {+ var DbSet = _dBContext.GetDbSet<GoodsownerEntity>();+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ if (await DbSet.AnyAsync(t => !t.id.Equals(viewModel.id) && t.tenant_id.Equals(entity.tenant_id) && t.goods_owner_name.Equals(viewModel.goods_owner_name)))+ {+ return (false, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["goods_owner_name"], viewModel.goods_owner_name));+ }+ entity.goods_owner_name = viewModel.goods_owner_name;+ entity.city = viewModel.city;+ entity.address = viewModel.address;+ entity.manager = viewModel.manager;+ entity.contact_tel = viewModel.contact_tel;+ entity.is_valid = viewModel.is_valid;+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ var qty = await _dBContext.GetDbSet<GoodsownerEntity>().Where(t => t.id.Equals(id)).ExecuteDeleteAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }+ #endregion+++ #region Import+ /// <summary>+ /// import goodsowners by excel+ /// </summary>+ /// <param name="input">excel data</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(bool flag, List<GoodsownerImportViewModel> errorData)> ExcelAsync(List<GoodsownerImportViewModel> input, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<GoodsownerEntity>();+ var existsDatas = await DbSet.AsNoTracking().Where(t => t.tenant_id.Equals(currentUser.tenant_id)).Select(t => new { t.goods_owner_name }).ToListAsync();+ input.ForEach(async t =>+ {+ t.errorMsg = string.Empty;+ if (existsDatas.Any(d => d.goods_owner_name.Equals(t.goods_owner_name)))+ {+ t.errorMsg = string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["goods_owner_name"], t.goods_owner_name);+ }+ else+ {+ await DbSet.AddAsync(new GoodsownerEntity+ {+ goods_owner_name = t.goods_owner_name,+ city = t.city,+ address = t.address,+ manager = t.manager,+ contact_tel = t.contact_tel,+ creator = currentUser.user_name,+ create_time = DateTime.Now,+ last_update_time = DateTime.Now,+ is_valid = true,+ tenant_id = currentUser.tenant_id+ });+ }+ });+ if (input.Any(t => t.errorMsg.Length > 0))+ {+ return (false, input.Where(t => t.errorMsg.Length > 0).ToList());+ }+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, new List<GoodsownerImportViewModel>());+ }+ else+ {+ return (false, new List<GoodsownerImportViewModel>());+ }+ }++ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Services/Goodslocation/GoodslocationService.cs b/backend/ModernWMS.WMS/Services/Goodslocation/GoodslocationService.csnew file mode 100644index 0000000..645de9b--- /dev/null+++ b/backend/ModernWMS.WMS/Services/Goodslocation/GoodslocationService.cs@@ -0,0 +1,228 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+ using Mapster;+ using Microsoft.EntityFrameworkCore;+ using ModernWMS.Core.DBContext;+ using ModernWMS.Core.Services;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using ModernWMS.Core.Models;+ using ModernWMS.Core.JWT;+ using Microsoft.Extensions.Localization;+ using ModernWMS.Core.DynamicSearch;++ namespace ModernWMS.WMS.Services+ {+ /// <summary>+ /// Goodslocation Service+ /// </summary>+ public class GoodslocationService : BaseService<GoodslocationEntity>, IGoodslocationService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Goodslocation constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public GoodslocationService(+ SqlDBContext dBContext+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer= stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// get goodslocation of the warehousearea by warehouse_id and warehousearea_id+ /// </summary>+ /// <param name="warehouse_area_id">warehousearea's id</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<List<FormSelectItem>> GetGoodslocationByWarehouse_area_id( int warehouse_area_id, CurrentUser currentUser)+ {+ var res = new List<FormSelectItem>();+ var DbSet = _dBContext.GetDbSet<GoodslocationEntity>();+ res = await (from g in DbSet.AsNoTracking()+ where g.is_valid == true && g.tenant_id == currentUser.tenant_id && g.warehouse_area_id== warehouse_area_id+ select new FormSelectItem+ {+ code = "goodslocation",+ comments = "goodslocations of the warehousearea",+ name = g.location_name,+ value = g.id.ToString(),+ }).ToListAsync();+ return res;+ }++ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<GoodslocationViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var DbSet = _dBContext.GetDbSet<GoodslocationEntity>().AsNoTracking();++ var query = DbSet+ .Where(t => t.tenant_id.Equals(currentUser.tenant_id))+ .Where(queries.AsExpression<GoodslocationEntity>());+ if (pageSearch.sqlTitle == "select")+ {+ query = query.Where(t => t.is_valid == true);+ }+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.create_time)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list.Adapt<List<GoodslocationViewModel>>(), totals);+ }++ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ public async Task<List<GoodslocationViewModel>> GetAllAsync(CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<GoodslocationEntity>();+ var data = await DbSet.AsNoTracking().Where(t=>t.tenant_id.Equals(currentUser.tenant_id)).ToListAsync();+ return data.Adapt<List<GoodslocationViewModel>>();+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <returns></returns>+ public async Task<GoodslocationViewModel> GetAsync(int id)+ {+ var DbSet = _dBContext.GetDbSet<GoodslocationEntity>();+ var entity = await DbSet.AsNoTracking().FirstOrDefaultAsync(t=>t.id.Equals(id));+ if (entity == null)+ {+ return null;+ }+ return entity.Adapt<GoodslocationViewModel>();+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(GoodslocationViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<GoodslocationEntity>();+ if (await DbSet.AnyAsync(t => t.location_name == viewModel.location_name && t.tenant_id == currentUser.tenant_id))+ {+ return (0, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["location_name"], viewModel.location_name));+ }+ var entity = viewModel.Adapt<GoodslocationEntity>();+ entity.id = 0;+ entity.create_time = DateTime.Now;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ await DbSet.AddAsync(entity);+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(GoodslocationViewModel viewModel,CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<GoodslocationEntity>();+ if (await DbSet.AnyAsync(t => t.id != viewModel.id && t.warehouse_id == viewModel.warehouse_id && t.location_name == viewModel.location_name && t.tenant_id == currentUser.tenant_id))+ {+ return (false, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["location_name"], viewModel.location_name));+ }+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (entity == null)+ {+ return (false,_stringLocalizer[ "not_exists_entity"]);+ }+ entity.id = viewModel.id;+ entity.warehouse_id = viewModel.warehouse_id;+ entity.warehouse_name = viewModel.warehouse_name;+ entity.warehouse_area_name = viewModel.warehouse_area_name;+ entity.warehouse_area_property = viewModel.warehouse_area_property;+ entity.location_name = viewModel.location_name;+ entity.location_length = viewModel.location_length;+ entity.location_width = viewModel.location_width;+ entity.location_heigth = viewModel.location_heigth;+ entity.location_volume = viewModel.location_volume;+ entity.location_load = viewModel.location_load;+ entity.roadway_number = viewModel.roadway_number;+ entity.shelf_number = viewModel.shelf_number;+ entity.layer_number = viewModel.layer_number;+ entity.tag_number = viewModel.tag_number;+ entity.is_valid = viewModel.is_valid;+ entity.warehouse_area_id = viewModel.warehouse_area_id;+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ var qty = await _dBContext.GetDbSet<GoodslocationEntity>().Where(t => t.id.Equals(id)).ExecuteDeleteAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/Services/Rolemenu/RolemenuService.cs b/backend/ModernWMS.WMS/Services/Rolemenu/RolemenuService.csnew file mode 100644index 0000000..e2fb75c--- /dev/null+++ b/backend/ModernWMS.WMS/Services/Rolemenu/RolemenuService.cs@@ -0,0 +1,281 @@+/*+ * date:2022-12-20+ * developer:AMo+ */+using Mapster;+using Microsoft.EntityFrameworkCore;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.DBContext;+using ModernWMS.Core.JWT;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;+using ModernWMS.Core.Models;+namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// Rolemenu Service+ /// </summary>+ public class RolemenuService : BaseService<RolemenuEntity>, IRolemenuService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Rolemenu constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public RolemenuService(+ SqlDBContext dBContext+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// Get all records+ /// </summary>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<List<RolemenuListViewModel>> GetAllAsync(CurrentUser currentUser)+ {+ var Rolemenus = _dBContext.GetDbSet<RolemenuEntity>();+ var Userroles = _dBContext.GetDbSet<UserroleEntity>();+ var queryMenusGroup = Rolemenus.AsNoTracking()+ .Where(t => t.tenant_id == currentUser.tenant_id)+ .GroupBy(g => new { g.userrole_id })+ .Select(g => new+ {+ userrole_id = g.Key.userrole_id,+ create_time = g.Min(t => t.create_time),+ last_update_time = g.Max(t => t.last_update_time)+ });+ var data = await (from g in queryMenusGroup+ join r in Userroles.AsNoTracking().Where(t => t.tenant_id == currentUser.tenant_id)+ on g.userrole_id equals r.id+ select new RolemenuListViewModel+ {+ userrole_id = g.userrole_id,+ role_name = r.role_name,+ is_valid = r.is_valid,+ create_time = g.create_time,+ last_update_time = g.last_update_time+ }).ToListAsync();+ return data;+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="userrole_id">userrole id</param>+ /// <returns></returns>+ public async Task<RolemenuBothViewModel> GetAsync(int userrole_id)+ {+ var Rolemenus = _dBContext.GetDbSet<RolemenuEntity>();+ var Userroles = _dBContext.GetDbSet<UserroleEntity>();+ var Menus = _dBContext.GetDbSet<MenuEntity>();+ var entities = await (from rm in Rolemenus.AsNoTracking()+ join m in Menus.AsNoTracking() on rm.menu_id equals m.id+ join r in Userroles.AsNoTracking() on rm.userrole_id equals r.id+ where rm.userrole_id == userrole_id+ orderby r.role_name, m.sort, m.menu_name+ select new+ {+ rm.id,+ rm.userrole_id,+ r.role_name,+ r.is_valid,+ rm.menu_id,+ m.menu_name,+ rm.authority,+ rm.create_time,+ rm.last_update_time+ }).ToListAsync();+ if (entities.Any())+ {+ var data = new RolemenuBothViewModel+ {+ userrole_id = entities.First().userrole_id,+ role_name = entities.First().role_name,+ is_valid = entities.First().is_valid,+ detailList = entities.Adapt<List<RolemenuViewModel>>()+ };+ return data;+ }+ else+ {+ return new RolemenuBothViewModel();+ }+ }+ /// <summary>+ /// Get all menus+ /// </summary>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<List<MenuViewModel>> GetAllMenusAsync(CurrentUser currentUser)+ {+ var Menus = _dBContext.GetDbSet<MenuEntity>();+ var data = await Menus.AsNoTracking()+ .Where(t => t.tenant_id == currentUser.tenant_id)+ .Select(m => new MenuViewModel+ {+ id = m.id,+ menu_name = m.menu_name,+ module = m.module,+ vue_path = m.vue_path,+ vue_path_detail = m.vue_path_detail,+ vue_directory = m.vue_directory,+ sort = m.sort+ }).ToListAsync();+ return data;+ }+ /// <summary>+ /// Get menu's authority by user role id+ /// </summary>+ /// <param name="userrole_id">user role id</param>+ /// <returns></returns>+ public async Task<List<MenuViewModel>> GetMenusByRoleId(int userrole_id)+ {+ var Rolemenus = _dBContext.GetDbSet<RolemenuEntity>();+ var Menus = _dBContext.GetDbSet<MenuEntity>();+ var data = await (from rm in Rolemenus.AsNoTracking()+ join m in Menus.AsNoTracking() on rm.menu_id equals m.id+ where rm.userrole_id == userrole_id+ orderby m.sort, m.menu_name+ select new MenuViewModel+ {+ id = m.id,+ menu_name = m.menu_name,+ module = m.module,+ vue_path = m.vue_path,+ vue_path_detail = m.vue_path_detail,+ vue_directory = m.vue_directory,+ sort = m.sort+ }).ToListAsync();+ return data;+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(RolemenuBothViewModel viewModel, CurrentUser currentUser)+ {+ var Rolemenus = _dBContext.GetDbSet<RolemenuEntity>();+ if (await Rolemenus.AnyAsync(t => t.userrole_id.Equals(viewModel.userrole_id)))+ {+ return (0, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["role_name"], viewModel.role_name));+ }+ var entities = viewModel.detailList.Select(t => new RolemenuEntity+ {+ id = 0,+ userrole_id = viewModel.userrole_id,+ menu_id = t.menu_id,+ authority = t.authority,+ create_time = DateTime.Now,+ last_update_time = DateTime.Now,+ tenant_id = currentUser.tenant_id+ }).ToList();++ await Rolemenus.AddRangeAsync(entities);+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (viewModel.userrole_id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(RolemenuBothViewModel viewModel, CurrentUser currentUser)+ {+ var Rolemenus = _dBContext.GetDbSet<RolemenuEntity>();+ if (!(await Rolemenus.AnyAsync(t => t.userrole_id.Equals(viewModel.userrole_id))))+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ var dbEntities = await Rolemenus.AsNoTracking().Where(t => t.userrole_id == viewModel.userrole_id).ToListAsync();++ var entities = (from vm in viewModel.detailList+ join db in dbEntities on new { id = Math.Abs(vm.id), vm.menu_id } equals new { db.id, db.menu_id } into dbJoin+ from db in dbJoin.DefaultIfEmpty()+ select new RolemenuEntity+ {+ id = vm.id,+ userrole_id = viewModel.userrole_id,+ menu_id = vm.menu_id,+ authority = vm.authority,+ create_time = db == null ? DateTime.Now : db.create_time,+ last_update_time = DateTime.Now,+ tenant_id = currentUser.tenant_id+ }).ToList();++ if (entities.Any(t => t.id > 0))+ {+ Rolemenus.UpdateRange(entities.Where(t => t.id > 0).ToList());+ }+ if (entities.Any(t => t.id == 0))+ {+ Rolemenus.AddRange(entities.Where(t => t.id == 0).ToList());+ }+ if (entities.Any(t => t.id < 0))+ {+ var dels = entities.Where(t => t.id < 0).ToList();+ dels.ForEach(t => t.id *= -1);+ Rolemenus.RemoveRange(dels);+ }+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="userrole_id">userrole id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int userrole_id)+ {+ var qty = await _dBContext.GetDbSet<RolemenuEntity>().Where(t => t.userrole_id.Equals(userrole_id)).ExecuteDeleteAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/Services/Sku/CategoryService.cs b/backend/ModernWMS.WMS/Services/Sku/CategoryService.csnew file mode 100644index 0000000..fd415e0--- /dev/null+++ b/backend/ModernWMS.WMS/Services/Sku/CategoryService.cs@@ -0,0 +1,208 @@+/*+ * date:2022-12-20+ * developer:AMo+ */+ using Mapster;+ using Microsoft.EntityFrameworkCore;+ using ModernWMS.Core.DBContext;+ using ModernWMS.Core.Services;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;+using ModernWMS.Core.JWT;+using System.Collections.Immutable;+using System.Collections.Generic;++namespace ModernWMS.WMS.Services+ {+ /// <summary>+ /// Category Service+ /// </summary>+ public class CategoryService : BaseService<CategoryEntity>, ICategoryService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Category constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public CategoryService(+ SqlDBContext dBContext+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// Get all records+ /// </summary>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<List<CategoryViewModel>> GetAllAsync(CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<CategoryEntity>();+ var data = await DbSet.AsNoTracking()+ .Where(t => t.tenant_id.Equals(currentUser.tenant_id))+ .ToListAsync();+ return data.Adapt<List<CategoryViewModel>>();+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <returns></returns>+ public async Task<CategoryViewModel> GetAsync(int id)+ {+ var DbSet = _dBContext.GetDbSet<CategoryEntity>();+ var entity = await DbSet.AsNoTracking().FirstOrDefaultAsync(t => t.id.Equals(id));+ if (entity == null)+ {+ return new CategoryViewModel();+ }+ return entity.Adapt<CategoryViewModel>();+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(CategoryViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<CategoryEntity>();+ if (await DbSet.AsNoTracking().AnyAsync(t => t.tenant_id.Equals(currentUser.tenant_id) && t.category_name.Equals(viewModel.category_name)))+ {+ return (0, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["category_name"], viewModel.category_name));+ }+ var entity = viewModel.Adapt<CategoryEntity>();+ entity.id = 0;+ entity.creator = currentUser.user_name;+ entity.create_time = DateTime.Now;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ entity.is_valid = viewModel.is_valid;+ await DbSet.AddAsync(entity);+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(CategoryViewModel viewModel)+ {+ var DbSet = _dBContext.GetDbSet<CategoryEntity>();+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ if (await DbSet.AsNoTracking().AnyAsync(t => !t.id.Equals(viewModel.id) && t.tenant_id.Equals(entity.tenant_id) && t.category_name.Equals(viewModel.category_name)))+ {+ return (false, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["category_name"], viewModel.category_name));+ }+ entity.id = viewModel.id;+ entity.category_name = viewModel.category_name;+ entity.parent_id = viewModel.parent_id;+ entity.last_update_time = DateTime.Now;+ if (!viewModel.is_valid.Equals(entity.is_valid))+ {+ var entities = await DbSet.Where(t => t.parent_id > 0).ToListAsync();+ List<CategoryEntity> children = new List<CategoryEntity>();+ GetChildren(entities, entity.id, ref children);+ if (children.Any())+ {+ children.ForEach(c =>+ {+ c.is_valid = viewModel.is_valid;+ c.last_update_time = DateTime.Now;+ });+ }+ }+ entity.is_valid = viewModel.is_valid;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ private void GetChildren(List<CategoryEntity> entities, int parentId, ref List<CategoryEntity> children)+ {+ var data = entities.Where(t => t.parent_id== parentId).ToList();+ if (data.Any())+ {+ foreach (var item in data)+ {+ children.Add(item);+ if (entities.Any(t => t.parent_id.Equals(item.id)))+ {+ GetChildren(entities, item.parent_id, ref children);+ }+ }+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ var DbSet = _dBContext.GetDbSet<CategoryEntity>();+ var entities = await DbSet.Where(t => t.parent_id.Equals(id)).ToListAsync();+ List<CategoryEntity> children = new List<CategoryEntity>();+ GetChildren(entities, id, ref children);+ List<int> idList = new List<int> { id };+ if (children.Any())+ {+ idList.AddRange(children.Select(t => t.id).ToList());+ }+ // 判断是否引用+ var Spus = _dBContext.GetDbSet<SpuEntity>();+ if (await Spus.AsNoTracking().AnyAsync(t => idList.Contains(t.category_id)))+ {+ return (false, _stringLocalizer["delete_referenced"]);+ }+ var qty = await _dBContext.GetDbSet<CategoryEntity>().Where(t => idList.Contains(t.id)).ExecuteDeleteAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/Services/Sku/SpuService.cs b/backend/ModernWMS.WMS/Services/Sku/SpuService.csnew file mode 100644index 0000000..581fe5d--- /dev/null+++ b/backend/ModernWMS.WMS/Services/Sku/SpuService.cs@@ -0,0 +1,452 @@+/*+ * date:2022-12-21+ * developer:AMo+ */+ using Mapster;+ using Microsoft.EntityFrameworkCore;+ using ModernWMS.Core.DBContext;+ using ModernWMS.Core.Services;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;+using ModernWMS.Core.DynamicSearch;+using ModernWMS.Core.Models;+using ModernWMS.Core.JWT;++namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// Spu Service+ /// </summary>+ public class SpuService : BaseService<SpuEntity>, ISpuService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Spu constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public SpuService(+ SqlDBContext dBContext+ , IStringLocalizer<Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<SpuBothViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var Categorys = _dBContext.GetDbSet<CategoryEntity>();+ var Spus = _dBContext.GetDbSet<SpuEntity>();+ var Skus = _dBContext.GetDbSet<SkuEntity>();+ var query = from m in Spus.AsNoTracking()+ join c in Categorys.AsNoTracking() on m.category_id equals c.id+ where m.tenant_id == currentUser.tenant_id+ select new SpuBothViewModel+ {+ id = m.id,+ spu_code = m.spu_code,+ spu_name = m.spu_name,+ category_id = m.category_id,+ category_name = c.category_name,+ spu_description = m.spu_description,+ bar_code = m.bar_code,+ supplier_id = m.supplier_id,+ supplier_name = m.supplier_name,+ brand = m.brand,+ origin = m.origin,+ length_unit = m.length_unit,+ volume_unit = m.volume_unit,+ weight_unit = m.weight_unit,+ creator = m.creator,+ create_time = m.create_time,+ last_update_time = m.last_update_time,+ is_valid = m.is_valid,+ detailList = Skus.AsNoTracking().Where(t => t.spu_id.Equals(m.id))+ .Select(t => new SkuViewModel+ {+ id = t.id,+ spu_id = t.spu_id,+ sku_code = t.sku_code,+ sku_name = t.sku_name,+ weight = t.weight,+ lenght = t.lenght,+ width = t.width,+ height = t.height,+ volume = t.volume,+ unit = t.unit,+ cost = t.cost,+ price = t.price,+ create_time = t.create_time,+ last_update_time = t.last_update_time+ }).ToList()++ };+ query = query.Where(queries.AsExpression<SpuBothViewModel>());+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.create_time)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list, totals);+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <returns></returns>+ public async Task<SpuBothViewModel> GetAsync(int id)+ {+ var Categorys = _dBContext.GetDbSet<CategoryEntity>();+ var Spus = _dBContext.GetDbSet<SpuEntity>();+ var Skus = _dBContext.GetDbSet<SkuEntity>();+ var query = from m in Spus.AsNoTracking()+ join c in Categorys.AsNoTracking() on m.category_id equals c.id+ where m.id == id+ select new SpuBothViewModel+ {+ id = m.id,+ spu_code = m.spu_code,+ spu_name = m.spu_name,+ category_id = m.category_id,+ category_name = c.category_name,+ spu_description = m.spu_description,+ bar_code = m.bar_code,+ supplier_id = m.supplier_id,+ supplier_name = m.supplier_name,+ brand = m.brand,+ origin = m.origin,+ length_unit = m.length_unit,+ volume_unit = m.volume_unit,+ weight_unit = m.weight_unit,+ creator = m.creator,+ create_time = m.create_time,+ last_update_time = m.last_update_time,+ is_valid = m.is_valid,+ detailList = Skus.Where(t => t.spu_id.Equals(m.id))+ .Select(t => new SkuViewModel+ {+ id = t.id,+ spu_id = t.spu_id,+ sku_code = t.sku_code,+ sku_name = t.sku_name,+ weight = t.weight,+ lenght = t.lenght,+ width = t.width,+ height = t.height,+ volume = t.volume,+ unit = t.unit,+ cost = t.cost,+ price = t.price,+ create_time = t.create_time,+ last_update_time = t.last_update_time+ }).ToList()++ };+ var data = await query.FirstOrDefaultAsync();+ if (data != null)+ {+ return data;+ }+ else+ {+ return new SpuBothViewModel();+ }+ }+ /// <summary>+ /// get sku info by sku_id+ /// </summary>+ /// <param name="sku_id">sku_id</param>+ /// <returns></returns>+ public async Task<SkuDetailViewModel> GetSkuAsync(int sku_id)+ {+ var Categorys = _dBContext.GetDbSet<CategoryEntity>();+ var Spus = _dBContext.GetDbSet<SpuEntity>();+ var Skus = _dBContext.GetDbSet<SkuEntity>();+ var query = from m in Spus.AsNoTracking()+ join c in Categorys.AsNoTracking() on m.category_id equals c.id+ join d in Skus.AsNoTracking() on m.id equals d.spu_id+ where d.id == sku_id+ select new SkuDetailViewModel+ {+ spu_id = m.id,+ spu_code = m.spu_code,+ spu_name = m.spu_name,+ category_id = m.category_id,+ category_name = c.category_name,+ spu_description = m.spu_description,+ bar_code = m.bar_code,+ supplier_id = m.supplier_id,+ supplier_name = m.supplier_name,+ brand = m.brand,+ origin = m.origin,+ length_unit = m.length_unit,+ volume_unit = m.volume_unit,+ weight_unit = m.weight_unit,+ sku_id = d.id,+ sku_code = d.sku_code,+ sku_name = d.sku_name,+ weight = d.weight,+ lenght = d.lenght,+ width = d.width,+ height = d.height,+ volume = d.volume,+ unit = d.unit,+ cost = d.cost,+ price = d.price+ };+ var data = await query.FirstOrDefaultAsync();+ if (data != null)+ {+ return data;+ }+ else+ {+ return new SkuDetailViewModel();+ }++ }++ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(SpuBothViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<SpuEntity>();+ if (await DbSet.AsNoTracking().AnyAsync(t => t.tenant_id.Equals(currentUser.tenant_id) && t.spu_code.Equals(viewModel.spu_code)))+ {+ return (0, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["spu_code"], viewModel.spu_code));+ }+ var entity = viewModel.Adapt<SpuEntity>();+ entity.id = 0;+ entity.creator = currentUser.user_name;+ entity.create_time = DateTime.Now;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ if (viewModel.detailList.Any())+ {+ decimal dec = ChangeLengthUnit(entity.length_unit, entity.volume_unit);+ viewModel.detailList.ForEach(t =>+ {+ t.id = 0;+ t.volume = Math.Round(t.lenght * dec * t.width * dec * t.height * dec, 3);+ });+ }+ await DbSet.AddAsync(entity);+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// change to the volume unit+ /// </summary>+ /// <param name="length_unit">length_unit</param>+ /// <param name="volume_unit">volume_unit</param>+ /// <returns></returns>+ private decimal ChangeLengthUnit(byte length_unit, byte volume_unit)+ {+ if (volume_unit.Equals(0)) // cm3+ {+ if (length_unit.Equals(0)) //mm+ {+ return 0.1M;+ }+ else if (length_unit.Equals(2)) // dm+ {+ return 10M;+ }+ else if (length_unit.Equals(3)) // m+ {+ return 100M;+ }+ else // cm+ {+ return 1M;+ }+ }+ else if (volume_unit.Equals(1)) // dm3+ {+ if (length_unit.Equals(0))+ {+ return 0.01M;+ }+ else if (length_unit.Equals(2))+ {+ return 1M;+ }+ else if (length_unit.Equals(3))+ {+ return 10M;+ }+ else+ {+ return 0.1M;+ }+ }+ else if (volume_unit.Equals(2)) // m3+ {+ if (length_unit.Equals(0))+ {+ return 0.001M;+ }+ else if (length_unit.Equals(2))+ {+ return 0.1M;+ }+ else if (length_unit.Equals(3))+ {+ return 1M;+ }+ else+ {+ return 0.01M;+ }+ }+ else+ {+ return 1M;+ }++ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(SpuBothViewModel viewModel)+ {+ var DbSet = _dBContext.GetDbSet<SpuEntity>();+ var entity = await DbSet.Include(d => d.detailList).FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ if (await DbSet.AsNoTracking().AnyAsync(t => !t.id.Equals(viewModel.id) && t.tenant_id.Equals(entity.tenant_id) && t.spu_code.Equals(viewModel.spu_code)))+ {+ return (false, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["spu_code"], viewModel.spu_code));+ }+ entity.spu_code = viewModel.spu_code;+ entity.spu_name = viewModel.spu_name;+ entity.category_id = viewModel.category_id;+ entity.spu_description = viewModel.spu_description;+ entity.bar_code = viewModel.bar_code;+ entity.supplier_id = viewModel.supplier_id;+ entity.supplier_name = viewModel.supplier_name;+ entity.brand = viewModel.brand;+ entity.origin = viewModel.origin;+ entity.length_unit = viewModel.length_unit;+ entity.volume_unit = viewModel.volume_unit;+ entity.weight_unit = viewModel.weight_unit;+ entity.is_valid = viewModel.is_valid;+ entity.last_update_time = DateTime.Now;+++ if (viewModel.detailList.Any(t => t.id > 0))+ {+ entity.detailList.ForEach(d =>+ {+ var vm = viewModel.detailList.Where(t => t.id > 0).FirstOrDefault(t => t.id == d.id);+ if (vm != null)+ {+ d.sku_code = vm.sku_code;+ d.sku_name = vm.sku_name;+ d.weight = vm.weight;+ d.lenght = vm.lenght;+ d.width = vm.width;+ d.height = vm.height;+ d.volume = vm.volume;+ d.unit = vm.unit;+ d.cost = vm.cost;+ d.price = vm.price;+ d.last_update_time = DateTime.Now;+ }+ });+ }+ if (viewModel.detailList.Any(t => t.id == 0))+ {+ entity.detailList.AddRange(viewModel.detailList.Where(t => t.id == 0).ToList().Adapt<List<SkuEntity>>());+ }+ if (viewModel.detailList.Any(t => t.id < 0))+ {+ var delIds = viewModel.detailList.Where(t => t.id < 0).Select(t => t.id * -1).ToList();+ entity.detailList.RemoveAll(entity => delIds.Contains(entity.id));+ }+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ decimal dec = ChangeLengthUnit(entity.length_unit, entity.volume_unit);+ await _dBContext.GetDbSet<SkuEntity>().Where(t => t.spu_id.Equals(entity.id))+ .ExecuteUpdateAsync(p => p.SetProperty(x => x.volume, x => Math.Round(x.lenght * dec * x.width * dec * x.height * dec, 3)));+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ var Asns = _dBContext.GetDbSet<AsnEntity>();+ if(await Asns.AsNoTracking().AnyAsync(t => t.spu_id.Equals(id)))+ {+ return (false, _stringLocalizer["delete_referenced"]);+ }+ var qty = await _dBContext.GetDbSet<SkuEntity>().Where(t => t.spu_id.Equals(id)).ExecuteDeleteAsync();+ qty += await _dBContext.GetDbSet<SpuEntity>().Where(t => t.id.Equals(id)).ExecuteDeleteAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/Services/Stock/StockService.cs b/backend/ModernWMS.WMS/Services/Stock/StockService.csnew file mode 100644index 0000000..d47d3d5--- /dev/null+++ b/backend/ModernWMS.WMS/Services/Stock/StockService.cs@@ -0,0 +1,427 @@+/*+ * date:2022-12-22+ * developer:NoNo+ */+using Mapster;+using Microsoft.EntityFrameworkCore;+using ModernWMS.Core.DBContext;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;+using ModernWMS.Core.Models;+using ModernWMS.Core.JWT;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.DynamicSearch;+using System.Runtime.Intrinsics.Arm;+using System.Net.WebSockets;+using System.Linq;++namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// Stock Service+ /// </summary>+ public class StockService : BaseService<StockEntity>, IStockService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Stock constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public StockService(+ SqlDBContext dBContext+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+++ /// <summary>+ /// stock page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<StockManagementViewModel> data, int totals)> StockPageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }++ var DbSet = _dBContext.GetDbSet<StockEntity>().Where(t => t.tenant_id.Equals(currentUser.tenant_id));+ var asn_DBSet = _dBContext.GetDbSet<AsnEntity>().Where(t => t.tenant_id.Equals(currentUser.tenant_id));+ var dispatch_DBSet = _dBContext.GetDbSet<DispatchlistEntity>().Where(t => t.tenant_id.Equals(currentUser.tenant_id));+ var sku_DBSet = _dBContext.GetDbSet<SkuEntity>().AsNoTracking();+ var spu_DBSet = _dBContext.GetDbSet<SpuEntity>().AsNoTracking();+ var processdetail_DBSet = _dBContext.GetDbSet<StockprocessdetailEntity>().AsNoTracking();+ var move_DBSet = _dBContext.GetDbSet<StockmoveEntity>();+ var stock_group_datas = from stock in DbSet.AsNoTracking()+ join gl in _dBContext.GetDbSet<GoodslocationEntity>().AsNoTracking() on stock.goods_location_id equals gl.id+ group new { stock ,gl} by stock.sku_id into sg+ select new+ {+ sku_id = sg.Key,+ qty_frozen = sg.Where(t => t.stock.is_freeze == true).Sum(e => e.stock.qty),+ qty = sg.Sum(t => t.stock.qty),+ qty_normal = sg.Where(t=>t.gl.warehouse_area_property != 5).Sum(t=>t.stock.qty),+ qty_normal_frozen = sg.Where(t=>t.gl.warehouse_area_property != 5 && t.stock.is_freeze == true).Sum(t=>t.stock.qty),+ };+ var asn_group_datas = from asn in asn_DBSet.AsNoTracking()+ group asn by asn.sku_id into ag+ select new+ {+ sku_id = ag.Key,+ qty_asn = ag.Where(t => t.asn_status == 0).Sum(t => t.asn_qty),+ qty_to_unload = ag.Where(t => t.asn_status == 1).Sum(t => t.asn_qty),+ qty_to_sort = ag.Where(t => t.asn_status == 2).Sum(t => t.asn_qty),+ qty_sorted = ag.Where(t => t.asn_status == 3).Sum(t => t.sorted_qty),+ shortage_qty = ag.Where(t => t.asn_status == 4).Sum(t => t.shortage_qty)+ };+ var dispatch_group_datas = from dp in dispatch_DBSet.AsNoTracking()+ group dp by dp.sku_id into dg+ select new+ {+ sku_id = dg.Key,+ qty_locked = dg.Sum(t => t.lock_qty)+ };+ var process_locked_group_datas = from pd in processdetail_DBSet+ join gl in _dBContext.GetDbSet<GoodslocationEntity>().AsNoTracking() on pd.goods_location_id equals gl.id+ where pd.is_update_stock == false && pd.is_source == true+ group new { pd , gl } by pd.sku_id into pdg+ select new+ {+ sku_id = pdg.Key,+ qty_locked = pdg.Sum(t => t.pd.qty),+ qty_normal_locked = pdg.Where(t => t.gl.warehouse_area_property != 5).Sum(t => t.pd.qty),+ };+ var move_locked_group_datas = from m in move_DBSet.AsNoTracking()+ join gl in _dBContext.GetDbSet<GoodslocationEntity>().AsNoTracking() on m.orig_goods_location_id equals gl.id+ where m.move_status == 0+ group new { m , gl } by m.sku_id into mg+ select new+ {+ sku_id = mg.Key,+ qty_locked = mg.Sum(t => t.m.qty),+ qty_normal_locked = mg.Where(t=>t.gl.warehouse_area_property !=5).Sum(t => t.m.qty),+ };++ var query = from sku in sku_DBSet+ join ag in asn_group_datas on sku.id equals ag.sku_id into ag_left+ from ag in ag_left.DefaultIfEmpty()+ join sg in stock_group_datas on sku.id equals sg.sku_id into sg_left+ from sg in sg_left.DefaultIfEmpty()+ join dp in dispatch_group_datas on sg.sku_id equals dp.sku_id into dp_left+ from dp in dp_left.DefaultIfEmpty()+ join pl in process_locked_group_datas on sku.id equals pl.sku_id into pl_left+ from pl in pl_left.DefaultIfEmpty()+ join m in move_locked_group_datas on sku.id equals m.sku_id into m_left+ from m in m_left.DefaultIfEmpty()+ join spu in spu_DBSet on sku.spu_id equals spu.id+ where spu.tenant_id == currentUser.tenant_id+ select new StockManagementViewModel+ {+ sku_id = sku.id,+ spu_name = spu.spu_name,+ spu_code = spu.spu_code,+ sku_code = sku.sku_code,+ qty_asn = ag.qty_asn == null ? 0: ag.qty_asn,+ qty_available = (sg.qty_normal == null ? 0 : sg.qty_normal) - (sg.qty_normal_frozen == null ? 0 : sg.qty_normal_frozen) - (dp.qty_locked == null ? 0 : dp.qty_locked) - (pl.qty_normal_locked == null ? 0 : pl.qty_normal_locked) - (m.qty_normal_locked == null ? 0 : m.qty_normal_locked) ,+ qty_frozen = sg.qty_frozen == null ? 0 : sg.qty_frozen,+ qty_locked = (dp.qty_locked == null ? 0 : dp.qty_locked) + (pl.qty_locked == null ? 0 : pl.qty_locked) + (m.qty_locked == null ? 0:m.qty_locked),+ qty_sorted = ag.qty_sorted==null?0:ag.qty_sorted,+ qty_to_sort = ag.qty_to_sort == null ? 0 : ag.qty_to_sort,+ shortage_qty = ag.shortage_qty == null ? 0 : ag.shortage_qty,+ qty_to_unload = ag.qty_to_unload == null ? 0 : ag.qty_to_unload,+ qty = sg.qty == null ? 0 : sg.qty,+ };+ query = query.Where(t=>t.qty_asn>0 || t.qty > 0).Where(queries.AsExpression<StockManagementViewModel>());+ int totals = await query.CountAsync();+ var list = await query.OrderBy(t => t.sku_code)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list, totals);+ }++ /// <summary>+ /// location stock page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<LocationStockManagementViewModel> data, int totals)> LocationStockPageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }++ var DbSet = _dBContext.GetDbSet<StockEntity>().Where(t => t.tenant_id.Equals(currentUser.tenant_id));+ var dispatchpick_DBSet = _dBContext.GetDbSet<DispatchpicklistEntity>();+ var dispatch_DBSet = _dBContext.GetDbSet<DispatchlistEntity>().Where(t => t.tenant_id.Equals(currentUser.tenant_id));+ var sku_DBSet = _dBContext.GetDbSet<SkuEntity>().AsNoTracking();+ var spu_DBSet = _dBContext.GetDbSet<SpuEntity>().AsNoTracking();+ var location_DBSet = _dBContext.GetDbSet<GoodslocationEntity>().AsNoTracking();+ var processdetail_DBSet = _dBContext.GetDbSet<StockprocessdetailEntity>().AsNoTracking();+ var move_DBSet = _dBContext.GetDbSet<StockmoveEntity>();++ var stock_group_datas = from stock in DbSet.AsNoTracking()+ where stock.tenant_id == currentUser.tenant_id+ group stock by new { stock.sku_id, stock.goods_location_id } into sg+ select new+ {+ sku_id = sg.Key.sku_id,+ goods_location_id = sg.Key.goods_location_id,+ qty_frozen = sg.Where(t => t.is_freeze == true).Sum(e => e.qty),+ qty = sg.Sum(t => t.qty)+ };++ var dispatch_group_datas = from dp in dispatch_DBSet.AsNoTracking()+ join dpp in dispatchpick_DBSet.AsNoTracking() on dp.id equals dpp.dispatchlist_id+ where dp.dispatch_status > 1 && dp.dispatch_status < 6+ group dpp by new { dpp.sku_id, dpp.goods_location_id } into dg+ select new+ {+ sku_id = dg.Key.sku_id,+ goods_location_id = dg.Key.goods_location_id,+ qty_locked = dg.Sum(t => t.pick_qty)+ };+ var process_locked_group_datas = from pd in processdetail_DBSet+ where pd.is_update_stock == false && pd.is_source == true+ group pd by new { pd.sku_id, pd.goods_location_id } into pdg+ select new+ {+ sku_id = pdg.Key.sku_id,+ goods_location_id = pdg.Key.goods_location_id,+ qty_locked = pdg.Sum(t => t.qty)+ };++ var move_locked_group_datas = from m in move_DBSet.AsNoTracking()+ where m.move_status == 0+ group m by new { m.sku_id, m.orig_goods_location_id } into mg+ select new+ {+ sku_id = mg.Key.sku_id,+ goods_location_id = mg.Key.orig_goods_location_id,+ qty_locked = mg.Sum(t => t.qty)+ };+ var query = from sg in stock_group_datas+ join dp in dispatch_group_datas on new { sg.sku_id, sg.goods_location_id } equals new { dp.sku_id, dp.goods_location_id } into dp_left+ from dp in dp_left.DefaultIfEmpty()+ join pl in process_locked_group_datas on new { sg.sku_id, sg.goods_location_id } equals new { pl.sku_id, pl.goods_location_id } into pl_left+ from pl in pl_left.DefaultIfEmpty()+ join m in move_locked_group_datas on new { sg.sku_id, sg.goods_location_id } equals new { m.sku_id, m.goods_location_id } into m_left+ from m in m_left.DefaultIfEmpty()+ join sku in sku_DBSet on sg.sku_id equals sku.id+ join spu in spu_DBSet on sku.spu_id equals spu.id+ join gl in location_DBSet on sg.goods_location_id equals gl.id+ select new LocationStockManagementViewModel+ {+ sku_id = sg.sku_id,+ spu_name = spu.spu_name,+ spu_code = spu.spu_code,+ sku_code = sku.sku_code,+ sku_name = sku.sku_name,+ qty_available =gl.warehouse_area_property == 5?0:( sg.qty - sg.qty_frozen - (dp.qty_locked == null ? 0 : dp.qty_locked) - (pl.qty_locked == null ? 0 : pl.qty_locked) - (m.qty_locked == null ? 0 : m.qty_locked)),+ qty_frozen = sg.qty_frozen,+ qty_locked = (dp.qty_locked == null ? 0 : dp.qty_locked) + (pl.qty_locked == null ? 0 : pl.qty_locked)+ (m.qty_locked == null ? 0 : m.qty_locked),+ qty = sg.qty,+ location_name = gl.location_name,+ warehouse_name = gl.warehouse_name,+ };+ query = query.Where(t => t.qty > 0).Where(queries.AsExpression<LocationStockManagementViewModel>());+ int totals = await query.CountAsync();+ var list = await query.OrderBy(t => t.sku_code)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list, totals);+ }++ /// <summary>+ /// page search select+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<StockViewModel> data, int totals)> SelectPageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }++ var DbSet = _dBContext.GetDbSet<StockEntity>().Where(t => t.tenant_id.Equals(currentUser.tenant_id));+ var dispatchpick_DBSet = _dBContext.GetDbSet<DispatchpicklistEntity>();+ var dispatch_DBSet = _dBContext.GetDbSet<DispatchlistEntity>().Where(t => t.tenant_id.Equals(currentUser.tenant_id));+ var sku_DBSet = _dBContext.GetDbSet<SkuEntity>().AsNoTracking();+ var spu_DBSet = _dBContext.GetDbSet<SpuEntity>().AsNoTracking();+ var location_DBSet = _dBContext.GetDbSet<GoodslocationEntity>().AsNoTracking();+ var processdetail_DBSet = _dBContext.GetDbSet<StockprocessdetailEntity>().AsNoTracking();+ var move_DBSet = _dBContext.GetDbSet<StockmoveEntity>();++ var dispatch_group_datas = from dp in dispatch_DBSet.AsNoTracking()+ join dpp in dispatchpick_DBSet.AsNoTracking() on dp.id equals dpp.dispatchlist_id+ where dp.dispatch_status > 1 && dp.dispatch_status < 6+ group dpp by new { dpp.sku_id, dpp.goods_location_id, dpp.goods_owner_id } into dg+ select new+ {+ goods_owner_id = dg.Key.goods_owner_id,+ sku_id = dg.Key.sku_id,+ goods_location_id = dg.Key.goods_location_id,+ qty_locked = dg.Sum(t => t.pick_qty)+ };+ var process_locked_group_datas = from pd in processdetail_DBSet+ where pd.is_update_stock == false && pd.is_source == true+ group pd by new { pd.sku_id, pd.goods_location_id, pd.goods_owner_id } into pdg+ select new+ {+ goods_owner_id = pdg.Key.goods_owner_id,+ sku_id = pdg.Key.sku_id,+ goods_location_id = pdg.Key.goods_location_id,+ qty_locked = pdg.Sum(t => t.qty)+ };+ var move_locked_group_datas = from m in move_DBSet.AsNoTracking()+ where m.move_status == 0+ group m by new { m.sku_id, m.orig_goods_location_id, m.goods_owner_id } into mg+ select new+ {+ goods_owner_id = mg.Key.goods_owner_id,+ sku_id = mg.Key.sku_id,+ goods_location_id = mg.Key.orig_goods_location_id,+ qty_locked = mg.Sum(t => t.qty)+ };+ var query = from sg in DbSet.AsNoTracking()+ join dp in dispatch_group_datas on new { sg.sku_id, sg.goods_location_id, sg.goods_owner_id } equals new { dp.sku_id, dp.goods_location_id, dp.goods_owner_id } into dp_left+ from dp in dp_left.DefaultIfEmpty()+ join pl in process_locked_group_datas on new { sg.sku_id, sg.goods_location_id, sg.goods_owner_id } equals new { pl.sku_id, pl.goods_location_id, pl.goods_owner_id } into pl_left+ from pl in pl_left.DefaultIfEmpty()+ join m in move_locked_group_datas on new { sg.sku_id, sg.goods_location_id, sg.goods_owner_id } equals new { m.sku_id, m.goods_location_id, m.goods_owner_id } into m_left+ from m in m_left.DefaultIfEmpty()+ join sku in sku_DBSet on sg.sku_id equals sku.id+ join spu in spu_DBSet on sku.spu_id equals spu.id+ join gl in location_DBSet on sg.goods_location_id equals gl.id+ join owner in _dBContext.GetDbSet<GoodsownerEntity>().AsNoTracking() on sg.goods_owner_id equals owner.id into o_left+ from owner in o_left.DefaultIfEmpty()+ where sg.tenant_id == currentUser.tenant_id+ group new {sg,dp,pl,m,sku,spu,gl} by new { sg.sku_id ,spu.spu_name , spu.spu_code, sku.sku_code,sku.sku_name,sg.goods_location_id,sg.goods_owner_id,owner.goods_owner_name+ , sg.qty , gl.location_name, sg.is_freeze, gl.warehouse_name ,sg.id,sku.unit,sg.tenant_id} into g+ select new StockViewModel+ {+ sku_id = g.Key.sku_id,+ spu_name = g.Key.spu_name,+ spu_code = g.Key.spu_code,+ sku_code = g.Key.sku_code,+ sku_name = g.Key.sku_name,+ qty_available = g.Key.is_freeze ? 0 : (g.Key.qty - g.Sum(t=>t.dp.qty_locked == null ? 0 : t.dp.qty_locked) - g.Sum(t => t.pl.qty_locked == null ? 0 : t.pl.qty_locked) - g.Sum(t=>(t.m.qty_locked == null ? 0 : t.m.qty_locked))),+ qty = g.Key.qty,+ goods_location_id= g.Key.goods_location_id,+ goods_owner_id = g.Key.goods_owner_id,+ location_name = g.Key.location_name,+ warehouse_name = g.Key.warehouse_name,+ is_freeze = g.Key.is_freeze,+ id = g.Key.id,+ tenant_id = g.Key.tenant_id,+ unit = g.Key.unit,+ goods_owner_name = g.Key.goods_owner_name == null? "":g.Key.goods_owner_name,+ };+ if(pageSearch.sqlTitle == "")+ {+ query = query.Where(t => t.qty_available > 0);+ }+ else if(pageSearch.sqlTitle == "all")+ {++ }+ else if(pageSearch.sqlTitle == "frozen")+ {+ query = query.Where(t => t.is_freeze == true);+ }+ query = query.Where(queries.AsExpression<StockViewModel>());+ int totals = await query.CountAsync();+ var list = await query.OrderBy(t => t.sku_code)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list, totals);+ }++ /// <summary>+ /// sku page search select+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<SkuSelectViewModel> data, int totals)> SkuSelectPageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var sku_DBSet = _dBContext.GetDbSet<SkuEntity>();+ var spu_DBSet = _dBContext.GetDbSet<SpuEntity>();+ var query = from sku in sku_DBSet.AsNoTracking()+ join spu in spu_DBSet.AsNoTracking() on sku.spu_id equals spu.id+ where spu.tenant_id == currentUser.tenant_id+ select new SkuSelectViewModel+ {+ spu_id = sku.spu_id,+ sku_code = sku.sku_code,+ sku_name = sku.sku_name,+ unit = sku.unit,+ spu_code = spu.spu_code,+ spu_name = spu.spu_name,+ supplier_id = spu.supplier_id,+ supplier_name = spu.supplier_name,+ brand = spu.brand,+ origin = spu.origin,+ sku_id = sku.id+ };+ query = query.Where(queries.AsExpression<SkuSelectViewModel>());+ int totals = await query.CountAsync();+ var list = await query.OrderBy(t => t.sku_code)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list, totals);+ }+ #endregion+ }+}+diff --git a/backend/ModernWMS.WMS/Services/Stockadjust/StockadjustService.cs b/backend/ModernWMS.WMS/Services/Stockadjust/StockadjustService.csnew file mode 100644index 0000000..9f231f4--- /dev/null+++ b/backend/ModernWMS.WMS/Services/Stockadjust/StockadjustService.cs@@ -0,0 +1,280 @@+/*+ * date:2022-12-26+ * developer:NoNo+ */+ using Mapster;+ using Microsoft.EntityFrameworkCore;+ using ModernWMS.Core.DBContext;+ using ModernWMS.Core.Services;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using ModernWMS.Core.Models;+ using ModernWMS.Core.JWT;+ using Microsoft.Extensions.Localization;+ using ModernWMS.Core.DynamicSearch;+using System.Net.Quic;++namespace ModernWMS.WMS.Services+ {+ /// <summary>+ /// Stockadjust Service+ /// </summary>+ public class StockadjustService : BaseService<StockadjustEntity>, IStockadjustService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Stockadjust constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public StockadjustService(+ SqlDBContext dBContext+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer= stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<StockadjustViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var Stockadjusts = _dBContext.GetDbSet<StockadjustEntity>();+ var Spus = _dBContext.GetDbSet<SpuEntity>();+ var Skus = _dBContext.GetDbSet<SkuEntity>();+ var Goodsowners = _dBContext.GetDbSet<GoodsownerEntity>();+ var Goodslocations = _dBContext.GetDbSet<GoodslocationEntity>();+ var query = from sj in Stockadjusts.AsNoTracking()+ join sku in Skus.AsNoTracking() on sj.sku_id equals sku.id+ join spu in Spus.AsNoTracking() on sku.spu_id equals spu.id+ join gsl in Goodslocations.AsNoTracking() on sj.goods_location_id equals gsl.id+ join gso in Goodsowners.AsNoTracking() on sj.goods_owner_id equals gso.id into gsoJoin+ from gso in gsoJoin.DefaultIfEmpty()+ where sj.tenant_id == currentUser.tenant_id+ select new StockadjustViewModel+ {+ id = sj.id,+ job_code = sj.job_code,+ is_update_stock = sj.is_update_stock,+ job_type = sj.job_type,+ qty = sj.qty,+ source_table_id = sj.source_table_id,+ tenant_id = sj.tenant_id,+ sku_id = sku.id,+ sku_code = sku.sku_code,+ sku_name = sku.sku_name,+ spu_code = spu.spu_code,+ spu_name = spu.spu_name,+ goods_location_id = sj.goods_location_id,+ warehouse_name = gsl.warehouse_name,+ location_name = gsl.location_name,+ goods_owner_id = sj.goods_owner_id,+ goods_owner_name = gso.goods_owner_name == null ? string.Empty : gso.goods_owner_name,+ creator = sj.creator,+ create_time = sj.create_time,+ last_update_time = sj.last_update_time+ };+ query = query.Where(queries.AsExpression<StockadjustViewModel>());+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.create_time)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list, totals);+ }++ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ public async Task<List<StockadjustViewModel>> GetAllAsync(CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<StockadjustEntity>();+ var data = await DbSet.AsNoTracking().Where(t=>t.tenant_id.Equals(currentUser.tenant_id)).ToListAsync();+ return data.Adapt<List<StockadjustViewModel>>();+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <returns></returns>+ public async Task<StockadjustViewModel> GetAsync(int id)+ {+ var DbSet = _dBContext.GetDbSet<StockadjustEntity>();+ var entity = await DbSet.AsNoTracking().FirstOrDefaultAsync(t=>t.id.Equals(id));+ if (entity == null)+ {+ return null;+ }+ return entity.Adapt<StockadjustViewModel>();+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(StockadjustViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<StockadjustEntity>();+ var entity = viewModel.Adapt<StockadjustEntity>();+ entity.id = 0;+ entity.create_time = DateTime.Now;+ entity.creator = currentUser.user_name;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ await DbSet.AddAsync(entity);+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(StockadjustViewModel viewModel)+ {+ var DbSet = _dBContext.GetDbSet<StockadjustEntity>();+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (entity == null)+ {+ return (false,_stringLocalizer[ "not_exists_entity"]);+ }+ entity.id = viewModel.id;+ entity.job_code = viewModel.job_code;+ entity.sku_id = viewModel.sku_id;+ entity.goods_owner_id = viewModel.goods_owner_id;+ entity.goods_location_id = viewModel.goods_location_id;+ entity.qty = viewModel.qty;+ entity.is_update_stock = viewModel.is_update_stock;+ entity.job_type = viewModel.job_type;+ entity.source_table_id = viewModel.source_table_id;+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ var DBSet = _dBContext.GetDbSet<StockadjustEntity>();+ var entity = await DBSet.Where(t=>t.id == id).FirstOrDefaultAsync();+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ DBSet.Remove(entity);+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }++ /// <summary>+ /// confirm adjustment+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> ConfirmAdjustment(int id)+ {+ var adjust_DBset = _dBContext.GetDbSet<StockadjustEntity>();+ var entity = await adjust_DBset.FirstOrDefaultAsync(t => t.id == id);+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ if(entity.job_type == 2)+ {+ var processdetail_DBSet = _dBContext.GetDbSet<StockprocessdetailEntity>();+ var processdetail = await processdetail_DBSet.Where(t => t.id == entity.source_table_id).FirstOrDefaultAsync();+ if (processdetail != null)+ {+ processdetail.last_update_time = DateTime.Now;+ processdetail.is_update_stock = true;+ }+ }+ var stock_DBSet = _dBContext.GetDbSet<StockEntity>();+ var stock = await stock_DBSet.Where(t=>t.goods_location_id == entity.goods_location_id&&t.sku_id== entity.sku_id).FirstOrDefaultAsync();+ if(stock == null)+ {+ stock = new StockEntity+ {+ id = entity.id,+ sku_id = entity.sku_id,+ goods_location_id = entity.goods_location_id,+ qty = entity.qty,+ goods_owner_id = entity.goods_owner_id,+ is_freeze = false,+ last_update_time = DateTime.Now,+ tenant_id = entity.tenant_id,+ };+ }+ else+ {+ stock.qty += entity.qty;+ stock.goods_owner_id= entity.goods_owner_id;+ stock.last_update_time= DateTime.Now;+ }+ entity.is_update_stock = true;+ entity.last_update_time = DateTime.Now;+ var res = await _dBContext.SaveChangesAsync();+ if (res > 0)+ {+ return (true, _stringLocalizer["operation_success"]);+ }+ return (false, _stringLocalizer["operation_failed"]);+ }+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/Services/Stockfreeze/StockfreezeService.cs b/backend/ModernWMS.WMS/Services/Stockfreeze/StockfreezeService.csnew file mode 100644index 0000000..9f4a2aa--- /dev/null+++ b/backend/ModernWMS.WMS/Services/Stockfreeze/StockfreezeService.cs@@ -0,0 +1,288 @@+/*+ * date:2022-12-26+ * developer:NoNo+ */+using Mapster;+using Microsoft.EntityFrameworkCore;+using ModernWMS.Core.DBContext;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;+using ModernWMS.Core.Models;+using ModernWMS.Core.JWT;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.DynamicSearch;+using Microsoft.AspNetCore.Mvc;+using System.Collections.Generic;+using Microsoft.CodeAnalysis;++namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// Stockfreeze Service+ /// </summary>+ public class StockfreezeService : BaseService<StockfreezeEntity>, IStockfreezeService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Stockfreeze constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public StockfreezeService(+ SqlDBContext dBContext+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<StockfreezeViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var DbSet = _dBContext.GetDbSet<StockfreezeEntity>();++ var query = from m in DbSet.AsNoTracking()+ join sku in _dBContext.GetDbSet<SkuEntity>().AsNoTracking() on m.sku_id equals sku.id+ join spu in _dBContext.GetDbSet<SpuEntity>().AsNoTracking() on sku.spu_id equals spu.id+ join location in _dBContext.GetDbSet<GoodslocationEntity>().AsNoTracking() on m.goods_location_id equals location.id+ select new StockfreezeViewModel+ {+ id = m.id,+ job_code = m.job_code,+ job_type = m.job_type,+ sku_id = m.sku_id,+ goods_owner_id = m.goods_owner_id,+ goods_location_id = m.goods_location_id,+ handler = m.handler,+ handle_time = m.handle_time,+ last_update_time = m.last_update_time,+ tenant_id = m.tenant_id,+ sku_code = sku.sku_code,+ spu_code = spu.spu_code,+ spu_name = spu.spu_name,+ location_name = location.location_name,+ warehouse_name = location.warehouse_name+ };+ query = query+ .Where(t => t.tenant_id.Equals(currentUser.tenant_id))+ .Where(queries.AsExpression<StockfreezeViewModel>());+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.handle_time)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list, totals);+ }++ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ public async Task<List<StockfreezeViewModel>> GetAllAsync(CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<StockfreezeEntity>();+ var data = await DbSet.AsNoTracking().Where(t => t.tenant_id.Equals(currentUser.tenant_id)).ToListAsync();+ return data.Adapt<List<StockfreezeViewModel>>();+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <returns></returns>+ public async Task<StockfreezeViewModel> GetAsync(int id)+ {+ var DbSet = _dBContext.GetDbSet<StockfreezeEntity>();+ var data = await (from m in DbSet.AsNoTracking()+ join sku in _dBContext.GetDbSet<SkuEntity>().AsNoTracking() on m.sku_id equals sku.id+ join spu in _dBContext.GetDbSet<SpuEntity>().AsNoTracking() on sku.spu_id equals spu.id+ join location in _dBContext.GetDbSet<GoodslocationEntity>().AsNoTracking() on m.goods_location_id equals location.id+ where m.id == id+ select new StockfreezeViewModel+ {+ id = m.id,+ job_code = m.job_code,+ job_type = m.job_type,+ sku_id = m.sku_id,+ goods_owner_id = m.goods_owner_id,+ goods_location_id = m.goods_location_id,+ handler = m.handler,+ handle_time = m.handle_time,+ last_update_time = m.last_update_time,+ tenant_id = m.tenant_id,+ sku_code = sku.sku_code,+ spu_code = spu.spu_code,+ spu_name = spu.spu_name,+ location_name = location.location_name,+ warehouse_name = location.warehouse_name+ }).FirstOrDefaultAsync();+ if (data == null)+ {+ return null;+ }+ return data;+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(StockfreezeViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<StockfreezeEntity>();+ var entity = viewModel.Adapt<StockfreezeEntity>();+ entity.id = 0;+ entity.handle_time = DateTime.Now;+ entity.handler = currentUser.user_name;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ entity.job_code = await GetOrderCode(currentUser);+ var stock_DBSet = _dBContext.GetDbSet<StockEntity>();+ var stocks = await stock_DBSet.Where(t => t.goods_location_id == entity.goods_location_id&& t.goods_owner_id == entity.goods_owner_id && t.sku_id == entity.sku_id).ToListAsync();+ foreach (var stock in stocks)+ {+ if (entity.job_type == true)+ stock.is_freeze = true;+ else+ stock.is_freeze = false;+ }+ await DbSet.AddAsync(entity);+ if( await (_dBContext.GetDbSet<StockprocessdetailEntity>().AnyAsync(t => t.goods_location_id == entity.goods_location_id && t.goods_owner_id == entity.goods_owner_id && t.sku_id == entity.sku_id && t.is_update_stock == false)))+ {+ return (0, _stringLocalizer["process_not_comfirm"]);+ }+ else if (await (_dBContext.GetDbSet<DispatchpicklistEntity>().AnyAsync(t => t.goods_location_id == entity.goods_location_id && t.sku_id == entity.sku_id && t.is_update_stock == false)))+ {+ return (0, _stringLocalizer["dispatch_not_comfirm"]);+ }+ else if (await (_dBContext.GetDbSet<StockmoveEntity>().AnyAsync(t =>( t.orig_goods_location_id == entity.goods_location_id || t.dest_googs_location_id == entity.goods_location_id)&& t.sku_id == entity.sku_id && t.move_status == 0)))+ {+ return (0, _stringLocalizer["move_not_comfirm"]);+ }+ else+ {+ await _dBContext.SaveChangesAsync();+ }+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(StockfreezeViewModel viewModel)+ {+ var DbSet = _dBContext.GetDbSet<StockfreezeEntity>();+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ entity.id = viewModel.id;+ entity.job_code = viewModel.job_code;+ entity.job_type = viewModel.job_type;+ entity.sku_id = viewModel.sku_id;+ entity.goods_owner_id = viewModel.goods_owner_id;+ entity.goods_location_id = viewModel.goods_location_id;+ entity.handler = viewModel.handler;+ entity.handle_time = viewModel.handle_time;+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ var qty = await _dBContext.GetDbSet<StockfreezeEntity>().Where(t => t.id.Equals(id)).ExecuteDeleteAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }++ /// <summary>+ /// get next order code number+ /// </summary>+ /// <returns></returns>+ public async Task<string> GetOrderCode(CurrentUser currentUser)+ {+ string code;+ string date = DateTime.Now.ToString("yyyy" + "MM" + "dd");+ string maxNo = await _dBContext.GetDbSet<StockfreezeEntity>().AsNoTracking().Where(t=> t.tenant_id == currentUser.tenant_id).MaxAsync(t => t.job_code);+ if (maxNo == null)+ {+ code = date + "-0001";+ }+ else+ {+ string maxDate = maxNo.Substring(0, 8);+ string maxDateNo = maxNo.Substring(9, 4);+ if (date == maxDate)+ {+ int.TryParse(maxDateNo, out int dd);+ int newDateNo = dd + 1;+ code = date + "-" + newDateNo.ToString("0000");+ }+ else+ {+ code = date + "-0001";+ }+ }+ return code;+ }+ #endregion+ }+}+diff --git a/backend/ModernWMS.WMS/Services/Stockmove/StockmoveService.cs b/backend/ModernWMS.WMS/Services/Stockmove/StockmoveService.csnew file mode 100644index 0000000..8e5c100--- /dev/null+++ b/backend/ModernWMS.WMS/Services/Stockmove/StockmoveService.cs@@ -0,0 +1,449 @@+/*+ * date:2022-12-27+ * developer:NoNo+ */+using Mapster;+using Microsoft.EntityFrameworkCore;+using ModernWMS.Core.DBContext;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;+using ModernWMS.Core.Models;+using ModernWMS.Core.JWT;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.DynamicSearch;+using Microsoft.AspNetCore.Mvc;+using static System.Runtime.InteropServices.JavaScript.JSType;+using System;+using ModernWMS.Core.Utility;++namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// Stockmove Service+ /// </summary>+ public class StockmoveService : BaseService<StockmoveEntity>, IStockmoveService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Stockmove constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public StockmoveService(+ SqlDBContext dBContext+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<StockmoveViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var DbSet = _dBContext.GetDbSet<StockmoveEntity>();+ var location_DBSet = _dBContext.GetDbSet<GoodslocationEntity>().AsNoTracking();+ var query = from m in DbSet.AsNoTracking()+ join sku in _dBContext.GetDbSet<SkuEntity>().AsNoTracking() on m.sku_id equals sku.id+ join spu in _dBContext.GetDbSet<SpuEntity>().AsNoTracking() on sku.spu_id equals spu.id+ join orig_location in location_DBSet on m.orig_goods_location_id equals orig_location.id+ join dest_location in location_DBSet on m.dest_googs_location_id equals dest_location.id+ select new StockmoveViewModel+ {+ id = m.id,+ job_code = m.job_code,+ move_status = m.move_status,+ sku_id = m.sku_id,+ orig_goods_location_id = m.orig_goods_location_id,+ dest_googs_location_id = m.dest_googs_location_id,+ qty = m.qty,+ goods_owner_id = m.goods_owner_id,+ handler = m.handler,+ handle_time = m.handle_time,+ creator = m.creator,+ create_time = m.create_time,+ last_update_time = m.last_update_time,+ tenant_id = m.tenant_id,+ sku_code = sku.sku_code,+ sku_name = sku.sku_name,+ spu_code = spu.spu_code,+ spu_name = spu.spu_name,+ dest_googs_location_name = dest_location.location_name,+ dest_googs_warehouse = dest_location.warehouse_name,+ orig_goods_location_name = orig_location.location_name,+ orig_goods_warehouse = orig_location.warehouse_name,+ };+ query = query.Where(t => t.tenant_id.Equals(currentUser.tenant_id))+ .Where(queries.AsExpression<StockmoveViewModel>());+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.create_time)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list, totals);+ }++ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ public async Task<List<StockmoveViewModel>> GetAllAsync(CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<StockmoveEntity>();+ var location_DBSet = _dBContext.GetDbSet<GoodslocationEntity>().AsNoTracking();+ var data = await(from m in DbSet.AsNoTracking().Where(t => t.tenant_id.Equals(currentUser.tenant_id))+ join sku in _dBContext.GetDbSet<SkuEntity>().AsNoTracking() on m.sku_id equals sku.id+ join spu in _dBContext.GetDbSet<SpuEntity>().AsNoTracking() on sku.spu_id equals spu.id+ join orig_location in location_DBSet on m.orig_goods_location_id equals orig_location.id+ join dest_location in location_DBSet on m.dest_googs_location_id equals dest_location.id+ select new StockmoveViewModel+ {+ id = m.id,+ job_code = m.job_code,+ move_status = m.move_status,+ sku_id = m.sku_id,+ orig_goods_location_id = m.orig_goods_location_id,+ dest_googs_location_id = m.dest_googs_location_id,+ qty = m.qty,+ goods_owner_id = m.goods_owner_id,+ handler = m.handler,+ handle_time = m.handle_time,+ creator = m.creator,+ create_time = m.create_time,+ last_update_time = m.last_update_time,+ tenant_id = m.tenant_id,+ sku_code = sku.sku_code,+ sku_name = sku.sku_name,+ spu_code = spu.spu_code,+ spu_name = spu.spu_name,+ dest_googs_location_name = dest_location.location_name,+ dest_googs_warehouse = dest_location.warehouse_name,+ orig_goods_location_name = orig_location.location_name,+ orig_goods_warehouse = orig_location.warehouse_name,+ }+ ).ToListAsync();+ return data.Adapt<List<StockmoveViewModel>>();+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <returns></returns>+ public async Task<StockmoveViewModel> GetAsync(int id)+ {+ var DbSet = _dBContext.GetDbSet<StockmoveEntity>();+ var location_DBSet = _dBContext.GetDbSet<GoodslocationEntity>().AsNoTracking();+ var data = await (from m in DbSet.AsNoTracking()+ join sku in _dBContext.GetDbSet<SkuEntity>().AsNoTracking() on m.sku_id equals sku.id+ join spu in _dBContext.GetDbSet<SpuEntity>().AsNoTracking() on sku.spu_id equals spu.id+ join orig_location in location_DBSet on m.orig_goods_location_id equals orig_location.id+ join dest_location in location_DBSet on m.dest_googs_location_id equals dest_location.id+ where m.id == id+ select new StockmoveViewModel+ {+ id = m.id,+ job_code = m.job_code,+ move_status = m.move_status,+ sku_id = m.sku_id,+ orig_goods_location_id = m.orig_goods_location_id,+ dest_googs_location_id = m.dest_googs_location_id,+ qty = m.qty,+ goods_owner_id = m.goods_owner_id,+ handler = m.handler,+ handle_time = m.handle_time,+ creator = m.creator,+ create_time = m.create_time,+ last_update_time = m.last_update_time,+ tenant_id = m.tenant_id,+ sku_code = sku.sku_code,+ sku_name = sku.sku_name,+ spu_code = spu.spu_code,+ spu_name = spu.spu_name,+ dest_googs_location_name = dest_location.location_name,+ dest_googs_warehouse = dest_location.warehouse_name,+ orig_goods_location_name = orig_location.location_name,+ orig_goods_warehouse = orig_location.warehouse_name,+ }).FirstOrDefaultAsync();+ if (data == null)+ {+ return null;+ }+ return data;+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(StockmoveViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<StockmoveEntity>();+ var stock_DBSet = _dBContext.GetDbSet<StockEntity>();+ var entity = viewModel.Adapt<StockmoveEntity>();+ var processdetail_DBSet = _dBContext.GetDbSet<StockprocessdetailEntity>().AsNoTracking();+ var dispatchpick_DBSet = _dBContext.GetDbSet<DispatchpicklistEntity>();+ var dispatch_DBSet = _dBContext.GetDbSet<DispatchlistEntity>().Where(t => t.tenant_id.Equals(currentUser.tenant_id));+ var dispatch_group_datas = from dp in dispatch_DBSet.AsNoTracking()+ join dpp in dispatchpick_DBSet.AsNoTracking() on dp.id equals dpp.dispatchlist_id+ where dp.dispatch_status > 1 && dp.dispatch_status < 6+ && dpp.goods_location_id == entity.orig_goods_location_id && dpp.sku_id == entity.sku_id+ group dpp by new { dpp.sku_id, dpp.goods_location_id } into dg+ select new+ {+ sku_id = dg.Key.sku_id,+ goods_location_id = dg.Key.goods_location_id,+ qty_locked = dg.Sum(t => t.pick_qty)+ };+ var process_locked_group_datas = from pd in processdetail_DBSet+ where pd.is_update_stock == false+ && pd.sku_id == entity.sku_id && pd.goods_location_id == entity.orig_goods_location_id+ group pd by new { pd.sku_id, pd.goods_location_id } into pdg+ select new+ {+ sku_id = pdg.Key.sku_id,+ goods_location_id = pdg.Key.goods_location_id,+ qty_locked = pdg.Sum(t => t.qty)+ };+ var move_locked_group_datas = from sm in DbSet.AsNoTracking()+ where sm.move_status == 0 && sm.sku_id == entity.sku_id && sm.orig_goods_location_id == entity.orig_goods_location_id+ group sm by new { sm.sku_id, goods_location_id = sm.orig_goods_location_id } into smg+ select new {+ smg.Key.sku_id,+ smg.Key.goods_location_id,+ qty_locked = smg.Sum(t => t.qty)+ };++ var orig_stock =await+ (from sg in stock_DBSet.AsNoTracking()+ join dp in dispatch_group_datas on new { sg.sku_id, sg.goods_location_id } equals new { dp.sku_id, dp.goods_location_id } into dp_left+ from dp in dp_left.DefaultIfEmpty()+ join pl in process_locked_group_datas on new { sg.sku_id, sg.goods_location_id } equals new { pl.sku_id, pl.goods_location_id } into pl_left+ from pl in pl_left.DefaultIfEmpty()+ join sm in move_locked_group_datas on new {sg.sku_id,sg.goods_location_id} equals new {sm.sku_id, goods_location_id = sm.goods_location_id} into sm_left+ from sm in sm_left.DefaultIfEmpty()+ where sg.sku_id == entity.sku_id && sg.goods_location_id == entity.orig_goods_location_id+ select new+ {+ id = sg.id,+ qty_available = sg.is_freeze ? 0 : (sg.qty - (dp.qty_locked == null ? 0 : dp.qty_locked) - (pl.qty_locked == null ? 0 : pl.qty_locked) - (sm.qty_locked == null ? 0 : sm.qty_locked)) ,+ }+ ).FirstOrDefaultAsync();+ var dest_stock = await stock_DBSet.FirstOrDefaultAsync(t => t.goods_location_id == entity.dest_googs_location_id && t.sku_id == entity.sku_id);+ if(orig_stock == null || orig_stock.qty_available<entity.qty)+ {+ return (0, _stringLocalizer["qty_not_available"]);+ }+ if(dest_stock!=null && dest_stock.is_freeze == true)+ {+ return (0, _stringLocalizer["dest_stock_freeze"]);+ }+ entity.id = 0;+ entity.move_status= 0;+ entity.create_time = DateTime.Now;+ entity.creator = currentUser.user_name;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ entity.job_code =await GetOrderCode(currentUser);+ await DbSet.AddAsync(entity);+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// confirm move+ /// </summary>+ /// <param name="id">id</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> Confirm(int id,CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<StockmoveEntity>();+ var stock_DBSet = _dBContext.GetDbSet<StockEntity>();+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(id));+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ entity.handler = currentUser.user_name;+ entity.handle_time = DateTime.Now;+ entity.move_status = 1;+ entity.last_update_time = DateTime.Now;+ var orig_stock = await stock_DBSet.FirstOrDefaultAsync(t => t.goods_location_id == entity.orig_goods_location_id && t.sku_id == entity.sku_id) ;+ var dest_stock = await stock_DBSet.FirstOrDefaultAsync(t=>t.goods_location_id == entity.dest_googs_location_id && t.sku_id!= entity.sku_id);+ if (orig_stock != null)+ {+ if(orig_stock.qty == entity.qty)+ {+ stock_DBSet.Remove(orig_stock);+ }+ else+ {+ orig_stock.qty -= entity.qty;+ orig_stock.last_update_time=DateTime.Now;+ }+ }+ if(dest_stock == null)+ {+ dest_stock = new StockEntity+ {+ goods_location_id = entity.dest_googs_location_id,+ sku_id = entity.sku_id,+ goods_owner_id = entity.goods_owner_id,+ is_freeze = false,+ last_update_time = DateTime.Now,+ qty = entity.qty,+ tenant_id = entity.tenant_id,+ };+ await stock_DBSet.AddAsync(dest_stock);+ }+ else+ {+ dest_stock.qty += entity.qty;+ dest_stock.last_update_time = DateTime.Now;+ }+ var saved = false;+ int res = 0;+ while (!saved)+ {+ try+ {+ // Attempt to save changes to the database+ res = await _dBContext.SaveChangesAsync();+ saved = true;+ }+ catch (DbUpdateConcurrencyException ex)+ {+ foreach (var entry in ex.Entries)+ {+ if (entry.Entity is StockEntity)+ {+ var proposedValues = entry.CurrentValues;+ var databaseValues = entry.GetDatabaseValues();+ if (UtilConvert.ObjToInt(proposedValues["id"]) == orig_stock.id)+ {+ if (UtilConvert.ObjToInt(databaseValues["qty"]) - entity.qty < 0)+ {+ throw new NotSupportedException(_stringLocalizer["try_agin"]);+ }+ else if(UtilConvert.ObjToInt(databaseValues["qty"]) - entity.qty==0)+ {+ entry.State = EntityState.Deleted;+ }+ else+ {+ entry.State = EntityState.Modified;+ proposedValues["qty"] = UtilConvert.ObjToInt(databaseValues["qty"]) - entity.qty;+ }+ }+ else if(UtilConvert.ObjToInt(proposedValues["id"]) == dest_stock.id)+ {+ proposedValues["qty"] = UtilConvert.ObjToInt(databaseValues["qty"]) + entity.qty;+ }+ // Refresh original values to bypass next concurrency check+ entry.OriginalValues.SetValues(databaseValues);+ }+ else+ {+ throw new NotSupportedException(_stringLocalizer["try_agin"]);+ }+ }+ }+ }+ if (res > 0)+ {+ return (true, _stringLocalizer["operation_success"]);+ }+ else+ {+ return (false, _stringLocalizer["operation_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ var qty = await _dBContext.GetDbSet<StockmoveEntity>().Where(t => t.id.Equals(id)&&t.move_status == 0).ExecuteDeleteAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }++ /// <summary>+ /// get next order code number+ /// </summary>+ /// <returns></returns>+ public async Task<string> GetOrderCode(CurrentUser currentUser)+ {+ string code;+ string date = DateTime.Now.ToString("yyyy" + "MM" + "dd");+ string maxNo = await _dBContext.GetDbSet<StockmoveEntity>().AsNoTracking().Where(t=>t.tenant_id == currentUser.tenant_id).MaxAsync(t => t.job_code);+ if (maxNo == null)+ {+ code = date + "-0001";+ }+ else+ {+ string maxDate = maxNo.Substring(0, 8);+ string maxDateNo = maxNo.Substring(9, 4);+ if (date == maxDate)+ {+ int.TryParse(maxDateNo, out int dd);+ int newDateNo = dd + 1;+ code = date + "-" + newDateNo.ToString("0000");+ }+ else+ {+ code = date + "-0001";+ }+ }++ return code;+ }+ #endregion+ }+}+diff --git a/backend/ModernWMS.WMS/Services/Stockprocess/StockprocessService.cs b/backend/ModernWMS.WMS/Services/Stockprocess/StockprocessService.csnew file mode 100644index 0000000..79a10a8--- /dev/null+++ b/backend/ModernWMS.WMS/Services/Stockprocess/StockprocessService.cs@@ -0,0 +1,482 @@+/*+ * date:2022-12-23+ * developer:NoNo+ */+using Mapster;+using Microsoft.EntityFrameworkCore;+using ModernWMS.Core.DBContext;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;+using ModernWMS.Core.Models;+using ModernWMS.Core.JWT;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.DynamicSearch;+using System.Linq.Expressions;+using System.Reflection;+using System.Collections.Generic;+using Microsoft.AspNetCore.Mvc.Formatters.Xml;+using Microsoft.AspNetCore.SignalR.Protocol;+using System.Linq;++namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// Stockprocess Service+ /// </summary>+ public class StockprocessService : BaseService<StockprocessEntity>, IStockprocessService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Stockprocess constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public StockprocessService(+ SqlDBContext dBContext+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<StockprocessGetViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var DbSet = _dBContext.GetDbSet<StockprocessEntity>();+ var adjust_DBSet = _dBContext.GetDbSet<StockadjustEntity>().AsNoTracking();+ var adjusted = from a in adjust_DBSet+ join d in _dBContext.GetDbSet<StockprocessdetailEntity>().AsNoTracking() on a.source_table_id equals d.id+ where a.job_type == 2+ group d by d.stock_process_id into ag+ select new+ {+ stockprocess_id = ag.Key+ };+ var query = from m in DbSet.AsNoTracking()+ join a in adjusted on m.id equals a.stockprocess_id into a_left+ from a in a_left.DefaultIfEmpty()+ select new StockprocessGetViewModel+ {+ id = m.id,+ job_code = m.job_code,+ job_type = m.job_type,+ process_status = m.process_status,+ processor = m.processor,+ process_time = m.process_time,+ creator = m.creator,+ create_time = m.create_time,+ last_update_time = m.last_update_time,+ tenant_id = m.tenant_id,+ adjust_status = (m.process_status && (a.stockprocess_id == null ? false : true)) ? true : false+ };+ query = query+ .Where(t => t.tenant_id.Equals(currentUser.tenant_id))+ .Where(queries.AsExpression<StockprocessGetViewModel>());+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.create_time)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list, totals);+ }++ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ public async Task<List<StockprocessGetViewModel>> GetAllAsync(CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<StockprocessEntity>();+ var data = await DbSet.AsNoTracking().Where(t => t.tenant_id.Equals(currentUser.tenant_id)).ToListAsync();+ return data.Adapt<List<StockprocessGetViewModel>>();+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <returns></returns>+ public async Task<StockprocessWithDetailViewModel> GetAsync(int id)+ {+ var DbSet = _dBContext.GetDbSet<StockprocessEntity>();+ var entity = await DbSet.AsNoTracking().FirstOrDefaultAsync(t => t.id.Equals(id));+ var details = await (from spd in _dBContext.GetDbSet<StockprocessdetailEntity>().AsNoTracking().Where(t => t.stock_process_id == id)+ join sku in _dBContext.GetDbSet<SkuEntity>().AsNoTracking() on spd.sku_id equals sku.id+ join spu in _dBContext.GetDbSet<SpuEntity>().AsNoTracking() on sku.spu_id equals spu.id+ join gl in _dBContext.GetDbSet<GoodslocationEntity>().AsNoTracking() on spd.goods_location_id equals gl.id into gl_left+ from gl in gl_left.DefaultIfEmpty()+ select new StockprocessdetailViewModel+ {+ id = spd.id,+ stock_process_id = spd.stock_process_id,+ sku_id = spd.sku_id,+ goods_owner_id = spd.goods_owner_id,+ goods_location_id = spd.goods_location_id,+ qty = spd.qty,+ last_update_time = spd.last_update_time,+ tenant_id = spd.tenant_id,+ is_source = spd.is_source,+ sku_code = sku.sku_code,+ spu_code = spu.spu_code,+ spu_name = spu.spu_name,+ unit = sku.unit,+ location_name = gl.location_name == null?"":gl.location_name+ }).ToListAsync();+ if (entity == null)+ {+ return null;+ }+ var res = entity.Adapt<StockprocessWithDetailViewModel>();+ var adjust_DBSet = _dBContext.GetDbSet<StockadjustEntity>().AsNoTracking();+ var adjusted = await (from a in adjust_DBSet+ join d in _dBContext.GetDbSet<StockprocessdetailEntity>().AsNoTracking() on a.source_table_id equals d.id+ where a.job_type == 2+ select a+ ).AnyAsync();+ res.adjust_status = adjusted;+ res.source_detail_list = details.Where(t => t.is_source == true).ToList();+ res.target_detail_list = details.Where(t => t.is_source == false).ToList();+ return res;+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(StockprocessViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<StockprocessEntity>();+ var entity = viewModel.Adapt<StockprocessEntity>();+ var stock_DBSet = _dBContext.GetDbSet<StockEntity>().AsNoTracking();++ ParameterExpression parameterExpression = Expression.Parameter(typeof(StockEntity), "m");+ Expression exp = null;+ for (int i = 0; i < entity.detailList.Count; i++)+ {+ ConstantExpression t_constan_location = Expression.Constant(entity.detailList[i].goods_location_id);+ PropertyInfo t_prop_location = typeof(StockEntity).GetProperty("goods_location_id");+ MemberExpression t_location_exp = Expression.Property(parameterExpression, t_prop_location);+ BinaryExpression t_location_full_exp = Expression.Equal(t_location_exp, t_constan_location);+ ConstantExpression t_constan_sku = Expression.Constant(entity.detailList[i].sku_id);+ PropertyInfo t_prop_sku = typeof(StockEntity).GetProperty("sku_id");+ MemberExpression t_sku_exp = Expression.Property(parameterExpression, t_prop_sku);+ BinaryExpression t_sku_full_exp = Expression.Equal(t_sku_exp, t_constan_sku);+ ConstantExpression t_constan_owner = Expression.Constant(entity.detailList[i].goods_owner_id);+ PropertyInfo t_prop_owner = typeof(StockEntity).GetProperty("goods_owner_id");+ MemberExpression t_owner_exp = Expression.Property(parameterExpression, t_prop_owner);+ BinaryExpression t_owner_full_exp = Expression.Equal(t_owner_exp, t_constan_owner);+ var t_exp = Expression.And(t_location_full_exp, t_sku_full_exp);+ t_exp = Expression.And(t_exp, t_owner_full_exp);+ if (exp != null)+ exp = Expression.Or(exp, t_exp);+ else+ exp = t_exp;+ }+ var predicate_res = Expression.Lambda<Func<StockEntity, bool>>(exp, new ParameterExpression[1] { parameterExpression });+ var stocks = await stock_DBSet.Where(predicate_res).ToListAsync();+ var goods_location_id_list = viewModel.detailList.Where(t => t.is_source == true).Select(t => t.goods_location_id).ToList();+ var sku_id_list = viewModel.detailList.Where(t => t.is_source == true).Select(t => t.sku_id).ToList();+ var lockeds = await (from d in _dBContext.GetDbSet<StockprocessdetailEntity>().AsNoTracking()+ where d.is_update_stock == false && goods_location_id_list.Contains(d.goods_location_id)+ && sku_id_list.Contains(d.sku_id)+ group d by new { d.goods_location_id, d.sku_id } into lg+ select new+ {+ sku_id = lg.Key.sku_id,+ goods_location_id = lg.Key.goods_location_id,+ qty_locked = lg.Sum(e => e.qty)+ }).ToListAsync();+ entity.id = 0;+ entity.create_time = DateTime.Now;+ entity.creator = currentUser.user_name;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ entity.job_code = await GetOrderCode(currentUser);+ await DbSet.AddAsync(entity);+ foreach (var d in entity.detailList)+ {+ d.tenant_id =currentUser.tenant_id;+ d.last_update_time = DateTime.Now;+ d.id = 0;+ var s = stocks.FirstOrDefault(t => t.sku_id == d.sku_id && t.goods_location_id == d.goods_location_id);+ if (d.is_source == true)+ {+ if (s == null)+ {+ return (0, _stringLocalizer["data_changed"]);+ }+ var locked = lockeds.FirstOrDefault(t => t.sku_id == d.sku_id && t.goods_location_id == d.goods_location_id);+ if ((s.qty - (locked == null ? 0 : locked.qty_locked)) < d.qty)+ {+ return (0, _stringLocalizer["data_changed"]);+ }+ if (s.is_freeze == true)+ {+ return (0, _stringLocalizer["stock_frozen"]);+ }+ }+ }+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(StockprocessViewModel viewModel)+ {+ var DbSet = _dBContext.GetDbSet<StockprocessEntity>();+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ entity.id = viewModel.id;+ entity.job_code = viewModel.job_code;+ entity.job_type = viewModel.job_type;+ entity.process_status = viewModel.process_status;+ entity.processor = viewModel.processor;+ entity.process_time = viewModel.process_time;+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ var entity = await _dBContext.GetDbSet<StockprocessEntity>().Where(t => t.id.Equals(id) && t.process_status == false).Include(e => e.detailList).FirstOrDefaultAsync();+ _dBContext.GetDbSet<StockprocessEntity>().Remove(entity);+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }++ /// <summary>+ /// confirm adjustment+ /// </summary>+ /// <param name="id">id</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> ConfirmAdjustment(int id, CurrentUser currentUser)+ {+ var DBSet = _dBContext.GetDbSet<StockprocessEntity>();+ var entity = await DBSet.FirstOrDefaultAsync(t => t.id == id);+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ var detail_DBSet = _dBContext.GetDbSet<StockprocessdetailEntity>();+ var adjust_DBset = _dBContext.GetDbSet<StockadjustEntity>();+ var details = await detail_DBSet.Where(t => t.stock_process_id == id).ToListAsync();+ var adjusts = (from d in details+ select new StockadjustEntity+ {+ sku_id = d.sku_id,+ source_table_id = d.id,+ is_update_stock = true,+ goods_location_id = d.goods_location_id,+ job_type = 2,+ goods_owner_id = d.goods_owner_id,+ qty = d.is_source ? -d.qty : d.qty,+ create_time = DateTime.Now,+ creator = currentUser.user_name,+ last_update_time = DateTime.Now,+ tenant_id = currentUser.tenant_id,+ }).ToList();+ entity.last_update_time = DateTime.Now;+ var stock_DBSet = _dBContext.GetDbSet<StockEntity>();+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }++ var stocks = await stock_DBSet.Where(s => detail_DBSet.Where(t => t.stock_process_id == id).Any(t => t.goods_location_id == s.goods_location_id && t.sku_id == s.sku_id && t.goods_owner_id == s.goods_owner_id)).ToListAsync();+ foreach (var d in details)+ {+ var stock = stocks.FirstOrDefault(t => t.goods_location_id == d.goods_location_id && t.sku_id == d.sku_id && t.goods_owner_id == d.goods_owner_id);+ d.is_update_stock= true;+ d.last_update_time = DateTime.Now;+ if (d.is_source)+ {+ if (stock == null)+ {+ return (false, _stringLocalizer["data_changed"]);+ }+ stock.qty -= d.qty;+ stock.last_update_time = DateTime.Now;+ }+ else+ {+ if(stock == null)+ {+ await stock_DBSet.AddAsync(new StockEntity+ {+ sku_id= d.sku_id,+ goods_location_id= d.goods_location_id,+ goods_owner_id= d.goods_owner_id,+ is_freeze =false,+ last_update_time =DateTime.Now,+ qty= d.qty,+ tenant_id = currentUser.tenant_id+ });+ }+ else+ {+ stock.qty += d.qty;+ stock.last_update_time = DateTime.Now;+ }+ }+ }+ var code = await GetAdjustOrderCode(currentUser);+ adjusts.ForEach(t => t.job_code = code);+ await adjust_DBset.AddRangeAsync(adjusts);+ var res = await _dBContext.SaveChangesAsync();+ if (res > 0)+ {+ return (true, _stringLocalizer["operation_success"]);+ }+ return (false, _stringLocalizer["operation_failed"]);+ }++ /// <summary>+ /// confirm processing+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> ConfirmProcess(int id, CurrentUser currentUser)+ {+ var DBSet = _dBContext.GetDbSet<StockprocessEntity>();+ var entity = await DBSet.FirstOrDefaultAsync(t => t.id == id);+ entity.process_status = true;+ entity.processor = currentUser.user_name;+ entity.process_time = DateTime.Now;+ entity.last_update_time = DateTime.Now;+ var res = await _dBContext.SaveChangesAsync();+ if (res > 0)+ {+ return (true, _stringLocalizer["operation_success"]);+ }+ return (false, _stringLocalizer["operation_failed"]);+ }++ /// <summary>+ /// get next order code number+ /// </summary>+ /// <returns></returns>+ public async Task<string> GetOrderCode(CurrentUser currentUser)+ {+ string code;+ string date = DateTime.Now.ToString("yyyy" + "MM" + "dd");+ string maxNo = await _dBContext.GetDbSet<StockprocessEntity>().AsNoTracking().Where(t=>t.tenant_id == currentUser.tenant_id).MaxAsync(t => t.job_code);+ if (maxNo == null)+ {+ code = date + "-0001";+ }+ else+ {+ string maxDate = maxNo.Substring(0, 8);+ string maxDateNo = maxNo.Substring(9, 4);+ if (date == maxDate)+ {+ int.TryParse(maxDateNo, out int dd);+ int newDateNo = dd + 1;+ code = date + "-" + newDateNo.ToString("0000");+ }+ else+ {+ code = date + "-0001";+ }+ }++ return code;+ }+ /// <summary>+ /// get next order code number+ /// </summary>+ /// <returns></returns>+ public async Task<string> GetAdjustOrderCode(CurrentUser currentUser)+ {+ string code;+ string date = DateTime.Now.ToString("yyyy" + "MM" + "dd");+ string maxNo = await _dBContext.GetDbSet<StockadjustEntity>().AsNoTracking().Where(t => t.tenant_id == currentUser.tenant_id).MaxAsync(t => t.job_code);+ if (maxNo == null)+ {+ code = date + "-0001";+ }+ else+ {+ string maxDate = maxNo.Substring(0, 8);+ string maxDateNo = maxNo.Substring(9, 4);+ if (date == maxDate)+ {+ int.TryParse(maxDateNo, out int dd);+ int newDateNo = dd + 1;+ code = date + "-" + newDateNo.ToString("0000");+ }+ else+ {+ code = date + "-0001";+ }+ }++ return code;+ }+ #endregion+ }+}+diff --git a/backend/ModernWMS.WMS/Services/Stocktaking/StocktakingService.cs b/backend/ModernWMS.WMS/Services/Stocktaking/StocktakingService.csnew file mode 100644index 0000000..35e01b9--- /dev/null+++ b/backend/ModernWMS.WMS/Services/Stocktaking/StocktakingService.cs@@ -0,0 +1,363 @@+/*+ * date:2022-12-30+ * developer:AMo+ */+ using Mapster;+ using Microsoft.EntityFrameworkCore;+ using ModernWMS.Core.DBContext;+ using ModernWMS.Core.Services;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;+ using ModernWMS.Core.DynamicSearch;+using ModernWMS.Core.Models;+using ModernWMS.Core.JWT;+using System.Linq;++namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// Stocktaking Service+ /// </summary>+ public class StocktakingService : BaseService<StocktakingEntity>, IStocktakingService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Stocktaking constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public StocktakingService(+ SqlDBContext dBContext+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<StocktakingViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var Stocktakings = _dBContext.GetDbSet<StocktakingEntity>();+ var Spus = _dBContext.GetDbSet<SpuEntity>();+ var Skus = _dBContext.GetDbSet<SkuEntity>();+ var Goodsowners = _dBContext.GetDbSet<GoodsownerEntity>();+ var Goodslocations = _dBContext.GetDbSet<GoodslocationEntity>();+ var Stockadjusts = _dBContext.GetDbSet<StockadjustEntity>();+ var queryAdjust = Stockadjusts.AsNoTracking().Where(t => t.job_type == 1).Select(t => new { t.id, t.source_table_id });++ var query = from st in Stocktakings.AsNoTracking()+ join sku in Skus.AsNoTracking() on st.sku_id equals sku.id+ join spu in Spus.AsNoTracking() on sku.spu_id equals spu.id+ join gsl in Goodslocations.AsNoTracking() on st.goods_location_id equals gsl.id+ join gso in Goodsowners.AsNoTracking() on st.goods_owner_id equals gso.id into gsoJoin+ from gso in gsoJoin.DefaultIfEmpty()+ join adj in queryAdjust on st.id equals adj.source_table_id into adjJoin+ from adj in adjJoin.DefaultIfEmpty()+ where st.tenant_id == currentUser.tenant_id+ select new StocktakingViewModel+ {+ id = st.id,+ job_code = st.job_code,+ job_status = st.job_status,+ adjust_status = adj.id == null ? false : true,+ sku_id = sku.id,+ sku_code = sku.sku_code,+ sku_name = sku.sku_name,+ spu_code = spu.spu_code,+ spu_name = spu.spu_name,+ goods_location_id = st.goods_location_id,+ warehouse_name = gsl.warehouse_name,+ location_name = gsl.location_name,+ goods_owner_id = st.goods_owner_id,+ goods_owner_name = gso.goods_owner_name == null ? string.Empty : gso.goods_owner_name,+ book_qty = st.book_qty,+ counted_qty = st.counted_qty,+ difference_qty = st.difference_qty,+ creator = st.creator,+ create_time = st.create_time,+ handler = st.handler,+ handle_time = st.handle_time,+ last_update_time = st.last_update_time+ };+ query = query.Where(queries.AsExpression<StocktakingViewModel>());+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.create_time)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list, totals);+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <returns></returns>+ public async Task<StocktakingViewModel> GetAsync(int id)+ {+ var Stocktakings = _dBContext.GetDbSet<StocktakingEntity>();+ var Spus = _dBContext.GetDbSet<SpuEntity>();+ var Skus = _dBContext.GetDbSet<SkuEntity>();+ var Goodsowners = _dBContext.GetDbSet<GoodsownerEntity>();+ var Goodslocations = _dBContext.GetDbSet<GoodslocationEntity>();+ var Stockadjusts = _dBContext.GetDbSet<StockadjustEntity>();+ var queryAdjust = Stockadjusts.AsNoTracking().Where(t => t.job_type == 1).Select(t => new { t.id, t.source_table_id });++ var query = from st in Stocktakings.AsNoTracking()+ join sku in Skus.AsNoTracking() on st.sku_id equals sku.id+ join spu in Spus.AsNoTracking() on sku.spu_id equals spu.id+ join gsl in Goodslocations.AsNoTracking() on st.goods_location_id equals gsl.id+ join gso in Goodsowners.AsNoTracking() on st.goods_owner_id equals gso.id into gsoJoin+ from gso in gsoJoin.DefaultIfEmpty()+ join adj in queryAdjust on st.id equals adj.source_table_id into adjJoin+ from adj in adjJoin.DefaultIfEmpty()+ where st.id == id+ select new StocktakingViewModel+ {+ id = st.id,+ job_code = st.job_code,+ job_status = st.job_status,+ adjust_status = adj.id == null ? false : true,+ sku_id = sku.id,+ sku_code = sku.sku_code,+ sku_name = sku.sku_name,+ spu_code = spu.spu_code,+ spu_name = spu.spu_name,+ goods_location_id = st.goods_location_id,+ warehouse_name = gsl.warehouse_name,+ location_name = gsl.location_name,+ goods_owner_id = st.goods_owner_id,+ goods_owner_name = gso.goods_owner_name == null ? string.Empty : gso.goods_owner_name,+ book_qty = st.book_qty,+ counted_qty = st.counted_qty,+ difference_qty = st.difference_qty,+ creator = st.creator,+ create_time = st.create_time,+ handler = st.handler,+ handle_time = st.handle_time,+ last_update_time = st.last_update_time+ };+ var data = await query.FirstOrDefaultAsync();+ if (data != null)+ {+ return data;+ }+ else+ {+ return new StocktakingViewModel();+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(StocktakingBasicViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<StocktakingEntity>();+ var entity = viewModel.Adapt<StocktakingEntity>();+ entity.id = 0;+ entity.job_code = await GetOrderCode(currentUser);+ entity.creator = currentUser.user_name;+ entity.create_time = DateTime.Now;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ await DbSet.AddAsync(entity);+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }++ /// <summary>+ /// get next code number+ /// </summary>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<string> GetOrderCode(CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<StocktakingEntity>();+ string code = "";+ string date = DateTime.Now.ToString("yyyy" + "MM" + "dd");+ string maxNo = await DbSet.AsNoTracking().Where(t => t.tenant_id.Equals(currentUser.tenant_id)).MaxAsync(t => t.job_code);+ if (string.IsNullOrEmpty(maxNo))+ {+ code = date + "-0001";+ }+ else+ {+ try+ {+ string maxDate = maxNo[..8];+ string maxDateNo = maxNo[9..];+ if (date == maxDate)+ {+ int.TryParse(maxDateNo, out int dd);+ int newDateNo = dd + 1;+ code = date + "-" + newDateNo.ToString("0000");+ }+ else+ {+ code = date + "-0001";+ }+ }+ catch+ {+ code = date + "-0001";+ }+ }++ return code;+ }+ /// <summary>+ /// update counted_qty+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> PutAsync(StocktakingConfirmViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<StocktakingEntity>();+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ entity.counted_qty = viewModel.counted_qty;+ entity.difference_qty = viewModel.counted_qty - entity.book_qty;+ entity.last_update_time = DateTime.Now;+ entity.handler = currentUser.user_name;+ entity.handle_time = DateTime.Now;+ entity.job_status = true;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }++ /// <summary>+ /// Confirm a record+ /// </summary>+ /// <param name="id">id</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> ConfirmAsync(int id, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<StocktakingEntity>();+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(id));+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ // change stock sku qty+ var Stocks = _dBContext.GetDbSet<StockEntity>();+ var stockEntity = await Stocks.FirstOrDefaultAsync(t => t.sku_id.Equals(entity.sku_id)+ && t.goods_owner_id.Equals(entity.goods_owner_id)+ && t.goods_location_id.Equals(entity.goods_location_id));+ if (stockEntity == null)+ {+ await Stocks.AddAsync(new StockEntity+ {+ sku_id = entity.sku_id,+ goods_location_id = entity.goods_location_id,+ qty = entity.difference_qty,+ goods_owner_id = entity.goods_owner_id,+ is_freeze = false,+ last_update_time = DateTime.Now,+ tenant_id = currentUser.tenant_id+ });+ }+ else+ {+ stockEntity.qty += entity.difference_qty;+ stockEntity.last_update_time = DateTime.Now;+ }+ // add a record to stockadjust+ var Stockadjusts = _dBContext.GetDbSet<StockadjustEntity>();+ await Stockadjusts.AddAsync(new StockadjustEntity+ {+ job_code = entity.job_code,+ sku_id = entity.sku_id,+ goods_location_id = entity.goods_location_id,+ goods_owner_id = entity.goods_owner_id,+ qty = entity.difference_qty,+ creator = currentUser.user_name,+ create_time = DateTime.Now,+ last_update_time = DateTime.Now,+ tenant_id = currentUser.tenant_id,+ is_update_stock = true,+ job_type = 1,+ source_table_id = entity.id+ });++ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["operation_success"]);+ }+ else+ {+ return (false, _stringLocalizer["operation_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ var qty = await _dBContext.GetDbSet<StocktakingEntity>().Where(t => t.id.Equals(id)).ExecuteDeleteAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }+ #endregion+ }+}+diff --git a/backend/ModernWMS.WMS/Services/Warehouse/WarehouseService.cs b/backend/ModernWMS.WMS/Services/Warehouse/WarehouseService.csnew file mode 100644index 0000000..35cdce7--- /dev/null+++ b/backend/ModernWMS.WMS/Services/Warehouse/WarehouseService.cs@@ -0,0 +1,284 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+using Mapster;+using Microsoft.EntityFrameworkCore;+using ModernWMS.Core.DBContext;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;+using ModernWMS.Core.Models;+using ModernWMS.Core.JWT;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.DynamicSearch;+using System.Text;++namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// Warehouse Service+ /// </summary>+ public class WarehouseService : BaseService<WarehouseEntity>, IWarehouseService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Warehouse constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public WarehouseService(+ SqlDBContext dBContext+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// get select items+ /// </summary>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<List<FormSelectItem>> GetSelectItemsAsnyc(CurrentUser currentUser)+ {+ var res = new List<FormSelectItem>();+ var DBSet = _dBContext.GetDbSet<WarehouseEntity>();+ res.AddRange(await (from db in DBSet.AsNoTracking()+ where db.is_valid == true && db.tenant_id == currentUser.tenant_id+ select new FormSelectItem+ {+ code = "warehouse_name",+ name = db.warehouse_name,+ value = db.id.ToString(),+ comments = "warehouse datas",+ }).ToListAsync());+ return res;+ }++ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<WarehouseViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var DbSet = _dBContext.GetDbSet<WarehouseEntity>();+ var query = DbSet.AsNoTracking()+ .Where(t => t.tenant_id.Equals(currentUser.tenant_id))+ .Where(queries.AsExpression<WarehouseEntity>());+ if (pageSearch.sqlTitle == "select")+ {+ query = query.Where(t => t.is_valid == true);+ }+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.create_time)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list.Adapt<List<WarehouseViewModel>>(), totals);+ }++ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ public async Task<List<WarehouseViewModel>> GetAllAsync(CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<WarehouseEntity>();+ var data = await DbSet.AsNoTracking().Where(t => t.tenant_id.Equals(currentUser.tenant_id)).ToListAsync();+ return data.Adapt<List<WarehouseViewModel>>();+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <returns></returns>+ public async Task<WarehouseViewModel> GetAsync(int id)+ {+ var DbSet = _dBContext.GetDbSet<WarehouseEntity>();+ var entity = await DbSet.AsNoTracking().FirstOrDefaultAsync(t => t.id.Equals(id));+ if (entity == null)+ {+ return null;+ }+ return entity.Adapt<WarehouseViewModel>();+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(WarehouseViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<WarehouseEntity>();+ if (await DbSet.AnyAsync(t => t.warehouse_name == viewModel.warehouse_name && t.tenant_id == currentUser.tenant_id))+ {+ return(0, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["warehouse_name"], viewModel.warehouse_name));+ }+ var entity = viewModel.Adapt<WarehouseEntity>();+ entity.id = 0;+ entity.create_time = DateTime.Now;+ entity.creator = currentUser.user_name;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ await DbSet.AddAsync(entity);+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(WarehouseViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<WarehouseEntity>();+ if (await DbSet.AnyAsync(t => t.id != viewModel.id && t.warehouse_name == viewModel.warehouse_name && t.tenant_id == currentUser.tenant_id))+ {+ return(false, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["warehouse_name"], viewModel.warehouse_name));+ }+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ entity.id = viewModel.id;+ entity.warehouse_name = viewModel.warehouse_name;+ entity.city = viewModel.city;+ entity.address = viewModel.address;+ entity.email = viewModel.email;+ entity.manager = viewModel.manager;+ entity.contact_tel = viewModel.contact_tel;+ entity.is_valid = viewModel.is_valid;+ entity.last_update_time = DateTime.Now;+ var warehousearea_DBSet = _dBContext.GetDbSet<WarehouseareaEntity>();+ var wadatas =await warehousearea_DBSet.Where(t => t.warehouse_id == entity.id).ToListAsync();+ wadatas.ForEach(t =>+ {+ t.is_valid = entity.is_valid;+ });+ var goodslocation_DBSet = _dBContext.GetDbSet<GoodslocationEntity>();+ var gldatas = await goodslocation_DBSet.Where(t => t.warehouse_area_id == entity.id).ToListAsync();+ gldatas.ForEach(t =>+ {+ t.warehouse_name = entity.warehouse_name;+ t.is_valid = entity.is_valid;+ });+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ if (await _dBContext.GetDbSet<GoodslocationEntity>().AnyAsync(t => t.warehouse_id == id))+ {+ return (false, _stringLocalizer["exist_warehousearea_not_delete"]);+ }+ var qty = await _dBContext.GetDbSet<WarehouseEntity>().Where(t => t.id.Equals(id)).ExecuteDeleteAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }++ /// <summary>+ /// import warehouses by excel+ /// </summary>+ /// <param name="datas">excel datas</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> ExcelAsync(List<WarehouseExcelImportViewModel> datas, CurrentUser currentUser)+ {+ StringBuilder sb = new StringBuilder();+ var DbSet = _dBContext.GetDbSet<WarehouseEntity>();+ var warehouse_name_repeat_excel = datas.GroupBy(t => t.warehouse_name).Select(t => new { warehouse_name = t.Key, cnt = t.Count() }).Where(t => t.cnt > 1).ToList();+ foreach (var repeat in warehouse_name_repeat_excel)+ {+ sb.AppendLine(string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["warehouse_name"], repeat.warehouse_name));+ }+ if (warehouse_name_repeat_excel.Count > 0)+ {+ return (false, sb.ToString());+ }++ var warehouse_name_repeat_exists = await DbSet.Where(t=>t.tenant_id == currentUser.tenant_id).Where(t => datas.Select(t => t.warehouse_name).ToList().Contains(t.warehouse_name)).Select(t => t.warehouse_name).ToListAsync();+ foreach (var repeat in warehouse_name_repeat_exists)+ {+ sb.AppendLine(string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["warehouse_name"], repeat));+ }+ if (warehouse_name_repeat_exists.Count > 0)+ {+ return (false, sb.ToString());+ }++ var entities = datas.Adapt<List<WarehouseEntity>>();+ entities.ForEach(t =>+ {+ t.creator = currentUser.user_name;+ t.tenant_id = currentUser.tenant_id;+ t.create_time = DateTime.Now;+ t.last_update_time = DateTime.Now;+ t.is_valid = true;+ });+ await DbSet.AddRangeAsync(entities);+ var res = await _dBContext.SaveChangesAsync();+ if (res > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ return (false, _stringLocalizer["save_failed"]);+ }+ #endregion+ }+}+diff --git a/backend/ModernWMS.WMS/Services/Warehousearea/WarehouseareaService.cs b/backend/ModernWMS.WMS/Services/Warehousearea/WarehouseareaService.csnew file mode 100644index 0000000..0ce7419--- /dev/null+++ b/backend/ModernWMS.WMS/Services/Warehousearea/WarehouseareaService.cs@@ -0,0 +1,248 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+using Mapster;+using Microsoft.EntityFrameworkCore;+using ModernWMS.Core.DBContext;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;+using ModernWMS.Core.Models;+using ModernWMS.Core.JWT;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.DynamicSearch;+using Microsoft.EntityFrameworkCore.Query.SqlExpressions;+using System.Net.WebSockets;++namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// Warehousearea Service+ /// </summary>+ public class WarehouseareaService : BaseService<WarehouseareaEntity>, IWarehouseareaService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Warehousearea constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public WarehouseareaService(+ SqlDBContext dBContext+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<WarehouseareaViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var DbSet = _dBContext.GetDbSet<WarehouseareaEntity>();+ var warehouse_DBSet = _dBContext.GetDbSet<WarehouseEntity>();++ var query = from wa in DbSet.AsNoTracking()+ join w in warehouse_DBSet.AsNoTracking() on wa.warehouse_id equals w.id+ select new WarehouseareaViewModel+ {+ id = wa.id,+ warehouse_id = wa.warehouse_id,+ warehouse_name = w.warehouse_name,+ area_name = wa.area_name,+ parent_id = wa.parent_id,+ create_time = wa.create_time,+ last_update_time = wa.last_update_time,+ is_valid = wa.is_valid,+ tenant_id = wa.tenant_id,+ area_property = wa.area_property,+ };+ if (pageSearch.sqlTitle == "select")+ {+ query = query.Where(t => t.is_valid == true);+ }+ query = query.Where(t => t.tenant_id.Equals(currentUser.tenant_id)).Where(queries.AsExpression<WarehouseareaViewModel>());+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.create_time)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list, totals);+ }+ /// <summary>+ /// get warehouseareas of the warehouse by warehouse_id+ /// </summary>+ /// <param name="warehouse_id">warehouse's id</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<List<FormSelectItem>> GetWarehouseareaByWarehouse_id(int warehouse_id, CurrentUser currentUser)+ {+ var res = new List<FormSelectItem>();+ var DbSet = _dBContext.GetDbSet<WarehouseareaEntity>();+ res = await (from wa in DbSet.AsNoTracking()+ where wa.is_valid == true && wa.tenant_id == currentUser.tenant_id && wa.warehouse_id == warehouse_id+ select new FormSelectItem+ {+ code = "warehousearea",+ comments = "warehouseareas of the warehouse",+ name = wa.area_name,+ value = wa.id.ToString(),+ }).ToListAsync();+ return res;+ }++ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ public async Task<List<WarehouseareaViewModel>> GetAllAsync(int warehouse_id, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<WarehouseareaEntity>().AsNoTracking();+ if (warehouse_id > 0)+ {+ DbSet = DbSet.Where(t=>t.warehouse_id == warehouse_id);+ }+ var data = await DbSet.Where(t =>t.is_valid == true && t.tenant_id.Equals(currentUser.tenant_id)).ToListAsync();+ return data.Adapt<List<WarehouseareaViewModel>>();+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <returns></returns>+ public async Task<WarehouseareaViewModel> GetAsync(int id)+ {+ var DbSet = _dBContext.GetDbSet<WarehouseareaEntity>();+ var entity = await DbSet.AsNoTracking().FirstOrDefaultAsync(t => t.id.Equals(id));+ if (entity == null)+ {+ return null;+ }+ return entity.Adapt<WarehouseareaViewModel>();+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(WarehouseareaViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<WarehouseareaEntity>();+ if (await DbSet.AnyAsync(t => t.warehouse_id == viewModel.warehouse_id && t.area_name == viewModel.area_name && t.tenant_id == currentUser.tenant_id))+ {+ return (0, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["area_name"], viewModel.area_name));+ }+ var entity = viewModel.Adapt<WarehouseareaEntity>();+ entity.id = 0;+ entity.create_time = DateTime.Now;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ await DbSet.AddAsync(entity);+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(WarehouseareaViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<WarehouseareaEntity>();+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (await DbSet.AnyAsync(t => t.id != viewModel.id && t.warehouse_id == viewModel.warehouse_id && t.area_name == viewModel.area_name && t.tenant_id == currentUser.tenant_id))+ {+ return (false, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["area_name"], viewModel.area_name));+ }+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ entity.id = viewModel.id;+ entity.warehouse_id = viewModel.warehouse_id;+ entity.area_name = viewModel.area_name;+ entity.parent_id = viewModel.parent_id;+ entity.is_valid = viewModel.is_valid;+ entity.area_property = viewModel.area_property;+ entity.last_update_time = DateTime.Now;+ var goodslocation_DBSet = _dBContext.GetDbSet<GoodslocationEntity>();+ var gldatas = await goodslocation_DBSet.Where(t => t.warehouse_area_id == entity.id).ToListAsync();+ gldatas.ForEach(t =>+ {+ t.warehouse_area_name = entity.area_name;+ t.warehouse_area_property = entity.area_property;+ t.is_valid = entity.is_valid;+ });+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ if (await _dBContext.GetDbSet < GoodslocationEntity>().AnyAsync(t=>t.warehouse_area_id == id))+ {+ return (false, _stringLocalizer["exist_location_not_delete"]);+ }+ var qty = await _dBContext.GetDbSet<WarehouseareaEntity>().Where(t => t.id.Equals(id)).ExecuteDeleteAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }+ #endregion+ }+}+diff --git a/backend/ModernWMS.WMS/Services/company/CompanyService.cs b/backend/ModernWMS.WMS/Services/company/CompanyService.csnew file mode 100644index 0000000..095819c--- /dev/null+++ b/backend/ModernWMS.WMS/Services/company/CompanyService.cs@@ -0,0 +1,159 @@+using Mapster;+using Microsoft.EntityFrameworkCore;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.DBContext;+using ModernWMS.Core.JWT;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;++namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// CompanyService+ /// </summary>+ public class CompanyService : BaseService<CompanyEntity>, ICompanyService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localization+ /// </summary>+ private readonly IStringLocalizer<Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ /// company service constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localization</param>+ public CompanyService(+ SqlDBContext dBContext+ , IStringLocalizer<Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ public async Task<List<CompanyViewModel>> GetAllAsync(CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<CompanyEntity>();+ var data = await DbSet.AsNoTracking().Where(t => t.tenant_id == currentUser.tenant_id)+ .OrderByDescending(t => t.create_time)+ .ToListAsync();+ return data.Adapt<List<CompanyViewModel>>();+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<CompanyViewModel> GetAsync(int id)+ {+ var entity = await _dBContext.GetDbSet<CompanyEntity>().AsNoTracking().FirstOrDefaultAsync(t => t.id.Equals(id));+ if (entity != null)+ {+ return entity.Adapt<CompanyViewModel>();+ }+ else+ {+ return new CompanyViewModel();+ }+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(CompanyViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<CompanyEntity>();+ if (await DbSet.AnyAsync(t => t.tenant_id.Equals(currentUser.tenant_id) && t.company_name.Equals(viewModel.company_name)))+ {+ return (0, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["company_name"], viewModel.company_name));+ }+ var entity = viewModel.Adapt<CompanyEntity>();+ entity.id = 0;+ entity.create_time = DateTime.Now;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ DbSet.Add(entity);+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(CompanyViewModel viewModel)+ {+ var DbSet = _dBContext.GetDbSet<CompanyEntity>();+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ if (await DbSet.AnyAsync(t => !t.id.Equals(viewModel.id) && t.tenant_id.Equals(entity.tenant_id) && t.company_name.Equals(viewModel.company_name)))+ {+ //国际化+ return (false, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["company_name"], viewModel.company_name));+ }+ entity.company_name = viewModel.company_name;+ entity.city = viewModel.city;+ entity.address = viewModel.address;+ entity.manager = viewModel.manager;+ entity.contact_tel = viewModel.contact_tel;+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ var qty = await _dBContext.GetDbSet<CompanyEntity>().Where(t => t.id.Equals(id)).ExecuteDeleteAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }+ #endregion+ }+}diff --git a/backend/ModernWMS.WMS/Services/supplier/SupplierService.cs b/backend/ModernWMS.WMS/Services/supplier/SupplierService.csnew file mode 100644index 0000000..620fcd0--- /dev/null+++ b/backend/ModernWMS.WMS/Services/supplier/SupplierService.cs@@ -0,0 +1,246 @@+/*+ * date:2022-12-21+ * developer:NoNo+ */+ using Mapster;+ using Microsoft.EntityFrameworkCore;+ using ModernWMS.Core.DBContext;+ using ModernWMS.Core.Services;+ using ModernWMS.WMS.Entities.Models;+ using ModernWMS.WMS.Entities.ViewModels;+ using ModernWMS.WMS.IServices;+ using Microsoft.Extensions.Localization;+ using ModernWMS.Core.DynamicSearch;+using ModernWMS.Core.Models;+using ModernWMS.Core.JWT;+using ModernWMS.Core.Utility;+using System.Text;++namespace ModernWMS.WMS.Services+ {+ /// <summary>+ /// Supplier Service+ /// </summary>+ public class SupplierService : BaseService<SupplierEntity>, ISupplierService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Supplier constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public SupplierService(+ SqlDBContext dBContext+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer= stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<SupplierViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var DbSet = _dBContext.GetDbSet<SupplierEntity>();+ var query = DbSet.AsNoTracking()+ .Where(t => t.tenant_id.Equals(currentUser.tenant_id))+ .Where(queries.AsExpression<SupplierEntity>());+ if(pageSearch.sqlTitle == "select")+ {+ query = query.Where(t => t.is_valid == true);+ }+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.create_time)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list.Adapt<List<SupplierViewModel>>(), totals);+ }++ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ public async Task<List<SupplierViewModel>> GetAllAsync(CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<SupplierEntity>();+ var data = await DbSet.AsNoTracking().Where(t=>t.tenant_id.Equals(currentUser.tenant_id)).ToListAsync();+ return data.Adapt<List<SupplierViewModel>>();+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <returns></returns>+ public async Task<SupplierViewModel> GetAsync(int id)+ {+ var DbSet = _dBContext.GetDbSet<SupplierEntity>();+ var entity = await DbSet.AsNoTracking().FirstOrDefaultAsync(t=>t.id.Equals(id));+ if (entity == null)+ {+ return null;+ }+ return entity.Adapt<SupplierViewModel>();+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(SupplierViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<SupplierEntity>();+ var entity = viewModel.Adapt<SupplierEntity>();+ entity.id = 0;+ entity.create_time = DateTime.Now;+ entity.creator = currentUser.user_name;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ await DbSet.AddAsync(entity);+ if (await DbSet.AnyAsync(t => t.supplier_name == viewModel.supplier_name && t.tenant_id == currentUser.tenant_id))+ {+ return (0, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["supplier_name"], viewModel.supplier_name));+ }+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(SupplierViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<SupplierEntity>();+ if (await DbSet.AnyAsync(t => t.id != viewModel.id && t.supplier_name == viewModel.supplier_name && t.tenant_id == currentUser.tenant_id))+ {+ return(false, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["supplier_name"], viewModel.supplier_name));+ }+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (entity == null)+ {+ return (false,_stringLocalizer[ "not_exists_entity"]);+ }+ entity.id = viewModel.id;+ entity.supplier_name = viewModel.supplier_name;+ entity.city = viewModel.city;+ entity.address = viewModel.address;+ entity.email = viewModel.email;+ entity.manager = viewModel.manager;+ entity.contact_tel = viewModel.contact_tel;+ entity.is_valid = viewModel.is_valid;+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ var qty = await _dBContext.GetDbSet<SupplierEntity>().Where(t => t.id.Equals(id)).ExecuteDeleteAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }++ /// <summary>+ /// import suppliers by excel+ /// </summary>+ /// <param name="datas">excel datas</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> ExcelAsync(List<SupplierExcelImportViewModel> datas,CurrentUser currentUser)+ {+ StringBuilder sb = new StringBuilder();+ var DbSet = _dBContext.GetDbSet<SupplierEntity>();+ var supplier_name_repeat_excel = datas.GroupBy(t => t.supplier_name).Select(t => new { supplier_name = t.Key, cnt = t.Count() }).Where(t => t.cnt > 1).ToList();+ foreach (var repeat in supplier_name_repeat_excel)+ {+ sb.AppendLine(string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["supplier_name"], repeat.supplier_name));+ }+ if (supplier_name_repeat_excel.Count > 0)+ {+ return (false, sb.ToString());+ }++ var supplier_name_repeat_exists = await DbSet.Where(t=>t.tenant_id == currentUser.tenant_id).Where(t => datas.Select(t => t.supplier_name).ToList().Contains(t.supplier_name)).Select(t => t.supplier_name).ToListAsync();+ foreach (var repeat in supplier_name_repeat_exists)+ {+ sb.AppendLine(string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["supplier_name"], repeat));+ }+ if (supplier_name_repeat_exists.Count > 0)+ {+ return (false, sb.ToString());+ }++ var entities = datas.Adapt<List<SupplierEntity>>();+ entities.ForEach(t => {+ t.creator = currentUser.user_name;+ t.tenant_id = currentUser.tenant_id;+ t.create_time = DateTime.Now;+ t.last_update_time = DateTime.Now;+ t.is_valid = true;+ });+ await DbSet.AddRangeAsync(entities);+ var res = await _dBContext.SaveChangesAsync();+ if (res > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ return (false, _stringLocalizer["save_failed"]);+ }+ #endregion+ }+ }+diff --git a/backend/ModernWMS.WMS/Services/user/UserService.cs b/backend/ModernWMS.WMS/Services/user/UserService.csnew file mode 100644index 0000000..acb0b6d--- /dev/null+++ b/backend/ModernWMS.WMS/Services/user/UserService.cs@@ -0,0 +1,560 @@+/*+ * date:2022-12-20+ * developer:NoNo+ */+using Mapster;+using Microsoft.EntityFrameworkCore;+using ModernWMS.Core.DBContext;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;+using ModernWMS.Core.Models;+using Microsoft.Extensions.Localization;+using ModernWMS.Core.Utility;+using System.Text;+using ModernWMS.Core.JWT;+using ModernWMS.Core.DynamicSearch;+using Microsoft.AspNetCore.Components.Forms;+using System.ComponentModel.Design;++namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// User Service+ /// </summary>+ public class UserService : BaseService<userEntity>, IUserService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///User constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public UserService(+ SqlDBContext dBContext+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// get select items+ /// </summary>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<List<FormSelectItem>> GetSelectItemsAsnyc(CurrentUser currentUser)+ {+ var res = new List<FormSelectItem>();+ var userrole_DBSet = _dBContext.GetDbSet<UserroleEntity>();+ res.AddRange(await (from ur in userrole_DBSet.AsNoTracking()+ where ur.is_valid == true && ur.tenant_id == currentUser.tenant_id+ select new FormSelectItem+ {+ code = "user_role",+ name = ur.role_name,+ value = ur.id.ToString(),+ comments = "user's role",+ }).ToListAsync());+ return res;+ }++ /// <summary>+ /// page search+ /// </summary>+ /// <param name="pageSearch">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(List<UserViewModel> data, int totals)> PageAsync(PageSearch pageSearch, CurrentUser currentUser)+ {+ QueryCollection queries = new QueryCollection();+ if (pageSearch.searchObjects.Any())+ {+ pageSearch.searchObjects.ForEach(s =>+ {+ queries.Add(s);+ });+ }+ var DbSet = _dBContext.GetDbSet<userEntity>();+ var query = DbSet.AsNoTracking()+ .Where(t => t.tenant_id.Equals(currentUser.tenant_id))+ .Where(queries.AsExpression<userEntity>());+ if (pageSearch.sqlTitle == "select")+ {+ query = query.Where(t => t.is_valid == true);+ }+ int totals = await query.CountAsync();+ var list = await query.OrderByDescending(t => t.create_time)+ .Skip((pageSearch.pageIndex - 1) * pageSearch.pageSize)+ .Take(pageSearch.pageSize)+ .ToListAsync();+ return (list.Adapt<List<UserViewModel>>(), totals);+ }+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ public async Task<List<UserViewModel>> GetAllAsync(CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<userEntity>();+ var data = await DbSet.AsNoTracking().Where(t=>t.tenant_id == currentUser.tenant_id).ToListAsync();+ return data.Adapt<List<UserViewModel>>();+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <returns></returns>+ public async Task<UserViewModel> GetAsync(int id)+ {+ var DbSet = _dBContext.GetDbSet<userEntity>();+ var entity = await DbSet.AsNoTracking().FirstOrDefaultAsync(t => t.id.Equals(id));+ if (entity == null)+ {+ return null;+ }+ return entity.Adapt<UserViewModel>();+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(UserViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<userEntity>();+ if (await DbSet.AnyAsync(t => t.user_num == viewModel.user_num && t.tenant_id == currentUser.tenant_id))+ {+ return (0, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["user_num"], viewModel.user_num));+ }+ var entity = viewModel.Adapt<userEntity>();+ entity.id = 0;+ entity.auth_string = Md5Helper.Md5Encrypt32("pwd123456");+ entity.create_time = DateTime.Now;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ await DbSet.AddAsync(entity);+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(UserViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<userEntity>();+ if (await DbSet.AnyAsync(t => t.id != viewModel.id && t.user_num == viewModel.user_num && t.tenant_id == currentUser.tenant_id))+ {+ return (false, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["user_num"], viewModel.user_num));+ }+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ entity.id = viewModel.id;+ entity.user_num = viewModel.user_num;+ entity.user_name = viewModel.user_name;+ entity.contact_tel = viewModel.contact_tel;+ entity.user_role = viewModel.user_role;+ entity.sex = viewModel.sex;+ entity.is_valid = viewModel.is_valid;+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ var qty = await _dBContext.GetDbSet<userEntity>().Where(t => t.id.Equals(id)).ExecuteDeleteAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }+ /// <summary>+ /// import users by excel+ /// </summary>+ /// <param name="datas">excel datas</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(bool flag,string msg)>ExcelAsync(List<UserExcelImportViewModel> datas,CurrentUser currentUser)+ {+ StringBuilder sb = new StringBuilder();+ var DbSet = _dBContext.GetDbSet<userEntity>();+ var user_num_repeat_excel = datas.GroupBy(t => t.user_num).Select(t=>new { user_num= t.Key,cnt = t.Count()}).Where(t=>t.cnt>1).ToList();+ foreach(var repeat in user_num_repeat_excel)+ {+ sb.AppendLine(string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["user_num"], repeat.user_num));+ }+ if (user_num_repeat_excel.Count > 0)+ {+ return (false,sb.ToString());+ }++ var user_num_repeat_exists =await DbSet.Where(t=>t.tenant_id == currentUser.tenant_id).Where(t => datas.Select(t => t.user_num).ToList().Contains(t.user_num)).Select(t=>t.user_num).ToListAsync();+ foreach (var repeat in user_num_repeat_exists)+ {+ sb.AppendLine(string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["user_num"], repeat));+ }+ if (user_num_repeat_exists.Count > 0)+ {+ return (false, sb.ToString());+ }++ var entities = datas.Adapt<List<userEntity>>();+ entities.ForEach(t => {+ t.creator = currentUser.user_name;+ t.tenant_id= currentUser.tenant_id;+ t.auth_string = Md5Helper.Md5Encrypt32("pwd123456");+ t.create_time = DateTime.Now;+ t.last_update_time= DateTime.Now;+ t.is_valid = true;+ });+ await DbSet.AddRangeAsync(entities);+ var res = await _dBContext.SaveChangesAsync();+ if (res > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ return (false, _stringLocalizer["save_failed"]);+ }++ /// <summary>+ /// reset password+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <returns></returns>+ public async Task<(bool,string)> ResetPwd(BatchOperationViewModel viewModel)+ {+ var DBSet = _dBContext.GetDbSet<userEntity>();+ var entities =await DBSet.Where(t => viewModel.id_list.Contains(t.id)).ToListAsync();+ var newpassword = GetRandomPassword();+ entities.ForEach(t => { t.auth_string = Md5Helper.Md5Encrypt32(newpassword); t.last_update_time = DateTime.Now; });+ var res = await _dBContext.SaveChangesAsync();+ if (res > 0)+ {+ return (true, newpassword);+ }+ return (false,_stringLocalizer["operation_failed"]);+ }++ /// <summary>+ /// change password+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <returns></returns>+ public async Task<(bool flag,string msg)> ChangePwd(UserChangePwdViewModel viewModel)+ {+ var DBSet = _dBContext.GetDbSet<userEntity>();+ var entity =await DBSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if(entity == null)+ {+ return (false, _stringLocalizer["not_exists_entity"]);+ }+ if (!entity.auth_string.Equals(viewModel.old_password)){+ return(false, _stringLocalizer["old_password"] + _stringLocalizer["is_incorrect"]);+ }+ entity.auth_string = viewModel.new_password;+ await _dBContext.SaveChangesAsync();+ return (true, _stringLocalizer["save_success"]);+ }+ /// <summary>+ /// register a new tenant+ /// </summary>+ /// <param name="viewModel">viewModel</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> Register(RegisterViewModel viewModel)+ {+ var DbSet = _dBContext.GetDbSet<userEntity>();+ var entity = viewModel.Adapt<userEntity>();+ var time = DateTime.Now;+ entity.user_num = entity.user_name;+ entity.id = 0;+ entity.auth_string = viewModel.auth_string;+ entity.create_time = time;+ entity.last_update_time = time;+ entity.email = viewModel.email;+ entity.sex = viewModel.sex;+ entity.is_valid = true;+ await DbSet.AddAsync(entity);+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ var tenant_id = entity.id;+ #region menus+ var menus = new List<MenuEntity>+ {+ new MenuEntity+ {+ menu_name = "companySetting",+ module = "baseModule",+ vue_path = "companySetting",+ vue_path_detail = "",+ vue_directory = "base/companySetting",+ sort = 1,+ tenant_id = tenant_id+ },+ new MenuEntity+ {+ menu_name = "userRoleSetting",+ module = "baseModule",+ vue_path = "userRoleSetting",+ vue_path_detail = "",+ vue_directory = "base/userRoleSetting",+ sort = 2,+ tenant_id = tenant_id+ },+ new MenuEntity+ {+ menu_name = "roleMenu",+ module = "baseModule",+ vue_path = "roleMenu",+ vue_path_detail = "",+ vue_directory = "base/roleMenu",+ sort = 3,+ tenant_id = tenant_id+ },+ new MenuEntity+ {+ menu_name = "userManagement",+ module = "baseModule",+ vue_path = "userManagement",+ vue_path_detail = "",+ vue_directory = "base/userManagement",+ sort = 4,+ tenant_id = tenant_id+ },+ new MenuEntity+ {+ menu_name = "commodityCategorySetting",+ module = "baseModule",+ vue_path = "commodityCategorySetting",+ vue_path_detail = "",+ vue_directory = "base/commodityCategorySetting",+ sort = 5,+ tenant_id = tenant_id+ },+ new MenuEntity+ {+ menu_name = "commodityManagement",+ module = "baseModule",+ vue_path = "commodityManagement",+ vue_path_detail = "",+ vue_directory = "base/commodityManagement",+ sort = 6,+ tenant_id = tenant_id+ },+ new MenuEntity+ {+ menu_name = "supplier",+ module = "baseModule",+ vue_path = "supplier",+ vue_path_detail = "",+ vue_directory = "base/supplier",+ sort = 7,+ tenant_id = tenant_id+ },+ new MenuEntity+ {+ menu_name = "warehouseSetting",+ module = "baseModule",+ vue_path = "warehouseSetting",+ vue_path_detail = "",+ vue_directory = "base/warehouseSetting",+ sort = 8,+ tenant_id = tenant_id+ },new MenuEntity+ {+ menu_name = "ownerOfCargo",+ module = "baseModule",+ vue_path = "ownerOfCargo",+ vue_path_detail = "",+ vue_directory = "base/ownerOfCargo",+ sort = 9,+ tenant_id = tenant_id+ },new MenuEntity+ {+ menu_name = "freightSetting",+ module = "baseModule",+ vue_path = "freightSetting",+ vue_path_detail = "",+ vue_directory = "base/freightSetting",+ sort = 10,+ tenant_id = tenant_id+ },new MenuEntity+ {+ menu_name = "customer",+ module = "baseModule",+ vue_path = "customer",+ vue_path_detail = "",+ vue_directory = "base/customer",+ sort = 11,+ tenant_id = tenant_id+ },new MenuEntity+ {+ menu_name = "stockManagement",+ module = "",+ vue_path = "stockManagement",+ vue_path_detail = "",+ vue_directory = "wms/stockManagement",+ sort = 3,+ tenant_id = tenant_id+ },new MenuEntity+ {+ menu_name = "warehouseProcessing",+ module = "warehouseWorkingModule",+ vue_path = "warehouseProcessing",+ vue_path_detail = "",+ vue_directory = "warehouseWorking/warehouseProcessing",+ sort = 4,+ tenant_id = tenant_id+ },new MenuEntity+ {+ menu_name = "warehouseMove",+ module = "warehouseWorkingModule",+ vue_path = "warehouseMove",+ vue_path_detail = "",+ vue_directory = "warehouseWorking/warehouseMove",+ sort = 5,+ tenant_id = tenant_id+ },new MenuEntity+ {+ menu_name = "warehouseFreeze",+ module = "warehouseWorkingModule",+ vue_path = "warehouseFreeze",+ vue_path_detail = "",+ vue_directory = "warehouseWorking/warehouseFreeze",+ sort = 6,+ tenant_id = tenant_id+ },new MenuEntity+ {+ menu_name = "warehouseAdjust",+ module = "warehouseWorkingModule",+ vue_path = "warehouseAdjust",+ vue_path_detail = "",+ vue_directory = "warehouseWorking/warehouseAdjust",+ sort = 7,+ tenant_id = tenant_id+ },new MenuEntity+ {+ menu_name = "warehouseTaking",+ module = "warehouseWorkingModule",+ vue_path = "warehouseTaking",+ vue_path_detail = "",+ vue_directory = "warehouseWorking/warehouseTaking",+ sort = 8,+ tenant_id = tenant_id+ },new MenuEntity+ {+ menu_name = "stockAsn",+ module = "",+ vue_path = "stockAsn",+ vue_path_detail = "",+ vue_directory = "wms/stockAsn",+ sort = 2,+ tenant_id = tenant_id+ },new MenuEntity+ {+ menu_name = "deliveryManagement",+ module = "",+ vue_path = "deliveryManagement",+ vue_path_detail = "",+ vue_directory = "deliveryManagement/deliveryManagement",+ sort = 5,+ tenant_id = tenant_id+ }+ };+ #endregion+ entity.tenant_id = tenant_id;+ entity.creator = entity.user_name;+ entity.user_role = "admin";+ var adminrole = new UserroleEntity {is_valid = true, last_update_time = time, create_time = time, role_name = "admin", tenant_id = tenant_id };+ await _dBContext.GetDbSet<UserroleEntity>().AddAsync(adminrole);+ await _dBContext.GetDbSet<MenuEntity>().AddRangeAsync(menus);+ await _dBContext.SaveChangesAsync();+ foreach(var menu in menus)+ {+ await _dBContext.GetDbSet<RolemenuEntity>().AddAsync(new RolemenuEntity+ {+ userrole_id = adminrole.id,+ authority = 1,+ menu_id = menu.id,+ tenant_id = tenant_id,+ last_update_time=time,+ create_time = time,+ });+ }+ await _dBContext.SaveChangesAsync();+ return (true, _stringLocalizer["operation_success"]);+ }+ else+ {+ return (false, _stringLocalizer["operation_failed"]);+ }+ }++ /// <summary>+ /// get a random password+ /// </summary>+ /// <returns></returns>+ public string GetRandomPassword()+ {+ string randomChars = "ABCDEFGHIJKLMNOPQRSTVWXYZ123456789";+ string password = string.Empty;+ int randomNum;+ Random random = new Random();+ for (int i = 0; i < 6; i++)+ {+ randomNum = random.Next(randomChars.Length);+ password += randomChars[randomNum];+ }+ return password;+ }++ #endregion+ }+}+diff --git a/backend/ModernWMS.WMS/Services/userrole/UserroleService.cs b/backend/ModernWMS.WMS/Services/userrole/UserroleService.csnew file mode 100644index 0000000..52d4f94--- /dev/null+++ b/backend/ModernWMS.WMS/Services/userrole/UserroleService.cs@@ -0,0 +1,225 @@+/*+ * date:2022-12-20+ * developer:NoNo+ */+using Mapster;+using Microsoft.EntityFrameworkCore;+using ModernWMS.Core.DBContext;+using ModernWMS.Core.Services;+using ModernWMS.WMS.Entities.Models;+using ModernWMS.WMS.Entities.ViewModels;+using ModernWMS.WMS.IServices;+using Microsoft.Extensions.Localization;+using Microsoft.EntityFrameworkCore.Infrastructure.Internal;+using ModernWMS.Core.JWT;+using System.Text;+using System.Collections.Immutable;+using ModernWMS.Core.Models;++namespace ModernWMS.WMS.Services+{+ /// <summary>+ /// Userrole Service+ /// </summary>+ public class UserroleService : BaseService<UserroleEntity>, IUserroleService+ {+ #region Args+ /// <summary>+ /// The DBContext+ /// </summary>+ private readonly SqlDBContext _dBContext;++ /// <summary>+ /// Localizer Service+ /// </summary>+ private readonly IStringLocalizer<ModernWMS.Core.MultiLanguage> _stringLocalizer;+ #endregion++ #region constructor+ /// <summary>+ ///Userrole constructor+ /// </summary>+ /// <param name="dBContext">The DBContext</param>+ /// <param name="stringLocalizer">Localizer</param>+ public UserroleService(+ SqlDBContext dBContext+ , IStringLocalizer<ModernWMS.Core.MultiLanguage> stringLocalizer+ )+ {+ this._dBContext = dBContext;+ this._stringLocalizer = stringLocalizer;+ }+ #endregion++ #region Api+ /// <summary>+ /// bulk save records+ /// </summary>+ /// <param name="viewModels">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> BulkSaveAsync(List<UserroleViewModel> viewModels, CurrentUser currentUser)+ {+ StringBuilder sb = new StringBuilder();+ var DBSet = _dBContext.GetDbSet<UserroleEntity>();+ var repaet_role_name_viewmodel = viewModels.Where(t => t.id >= 0).GroupBy(t => t.role_name).Select(t => new { role_name = t.Key, cnt = t.Count() }).Where(t => t.cnt > 1).ToList();+ foreach (var repeat in repaet_role_name_viewmodel)+ {+ sb.AppendLine(string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["role_name"], repeat));+ }+ if (repaet_role_name_viewmodel.Count() > 0)+ {+ return (false, sb.ToString());+ }+ var delete_viewmodels = viewModels.Where(t => t.id < 0).ToList();+ var enties_check = await DBSet.AsNoTracking().Where(t => t.tenant_id == currentUser.tenant_id && !delete_viewmodels.Select(e => -e.id).ToList().Contains(t.id)).ToListAsync();+ var role_name_viewmodels = viewModels.Where(t => t.id >= 0).Select(t => t.role_name).ToList();+ var repaet_role_name_exists = enties_check.Where(t => role_name_viewmodels.Contains(t.role_name)).ToList();+ foreach (var repeat in repaet_role_name_exists)+ {+ sb.AppendLine(string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["role_name"], repeat.role_name));+ }+ if (repaet_role_name_exists.Count() > 0)+ {+ return (false, sb.ToString());+ }+ var add_entities = (from vm in viewModels+ where vm.id == 0+ select new UserroleEntity+ {+ id = 0,+ create_time = DateTime.Now,+ last_update_time = DateTime.Now,+ is_valid = true,+ role_name = vm.role_name,+ tenant_id = currentUser.tenant_id,+ }).ToList();+ await DBSet.AddRangeAsync(add_entities);+ var update_viewmodel_id = viewModels.Where(t => t.id > 0).Select(t => t.id).ToList();+ var update_entities = await DBSet.Where(t => update_viewmodel_id.Contains(t.id)).ToListAsync();+ update_entities.ForEach(t =>+ {+ var update_vm = viewModels.FirstOrDefault(e => e.id == t.id);+ if (update_vm != null)+ {+ t.last_update_time = DateTime.Now;+ t.is_valid = update_vm.is_valid;+ t.role_name = update_vm.role_name;+ }+ });++ var delete_entites = await DBSet.Where(t => delete_viewmodels.Select(e => -e.id).ToList().Contains(t.id)).ToListAsync();+ DBSet.RemoveRange(delete_entites);+ await _dBContext.SaveChangesAsync();+ return (true, _stringLocalizer["save_success"]);+ }+ /// <summary>+ /// Get all records+ /// </summary>+ /// <returns></returns>+ public async Task<List<UserroleViewModel>> GetAllAsync(CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<UserroleEntity>();+ var data = await DbSet.AsNoTracking().Where(t => t.tenant_id == currentUser.tenant_id).ToListAsync();+ return data.Adapt<List<UserroleViewModel>>();+ }++ /// <summary>+ /// Get a record by id+ /// </summary>+ /// <returns></returns>+ public async Task<UserroleViewModel> GetAsync(int id)+ {+ var DbSet = _dBContext.GetDbSet<UserroleEntity>();+ var entity = await DbSet.AsNoTracking().FirstOrDefaultAsync(t => t.id.Equals(id));+ if (entity == null)+ {+ return null;+ }+ return entity.Adapt<UserroleViewModel>();+ }+ /// <summary>+ /// add a new record+ /// </summary>+ /// <param name="viewModel">viewmodel</param>+ /// <param name="currentUser">current user</param>+ /// <returns></returns>+ public async Task<(int id, string msg)> AddAsync(UserroleViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<UserroleEntity>();+ if (await DbSet.AnyAsync(t => t.role_name == viewModel.role_name && t.tenant_id == currentUser.tenant_id))+ {+ return (0, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["role_name"], viewModel.role_name));+ }+ var entity = viewModel.Adapt<UserroleEntity>();+ entity.id = 0;+ entity.create_time = DateTime.Now;+ entity.last_update_time = DateTime.Now;+ entity.tenant_id = currentUser.tenant_id;+ await DbSet.AddAsync(entity);+ await _dBContext.SaveChangesAsync();+ if (entity.id > 0)+ {+ return (entity.id, _stringLocalizer["save_success"]);+ }+ else+ {+ return (0, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// update a record+ /// </summary>+ /// <param name="viewModel">args</param>+ /// <param name="currentUser">currentUser</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> UpdateAsync(UserroleViewModel viewModel, CurrentUser currentUser)+ {+ var DbSet = _dBContext.GetDbSet<UserroleEntity>();+ if (await DbSet.AnyAsync(t => t.id != viewModel.id && t.role_name == viewModel.role_name && t.tenant_id == currentUser.tenant_id))+ {+ return (false, string.Format(_stringLocalizer["exists_entity"], _stringLocalizer["role_name"], viewModel.role_name));+ }+ var entity = await DbSet.FirstOrDefaultAsync(t => t.id.Equals(viewModel.id));+ if (entity == null)+ {+ return (false, _stringLocalizer["not exists entity"]);+ }+ var user_DBSet = _dBContext.GetDbSet<userEntity>();+ var this_role_users = await user_DBSet.Where(t=>t.user_role == entity.role_name).ToListAsync();+ this_role_users.ForEach(t=>t.user_role=viewModel.role_name);+ entity.id = viewModel.id;+ entity.role_name = viewModel.role_name;+ entity.is_valid = viewModel.is_valid;+ entity.last_update_time = DateTime.Now;+ var qty = await _dBContext.SaveChangesAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["save_success"]);+ }+ else+ {+ return (false, _stringLocalizer["save_failed"]);+ }+ }+ /// <summary>+ /// delete a record+ /// </summary>+ /// <param name="id">id</param>+ /// <returns></returns>+ public async Task<(bool flag, string msg)> DeleteAsync(int id)+ {+ var qty = await _dBContext.GetDbSet<UserroleEntity>().Where(t => t.id.Equals(id)).ExecuteDeleteAsync();+ if (qty > 0)+ {+ return (true, _stringLocalizer["delete_success"]);+ }+ else+ {+ return (false, _stringLocalizer["delete_failed"]);+ }+ }+ #endregion+ }+}+diff --git a/backend/ModernWMS.sln b/backend/ModernWMS.slnnew file mode 100644index 0000000..1601cb4--- /dev/null+++ b/backend/ModernWMS.sln@@ -0,0 +1,37 @@++Microsoft Visual Studio Solution File, Format Version 12.00+# Visual Studio Version 17+VisualStudioVersion = 17.4.33122.133+MinimumVisualStudioVersion = 10.0.40219.1+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModernWMS", "ModernWMS\ModernWMS.csproj", "{59E73801-09AE-4234-9B14-9FF5787F7004}"+EndProject+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModernWMS.Core", "ModernWMS.Core\ModernWMS.Core.csproj", "{8E8FC264-84FF-4353-B68B-ED007859E095}"+EndProject+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernWMS.WMS", "ModernWMS.WMS\ModernWMS.WMS.csproj", "{2A69B0EE-95A8-4459-96DE-867C160EA615}"+EndProject+Global+ GlobalSection(SolutionConfigurationPlatforms) = preSolution+ Debug|Any CPU = Debug|Any CPU+ Release|Any CPU = Release|Any CPU+ EndGlobalSection+ GlobalSection(ProjectConfigurationPlatforms) = postSolution+ {59E73801-09AE-4234-9B14-9FF5787F7004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU+ {59E73801-09AE-4234-9B14-9FF5787F7004}.Debug|Any CPU.Build.0 = Debug|Any CPU+ {59E73801-09AE-4234-9B14-9FF5787F7004}.Release|Any CPU.ActiveCfg = Release|Any CPU+ {59E73801-09AE-4234-9B14-9FF5787F7004}.Release|Any CPU.Build.0 = Release|Any CPU+ {8E8FC264-84FF-4353-B68B-ED007859E095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU+ {8E8FC264-84FF-4353-B68B-ED007859E095}.Debug|Any CPU.Build.0 = Debug|Any CPU+ {8E8FC264-84FF-4353-B68B-ED007859E095}.Release|Any CPU.ActiveCfg = Release|Any CPU+ {8E8FC264-84FF-4353-B68B-ED007859E095}.Release|Any CPU.Build.0 = Release|Any CPU+ {2A69B0EE-95A8-4459-96DE-867C160EA615}.Debug|Any CPU.ActiveCfg = Debug|Any CPU+ {2A69B0EE-95A8-4459-96DE-867C160EA615}.Debug|Any CPU.Build.0 = Debug|Any CPU+ {2A69B0EE-95A8-4459-96DE-867C160EA615}.Release|Any CPU.ActiveCfg = Release|Any CPU+ {2A69B0EE-95A8-4459-96DE-867C160EA615}.Release|Any CPU.Build.0 = Release|Any CPU+ EndGlobalSection+ GlobalSection(SolutionProperties) = preSolution+ HideSolutionNode = FALSE+ EndGlobalSection+ GlobalSection(ExtensibilityGlobals) = postSolution+ SolutionGuid = {0CEBCBBC-DCCB-4D5C-A47F-9046F3BF0AB9}+ EndGlobalSection+EndGlobaldiff --git a/backend/ModernWMS/ModernWMS.csproj b/backend/ModernWMS/ModernWMS.csprojnew file mode 100644index 0000000..b2329f1--- /dev/null+++ b/backend/ModernWMS/ModernWMS.csproj@@ -0,0 +1,28 @@+<Project Sdk="Microsoft.NET.Sdk.Web">++ <PropertyGroup>+ <TargetFramework>net7.0</TargetFramework>+ <Nullable>enable</Nullable>+ <ImplicitUsings>enable</ImplicitUsings>+ </PropertyGroup>++ <ItemGroup>+ <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.0" />+ <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.1">+ <PrivateAssets>all</PrivateAssets>+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>+ </PackageReference>+ <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.1">+ <PrivateAssets>all</PrivateAssets>+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>+ </PackageReference>+ <PackageReference Include="NLog.Web.AspNetCore" Version="5.2.0" />+ <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />+ </ItemGroup>++ <ItemGroup>+ <ProjectReference Include="..\ModernWMS.Core\ModernWMS.Core.csproj" />+ <ProjectReference Include="..\ModernWMS.WMS\ModernWMS.WMS.csproj" />+ </ItemGroup>++</Project>diff --git a/backend/ModernWMS/Program.cs b/backend/ModernWMS/Program.csnew file mode 100644index 0000000..c5bcf28--- /dev/null+++ b/backend/ModernWMS/Program.cs@@ -0,0 +1,45 @@++using Microsoft.AspNetCore.Hosting;+using NLog.Web;++namespace ModernWMS+{+ public class Program+ {+ public static void Main(string[] args)+ {+ var logger = NLog.Web.NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();+ try+ {+ logger.Debug("--- run");+ CreateHostBuilder(args).Build().Run();+ }+ catch (Exception exception)+ {+ logger.Error(exception, "---- exception");+ throw;+ }+ finally+ {+ NLog.LogManager.Shutdown();+ }+ }++ public static IHostBuilder CreateHostBuilder(string[] args) =>+ Host.CreateDefaultBuilder(args)+ .ConfigureWebHostDefaults(webBuilder =>+ {+ webBuilder.UseUrls("http://*:5555")+ .UseStartup<Startup>()+ .UseKestrel(opt => opt.Limits.MaxRequestBodySize = null);+ }).ConfigureLogging(logging =>+ {+ logging.ClearProviders();+ logging.SetMinimumLevel(LogLevel.Trace);+ }).UseNLog()+ .UseDefaultServiceProvider(options =>+ {+ options.ValidateScopes = false;+ });+ }+}diff --git a/backend/ModernWMS/Properties/launchSettings.json b/backend/ModernWMS/Properties/launchSettings.jsonnew file mode 100644index 0000000..12fae4f--- /dev/null+++ b/backend/ModernWMS/Properties/launchSettings.json@@ -0,0 +1,31 @@+{+ "$schema": "https://json.schemastore.org/launchsettings.json",+ "iisSettings": {+ "windowsAuthentication": false,+ "anonymousAuthentication": true,+ "iisExpress": {+ "applicationUrl": "http://localhost:16453",+ "sslPort": 0+ }+ },+ "profiles": {+ "http": {+ "commandName": "Project",+ "dotnetRunMessages": true,+ "launchBrowser": true,+ "launchUrl": "swagger",+ "applicationUrl": "http://localhost:5056",+ "environmentVariables": {+ "ASPNETCORE_ENVIRONMENT": "Development"+ }+ },+ "IIS Express": {+ "commandName": "IISExpress",+ "launchBrowser": true,+ "launchUrl": "swagger",+ "environmentVariables": {+ "ASPNETCORE_ENVIRONMENT": "Development"+ }+ }+ }+}diff --git a/backend/ModernWMS/Startup.cs b/backend/ModernWMS/Startup.csnew file mode 100644index 0000000..749f257--- /dev/null+++ b/backend/ModernWMS/Startup.cs@@ -0,0 +1,42 @@+using Microsoft.AspNetCore.Builder;+using Microsoft.AspNetCore.Hosting;+using Microsoft.Extensions.Configuration;+using Microsoft.Extensions.DependencyInjection;+using System;+using ModernWMS.Core.Extentions;+namespace ModernWMS+{+ public class Startup+ {+ /// <summary>+ /// startup+ /// </summary>+ /// <param name="configuration">Config</param>+ public Startup(IConfiguration configuration)+ {+ Configuration = configuration;+ }++ public IConfiguration Configuration { get; }++ /// <summary>+ /// register service+ /// </summary>+ /// <param name="services">services</param>+ public void ConfigureServices(IServiceCollection services)+ {+ services.AddExtensionsService(Configuration);+ }++ /// <summary>+ /// configure+ /// </summary>+ /// <param name="app">app</param>+ /// <param name="env">env</param>+ /// <param name="serviceProvider">serviceProvider</param>+ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IServiceProvider service_provider)+ {+ app.UseExtensionsConfigure(env, service_provider, Configuration);+ }+ }+}diff --git a/backend/ModernWMS/appsettings.Development.json b/backend/ModernWMS/appsettings.Development.jsonnew file mode 100644index 0000000..0c208ae--- /dev/null+++ b/backend/ModernWMS/appsettings.Development.json@@ -0,0 +1,8 @@+{+ "Logging": {+ "LogLevel": {+ "Default": "Information",+ "Microsoft.AspNetCore": "Warning"+ }+ }+}diff --git a/backend/ModernWMS/appsettings.json b/backend/ModernWMS/appsettings.jsonnew file mode 100644index 0000000..e0b16c6--- /dev/null+++ b/backend/ModernWMS/appsettings.json@@ -0,0 +1,31 @@+{+ "Logging": {+ "LogLevel": {+ "Default": "Information",+ "Microsoft.AspNetCore": "Warning"+ }+ },+ "AllowedHosts": "*",+ "Database": { "db": "MySql" },+ "ConnectionStrings": {+ "MySqlConn": "Server=127.0.0.1;Database=wms;Port=3306;charset=utf8;uid=root;pwd=123456789a?;",+ "SqlLiteConn": "Data Source = wms.db"+ },+ "SwaggerSettings": {+ "Name": "ModernWMS",+ "ApiTitle": "ModernWMS_API",+ "ApiVersion": "V1.0",+ "ApiDescription": "ModernWMS_API",+ "SecurityDefinition": false,+ "XmlFiles": [+ "ModernWMS.Core.xml",+ "ModernWMS.WMS.xml"+ ]+ },+ "TokenSettings": {+ "Audience": "ModernWMS",+ "Issuer": "ModernWMS",+ "SigningKey": "ModernWMS_SigningKey",+ "ExpireMinute": 60+ }+}diff --git a/backend/ModernWMS/nlog.config b/backend/ModernWMS/nlog.confignew file mode 100644index 0000000..36541e0--- /dev/null+++ b/backend/ModernWMS/nlog.config@@ -0,0 +1,34 @@+<?xml version="1.0" encoding="utf-8" ?>+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"+ autoReload="true"+ internalLogLevel="Info"+ internalLogFile="${basedir}/Log/internal-nlog.txt">++ <!-- enable asp.net core layout renderers -->+ <extensions>+ <add assembly="NLog.Web.AspNetCore"/>+ </extensions>++ <!-- the targets to write to -->+ <targets>+ <!-- write logs to file -->+ <target xsi:type="File" name="allfile" fileName="${basedir}\Log\nlog-all-${shortdate}.log"+ layout="${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}" />++ <!-- another file log, only own logs. Uses some ASP.NET core renderers -->+ <target xsi:type="File" name="ownFile-web" fileName="${basedir}\Log\nlog-own-${shortdate}.log"+ layout="${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}" />+ </targets>++ <!-- rules to map from logger name to target -->+ <rules>+ <!--All logs, including from Microsoft-->+ <logger name="*" minlevel="Trace" writeTo="allfile" />++ <!--Skip non-critical Microsoft logs and so log only own logs-->+ <logger name="Microsoft.*" maxlevel="Info" final="true" />+ <!-- BlackHole without writeTo -->+ <logger name="*" minlevel="Trace" writeTo="ownFile-web" />+ </rules>+</nlog>\ No newline at end of filediff --git a/backend/ModernWMS/wms.db b/backend/ModernWMS/wms.dbnew file mode 100644index 0000000..e81be57Binary files /dev/null and b/backend/ModernWMS/wms.db differdiff --git a/backend/readme.txt b/backend/readme.txtnew file mode 100644index 0000000..e69de29