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。
Merge: Merge first commit from release to master (#2)
ModernWMS555a753a6247
diff --git a/.gitignore b/.gitignorenew file mode 100644index 0000000..72de34f--- /dev/null+++ b/.gitignore@@ -0,0 +1,388 @@+## Ignore Visual Studio temporary files, build results, and+## files generated by popular Visual Studio add-ons.+##+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore++# User-specific files+*.rsuser+*.suo+*.user+*.userosscache+*.sln.docstates++# User-specific files (MonoDevelop/Xamarin Studio)+*.userprefs++# Mono auto generated files+mono_crash.*++# Build results+[Dd]ebug/+[Dd]ebugPublic/+[Rr]elease/+[Rr]eleases/+x64/+x86/+[Ww][Ii][Nn]32/+[Aa][Rr][Mm]/+[Aa][Rr][Mm]64/+bld/+[Bb]in/+[Oo]bj/+[Ll]og/+[Ll]ogs/++# Visual Studio 2015/2017 cache/options directory+.vs/+# Uncomment if you have tasks that create the project's static files in wwwroot+#wwwroot/++# Visual Studio 2017 auto generated files+Generated\ Files/++# MSTest test Results+[Tt]est[Rr]esult*/+[Bb]uild[Ll]og.*++# NUnit+*.VisualState.xml+TestResult.xml+nunit-*.xml++# Build Results of an ATL Project+[Dd]ebugPS/+[Rr]eleasePS/+dlldata.c++# Benchmark Results+BenchmarkDotNet.Artifacts/++# .NET Core+project.lock.json+project.fragment.lock.json+artifacts/++# ASP.NET Scaffolding+ScaffoldingReadMe.txt++# StyleCop+StyleCopReport.xml++# Files built by Visual Studio+*_i.c+*_p.c+*_h.h+*.ilk+*.meta+*.obj+*.iobj+*.pch+*.pdb+*.ipdb+*.pgc+*.pgd+*.rsp+*.sbr+*.tlb+*.tli+*.tlh+*.tmp+*.tmp_proj+*_wpftmp.csproj+*.log+*.tlog+*.vspscc+*.vssscc+.builds+*.pidb+*.svclog+*.scc++# Chutzpah Test files+_Chutzpah*++# Visual C++ cache files+ipch/+*.aps+*.ncb+*.opendb+*.opensdf+*.sdf+*.cachefile+*.VC.db+*.VC.VC.opendb++# Visual Studio profiler+*.psess+*.vsp+*.vspx+*.sap++# Visual Studio Trace Files+*.e2e++# TFS 2012 Local Workspace+$tf/++# Guidance Automation Toolkit+*.gpState++# ReSharper is a .NET coding add-in+_ReSharper*/+*.[Rr]e[Ss]harper+*.DotSettings.user++# TeamCity is a build add-in+_TeamCity*++# DotCover is a Code Coverage Tool+*.dotCover++# AxoCover is a Code Coverage Tool+.axoCover/*+!.axoCover/settings.json++# Coverlet is a free, cross platform Code Coverage Tool+coverage*.json+coverage*.xml+coverage*.info++# Visual Studio code coverage results+*.coverage+*.coveragexml++# NCrunch+_NCrunch_*+.*crunch*.local.xml+nCrunchTemp_*++# MightyMoose+*.mm.*+AutoTest.Net/++# Web workbench (sass)+.sass-cache/++# Installshield output folder+[Ee]xpress/++# DocProject is a documentation generator add-in+DocProject/buildhelp/+DocProject/Help/*.HxT+DocProject/Help/*.HxC+DocProject/Help/*.hhc+DocProject/Help/*.hhk+DocProject/Help/*.hhp+DocProject/Help/Html2+DocProject/Help/html++# Click-Once directory+publish/++# Publish Web Output+*.[Pp]ublish.xml+*.azurePubxml+# Note: Comment the next line if you want to checkin your web deploy settings,+# but database connection strings (with potential passwords) will be unencrypted+*.pubxml+*.publishproj++# Microsoft Azure Web App publish settings. Comment the next line if you want to+# checkin your Azure Web App publish settings, but sensitive information contained+# in these scripts will be unencrypted+PublishScripts/++# NuGet Packages+*.nupkg+# NuGet Symbol Packages+*.snupkg+# The packages folder can be ignored because of Package Restore+**/[Pp]ackages/*+# except build/, which is used as an MSBuild target.+!**/[Pp]ackages/build/+# Uncomment if necessary however generally it will be regenerated when needed+#!**/[Pp]ackages/repositories.config+# NuGet v3's project.json files produces more ignorable files+*.nuget.props+*.nuget.targets++# Nuget personal access tokens and Credentials+nuget.config++# Microsoft Azure Build Output+csx/+*.build.csdef++# Microsoft Azure Emulator+ecf/+rcf/++# Windows Store app package directories and files+AppPackages/+BundleArtifacts/+Package.StoreAssociation.xml+_pkginfo.txt+*.appx+*.appxbundle+*.appxupload++# Visual Studio cache files+# files ending in .cache can be ignored+*.[Cc]ache+# but keep track of directories ending in .cache+!?*.[Cc]ache/++# Others+ClientBin/+~$*+*~+*.dbmdl+*.dbproj.schemaview+*.jfm+*.pfx+*.publishsettings+orleans.codegen.cs++# Including strong name files can present a security risk+# (https://github.com/github/gitignore/pull/2483#issue-259490424)+#*.snk++# Since there are multiple workflows, uncomment next line to ignore bower_components+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)+#bower_components/++# RIA/Silverlight projects+Generated_Code/++# Backup & report files from converting an old project file+# to a newer Visual Studio version. Backup files are not needed,+# because we have git ;-)+_UpgradeReport_Files/+Backup*/+UpgradeLog*.XML+UpgradeLog*.htm+ServiceFabricBackup/+*.rptproj.bak++# SQL Server files+*.mdf+*.ldf+*.ndf++# Business Intelligence projects+*.rdl.data+*.bim.layout+*.bim_*.settings+*.rptproj.rsuser+*- [Bb]ackup.rdl+*- [Bb]ackup ([0-9]).rdl+*- [Bb]ackup ([0-9][0-9]).rdl++# Microsoft Fakes+FakesAssemblies/++# GhostDoc plugin setting file+*.GhostDoc.xml++# Node.js Tools for Visual Studio+.ntvs_analysis.dat+node_modules/++# Visual Studio 6 build log+*.plg++# Visual Studio 6 workspace options file+*.opt++# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)+*.vbw++# Visual Studio LightSwitch build output+**/*.HTMLClient/GeneratedArtifacts+**/*.DesktopClient/GeneratedArtifacts+**/*.DesktopClient/ModelManifest.xml+**/*.Server/GeneratedArtifacts+**/*.Server/ModelManifest.xml+_Pvt_Extensions++# Paket dependency manager+.paket/paket.exe+paket-files/++# FAKE - F# Make+.fake/++# CodeRush personal settings+.cr/personal++# Python Tools for Visual Studio (PTVS)+__pycache__/+*.pyc++# Cake - Uncomment if you are using it+# tools/**+# !tools/packages.config++# Tabs Studio+*.tss++# Telerik's JustMock configuration file+*.jmconfig++# BizTalk build output+*.btp.cs+*.btm.cs+*.odx.cs+*.xsd.cs++# OpenCover UI analysis results+OpenCover/++# Azure Stream Analytics local run output+ASALocalRun/++# MSBuild Binary and Structured Log+*.binlog++# NVidia Nsight GPU debugger configuration file+*.nvuser++# MFractors (Xamarin productivity tool) working folder+.mfractor/++# Local History for Visual Studio+.localhistory/++# BeatPulse healthcheck temp database+healthchecksdb++# Backup folder for Package Reference Convert tool in Visual Studio 2017+MigrationBackup/++# Ionide (cross platform F# VS Code tools) working folder+.ionide/++# Fody - auto-generated XML schema+FodyWeavers.xsd++# VS Code files for those working on multiple tools+.vscode/*+!.vscode/settings.json+!.vscode/tasks.json+!.vscode/launch.json+!.vscode/extensions.json+*.code-workspace++# Local History for Visual Studio Code+.history/++# Windows Installer files from build outputs+*.cab+*.msi+*.msix+*.msm+*.msp++# JetBrains Rider+.idea/+*.sln.iml\ No newline at end of filediff --git a/README.md b/README.mdnew file mode 100644index 0000000..6c1da5b--- /dev/null+++ b/README.md@@ -0,0 +1,198 @@+# ModernWMS - 仓库管理系统++<div align="center">+ <img src="/logo.png" alt="ModernWMS logo" width="200" height="auto" />+ <h1>ModernWMS</h1>+ <p>开源的简易完整的仓库管理系统</p>++<!-- Badges -->+[](https://opensource.org/licenses/MIT/)+++++[](https://www.mysql.com/downloads/)++++<!-- -->++++++++++++++++</div>++# Contents - 目录++- [ModernWMS - 仓库管理系统](#modernwms---仓库管理系统)+- [Contents - 目录](#contents---目录)+ - [Introduction - 介绍](#introduction---介绍)+ - [Requirements - 必要条件](#requirements---必要条件)+ - [Linux OS](#linux-os)+ - [Windows OS](#windows-os)+ - [Installation - 安装](#installation---安装)+ - [Linux](#linux)+ - [Windows](#windows)+ - [Docker](#docker)+ - [Usage - 用法](#usage---用法)+ - [Contact - 联系](#contact---联系)+ - [License - 版权信息](#license---版权信息)++## Introduction - 介绍+ 该库存管理系统是,我们从多年ERP系统研发中总结出来的一套针对小型物流仓储供应链流程。 在工作过程中我们很多的中小企业,由于IT预算有限,所以无法用上适合他们的系统,却又实实在在存在仓储管理方面的需求,以此我们开始了这个项目。 为了帮助一些有需要的用户。++## Requirements - 必要条件++### Linux OS+++ Ubuntu 18.04(LTS),20.04(LTS),22.04(LTS)++ CentOS Stream 8,9++ RHEL 8(8.7),9(9.1)++ Debian 10,11++ openSUSE 15++### Windows OS+++ Windows 10 版本 1607 或更高版本++ Windows Server 2012 或更高版本++## Installation - 安装++### Linux+++ 下载源码后编译+ + 第一步,下载源码++ ```bash+ cd /tmp/ && wget https://github.com/fjykTec/ModernWMS/archive/refs/heads/master.zip+ ```++ + 第二步,安装.NET SDK 、运行时 和 NodeJS++ ```bash+ wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb+ sudo dpkg -i packages-microsoft-prod.deb+ sudo apt-get update && sudo apt-get install -y dotnet-sdk-7.0+ sudo apt-get install -y aspnetcore-runtime-7.0+ curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -+ sudo apt install -y nodejs+ ```++ + 第三步,编译前端和后端++ ```bash+ cd /tmp/ && unzip master.zip && cd ./ModernWMS-master+ mkdir -p /ModernWMS/frontend/ /ModernWMS/backend/+ cd ./frontend/ && yarn && yarn build && cp -rf ./frontend/dist/* /ModernWMS/frontend/+ cd ./backend/ && sudo dotnet publish && cp -rf ./backend/ModernWMS/bin/Debug/net7.0/publish/* /ModernWMS/backend/+ ```++ + 第四步,安装nginx++ ```bash+ cd /tmp/ && wget http://nginx.org/download/nginx-1.18.0.tar.gz+ tar -zxvf nginx-1.18.0.tar.gz && cd nginx-1.18.0+ ./configure --prefix=/etc/nginx --with-http_secure_link_module --with-http_stub_status_module --with-http_ssl_module --with-http_realip_module+ make && make install+ ```+### Windows+++ 下载源码后编译部署+ + 第一步,下载源码+ ```PowerShell+ cd c:\+ wget -Uri https://github.com/fjykTec/ModernWMS/archive/refs/heads/master.zip -OutFile master.zip+ Expand-Archive -Path C:\master.zip -DestinationPath C:\+ ```+ + 第二步,安装.NET SDK 、运行时 和 NodeJS+ ```CMD+ wget -Uri https://download.visualstudio.microsoft.com/download/pr/35660869-0942-4c5d-8692-6e0d4040137a/4921a36b578d8358dac4c27598519832/dotnet-sdk-7.0.101-win-x64.exe -OutFile dotnet-sdk-7.0.101-win-x64.exe+ dotnet-sdk-7.0.100-win-x64.exe /install /quiet /norestart+ wget -Uri https://nodejs.org/dist/v16.13.1/node-v16.13.1-x64.msi -OutFile node-v16.13.1-x64.msi+ msiexec /i .\node-v16.13.1-x64.msi /passive /norestart+ ```+ + 第三步,编译前端和后端+ ```+ md C:\ModernWMS\frontend\+ md C:\ModernWMS\backend\+ cd c:\ModernWMS-master\backend+ dotnet publish+ copy-item -path ".\backend\ModernWMS\bin\Debug\net7.0\publish\" -destination "C:\ModernWMS\backend\" -recurse+ cd c:\ModernWMS-master\frontend+ yarn && yarn build+ copy-item -path ".\frontend\dist\" -destination "C:\ModernWMS\frontend\" -recurse+ ```+ + 第四步,安装nginx并启动+ ```+ cd C:\+ wget -Uri http://nginx.org/download/nginx-1.16.1.zip -OutFile nginx-1.16.1.zip+ Expand-Archive -Path C:\nginx-1.16.1.zip -DestinationPath C:\+ start .\nginx-1.16.1\nginx.exe+ cd C:\ModernWMS\backend\+ dotnet ModernWMS.dll --urls http://0.0.0.0:20011+ ```++### Docker++++ 下载源码后编译+ + 第一步,下载源码++ ```bash+ cd /tmp/ && wget https://github.com/fjykTec/ModernWMS/archive/refs/heads/master.zip+ ```++ + 第二步,编译前端和后端++ ```bash+ cd /tmp/ && unzip master.zip && cd ./ModernWMS-master+ cd ./frontend/ && yarn && yarn build && cp -rf ./frontend/dist/* ./docker/frontend/+ cd ./backend/ && sudo dotnet publish && cp -rf ./backend/ModernWMS/bin/Debug/net7.0/publish/* ./docker/backend/+ ```+ + 第三步,部署++ ```bash+ cd /tmp/ModernWMS-master/docker/+ docker build -t modernwms:1.0 .+ docker run -d -p 80:80 modernwms:1.0 /bin/bash ./run.sh+ ```+## Usage - 用法++ ```+ 打开浏览器,进入:http://127.0.0.1 或者 http://部署电脑的IP地址+ ```+ <h4>+ <a href="https://wmsonline.ikeyly.com">体验地址入口</a>+ </h4>++ ++ ++ ++## Contact - 联系++<h4>+ <a href="https://github.com/fjykTec/ModernWMS/issues/new?template=bug_report.md&title=[BUG]">提交一个Bug</a>+</h4>+<h4>+ <a href="https://github.com/fjykTec/ModernWMS/issues/new?template=feature_request.md&title=[FR]">提交一个建议</a>+</h4>+<h4>+ <a href="https://jq.qq.com/?_wv=1027&k=YgVJGWnI">加入QQ群 757128595</a>+</h4>++## License - 版权信息+该项目使用的是 [MIT](https://opensource.org/licenses/MIT/) 协议. 详情查阅[LICENSE.txt](https://github.com/fjykTec/ModernWMS/master/LICENSE).必须遵守此协议。\ No newline at end of filediff --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.md b/backend/README.mdnew file mode 100644index 0000000..e69de29diff --git a/backend/readme.txt b/backend/readme.txtnew file mode 100644index 0000000..e69de29diff --git a/docker/Dockerfile b/docker/Dockerfilenew file mode 100644index 0000000..160bba0--- /dev/null+++ b/docker/Dockerfile@@ -0,0 +1,18 @@+FROM ubuntu:22.04++RUN apt-get update && apt-get install -y wget curl+RUN wget https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \+ && dpkg -i packages-microsoft-prod.deb \+ && apt-get update \+ && apt-get install -y aspnetcore-runtime-7.0 nginx \+ && curl -fsSL https://deb.nodesource.com/setup_16.x | /bin/bash - \+ && apt install -y nodejs \+ && mkdir -p /app/ /frontend/+WORKDIR /app+COPY ./nginx.conf /etc/nginx/nginx.conf+COPY ./frontend /frontend/+COPY ./backend /app/+COPY ./run.sh /app/run.sh+RUN chmod u+x /app/run.sh+EXPOSE 80+ENTRYPOINT ["/bin/bash"]\ No newline at end of filediff --git a/docker/backend/web.config b/docker/backend/web.confignew file mode 100644index 0000000..e69de29diff --git a/docker/frontend/index.html b/docker/frontend/index.htmlnew file mode 100644index 0000000..e69de29diff --git a/docker/nginx.conf b/docker/nginx.confnew file mode 100644index 0000000..7dfb056--- /dev/null+++ b/docker/nginx.conf@@ -0,0 +1,60 @@+#user nobody;+worker_processes 1;++events {+ worker_connections 1024;+}+++http {+ include mime.types;+ default_type application/octet-stream;++ log_format main '[$remote_addr] [conn:$connection] [conn_req:$connection_requests] '+ '[$time_iso8601] "$request" [$http_referer] [$http_user_agent] '+ '[body:$body_bytes_sent] [request_length:$request_length] [status:$status] [request_time:$request_time] [$http_UserName]';++ #access_log logs/access.log main;++ sendfile on;+ #tcp_nopush on;++ #keepalive_timeout 0;+ keepalive_timeout 65;+ #gzip on;++ #wms ModernWMS backend+ #server {+ #listen 21011;+ #server_name server localhost; # xxx.xxx.xxx.xxx your ip address+ #location / {+ # proxy_pass http://127.0.0.1:20011;+ # root html;+ # index index.html index.htm;+ # proxy_set_header X-Real-IP $remote_addr;+ #}+ #proxy_send_timeout 300;+ #proxy_read_timeout 300;+ #+ #client_max_body_size 1024m;+ # client_header_buffer_size 10m;+ # large_client_header_buffers 4 10m;+ # proxy_buffers 16 1024k;+ # proxy_buffer_size 1024k;+ #}+ #wms ModernWMS frontend+ server {+ listen 80;+ server_name localhost;+ location / {+ root /frontend/;+ index index.html index.htm;+ }++ error_page 500 502 503 504 /50x.html;+ location = /50x.html {+ root html;+ }+ }++}diff --git a/docker/run.sh b/docker/run.shnew file mode 100644index 0000000..85d4a04--- /dev/null+++ b/docker/run.sh@@ -0,0 +1,9 @@+#!/bin/bash+# start 1+/usr/sbin/nginx -g 'daemon off;' > /var/log/start1.log 2>&1 &+# start 2+dotnet /app/ModernWMS.dll --urls http://0.0.0.0:21011 > /var/log/start2.log 2>&1 &+# just keep this script running+while [[ true ]]; do+ sleep 1+done\ No newline at end of filediff --git a/frontend/.env.development b/frontend/.env.developmentnew file mode 100644index 0000000..7c552fc--- /dev/null+++ b/frontend/.env.development@@ -0,0 +1,6 @@+ENV = 'development'++VITE_CLI_PORT = 5173+VITE_SERVER_PORT = 21011+VITE_BASE_API = /api+VITE_BASE_PATH = http://192.168.103.80diff --git a/frontend/.env.production b/frontend/.env.productionnew file mode 100644index 0000000..39576f1--- /dev/null+++ b/frontend/.env.production@@ -0,0 +1,6 @@+ENV = 'production'++VITE_CLI_PORT = 5174+VITE_SERVER_PORT = 20011+VITE_BASE_API = /api+VITE_BASE_PATH = https://wmsonline.ikeyly.comdiff --git a/frontend/.eslintrc b/frontend/.eslintrcnew file mode 100644index 0000000..973a451--- /dev/null+++ b/frontend/.eslintrc@@ -0,0 +1,82 @@+{+ "root": true,+ "globals": {+ "defineEmits": "readonly",+ "defineProps": "readonly",+ "defineExpose": "readonly"+ },+ "extends": ["plugin:@typescript-eslint/recommended", "plugin:vue/vue3-recommended", "airbnb-base"],+ "parserOptions": {+ "parser": "@typescript-eslint/parser",+ "ecmaVersion": 2020+ },+ "rules": {+ "camelcase": "off",+ "no-bitwise": "off", // 禁用按位运算符+ "no-tabs": "off", // 禁用 tab+ "array-element-newline": ["error", "consistent"], // 强制数组元素间出现换行+ "indent": "off", // 强制使用一致的缩进+ "quotes": ["error", "single"], // 强制使用一致的反勾号、双引号或单引号+ "comma-dangle": "off", // 要求或禁止末尾逗号+ "object-curly-spacing": ["error", "always"], // 强制在大括号中使用一致的空格+ "max-len": ["error", 200], // 强制一行的最大长度; 注意: 这里特意调整的比prettierrc多50, 因为某些情况下两个插件格式化出来的结果不同导致界面上有波浪线+ "no-new": "off", // 禁止使用 new 以避免产生副作用+ "linebreak-style": "off", // 强制使用一致的换行风格+ "import/extensions": "off", // 确保在导入路径中统一使用文件扩展名+ "eol-last": "off", // 要求或禁止文件末尾存在空行+ "no-shadow": "off", // 禁止变量声明与外层作用域的变量同名+ "no-unused-vars": "warn", // 禁止出现未使用过的变量+ "import/no-cycle": "off", // 禁止一个模块导入一个有依赖路径的模块回到自己身上+ "arrow-parens": "off", // 要求箭头函数的参数使用圆括号+ "semi": ["error", "never"], // 要求或禁止使用分号代替 ASI+ "eqeqeq": "off", // 要求使用 === 和 !==+ "no-param-reassign": "off", // 禁止对 function 的参数进行重新赋值+ "import/prefer-default-export": "off", // 如果模块只输入一个名字,则倾向于默认输出+ "no-use-before-define": "off", // 禁止在变量定义之前使用它们,则倾向于默认输出+ "no-continue": "off", // 禁用 continue 语句+ "prefer-destructuring": "off", // 优先使用数组和对象解构+ "no-plusplus": "off", // 禁用一元操作符 ++ 和 --+ "prefer-const": "warn", // 要求使用 const 声明那些声明后不再被修改的变量+ "global-require": "off", // 要求 require() 出现在顶层模块作用域中+ "no-prototype-builtins": "off", // 禁止直接调用 Object.prototypes 的内置属性+ "consistent-return": "off", // 要求 return 语句要么总是指定返回的值,要么不指定+ "one-var-declaration-per-line": "off", // 要求或禁止在变量声明周围换行+ "one-var": "off", // 强制函数中的变量要么一起声明要么分开声明+ "import/named": "off", // 确保命名导入与远程文件中的命名导出相对应+ "object-curly-newline": "off", // 强制大括号内换行符的一致性+ "default-case": "off", // 要求 switch 语句中有 default 分支+ "no-trailing-spaces": "off", // 禁用行尾空格+ "func-names": "off", // 要求或禁止使用命名的 function 表达式+ "radix": "off", // 强制在 parseInt() 使用基数参数+ "no-unused-expressions": "off", // 禁止出现未使用过的表达式+ "no-underscore-dangle": "off", // 禁止标识符中有悬空下划线+ "no-nested-ternary": "off", // 禁用嵌套的三元表达式+ "no-restricted-syntax": "off", // 禁用特定的语法+ "no-await-in-loop": "off", // 禁止在循环中出现 await+ "import/no-extraneous-dependencies": "off", // 禁止使用外部包+ "import/no-unresolved": "off", // 确保导入指向一个可以解析的文件/模块+ "template-curly-spacing": ["error", "always"], // 要求或禁止模板字符串中的嵌入表达式周围空格的使用+ "@typescript-eslint/no-var-requires": "off", // 除import语句外,禁止使用require语句+ "@typescript-eslint/no-empty-function": "off", // 不允许空函数+ "@typescript-eslint/no-explicit-any": "off", // 禁止使用 any 类型+ "guard-for-in": "off", // 要求 for-in 循环中有一个 if 语句+ "class-methods-use-this": "off", // 强制类方法使用 this+ "vue/html-indent": ["error", 2], // 在<template>中强制一致缩进+ "vue/html-self-closing": "off", // 执行自闭合的风格+ "vue/max-attributes-per-line": [+ // 强制每行属性的最大数量+ "warn",+ {+ "singleline": {+ "max": 10,+ "allowFirstLine": true+ },+ "multiline": {+ "max": 1,+ "allowFirstLine": false+ }+ }+ ],+ "vue/singleline-html-element-content-newline": "off" // 要求单行元素的内容前后有一个换行符+ }+}diff --git a/frontend/.gitignore b/frontend/.gitignorenew file mode 100644index 0000000..a547bf3--- /dev/null+++ b/frontend/.gitignore@@ -0,0 +1,24 @@+# Logs+logs+*.log+npm-debug.log*+yarn-debug.log*+yarn-error.log*+pnpm-debug.log*+lerna-debug.log*++node_modules+dist+dist-ssr+*.local++# Editor directories and files+.vscode/*+!.vscode/extensions.json+.idea+.DS_Store+*.suo+*.ntvs*+*.njsproj+*.sln+*.sw?diff --git a/frontend/.prettierrc.json b/frontend/.prettierrc.jsonnew file mode 100644index 0000000..ff2eec4--- /dev/null+++ b/frontend/.prettierrc.json@@ -0,0 +1,19 @@+{+ "eslintIntegration": false,+ "printWidth": 150,+ "tabWidth": 2,+ "useTabs": false,+ "semi": false,+ "singleQuote": true,+ "quoteProps": "as-needed",+ "bracketSpacing": true,+ "trailingComma": "none",+ "jsxBracketSameLine": false,+ "jsxSingleQuote": false,+ "arrowParens": "always",+ "insertPragma": false,+ "requirePragma": false,+ "proseWrap": "never",+ "htmlWhitespaceSensitivity": "strict",+ "endOfLine": "lf"+}\ No newline at end of filediff --git a/frontend/.vscode/extensions.json b/frontend/.vscode/extensions.jsonnew file mode 100644index 0000000..c0a6e5a--- /dev/null+++ b/frontend/.vscode/extensions.json@@ -0,0 +1,3 @@+{+ "recommendations": ["Vue.volar", "Vue.vscode-typescript-vue-plugin"]+}diff --git a/frontend/README.md b/frontend/README.mdnew file mode 100644index 0000000..6a05371--- /dev/null+++ b/frontend/README.md@@ -0,0 +1,4 @@+ # 系统环境+ Vue + TS: 3.2.45+ Vite: 4.0.0+ Node: 16.13.1\ No newline at end of filediff --git a/frontend/auto-imports.d.ts b/frontend/auto-imports.d.tsnew file mode 100644index 0000000..08908ed--- /dev/null+++ b/frontend/auto-imports.d.ts@@ -0,0 +1,5 @@+// Generated by 'unplugin-auto-import'+export {}+declare global {++}diff --git a/frontend/components.d.ts b/frontend/components.d.tsnew file mode 100644index 0000000..607d675--- /dev/null+++ b/frontend/components.d.ts@@ -0,0 +1,13 @@+// generated by unplugin-vue-components+// We suggest you to commit this file into source control+// Read more: https://github.com/vuejs/core/pull/3399+import '@vue/runtime-core'++export {}++declare module '@vue/runtime-core' {+ export interface GlobalComponents {+ RouterLink: typeof import('vue-router')['RouterLink']+ RouterView: typeof import('vue-router')['RouterView']+ }+}diff --git a/frontend/index.html b/frontend/index.htmlnew file mode 100644index 0000000..31e1e1c--- /dev/null+++ b/frontend/index.html@@ -0,0 +1,16 @@+<!DOCTYPE html>+<html lang="en">++<head>+ <meta charset="UTF-8" />+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />+ <title>ModernWMS</title>+ <link rel="icon" href="./src/assets/img/webLogoMini.png" />+</head>++<body>+ <div id="app"></div>+ <script type="module" src="/src/main.ts"></script>+</body>++</html>\ No newline at end of filediff --git a/frontend/package-lock.json b/frontend/package-lock.jsonnew file mode 100644index 0000000..338e7c8--- /dev/null+++ b/frontend/package-lock.json@@ -0,0 +1,3472 @@+{+ "name": "ykwms",+ "version": "0.0.0",+ "lockfileVersion": 1,+ "requires": true,+ "dependencies": {+ "@antfu/install-pkg": {+ "version": "0.1.1",+ "resolved": "https://registry.npmmirror.com/@antfu/install-pkg/-/install-pkg-0.1.1.tgz",+ "integrity": "sha512-LyB/8+bSfa0DFGC06zpCEfs89/XoWZwws5ygEa5D+Xsm3OfI+aXQ86VgVG7Acyef+rSZ5HE7J8rrxzrQeM3PjQ==",+ "dev": true,+ "requires": {+ "execa": "^5.1.1",+ "find-up": "^5.0.0"+ }+ },+ "@antfu/utils": {+ "version": "0.7.2",+ "resolved": "https://registry.npmmirror.com/@antfu/utils/-/utils-0.7.2.tgz",+ "integrity": "sha512-vy9fM3pIxZmX07dL+VX1aZe7ynZ+YyB0jY+jE6r3hOK6GNY2t6W8rzpFC4tgpbXUYABkFQwgJq2XYXlxbXAI0g==",+ "dev": true+ },+ "@babel/code-frame": {+ "version": "7.18.6",+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",+ "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",+ "dev": true,+ "requires": {+ "@babel/highlight": "^7.18.6"+ }+ },+ "@babel/helper-validator-identifier": {+ "version": "7.19.1",+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",+ "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",+ "dev": true+ },+ "@babel/highlight": {+ "version": "7.18.6",+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",+ "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",+ "dev": true,+ "requires": {+ "@babel/helper-validator-identifier": "^7.18.6",+ "chalk": "^2.0.0",+ "js-tokens": "^4.0.0"+ },+ "dependencies": {+ "chalk": {+ "version": "2.4.2",+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",+ "dev": true,+ "requires": {+ "ansi-styles": "^3.2.1",+ "escape-string-regexp": "^1.0.5",+ "supports-color": "^5.3.0"+ }+ }+ }+ },+ "@babel/parser": {+ "version": "7.20.5",+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz",+ "integrity": "sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA=="+ },+ "@esbuild/android-arm": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.4.tgz",+ "integrity": "sha512-rZzb7r22m20S1S7ufIc6DC6W659yxoOrl7sKP1nCYhuvUlnCFHVSbATG4keGUtV8rDz11sRRDbWkvQZpzPaHiw==",+ "dev": true,+ "optional": true+ },+ "@esbuild/android-arm64": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.4.tgz",+ "integrity": "sha512-VPuTzXFm/m2fcGfN6CiwZTlLzxrKsWbPkG7ArRFpuxyaHUm/XFHQPD4xNwZT6uUmpIHhnSjcaCmcla8COzmZ5Q==",+ "dev": true,+ "optional": true+ },+ "@esbuild/android-x64": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.4.tgz",+ "integrity": "sha512-MW+B2O++BkcOfMWmuHXB15/l1i7wXhJFqbJhp82IBOais8RBEQv2vQz/jHrDEHaY2X0QY7Wfw86SBL2PbVOr0g==",+ "dev": true,+ "optional": true+ },+ "@esbuild/darwin-arm64": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.4.tgz",+ "integrity": "sha512-a28X1O//aOfxwJVZVs7ZfM8Tyih2Za4nKJrBwW5Wm4yKsnwBy9aiS/xwpxiiTRttw3EaTg4Srerhcm6z0bu9Wg==",+ "dev": true,+ "optional": true+ },+ "@esbuild/darwin-x64": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.4.tgz",+ "integrity": "sha512-e3doCr6Ecfwd7VzlaQqEPrnbvvPjE9uoTpxG5pyLzr2rI2NMjDHmvY1E5EO81O/e9TUOLLkXA5m6T8lfjK9yAA==",+ "dev": true,+ "optional": true+ },+ "@esbuild/freebsd-arm64": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.4.tgz",+ "integrity": "sha512-Oup3G/QxBgvvqnXWrBed7xxkFNwAwJVHZcklWyQt7YCAL5bfUkaa6FVWnR78rNQiM8MqqLiT6ZTZSdUFuVIg1w==",+ "dev": true,+ "optional": true+ },+ "@esbuild/freebsd-x64": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.4.tgz",+ "integrity": "sha512-vAP+eYOxlN/Bpo/TZmzEQapNS8W1njECrqkTpNgvXskkkJC2AwOXwZWai/Kc2vEFZUXQttx6UJbj9grqjD/+9Q==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-arm": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.4.tgz",+ "integrity": "sha512-A47ZmtpIPyERxkSvIv+zLd6kNIOtJH03XA0Hy7jaceRDdQaQVGSDt4mZqpWqJYgDk9rg96aglbF6kCRvPGDSUA==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-arm64": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.4.tgz",+ "integrity": "sha512-2zXoBhv4r5pZiyjBKrOdFP4CXOChxXiYD50LRUU+65DkdS5niPFHbboKZd/c81l0ezpw7AQnHeoCy5hFrzzs4g==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-ia32": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.4.tgz",+ "integrity": "sha512-uxdSrpe9wFhz4yBwt2kl2TxS/NWEINYBUFIxQtaEVtglm1eECvsj1vEKI0KX2k2wCe17zDdQ3v+jVxfwVfvvjw==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-loong64": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.4.tgz",+ "integrity": "sha512-peDrrUuxbZ9Jw+DwLCh/9xmZAk0p0K1iY5d2IcwmnN+B87xw7kujOkig6ZRcZqgrXgeRGurRHn0ENMAjjD5DEg==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-mips64el": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.4.tgz",+ "integrity": "sha512-sD9EEUoGtVhFjjsauWjflZklTNr57KdQ6xfloO4yH1u7vNQlOfAlhEzbyBKfgbJlW7rwXYBdl5/NcZ+Mg2XhQA==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-ppc64": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.4.tgz",+ "integrity": "sha512-X1HSqHUX9D+d0l6/nIh4ZZJ94eQky8d8z6yxAptpZE3FxCWYWvTDd9X9ST84MGZEJx04VYUD/AGgciddwO0b8g==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-riscv64": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.4.tgz",+ "integrity": "sha512-97ANpzyNp0GTXCt6SRdIx1ngwncpkV/z453ZuxbnBROCJ5p/55UjhbaG23UdHj88fGWLKPFtMoU4CBacz4j9FA==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-s390x": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.4.tgz",+ "integrity": "sha512-pUvPQLPmbEeJRPjP0DYTC1vjHyhrnCklQmCGYbipkep+oyfTn7GTBJXoPodR7ZS5upmEyc8lzAkn2o29wD786A==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-x64": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.4.tgz",+ "integrity": "sha512-N55Q0mJs3Sl8+utPRPBrL6NLYZKBCLLx0bme/+RbjvMforTGGzFvsRl4xLTZMUBFC1poDzBEPTEu5nxizQ9Nlw==",+ "dev": true,+ "optional": true+ },+ "@esbuild/netbsd-x64": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.4.tgz",+ "integrity": "sha512-LHSJLit8jCObEQNYkgsDYBh2JrJT53oJO2HVdkSYLa6+zuLJh0lAr06brXIkljrlI+N7NNW1IAXGn/6IZPi3YQ==",+ "dev": true,+ "optional": true+ },+ "@esbuild/openbsd-x64": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.4.tgz",+ "integrity": "sha512-nLgdc6tWEhcCFg/WVFaUxHcPK3AP/bh+KEwKtl69Ay5IBqUwKDaq/6Xk0E+fh/FGjnLwqFSsarsbPHeKM8t8Sw==",+ "dev": true,+ "optional": true+ },+ "@esbuild/sunos-x64": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.4.tgz",+ "integrity": "sha512-08SluG24GjPO3tXKk95/85n9kpyZtXCVwURR2i4myhrOfi3jspClV0xQQ0W0PYWHioJj+LejFMt41q+PG3mlAQ==",+ "dev": true,+ "optional": true+ },+ "@esbuild/win32-arm64": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.4.tgz",+ "integrity": "sha512-yYiRDQcqLYQSvNQcBKN7XogbrSvBE45FEQdH8fuXPl7cngzkCvpsG2H9Uey39IjQ6gqqc+Q4VXYHsQcKW0OMjQ==",+ "dev": true,+ "optional": true+ },+ "@esbuild/win32-ia32": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.4.tgz",+ "integrity": "sha512-5rabnGIqexekYkh9zXG5waotq8mrdlRoBqAktjx2W3kb0zsI83mdCwrcAeKYirnUaTGztR5TxXcXmQrEzny83w==",+ "dev": true,+ "optional": true+ },+ "@esbuild/win32-x64": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.4.tgz",+ "integrity": "sha512-sN/I8FMPtmtT2Yw+Dly8Ur5vQ5a/RmC8hW7jO9PtPSQUPkowxWpcUZnqOggU7VwyT3Xkj6vcXWd3V/qTXwultQ==",+ "dev": true,+ "optional": true+ },+ "@iconify/types": {+ "version": "2.0.0",+ "resolved": "https://registry.npmmirror.com/@iconify/types/-/types-2.0.0.tgz",+ "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==",+ "dev": true+ },+ "@iconify/utils": {+ "version": "2.0.9",+ "resolved": "https://registry.npmmirror.com/@iconify/utils/-/utils-2.0.9.tgz",+ "integrity": "sha512-ropNqaeamoxZvXxvaTJXrI0MrqdWdDVIs/mW7/sEQbNi0aXYUGL2iuLs1da3QR163gyG63kiyTsqw2oQYamw3Q==",+ "dev": true,+ "requires": {+ "@antfu/install-pkg": "^0.1.1",+ "@antfu/utils": "^0.7.2",+ "@iconify/types": "^2.0.0",+ "debug": "^4.3.4",+ "kolorist": "^1.6.0",+ "local-pkg": "^0.4.2"+ }+ },+ "@intlify/core-base": {+ "version": "9.2.2",+ "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.2.2.tgz",+ "integrity": "sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==",+ "requires": {+ "@intlify/devtools-if": "9.2.2",+ "@intlify/message-compiler": "9.2.2",+ "@intlify/shared": "9.2.2",+ "@intlify/vue-devtools": "9.2.2"+ }+ },+ "@intlify/devtools-if": {+ "version": "9.2.2",+ "resolved": "https://registry.npmmirror.com/@intlify/devtools-if/-/devtools-if-9.2.2.tgz",+ "integrity": "sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==",+ "requires": {+ "@intlify/shared": "9.2.2"+ }+ },+ "@intlify/message-compiler": {+ "version": "9.2.2",+ "resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-9.2.2.tgz",+ "integrity": "sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==",+ "requires": {+ "@intlify/shared": "9.2.2",+ "source-map": "0.6.1"+ }+ },+ "@intlify/shared": {+ "version": "9.2.2",+ "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-9.2.2.tgz",+ "integrity": "sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q=="+ },+ "@intlify/vue-devtools": {+ "version": "9.2.2",+ "resolved": "https://registry.npmmirror.com/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz",+ "integrity": "sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==",+ "requires": {+ "@intlify/core-base": "9.2.2",+ "@intlify/shared": "9.2.2"+ }+ },+ "@jridgewell/sourcemap-codec": {+ "version": "1.4.14",+ "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",+ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",+ "dev": true+ },+ "@mdi/font": {+ "version": "7.1.96",+ "resolved": "https://registry.npmmirror.com/@mdi/font/-/font-7.1.96.tgz",+ "integrity": "sha512-Imag6npmfkBDi2Ze2jiZVAPTDIKLxhz2Sx82xJ2zctyAU5LYJejLI5ChnDwiD9bMkQfVuzEsI98Q8toHyC+HCg==",+ "dev": true+ },+ "@nodelib/fs.scandir": {+ "version": "2.1.5",+ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",+ "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",+ "dev": true,+ "requires": {+ "@nodelib/fs.stat": "2.0.5",+ "run-parallel": "^1.1.9"+ }+ },+ "@nodelib/fs.stat": {+ "version": "2.0.5",+ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",+ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",+ "dev": true+ },+ "@nodelib/fs.walk": {+ "version": "1.2.8",+ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",+ "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",+ "dev": true,+ "requires": {+ "@nodelib/fs.scandir": "2.1.5",+ "fastq": "^1.6.0"+ }+ },+ "@rollup/pluginutils": {+ "version": "5.0.2",+ "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz",+ "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==",+ "dev": true,+ "requires": {+ "@types/estree": "^1.0.0",+ "estree-walker": "^2.0.2",+ "picomatch": "^2.3.1"+ }+ },+ "@types/estree": {+ "version": "1.0.0",+ "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.0.tgz",+ "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==",+ "dev": true+ },+ "@types/json-schema": {+ "version": "7.0.11",+ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",+ "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",+ "dev": true+ },+ "@types/json5": {+ "version": "0.0.29",+ "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",+ "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",+ "dev": true+ },+ "@types/node": {+ "version": "18.11.13",+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.13.tgz",+ "integrity": "sha512-IASpMGVcWpUsx5xBOrxMj7Bl8lqfuTY7FKAnPmu5cHkfQVWF8GulWS1jbRqA934qZL35xh5xN/+Xe/i26Bod4w==",+ "dev": true+ },+ "@types/semver": {+ "version": "7.3.13",+ "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",+ "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",+ "dev": true+ },+ "@typescript-eslint/eslint-plugin": {+ "version": "5.46.0",+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.46.0.tgz",+ "integrity": "sha512-QrZqaIOzJAjv0sfjY4EjbXUi3ZOFpKfzntx22gPGr9pmFcTjcFw/1sS1LJhEubfAGwuLjNrPV0rH+D1/XZFy7Q==",+ "dev": true,+ "requires": {+ "@typescript-eslint/scope-manager": "5.46.0",+ "@typescript-eslint/type-utils": "5.46.0",+ "@typescript-eslint/utils": "5.46.0",+ "debug": "^4.3.4",+ "ignore": "^5.2.0",+ "natural-compare-lite": "^1.4.0",+ "regexpp": "^3.2.0",+ "semver": "^7.3.7",+ "tsutils": "^3.21.0"+ }+ },+ "@typescript-eslint/parser": {+ "version": "5.46.0",+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.46.0.tgz",+ "integrity": "sha512-joNO6zMGUZg+C73vwrKXCd8usnsmOYmgW/w5ZW0pG0RGvqeznjtGDk61EqqTpNrFLUYBW2RSBFrxdAZMqA4OZA==",+ "dev": true,+ "requires": {+ "@typescript-eslint/scope-manager": "5.46.0",+ "@typescript-eslint/types": "5.46.0",+ "@typescript-eslint/typescript-estree": "5.46.0",+ "debug": "^4.3.4"+ }+ },+ "@typescript-eslint/scope-manager": {+ "version": "5.46.0",+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.46.0.tgz",+ "integrity": "sha512-7wWBq9d/GbPiIM6SqPK9tfynNxVbfpihoY5cSFMer19OYUA3l4powA2uv0AV2eAZV6KoAh6lkzxv4PoxOLh1oA==",+ "dev": true,+ "requires": {+ "@typescript-eslint/types": "5.46.0",+ "@typescript-eslint/visitor-keys": "5.46.0"+ }+ },+ "@typescript-eslint/type-utils": {+ "version": "5.46.0",+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.46.0.tgz",+ "integrity": "sha512-dwv4nimVIAsVS2dTA0MekkWaRnoYNXY26dKz8AN5W3cBFYwYGFQEqm/cG+TOoooKlncJS4RTbFKgcFY/pOiBCg==",+ "dev": true,+ "requires": {+ "@typescript-eslint/typescript-estree": "5.46.0",+ "@typescript-eslint/utils": "5.46.0",+ "debug": "^4.3.4",+ "tsutils": "^3.21.0"+ }+ },+ "@typescript-eslint/types": {+ "version": "5.46.0",+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.46.0.tgz",+ "integrity": "sha512-wHWgQHFB+qh6bu0IAPAJCdeCdI0wwzZnnWThlmHNY01XJ9Z97oKqKOzWYpR2I83QmshhQJl6LDM9TqMiMwJBTw==",+ "dev": true+ },+ "@typescript-eslint/typescript-estree": {+ "version": "5.46.0",+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.46.0.tgz",+ "integrity": "sha512-kDLNn/tQP+Yp8Ro2dUpyyVV0Ksn2rmpPpB0/3MO874RNmXtypMwSeazjEN/Q6CTp8D7ExXAAekPEcCEB/vtJkw==",+ "dev": true,+ "requires": {+ "@typescript-eslint/types": "5.46.0",+ "@typescript-eslint/visitor-keys": "5.46.0",+ "debug": "^4.3.4",+ "globby": "^11.1.0",+ "is-glob": "^4.0.3",+ "semver": "^7.3.7",+ "tsutils": "^3.21.0"+ }+ },+ "@typescript-eslint/utils": {+ "version": "5.46.0",+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.46.0.tgz",+ "integrity": "sha512-4O+Ps1CRDw+D+R40JYh5GlKLQERXRKW5yIQoNDpmXPJ+C7kaPF9R7GWl+PxGgXjB3PQCqsaaZUpZ9dG4U6DO7g==",+ "dev": true,+ "requires": {+ "@types/json-schema": "^7.0.9",+ "@types/semver": "^7.3.12",+ "@typescript-eslint/scope-manager": "5.46.0",+ "@typescript-eslint/types": "5.46.0",+ "@typescript-eslint/typescript-estree": "5.46.0",+ "eslint-scope": "^5.1.1",+ "eslint-utils": "^3.0.0",+ "semver": "^7.3.7"+ }+ },+ "@typescript-eslint/visitor-keys": {+ "version": "5.46.0",+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.0.tgz",+ "integrity": "sha512-E13gBoIXmaNhwjipuvQg1ByqSAu/GbEpP/qzFihugJ+MomtoJtFAJG/+2DRPByf57B863m0/q7Zt16V9ohhANw==",+ "dev": true,+ "requires": {+ "@typescript-eslint/types": "5.46.0",+ "eslint-visitor-keys": "^3.3.0"+ }+ },+ "@vitejs/plugin-vue": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.0.0.tgz",+ "integrity": "sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==",+ "dev": true+ },+ "@volar/language-core": {+ "version": "1.0.12",+ "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-1.0.12.tgz",+ "integrity": "sha512-I9wylkEq5Fhv4uIxXq4ys+GKVAxKY64DEw1nj8oP36xaOl80r6ogZ9V3BCKJp/npAlFCH7pAkUDSBkSo8v3Tfg==",+ "dev": true,+ "requires": {+ "@volar/source-map": "1.0.12",+ "@vue/reactivity": "^3.2.45",+ "muggle-string": "^0.1.0"+ }+ },+ "@volar/source-map": {+ "version": "1.0.12",+ "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-1.0.12.tgz",+ "integrity": "sha512-5npjYmotdIIerchOn9QwGHM7LBNJLWAjPBMrZnvv1MbqTwAxu2H1+MNh/cvLeIcrzNSYui81RZsMaPKTRiiXyg==",+ "dev": true,+ "requires": {+ "muggle-string": "^0.1.0"+ }+ },+ "@volar/typescript": {+ "version": "1.0.12",+ "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-1.0.12.tgz",+ "integrity": "sha512-7PR4Fwg3EyuwmagodaGntKxDqzie5Ywiq7evx5UvNIY0BP3yXrCADxBMFYLJykb+ECSE+GbTClsyXTnJQ9xi1Q==",+ "dev": true,+ "requires": {+ "@volar/language-core": "1.0.12"+ }+ },+ "@volar/vue-language-core": {+ "version": "1.0.12",+ "resolved": "https://registry.npmjs.org/@volar/vue-language-core/-/vue-language-core-1.0.12.tgz",+ "integrity": "sha512-2JnKRwTJZxAHwFiaQmp79GwyAzf2UPOSnAe6QfOCTQvQ79iNj/zdzDjSzogeuwkCgrG8GHgaMiuWZx4xIXgTIQ==",+ "dev": true,+ "requires": {+ "@volar/language-core": "1.0.12",+ "@volar/source-map": "1.0.12",+ "@vue/compiler-dom": "^3.2.45",+ "@vue/compiler-sfc": "^3.2.45",+ "@vue/reactivity": "^3.2.45",+ "@vue/shared": "^3.2.45",+ "minimatch": "^5.1.0",+ "vue-template-compiler": "^2.7.14"+ }+ },+ "@volar/vue-typescript": {+ "version": "1.0.12",+ "resolved": "https://registry.npmjs.org/@volar/vue-typescript/-/vue-typescript-1.0.12.tgz",+ "integrity": "sha512-MhdZmUlvl54w2rsPXEtwbX7dq1Dya7THFcDof7vNaH3PwBxqnDn8SZS1Yoxe3pENuAXNwQskAc2uP9R9LYe36g==",+ "dev": true,+ "requires": {+ "@volar/typescript": "1.0.12",+ "@volar/vue-language-core": "1.0.12"+ }+ },+ "@vue/compiler-core": {+ "version": "3.2.45",+ "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz",+ "integrity": "sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==",+ "requires": {+ "@babel/parser": "^7.16.4",+ "@vue/shared": "3.2.45",+ "estree-walker": "^2.0.2",+ "source-map": "^0.6.1"+ }+ },+ "@vue/compiler-dom": {+ "version": "3.2.45",+ "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz",+ "integrity": "sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==",+ "requires": {+ "@vue/compiler-core": "3.2.45",+ "@vue/shared": "3.2.45"+ }+ },+ "@vue/compiler-sfc": {+ "version": "3.2.45",+ "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz",+ "integrity": "sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==",+ "requires": {+ "@babel/parser": "^7.16.4",+ "@vue/compiler-core": "3.2.45",+ "@vue/compiler-dom": "3.2.45",+ "@vue/compiler-ssr": "3.2.45",+ "@vue/reactivity-transform": "3.2.45",+ "@vue/shared": "3.2.45",+ "estree-walker": "^2.0.2",+ "magic-string": "^0.25.7",+ "postcss": "^8.1.10",+ "source-map": "^0.6.1"+ }+ },+ "@vue/compiler-ssr": {+ "version": "3.2.45",+ "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz",+ "integrity": "sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==",+ "requires": {+ "@vue/compiler-dom": "3.2.45",+ "@vue/shared": "3.2.45"+ }+ },+ "@vue/devtools-api": {+ "version": "6.4.5",+ "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz",+ "integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="+ },+ "@vue/reactivity": {+ "version": "3.2.45",+ "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.45.tgz",+ "integrity": "sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==",+ "requires": {+ "@vue/shared": "3.2.45"+ }+ },+ "@vue/reactivity-transform": {+ "version": "3.2.45",+ "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz",+ "integrity": "sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==",+ "requires": {+ "@babel/parser": "^7.16.4",+ "@vue/compiler-core": "3.2.45",+ "@vue/shared": "3.2.45",+ "estree-walker": "^2.0.2",+ "magic-string": "^0.25.7"+ }+ },+ "@vue/runtime-core": {+ "version": "3.2.45",+ "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.45.tgz",+ "integrity": "sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==",+ "requires": {+ "@vue/reactivity": "3.2.45",+ "@vue/shared": "3.2.45"+ }+ },+ "@vue/runtime-dom": {+ "version": "3.2.45",+ "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz",+ "integrity": "sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==",+ "requires": {+ "@vue/runtime-core": "3.2.45",+ "@vue/shared": "3.2.45",+ "csstype": "^2.6.8"+ }+ },+ "@vue/server-renderer": {+ "version": "3.2.45",+ "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.45.tgz",+ "integrity": "sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==",+ "requires": {+ "@vue/compiler-ssr": "3.2.45",+ "@vue/shared": "3.2.45"+ }+ },+ "@vue/shared": {+ "version": "3.2.45",+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz",+ "integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg=="+ },+ "acorn": {+ "version": "7.4.1",+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",+ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",+ "dev": true+ },+ "acorn-jsx": {+ "version": "5.3.2",+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",+ "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",+ "dev": true+ },+ "ajv": {+ "version": "6.12.6",+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",+ "dev": true,+ "requires": {+ "fast-deep-equal": "^3.1.1",+ "fast-json-stable-stringify": "^2.0.0",+ "json-schema-traverse": "^0.4.1",+ "uri-js": "^4.2.2"+ }+ },+ "ansi-escapes": {+ "version": "4.3.2",+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",+ "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",+ "dev": true,+ "requires": {+ "type-fest": "^0.21.3"+ },+ "dependencies": {+ "type-fest": {+ "version": "0.21.3",+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",+ "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",+ "dev": true+ }+ }+ },+ "ansi-regex": {+ "version": "5.0.1",+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",+ "dev": true+ },+ "ansi-styles": {+ "version": "3.2.1",+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",+ "dev": true,+ "requires": {+ "color-convert": "^1.9.0"+ }+ },+ "anymatch": {+ "version": "3.1.3",+ "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",+ "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",+ "dev": true,+ "requires": {+ "normalize-path": "^3.0.0",+ "picomatch": "^2.0.4"+ }+ },+ "argparse": {+ "version": "1.0.10",+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",+ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",+ "dev": true,+ "requires": {+ "sprintf-js": "~1.0.2"+ }+ },+ "array-includes": {+ "version": "3.1.6",+ "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",+ "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2",+ "define-properties": "^1.1.4",+ "es-abstract": "^1.20.4",+ "get-intrinsic": "^1.1.3",+ "is-string": "^1.0.7"+ }+ },+ "array-union": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",+ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",+ "dev": true+ },+ "array.prototype.flat": {+ "version": "1.3.1",+ "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",+ "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2",+ "define-properties": "^1.1.4",+ "es-abstract": "^1.20.4",+ "es-shim-unscopables": "^1.0.0"+ }+ },+ "astral-regex": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",+ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",+ "dev": true+ },+ "asynckit": {+ "version": "0.4.0",+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",+ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="+ },+ "axios": {+ "version": "1.2.1",+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.1.tgz",+ "integrity": "sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==",+ "requires": {+ "follow-redirects": "^1.15.0",+ "form-data": "^4.0.0",+ "proxy-from-env": "^1.1.0"+ }+ },+ "balanced-match": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",+ "dev": true+ },+ "binary-extensions": {+ "version": "2.2.0",+ "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",+ "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",+ "dev": true+ },+ "brace-expansion": {+ "version": "2.0.1",+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",+ "dev": true,+ "requires": {+ "balanced-match": "^1.0.0"+ }+ },+ "braces": {+ "version": "3.0.2",+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",+ "dev": true,+ "requires": {+ "fill-range": "^7.0.1"+ }+ },+ "call-bind": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",+ "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",+ "dev": true,+ "requires": {+ "function-bind": "^1.1.1",+ "get-intrinsic": "^1.0.2"+ }+ },+ "callsites": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",+ "dev": true+ },+ "chalk": {+ "version": "4.1.2",+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",+ "dev": true,+ "requires": {+ "ansi-styles": "^4.1.0",+ "supports-color": "^7.1.0"+ },+ "dependencies": {+ "ansi-styles": {+ "version": "4.3.0",+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",+ "dev": true,+ "requires": {+ "color-convert": "^2.0.1"+ }+ },+ "color-convert": {+ "version": "2.0.1",+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",+ "dev": true,+ "requires": {+ "color-name": "~1.1.4"+ }+ },+ "color-name": {+ "version": "1.1.4",+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",+ "dev": true+ },+ "has-flag": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",+ "dev": true+ },+ "supports-color": {+ "version": "7.2.0",+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",+ "dev": true,+ "requires": {+ "has-flag": "^4.0.0"+ }+ }+ }+ },+ "chardet": {+ "version": "0.7.0",+ "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",+ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",+ "dev": true+ },+ "chokidar": {+ "version": "3.5.3",+ "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz",+ "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",+ "dev": true,+ "requires": {+ "anymatch": "~3.1.2",+ "braces": "~3.0.2",+ "fsevents": "~2.3.2",+ "glob-parent": "~5.1.2",+ "is-binary-path": "~2.1.0",+ "is-glob": "~4.0.1",+ "normalize-path": "~3.0.0",+ "readdirp": "~3.6.0"+ }+ },+ "cli-cursor": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",+ "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",+ "dev": true,+ "requires": {+ "restore-cursor": "^3.1.0"+ }+ },+ "cli-width": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",+ "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",+ "dev": true+ },+ "color-convert": {+ "version": "1.9.3",+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",+ "dev": true,+ "requires": {+ "color-name": "1.1.3"+ }+ },+ "color-name": {+ "version": "1.1.3",+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",+ "dev": true+ },+ "combined-stream": {+ "version": "1.0.8",+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",+ "requires": {+ "delayed-stream": "~1.0.0"+ }+ },+ "concat-map": {+ "version": "0.0.1",+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",+ "dev": true+ },+ "confusing-browser-globals": {+ "version": "1.0.11",+ "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",+ "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",+ "dev": true+ },+ "copy-anything": {+ "version": "2.0.6",+ "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",+ "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==",+ "dev": true,+ "requires": {+ "is-what": "^3.14.1"+ }+ },+ "cross-spawn": {+ "version": "7.0.3",+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",+ "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",+ "dev": true,+ "requires": {+ "path-key": "^3.1.0",+ "shebang-command": "^2.0.0",+ "which": "^2.0.1"+ }+ },+ "csstype": {+ "version": "2.6.21",+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz",+ "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="+ },+ "de-indent": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",+ "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",+ "dev": true+ },+ "debug": {+ "version": "4.3.4",+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",+ "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",+ "dev": true,+ "requires": {+ "ms": "2.1.2"+ }+ },+ "deep-is": {+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",+ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",+ "dev": true+ },+ "deepmerge": {+ "version": "4.2.2",+ "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.2.2.tgz",+ "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="+ },+ "define-properties": {+ "version": "1.1.4",+ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",+ "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",+ "dev": true,+ "requires": {+ "has-property-descriptors": "^1.0.0",+ "object-keys": "^1.1.1"+ }+ },+ "delayed-stream": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",+ "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="+ },+ "dir-glob": {+ "version": "3.0.1",+ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",+ "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",+ "dev": true,+ "requires": {+ "path-type": "^4.0.0"+ }+ },+ "doctrine": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",+ "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",+ "dev": true,+ "requires": {+ "esutils": "^2.0.2"+ }+ },+ "emoji-regex": {+ "version": "8.0.0",+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",+ "dev": true+ },+ "errno": {+ "version": "0.1.8",+ "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",+ "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",+ "dev": true,+ "optional": true,+ "requires": {+ "prr": "~1.0.1"+ }+ },+ "es-abstract": {+ "version": "1.20.5",+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz",+ "integrity": "sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2",+ "es-to-primitive": "^1.2.1",+ "function-bind": "^1.1.1",+ "function.prototype.name": "^1.1.5",+ "get-intrinsic": "^1.1.3",+ "get-symbol-description": "^1.0.0",+ "gopd": "^1.0.1",+ "has": "^1.0.3",+ "has-property-descriptors": "^1.0.0",+ "has-symbols": "^1.0.3",+ "internal-slot": "^1.0.3",+ "is-callable": "^1.2.7",+ "is-negative-zero": "^2.0.2",+ "is-regex": "^1.1.4",+ "is-shared-array-buffer": "^1.0.2",+ "is-string": "^1.0.7",+ "is-weakref": "^1.0.2",+ "object-inspect": "^1.12.2",+ "object-keys": "^1.1.1",+ "object.assign": "^4.1.4",+ "regexp.prototype.flags": "^1.4.3",+ "safe-regex-test": "^1.0.0",+ "string.prototype.trimend": "^1.0.6",+ "string.prototype.trimstart": "^1.0.6",+ "unbox-primitive": "^1.0.2"+ }+ },+ "es-shim-unscopables": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",+ "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",+ "dev": true,+ "requires": {+ "has": "^1.0.3"+ }+ },+ "es-to-primitive": {+ "version": "1.2.1",+ "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",+ "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",+ "dev": true,+ "requires": {+ "is-callable": "^1.1.4",+ "is-date-object": "^1.0.1",+ "is-symbol": "^1.0.2"+ }+ },+ "esbuild": {+ "version": "0.16.4",+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.16.4.tgz",+ "integrity": "sha512-qQrPMQpPTWf8jHugLWHoGqZjApyx3OEm76dlTXobHwh/EBbavbRdjXdYi/GWr43GyN0sfpap14GPkb05NH3ROA==",+ "dev": true,+ "requires": {+ "@esbuild/android-arm": "0.16.4",+ "@esbuild/android-arm64": "0.16.4",+ "@esbuild/android-x64": "0.16.4",+ "@esbuild/darwin-arm64": "0.16.4",+ "@esbuild/darwin-x64": "0.16.4",+ "@esbuild/freebsd-arm64": "0.16.4",+ "@esbuild/freebsd-x64": "0.16.4",+ "@esbuild/linux-arm": "0.16.4",+ "@esbuild/linux-arm64": "0.16.4",+ "@esbuild/linux-ia32": "0.16.4",+ "@esbuild/linux-loong64": "0.16.4",+ "@esbuild/linux-mips64el": "0.16.4",+ "@esbuild/linux-ppc64": "0.16.4",+ "@esbuild/linux-riscv64": "0.16.4",+ "@esbuild/linux-s390x": "0.16.4",+ "@esbuild/linux-x64": "0.16.4",+ "@esbuild/netbsd-x64": "0.16.4",+ "@esbuild/openbsd-x64": "0.16.4",+ "@esbuild/sunos-x64": "0.16.4",+ "@esbuild/win32-arm64": "0.16.4",+ "@esbuild/win32-ia32": "0.16.4",+ "@esbuild/win32-x64": "0.16.4"+ }+ },+ "escape-string-regexp": {+ "version": "1.0.5",+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",+ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",+ "dev": true+ },+ "eslint": {+ "version": "7.2.0",+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.2.0.tgz",+ "integrity": "sha512-B3BtEyaDKC5MlfDa2Ha8/D6DsS4fju95zs0hjS3HdGazw+LNayai38A25qMppK37wWGWNYSPOR6oYzlz5MHsRQ==",+ "dev": true,+ "requires": {+ "@babel/code-frame": "^7.0.0",+ "ajv": "^6.10.0",+ "chalk": "^4.0.0",+ "cross-spawn": "^7.0.2",+ "debug": "^4.0.1",+ "doctrine": "^3.0.0",+ "eslint-scope": "^5.1.0",+ "eslint-utils": "^2.0.0",+ "eslint-visitor-keys": "^1.2.0",+ "espree": "^7.1.0",+ "esquery": "^1.2.0",+ "esutils": "^2.0.2",+ "file-entry-cache": "^5.0.1",+ "functional-red-black-tree": "^1.0.1",+ "glob-parent": "^5.0.0",+ "globals": "^12.1.0",+ "ignore": "^4.0.6",+ "import-fresh": "^3.0.0",+ "imurmurhash": "^0.1.4",+ "inquirer": "^7.0.0",+ "is-glob": "^4.0.0",+ "js-yaml": "^3.13.1",+ "json-stable-stringify-without-jsonify": "^1.0.1",+ "levn": "^0.4.1",+ "lodash": "^4.17.14",+ "minimatch": "^3.0.4",+ "natural-compare": "^1.4.0",+ "optionator": "^0.9.1",+ "progress": "^2.0.0",+ "regexpp": "^3.1.0",+ "semver": "^7.2.1",+ "strip-ansi": "^6.0.0",+ "strip-json-comments": "^3.1.0",+ "table": "^5.2.3",+ "text-table": "^0.2.0",+ "v8-compile-cache": "^2.0.3"+ },+ "dependencies": {+ "brace-expansion": {+ "version": "1.1.11",+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",+ "dev": true,+ "requires": {+ "balanced-match": "^1.0.0",+ "concat-map": "0.0.1"+ }+ },+ "eslint-utils": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",+ "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",+ "dev": true,+ "requires": {+ "eslint-visitor-keys": "^1.1.0"+ }+ },+ "eslint-visitor-keys": {+ "version": "1.3.0",+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",+ "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",+ "dev": true+ },+ "ignore": {+ "version": "4.0.6",+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",+ "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",+ "dev": true+ },+ "minimatch": {+ "version": "3.1.2",+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",+ "dev": true,+ "requires": {+ "brace-expansion": "^1.1.7"+ }+ }+ }+ },+ "eslint-config-airbnb-base": {+ "version": "14.2.1",+ "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz",+ "integrity": "sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==",+ "dev": true,+ "requires": {+ "confusing-browser-globals": "^1.0.10",+ "object.assign": "^4.1.2",+ "object.entries": "^1.1.2"+ }+ },+ "eslint-import-resolver-node": {+ "version": "0.3.6",+ "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",+ "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",+ "dev": true,+ "requires": {+ "debug": "^3.2.7",+ "resolve": "^1.20.0"+ },+ "dependencies": {+ "debug": {+ "version": "3.2.7",+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",+ "dev": true,+ "requires": {+ "ms": "^2.1.1"+ }+ }+ }+ },+ "eslint-module-utils": {+ "version": "2.7.4",+ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",+ "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",+ "dev": true,+ "requires": {+ "debug": "^3.2.7"+ },+ "dependencies": {+ "debug": {+ "version": "3.2.7",+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",+ "dev": true,+ "requires": {+ "ms": "^2.1.1"+ }+ }+ }+ },+ "eslint-plugin-import": {+ "version": "2.26.0",+ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",+ "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",+ "dev": true,+ "requires": {+ "array-includes": "^3.1.4",+ "array.prototype.flat": "^1.2.5",+ "debug": "^2.6.9",+ "doctrine": "^2.1.0",+ "eslint-import-resolver-node": "^0.3.6",+ "eslint-module-utils": "^2.7.3",+ "has": "^1.0.3",+ "is-core-module": "^2.8.1",+ "is-glob": "^4.0.3",+ "minimatch": "^3.1.2",+ "object.values": "^1.1.5",+ "resolve": "^1.22.0",+ "tsconfig-paths": "^3.14.1"+ },+ "dependencies": {+ "brace-expansion": {+ "version": "1.1.11",+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",+ "dev": true,+ "requires": {+ "balanced-match": "^1.0.0",+ "concat-map": "0.0.1"+ }+ },+ "debug": {+ "version": "2.6.9",+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",+ "dev": true,+ "requires": {+ "ms": "2.0.0"+ }+ },+ "doctrine": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",+ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",+ "dev": true,+ "requires": {+ "esutils": "^2.0.2"+ }+ },+ "minimatch": {+ "version": "3.1.2",+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",+ "dev": true,+ "requires": {+ "brace-expansion": "^1.1.7"+ }+ },+ "ms": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",+ "dev": true+ }+ }+ },+ "eslint-plugin-vue": {+ "version": "7.20.0",+ "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.20.0.tgz",+ "integrity": "sha512-oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw==",+ "dev": true,+ "requires": {+ "eslint-utils": "^2.1.0",+ "natural-compare": "^1.4.0",+ "semver": "^6.3.0",+ "vue-eslint-parser": "^7.10.0"+ },+ "dependencies": {+ "eslint-utils": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",+ "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",+ "dev": true,+ "requires": {+ "eslint-visitor-keys": "^1.1.0"+ }+ },+ "eslint-visitor-keys": {+ "version": "1.3.0",+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",+ "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",+ "dev": true+ },+ "espree": {+ "version": "6.2.1",+ "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",+ "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",+ "dev": true,+ "requires": {+ "acorn": "^7.1.1",+ "acorn-jsx": "^5.2.0",+ "eslint-visitor-keys": "^1.1.0"+ }+ },+ "semver": {+ "version": "6.3.0",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",+ "dev": true+ },+ "vue-eslint-parser": {+ "version": "7.11.0",+ "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",+ "integrity": "sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==",+ "dev": true,+ "requires": {+ "debug": "^4.1.1",+ "eslint-scope": "^5.1.1",+ "eslint-visitor-keys": "^1.1.0",+ "espree": "^6.2.1",+ "esquery": "^1.4.0",+ "lodash": "^4.17.21",+ "semver": "^6.3.0"+ }+ }+ }+ },+ "eslint-scope": {+ "version": "5.1.1",+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",+ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",+ "dev": true,+ "requires": {+ "esrecurse": "^4.3.0",+ "estraverse": "^4.1.1"+ }+ },+ "eslint-utils": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",+ "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",+ "dev": true,+ "requires": {+ "eslint-visitor-keys": "^2.0.0"+ },+ "dependencies": {+ "eslint-visitor-keys": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",+ "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",+ "dev": true+ }+ }+ },+ "eslint-visitor-keys": {+ "version": "3.3.0",+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",+ "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",+ "dev": true+ },+ "espree": {+ "version": "7.3.1",+ "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",+ "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",+ "dev": true,+ "requires": {+ "acorn": "^7.4.0",+ "acorn-jsx": "^5.3.1",+ "eslint-visitor-keys": "^1.3.0"+ },+ "dependencies": {+ "eslint-visitor-keys": {+ "version": "1.3.0",+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",+ "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",+ "dev": true+ }+ }+ },+ "esprima": {+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",+ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",+ "dev": true+ },+ "esquery": {+ "version": "1.4.0",+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",+ "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",+ "dev": true,+ "requires": {+ "estraverse": "^5.1.0"+ },+ "dependencies": {+ "estraverse": {+ "version": "5.3.0",+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",+ "dev": true+ }+ }+ },+ "esrecurse": {+ "version": "4.3.0",+ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",+ "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",+ "dev": true,+ "requires": {+ "estraverse": "^5.2.0"+ },+ "dependencies": {+ "estraverse": {+ "version": "5.3.0",+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",+ "dev": true+ }+ }+ },+ "estraverse": {+ "version": "4.3.0",+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",+ "dev": true+ },+ "estree-walker": {+ "version": "2.0.2",+ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",+ "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="+ },+ "esutils": {+ "version": "2.0.3",+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",+ "dev": true+ },+ "execa": {+ "version": "5.1.1",+ "resolved": "https://registry.npmmirror.com/execa/-/execa-5.1.1.tgz",+ "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",+ "dev": true,+ "requires": {+ "cross-spawn": "^7.0.3",+ "get-stream": "^6.0.0",+ "human-signals": "^2.1.0",+ "is-stream": "^2.0.0",+ "merge-stream": "^2.0.0",+ "npm-run-path": "^4.0.1",+ "onetime": "^5.1.2",+ "signal-exit": "^3.0.3",+ "strip-final-newline": "^2.0.0"+ }+ },+ "external-editor": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",+ "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",+ "dev": true,+ "requires": {+ "chardet": "^0.7.0",+ "iconv-lite": "^0.4.24",+ "tmp": "^0.0.33"+ }+ },+ "fast-deep-equal": {+ "version": "3.1.3",+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",+ "dev": true+ },+ "fast-glob": {+ "version": "3.2.12",+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",+ "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",+ "dev": true,+ "requires": {+ "@nodelib/fs.stat": "^2.0.2",+ "@nodelib/fs.walk": "^1.2.3",+ "glob-parent": "^5.1.2",+ "merge2": "^1.3.0",+ "micromatch": "^4.0.4"+ }+ },+ "fast-json-stable-stringify": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",+ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",+ "dev": true+ },+ "fast-levenshtein": {+ "version": "2.0.6",+ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",+ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",+ "dev": true+ },+ "fastq": {+ "version": "1.14.0",+ "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz",+ "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==",+ "dev": true,+ "requires": {+ "reusify": "^1.0.4"+ }+ },+ "figures": {+ "version": "3.2.0",+ "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",+ "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",+ "dev": true,+ "requires": {+ "escape-string-regexp": "^1.0.5"+ }+ },+ "file-entry-cache": {+ "version": "5.0.1",+ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",+ "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",+ "dev": true,+ "requires": {+ "flat-cache": "^2.0.1"+ }+ },+ "fill-range": {+ "version": "7.0.1",+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",+ "dev": true,+ "requires": {+ "to-regex-range": "^5.0.1"+ }+ },+ "find-up": {+ "version": "5.0.0",+ "resolved": "https://registry.npmmirror.com/find-up/-/find-up-5.0.0.tgz",+ "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",+ "dev": true,+ "requires": {+ "locate-path": "^6.0.0",+ "path-exists": "^4.0.0"+ }+ },+ "flat-cache": {+ "version": "2.0.1",+ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",+ "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",+ "dev": true,+ "requires": {+ "flatted": "^2.0.0",+ "rimraf": "2.6.3",+ "write": "1.0.3"+ }+ },+ "flatted": {+ "version": "2.0.2",+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",+ "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",+ "dev": true+ },+ "follow-redirects": {+ "version": "1.15.2",+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",+ "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="+ },+ "form-data": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",+ "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",+ "requires": {+ "asynckit": "^0.4.0",+ "combined-stream": "^1.0.8",+ "mime-types": "^2.1.12"+ }+ },+ "fs.realpath": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",+ "dev": true+ },+ "fsevents": {+ "version": "2.3.2",+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",+ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",+ "dev": true,+ "optional": true+ },+ "function-bind": {+ "version": "1.1.1",+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",+ "dev": true+ },+ "function.prototype.name": {+ "version": "1.1.5",+ "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",+ "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2",+ "define-properties": "^1.1.3",+ "es-abstract": "^1.19.0",+ "functions-have-names": "^1.2.2"+ }+ },+ "functional-red-black-tree": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",+ "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",+ "dev": true+ },+ "functions-have-names": {+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",+ "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",+ "dev": true+ },+ "get-intrinsic": {+ "version": "1.1.3",+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",+ "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",+ "dev": true,+ "requires": {+ "function-bind": "^1.1.1",+ "has": "^1.0.3",+ "has-symbols": "^1.0.3"+ }+ },+ "get-stream": {+ "version": "6.0.1",+ "resolved": "https://registry.npmmirror.com/get-stream/-/get-stream-6.0.1.tgz",+ "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",+ "dev": true+ },+ "get-symbol-description": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",+ "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2",+ "get-intrinsic": "^1.1.1"+ }+ },+ "glob": {+ "version": "7.2.3",+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",+ "dev": true,+ "requires": {+ "fs.realpath": "^1.0.0",+ "inflight": "^1.0.4",+ "inherits": "2",+ "minimatch": "^3.1.1",+ "once": "^1.3.0",+ "path-is-absolute": "^1.0.0"+ },+ "dependencies": {+ "brace-expansion": {+ "version": "1.1.11",+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",+ "dev": true,+ "requires": {+ "balanced-match": "^1.0.0",+ "concat-map": "0.0.1"+ }+ },+ "minimatch": {+ "version": "3.1.2",+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",+ "dev": true,+ "requires": {+ "brace-expansion": "^1.1.7"+ }+ }+ }+ },+ "glob-parent": {+ "version": "5.1.2",+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",+ "dev": true,+ "requires": {+ "is-glob": "^4.0.1"+ }+ },+ "globals": {+ "version": "12.4.0",+ "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",+ "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",+ "dev": true,+ "requires": {+ "type-fest": "^0.8.1"+ }+ },+ "globby": {+ "version": "11.1.0",+ "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",+ "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",+ "dev": true,+ "requires": {+ "array-union": "^2.1.0",+ "dir-glob": "^3.0.1",+ "fast-glob": "^3.2.9",+ "ignore": "^5.2.0",+ "merge2": "^1.4.1",+ "slash": "^3.0.0"+ }+ },+ "gopd": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",+ "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",+ "dev": true,+ "requires": {+ "get-intrinsic": "^1.1.3"+ }+ },+ "graceful-fs": {+ "version": "4.2.10",+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",+ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",+ "dev": true,+ "optional": true+ },+ "has": {+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",+ "dev": true,+ "requires": {+ "function-bind": "^1.1.1"+ }+ },+ "has-bigints": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",+ "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",+ "dev": true+ },+ "has-flag": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",+ "dev": true+ },+ "has-property-descriptors": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",+ "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",+ "dev": true,+ "requires": {+ "get-intrinsic": "^1.1.1"+ }+ },+ "has-symbols": {+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",+ "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",+ "dev": true+ },+ "has-tostringtag": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",+ "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",+ "dev": true,+ "requires": {+ "has-symbols": "^1.0.2"+ }+ },+ "he": {+ "version": "1.2.0",+ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",+ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",+ "dev": true+ },+ "human-signals": {+ "version": "2.1.0",+ "resolved": "https://registry.npmmirror.com/human-signals/-/human-signals-2.1.0.tgz",+ "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",+ "dev": true+ },+ "iconv-lite": {+ "version": "0.4.24",+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",+ "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",+ "dev": true,+ "requires": {+ "safer-buffer": ">= 2.1.2 < 3"+ }+ },+ "ignore": {+ "version": "5.2.1",+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz",+ "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==",+ "dev": true+ },+ "image-size": {+ "version": "0.5.5",+ "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",+ "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",+ "dev": true,+ "optional": true+ },+ "import-fresh": {+ "version": "3.3.0",+ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",+ "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",+ "dev": true,+ "requires": {+ "parent-module": "^1.0.0",+ "resolve-from": "^4.0.0"+ }+ },+ "imurmurhash": {+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",+ "dev": true+ },+ "inflight": {+ "version": "1.0.6",+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",+ "dev": true,+ "requires": {+ "once": "^1.3.0",+ "wrappy": "1"+ }+ },+ "inherits": {+ "version": "2.0.4",+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",+ "dev": true+ },+ "inquirer": {+ "version": "7.3.3",+ "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",+ "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",+ "dev": true,+ "requires": {+ "ansi-escapes": "^4.2.1",+ "chalk": "^4.1.0",+ "cli-cursor": "^3.1.0",+ "cli-width": "^3.0.0",+ "external-editor": "^3.0.3",+ "figures": "^3.0.0",+ "lodash": "^4.17.19",+ "mute-stream": "0.0.8",+ "run-async": "^2.4.0",+ "rxjs": "^6.6.0",+ "string-width": "^4.1.0",+ "strip-ansi": "^6.0.0",+ "through": "^2.3.6"+ }+ },+ "internal-slot": {+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",+ "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",+ "dev": true,+ "requires": {+ "get-intrinsic": "^1.1.0",+ "has": "^1.0.3",+ "side-channel": "^1.0.4"+ }+ },+ "is-bigint": {+ "version": "1.0.4",+ "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",+ "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",+ "dev": true,+ "requires": {+ "has-bigints": "^1.0.1"+ }+ },+ "is-binary-path": {+ "version": "2.1.0",+ "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",+ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",+ "dev": true,+ "requires": {+ "binary-extensions": "^2.0.0"+ }+ },+ "is-boolean-object": {+ "version": "1.1.2",+ "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",+ "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2",+ "has-tostringtag": "^1.0.0"+ }+ },+ "is-callable": {+ "version": "1.2.7",+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",+ "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",+ "dev": true+ },+ "is-core-module": {+ "version": "2.11.0",+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",+ "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",+ "dev": true,+ "requires": {+ "has": "^1.0.3"+ }+ },+ "is-date-object": {+ "version": "1.0.5",+ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",+ "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",+ "dev": true,+ "requires": {+ "has-tostringtag": "^1.0.0"+ }+ },+ "is-extglob": {+ "version": "2.1.1",+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",+ "dev": true+ },+ "is-fullwidth-code-point": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",+ "dev": true+ },+ "is-glob": {+ "version": "4.0.3",+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",+ "dev": true,+ "requires": {+ "is-extglob": "^2.1.1"+ }+ },+ "is-negative-zero": {+ "version": "2.0.2",+ "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",+ "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",+ "dev": true+ },+ "is-number": {+ "version": "7.0.0",+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",+ "dev": true+ },+ "is-number-object": {+ "version": "1.0.7",+ "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",+ "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",+ "dev": true,+ "requires": {+ "has-tostringtag": "^1.0.0"+ }+ },+ "is-regex": {+ "version": "1.1.4",+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",+ "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2",+ "has-tostringtag": "^1.0.0"+ }+ },+ "is-shared-array-buffer": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",+ "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2"+ }+ },+ "is-stream": {+ "version": "2.0.1",+ "resolved": "https://registry.npmmirror.com/is-stream/-/is-stream-2.0.1.tgz",+ "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",+ "dev": true+ },+ "is-string": {+ "version": "1.0.7",+ "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",+ "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",+ "dev": true,+ "requires": {+ "has-tostringtag": "^1.0.0"+ }+ },+ "is-symbol": {+ "version": "1.0.4",+ "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",+ "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",+ "dev": true,+ "requires": {+ "has-symbols": "^1.0.2"+ }+ },+ "is-weakref": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",+ "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2"+ }+ },+ "is-what": {+ "version": "3.14.1",+ "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",+ "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",+ "dev": true+ },+ "isexe": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",+ "dev": true+ },+ "js-tokens": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",+ "dev": true+ },+ "js-yaml": {+ "version": "3.14.1",+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",+ "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",+ "dev": true,+ "requires": {+ "argparse": "^1.0.7",+ "esprima": "^4.0.0"+ }+ },+ "json-schema-traverse": {+ "version": "0.4.1",+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",+ "dev": true+ },+ "json-stable-stringify-without-jsonify": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",+ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",+ "dev": true+ },+ "json5": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",+ "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",+ "dev": true,+ "requires": {+ "minimist": "^1.2.0"+ }+ },+ "jsonc-parser": {+ "version": "3.2.0",+ "resolved": "https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz",+ "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",+ "dev": true+ },+ "klona": {+ "version": "2.0.5",+ "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",+ "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",+ "dev": true+ },+ "kolorist": {+ "version": "1.6.0",+ "resolved": "https://registry.npmmirror.com/kolorist/-/kolorist-1.6.0.tgz",+ "integrity": "sha512-dLkz37Ab97HWMx9KTes3Tbi3D1ln9fCAy2zr2YVExJasDRPGRaKcoE4fycWNtnCAJfjFqe0cnY+f8KT2JePEXQ==",+ "dev": true+ },+ "less": {+ "version": "4.1.3",+ "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz",+ "integrity": "sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==",+ "dev": true,+ "requires": {+ "copy-anything": "^2.0.1",+ "errno": "^0.1.1",+ "graceful-fs": "^4.1.2",+ "image-size": "~0.5.0",+ "make-dir": "^2.1.0",+ "mime": "^1.4.1",+ "needle": "^3.1.0",+ "parse-node-version": "^1.0.1",+ "source-map": "~0.6.0",+ "tslib": "^2.3.0"+ },+ "dependencies": {+ "tslib": {+ "version": "2.4.1",+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",+ "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",+ "dev": true+ }+ }+ },+ "less-loader": {+ "version": "11.1.0",+ "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.0.tgz",+ "integrity": "sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==",+ "dev": true,+ "requires": {+ "klona": "^2.0.4"+ }+ },+ "levn": {+ "version": "0.4.1",+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",+ "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",+ "dev": true,+ "requires": {+ "prelude-ls": "^1.2.1",+ "type-check": "~0.4.0"+ }+ },+ "local-pkg": {+ "version": "0.4.2",+ "resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-0.4.2.tgz",+ "integrity": "sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==",+ "dev": true+ },+ "locate-path": {+ "version": "6.0.0",+ "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-6.0.0.tgz",+ "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",+ "dev": true,+ "requires": {+ "p-locate": "^5.0.0"+ }+ },+ "lodash": {+ "version": "4.17.21",+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",+ "dev": true+ },+ "lru-cache": {+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",+ "dev": true,+ "requires": {+ "yallist": "^4.0.0"+ }+ },+ "magic-string": {+ "version": "0.25.9",+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",+ "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",+ "requires": {+ "sourcemap-codec": "^1.4.8"+ }+ },+ "make-dir": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",+ "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",+ "dev": true,+ "optional": true,+ "requires": {+ "pify": "^4.0.1",+ "semver": "^5.6.0"+ },+ "dependencies": {+ "semver": {+ "version": "5.7.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",+ "dev": true,+ "optional": true+ }+ }+ },+ "material-design-icons-iconfont": {+ "version": "6.7.0",+ "resolved": "https://registry.npmmirror.com/material-design-icons-iconfont/-/material-design-icons-iconfont-6.7.0.tgz",+ "integrity": "sha512-lSj71DgVv20kO0kGbs42icDzbRot61gEDBLQACzkUuznRQBUYmbxzEkGU6dNBb5fRWHMaScYlAXX96HQ4/cJWA==",+ "dev": true+ },+ "merge-stream": {+ "version": "2.0.0",+ "resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",+ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",+ "dev": true+ },+ "merge2": {+ "version": "1.4.1",+ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",+ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",+ "dev": true+ },+ "micromatch": {+ "version": "4.0.5",+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",+ "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",+ "dev": true,+ "requires": {+ "braces": "^3.0.2",+ "picomatch": "^2.3.1"+ }+ },+ "mime": {+ "version": "1.6.0",+ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",+ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",+ "dev": true,+ "optional": true+ },+ "mime-db": {+ "version": "1.52.0",+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="+ },+ "mime-types": {+ "version": "2.1.35",+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",+ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",+ "requires": {+ "mime-db": "1.52.0"+ }+ },+ "mimic-fn": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",+ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",+ "dev": true+ },+ "minimatch": {+ "version": "5.1.1",+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.1.tgz",+ "integrity": "sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g==",+ "dev": true,+ "requires": {+ "brace-expansion": "^2.0.1"+ }+ },+ "minimist": {+ "version": "1.2.7",+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",+ "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",+ "dev": true+ },+ "mitt": {+ "version": "3.0.0",+ "resolved": "https://registry.npmmirror.com/mitt/-/mitt-3.0.0.tgz",+ "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ=="+ },+ "mkdirp": {+ "version": "0.5.6",+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",+ "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",+ "dev": true,+ "requires": {+ "minimist": "^1.2.6"+ }+ },+ "mlly": {+ "version": "1.0.0",+ "resolved": "https://registry.npmmirror.com/mlly/-/mlly-1.0.0.tgz",+ "integrity": "sha512-QL108Hwt+u9bXdWgOI0dhzZfACovn5Aen4Xvc8Jasd9ouRH4NjnrXEiyP3nVvJo91zPlYjVRckta0Nt2zfoR6g==",+ "dev": true,+ "requires": {+ "acorn": "^8.8.1",+ "pathe": "^1.0.0",+ "pkg-types": "^1.0.0",+ "ufo": "^1.0.0"+ },+ "dependencies": {+ "acorn": {+ "version": "8.8.1",+ "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.8.1.tgz",+ "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",+ "dev": true+ }+ }+ },+ "ms": {+ "version": "2.1.2",+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",+ "dev": true+ },+ "muggle-string": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.1.0.tgz",+ "integrity": "sha512-Tr1knR3d2mKvvWthlk7202rywKbiOm4rVFLsfAaSIhJ6dt9o47W4S+JMtWhd/PW9Wrdew2/S2fSvhz3E2gkfEg==",+ "dev": true+ },+ "mute-stream": {+ "version": "0.0.8",+ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",+ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",+ "dev": true+ },+ "nanoid": {+ "version": "3.3.4",+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",+ "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="+ },+ "natural-compare": {+ "version": "1.4.0",+ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",+ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",+ "dev": true+ },+ "natural-compare-lite": {+ "version": "1.4.0",+ "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",+ "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",+ "dev": true+ },+ "needle": {+ "version": "3.2.0",+ "resolved": "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz",+ "integrity": "sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==",+ "dev": true,+ "optional": true,+ "requires": {+ "debug": "^3.2.6",+ "iconv-lite": "^0.6.3",+ "sax": "^1.2.4"+ },+ "dependencies": {+ "debug": {+ "version": "3.2.7",+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",+ "dev": true,+ "optional": true,+ "requires": {+ "ms": "^2.1.1"+ }+ },+ "iconv-lite": {+ "version": "0.6.3",+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",+ "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",+ "dev": true,+ "optional": true,+ "requires": {+ "safer-buffer": ">= 2.1.2 < 3.0.0"+ }+ }+ }+ },+ "normalize-path": {+ "version": "3.0.0",+ "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",+ "dev": true+ },+ "npm-run-path": {+ "version": "4.0.1",+ "resolved": "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-4.0.1.tgz",+ "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",+ "dev": true,+ "requires": {+ "path-key": "^3.0.0"+ }+ },+ "object-inspect": {+ "version": "1.12.2",+ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",+ "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",+ "dev": true+ },+ "object-keys": {+ "version": "1.1.1",+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",+ "dev": true+ },+ "object.assign": {+ "version": "4.1.4",+ "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",+ "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2",+ "define-properties": "^1.1.4",+ "has-symbols": "^1.0.3",+ "object-keys": "^1.1.1"+ }+ },+ "object.entries": {+ "version": "1.1.6",+ "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",+ "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2",+ "define-properties": "^1.1.4",+ "es-abstract": "^1.20.4"+ }+ },+ "object.values": {+ "version": "1.1.6",+ "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",+ "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2",+ "define-properties": "^1.1.4",+ "es-abstract": "^1.20.4"+ }+ },+ "once": {+ "version": "1.4.0",+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",+ "dev": true,+ "requires": {+ "wrappy": "1"+ }+ },+ "onetime": {+ "version": "5.1.2",+ "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",+ "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",+ "dev": true,+ "requires": {+ "mimic-fn": "^2.1.0"+ }+ },+ "optionator": {+ "version": "0.9.1",+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",+ "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",+ "dev": true,+ "requires": {+ "deep-is": "^0.1.3",+ "fast-levenshtein": "^2.0.6",+ "levn": "^0.4.1",+ "prelude-ls": "^1.2.1",+ "type-check": "^0.4.0",+ "word-wrap": "^1.2.3"+ }+ },+ "os-tmpdir": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",+ "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",+ "dev": true+ },+ "p-limit": {+ "version": "3.1.0",+ "resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-3.1.0.tgz",+ "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",+ "dev": true,+ "requires": {+ "yocto-queue": "^0.1.0"+ }+ },+ "p-locate": {+ "version": "5.0.0",+ "resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-5.0.0.tgz",+ "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",+ "dev": true,+ "requires": {+ "p-limit": "^3.0.2"+ }+ },+ "parent-module": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",+ "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",+ "dev": true,+ "requires": {+ "callsites": "^3.0.0"+ }+ },+ "parse-node-version": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",+ "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",+ "dev": true+ },+ "path-exists": {+ "version": "4.0.0",+ "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",+ "dev": true+ },+ "path-is-absolute": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",+ "dev": true+ },+ "path-key": {+ "version": "3.1.1",+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",+ "dev": true+ },+ "path-parse": {+ "version": "1.0.7",+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",+ "dev": true+ },+ "path-type": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",+ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",+ "dev": true+ },+ "pathe": {+ "version": "1.0.0",+ "resolved": "https://registry.npmmirror.com/pathe/-/pathe-1.0.0.tgz",+ "integrity": "sha512-nPdMG0Pd09HuSsr7QOKUXO2Jr9eqaDiZvDwdyIhNG5SHYujkQHYKDfGQkulBxvbDHz8oHLsTgKN86LSwYzSHAg==",+ "dev": true+ },+ "picocolors": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",+ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="+ },+ "picomatch": {+ "version": "2.3.1",+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",+ "dev": true+ },+ "pify": {+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",+ "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",+ "dev": true,+ "optional": true+ },+ "pkg-types": {+ "version": "1.0.1",+ "resolved": "https://registry.npmmirror.com/pkg-types/-/pkg-types-1.0.1.tgz",+ "integrity": "sha512-jHv9HB+Ho7dj6ItwppRDDl0iZRYBD0jsakHXtFgoLr+cHSF6xC+QL54sJmWxyGxOLYSHm0afhXhXcQDQqH9z8g==",+ "dev": true,+ "requires": {+ "jsonc-parser": "^3.2.0",+ "mlly": "^1.0.0",+ "pathe": "^1.0.0"+ }+ },+ "postcss": {+ "version": "8.4.19",+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",+ "integrity": "sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==",+ "requires": {+ "nanoid": "^3.3.4",+ "picocolors": "^1.0.0",+ "source-map-js": "^1.0.2"+ }+ },+ "prelude-ls": {+ "version": "1.2.1",+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",+ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",+ "dev": true+ },+ "progress": {+ "version": "2.0.3",+ "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",+ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",+ "dev": true+ },+ "proxy-from-env": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",+ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="+ },+ "prr": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",+ "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",+ "dev": true,+ "optional": true+ },+ "punycode": {+ "version": "2.1.1",+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",+ "dev": true+ },+ "queue-microtask": {+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",+ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",+ "dev": true+ },+ "readdirp": {+ "version": "3.6.0",+ "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",+ "dev": true,+ "requires": {+ "picomatch": "^2.2.1"+ }+ },+ "regexp.prototype.flags": {+ "version": "1.4.3",+ "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",+ "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2",+ "define-properties": "^1.1.3",+ "functions-have-names": "^1.2.2"+ }+ },+ "regexpp": {+ "version": "3.2.0",+ "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",+ "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",+ "dev": true+ },+ "resolve": {+ "version": "1.22.1",+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",+ "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",+ "dev": true,+ "requires": {+ "is-core-module": "^2.9.0",+ "path-parse": "^1.0.7",+ "supports-preserve-symlinks-flag": "^1.0.0"+ }+ },+ "resolve-from": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",+ "dev": true+ },+ "restore-cursor": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",+ "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",+ "dev": true,+ "requires": {+ "onetime": "^5.1.0",+ "signal-exit": "^3.0.2"+ }+ },+ "reusify": {+ "version": "1.0.4",+ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",+ "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",+ "dev": true+ },+ "rimraf": {+ "version": "2.6.3",+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",+ "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",+ "dev": true,+ "requires": {+ "glob": "^7.1.3"+ }+ },+ "rollup": {+ "version": "3.7.2",+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.7.2.tgz",+ "integrity": "sha512-orqIX5zkHyHKVsIBl8J5a2tnVikOAMte0DgOLViyW6McYuj45FG+cQPrXILhaifBSmy0D0hKbHg2RbgzFJcwTg==",+ "dev": true,+ "requires": {+ "fsevents": "~2.3.2"+ }+ },+ "run-async": {+ "version": "2.4.1",+ "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",+ "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",+ "dev": true+ },+ "run-parallel": {+ "version": "1.2.0",+ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",+ "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",+ "dev": true,+ "requires": {+ "queue-microtask": "^1.2.2"+ }+ },+ "rxjs": {+ "version": "6.6.7",+ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",+ "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",+ "dev": true,+ "requires": {+ "tslib": "^1.9.0"+ }+ },+ "safe-regex-test": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",+ "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2",+ "get-intrinsic": "^1.1.3",+ "is-regex": "^1.1.4"+ }+ },+ "safer-buffer": {+ "version": "2.1.2",+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",+ "dev": true+ },+ "sax": {+ "version": "1.2.4",+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",+ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",+ "dev": true,+ "optional": true+ },+ "scule": {+ "version": "1.0.0",+ "resolved": "https://registry.npmmirror.com/scule/-/scule-1.0.0.tgz",+ "integrity": "sha512-4AsO/FrViE/iDNEPaAQlb77tf0csuq27EsVpy6ett584EcRTp6pTDLoGWVxCD77y5iU5FauOvhsI4o1APwPoSQ==",+ "dev": true+ },+ "semver": {+ "version": "7.3.8",+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",+ "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",+ "dev": true,+ "requires": {+ "lru-cache": "^6.0.0"+ }+ },+ "shebang-command": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",+ "dev": true,+ "requires": {+ "shebang-regex": "^3.0.0"+ }+ },+ "shebang-regex": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",+ "dev": true+ },+ "side-channel": {+ "version": "1.0.4",+ "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",+ "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.0",+ "get-intrinsic": "^1.0.2",+ "object-inspect": "^1.9.0"+ }+ },+ "signal-exit": {+ "version": "3.0.7",+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",+ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",+ "dev": true+ },+ "slash": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",+ "dev": true+ },+ "slice-ansi": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",+ "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",+ "dev": true,+ "requires": {+ "ansi-styles": "^3.2.0",+ "astral-regex": "^1.0.0",+ "is-fullwidth-code-point": "^2.0.0"+ },+ "dependencies": {+ "is-fullwidth-code-point": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",+ "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",+ "dev": true+ }+ }+ },+ "source-map": {+ "version": "0.6.1",+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="+ },+ "source-map-js": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",+ "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="+ },+ "sourcemap-codec": {+ "version": "1.4.8",+ "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",+ "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="+ },+ "sprintf-js": {+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",+ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",+ "dev": true+ },+ "string-width": {+ "version": "4.2.3",+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",+ "dev": true,+ "requires": {+ "emoji-regex": "^8.0.0",+ "is-fullwidth-code-point": "^3.0.0",+ "strip-ansi": "^6.0.1"+ }+ },+ "string.prototype.trimend": {+ "version": "1.0.6",+ "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",+ "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2",+ "define-properties": "^1.1.4",+ "es-abstract": "^1.20.4"+ }+ },+ "string.prototype.trimstart": {+ "version": "1.0.6",+ "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",+ "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2",+ "define-properties": "^1.1.4",+ "es-abstract": "^1.20.4"+ }+ },+ "strip-ansi": {+ "version": "6.0.1",+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",+ "dev": true,+ "requires": {+ "ansi-regex": "^5.0.1"+ }+ },+ "strip-bom": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",+ "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",+ "dev": true+ },+ "strip-final-newline": {+ "version": "2.0.0",+ "resolved": "https://registry.npmmirror.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz",+ "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",+ "dev": true+ },+ "strip-json-comments": {+ "version": "3.1.1",+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",+ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",+ "dev": true+ },+ "strip-literal": {+ "version": "1.0.0",+ "resolved": "https://registry.npmmirror.com/strip-literal/-/strip-literal-1.0.0.tgz",+ "integrity": "sha512-5o4LsH1lzBzO9UFH63AJ2ad2/S2AVx6NtjOcaz+VTT2h1RiRvbipW72z8M/lxEhcPHDBQwpDrnTF7sXy/7OwCQ==",+ "dev": true,+ "requires": {+ "acorn": "^8.8.1"+ },+ "dependencies": {+ "acorn": {+ "version": "8.8.1",+ "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.8.1.tgz",+ "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",+ "dev": true+ }+ }+ },+ "supports-color": {+ "version": "5.5.0",+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",+ "dev": true,+ "requires": {+ "has-flag": "^3.0.0"+ }+ },+ "supports-preserve-symlinks-flag": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",+ "dev": true+ },+ "table": {+ "version": "5.4.6",+ "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",+ "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",+ "dev": true,+ "requires": {+ "ajv": "^6.10.2",+ "lodash": "^4.17.14",+ "slice-ansi": "^2.1.0",+ "string-width": "^3.0.0"+ },+ "dependencies": {+ "ansi-regex": {+ "version": "4.1.1",+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",+ "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",+ "dev": true+ },+ "emoji-regex": {+ "version": "7.0.3",+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",+ "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",+ "dev": true+ },+ "is-fullwidth-code-point": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",+ "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",+ "dev": true+ },+ "string-width": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",+ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",+ "dev": true,+ "requires": {+ "emoji-regex": "^7.0.1",+ "is-fullwidth-code-point": "^2.0.0",+ "strip-ansi": "^5.1.0"+ }+ },+ "strip-ansi": {+ "version": "5.2.0",+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",+ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",+ "dev": true,+ "requires": {+ "ansi-regex": "^4.1.0"+ }+ }+ }+ },+ "text-table": {+ "version": "0.2.0",+ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",+ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",+ "dev": true+ },+ "through": {+ "version": "2.3.8",+ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",+ "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",+ "dev": true+ },+ "tmp": {+ "version": "0.0.33",+ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",+ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",+ "dev": true,+ "requires": {+ "os-tmpdir": "~1.0.2"+ }+ },+ "to-regex-range": {+ "version": "5.0.1",+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",+ "dev": true,+ "requires": {+ "is-number": "^7.0.0"+ }+ },+ "ts-md5": {+ "version": "1.3.1",+ "resolved": "https://registry.npmmirror.com/ts-md5/-/ts-md5-1.3.1.tgz",+ "integrity": "sha512-DiwiXfwvcTeZ5wCE0z+2A9EseZsztaiZtGrtSaY5JOD7ekPnR/GoIVD5gXZAlK9Na9Kvpo9Waz5rW64WKAWApg=="+ },+ "tsconfig-paths": {+ "version": "3.14.1",+ "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",+ "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",+ "dev": true,+ "requires": {+ "@types/json5": "^0.0.29",+ "json5": "^1.0.1",+ "minimist": "^1.2.6",+ "strip-bom": "^3.0.0"+ }+ },+ "tslib": {+ "version": "1.14.1",+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",+ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",+ "dev": true+ },+ "tsutils": {+ "version": "3.21.0",+ "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",+ "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",+ "dev": true,+ "requires": {+ "tslib": "^1.8.1"+ }+ },+ "type-check": {+ "version": "0.4.0",+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",+ "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",+ "dev": true,+ "requires": {+ "prelude-ls": "^1.2.1"+ }+ },+ "type-fest": {+ "version": "0.8.1",+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",+ "dev": true+ },+ "typescript": {+ "version": "4.9.4",+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",+ "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",+ "dev": true+ },+ "ufo": {+ "version": "1.0.1",+ "resolved": "https://registry.npmmirror.com/ufo/-/ufo-1.0.1.tgz",+ "integrity": "sha512-boAm74ubXHY7KJQZLlXrtMz52qFvpsbOxDcZOnw/Wf+LS4Mmyu7JxmzD4tDLtUQtmZECypJ0FrCz4QIe6dvKRA==",+ "dev": true+ },+ "unbox-primitive": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",+ "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",+ "dev": true,+ "requires": {+ "call-bind": "^1.0.2",+ "has-bigints": "^1.0.2",+ "has-symbols": "^1.0.3",+ "which-boxed-primitive": "^1.0.2"+ }+ },+ "unimport": {+ "version": "1.1.0",+ "resolved": "https://registry.npmmirror.com/unimport/-/unimport-1.1.0.tgz",+ "integrity": "sha512-dSufi3POQWUVAMU6DxXu39U0cWzz5m3FtQBUbgDJTkCpeRfyiYhDg+BOz6UPKfDPtEhkbshV8JoMV3I8i/mQ+A==",+ "dev": true,+ "requires": {+ "@rollup/pluginutils": "^5.0.2",+ "escape-string-regexp": "^5.0.0",+ "fast-glob": "^3.2.12",+ "local-pkg": "^0.4.2",+ "magic-string": "^0.27.0",+ "mlly": "^1.0.0",+ "pathe": "^1.0.0",+ "pkg-types": "^1.0.1",+ "scule": "^1.0.0",+ "strip-literal": "^1.0.0",+ "unplugin": "^1.0.1"+ },+ "dependencies": {+ "escape-string-regexp": {+ "version": "5.0.0",+ "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",+ "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",+ "dev": true+ },+ "magic-string": {+ "version": "0.27.0",+ "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.27.0.tgz",+ "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",+ "dev": true,+ "requires": {+ "@jridgewell/sourcemap-codec": "^1.4.13"+ }+ }+ }+ },+ "unplugin": {+ "version": "1.0.1",+ "resolved": "https://registry.npmmirror.com/unplugin/-/unplugin-1.0.1.tgz",+ "integrity": "sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==",+ "dev": true,+ "requires": {+ "acorn": "^8.8.1",+ "chokidar": "^3.5.3",+ "webpack-sources": "^3.2.3",+ "webpack-virtual-modules": "^0.5.0"+ },+ "dependencies": {+ "acorn": {+ "version": "8.8.1",+ "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.8.1.tgz",+ "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",+ "dev": true+ }+ }+ },+ "unplugin-auto-import": {+ "version": "0.12.1",+ "resolved": "https://registry.npmmirror.com/unplugin-auto-import/-/unplugin-auto-import-0.12.1.tgz",+ "integrity": "sha512-J/3ZORq5YGKG+8D5vLLOgqaHNK77izlVN07mQ752yRLqBNDbJiwPRSnUwwYqH5N6rDay1SqnJCHaUdbJ9QMI2w==",+ "dev": true,+ "requires": {+ "@antfu/utils": "^0.7.2",+ "@rollup/pluginutils": "^5.0.2",+ "local-pkg": "^0.4.2",+ "magic-string": "^0.27.0",+ "unimport": "^1.0.2",+ "unplugin": "^1.0.1"+ },+ "dependencies": {+ "magic-string": {+ "version": "0.27.0",+ "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.27.0.tgz",+ "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",+ "dev": true,+ "requires": {+ "@jridgewell/sourcemap-codec": "^1.4.13"+ }+ }+ }+ },+ "unplugin-icons": {+ "version": "0.14.15",+ "resolved": "https://registry.npmmirror.com/unplugin-icons/-/unplugin-icons-0.14.15.tgz",+ "integrity": "sha512-J6YBA+fUzVM2IZPXCK3Pnk36jYVwQ6lkjRgOnZaXNIxpMDsmwDqrE1AGJ0zUbfuEoOa90OBGc0OPfN1r+qlSIQ==",+ "dev": true,+ "requires": {+ "@antfu/install-pkg": "^0.1.1",+ "@antfu/utils": "^0.7.2",+ "@iconify/utils": "^2.0.3",+ "debug": "^4.3.4",+ "kolorist": "^1.6.0",+ "local-pkg": "^0.4.2",+ "unplugin": "^1.0.1"+ }+ },+ "unplugin-vue-components": {+ "version": "0.22.12",+ "resolved": "https://registry.npmmirror.com/unplugin-vue-components/-/unplugin-vue-components-0.22.12.tgz",+ "integrity": "sha512-FxyzsuBvMCYPIk+8cgscGBQ345tvwVu+qY5IhE++eorkyvA4Z1TiD/HCiim+Kbqozl10i4K+z+NCa2WO2jexRA==",+ "dev": true,+ "requires": {+ "@antfu/utils": "^0.7.2",+ "@rollup/pluginutils": "^5.0.2",+ "chokidar": "^3.5.3",+ "debug": "^4.3.4",+ "fast-glob": "^3.2.12",+ "local-pkg": "^0.4.2",+ "magic-string": "^0.27.0",+ "minimatch": "^5.1.1",+ "resolve": "^1.22.1",+ "unplugin": "^1.0.1"+ },+ "dependencies": {+ "magic-string": {+ "version": "0.27.0",+ "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.27.0.tgz",+ "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",+ "dev": true,+ "requires": {+ "@jridgewell/sourcemap-codec": "^1.4.13"+ }+ }+ }+ },+ "uri-js": {+ "version": "4.4.1",+ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",+ "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",+ "dev": true,+ "requires": {+ "punycode": "^2.1.0"+ }+ },+ "v8-compile-cache": {+ "version": "2.3.0",+ "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",+ "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",+ "dev": true+ },+ "vite": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/vite/-/vite-4.0.0.tgz",+ "integrity": "sha512-ynad+4kYs8Jcnn8J7SacS9vAbk7eMy0xWg6E7bAhS1s79TK+D7tVFGXVZ55S7RNLRROU1rxoKlvZ/qjaB41DGA==",+ "dev": true,+ "requires": {+ "esbuild": "^0.16.3",+ "fsevents": "~2.3.2",+ "postcss": "^8.4.19",+ "resolve": "^1.22.1",+ "rollup": "^3.7.0"+ }+ },+ "vue": {+ "version": "3.2.45",+ "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.45.tgz",+ "integrity": "sha512-9Nx/Mg2b2xWlXykmCwiTUCWHbWIj53bnkizBxKai1g61f2Xit700A1ljowpTIM11e3uipOeiPcSqnmBg6gyiaA==",+ "requires": {+ "@vue/compiler-dom": "3.2.45",+ "@vue/compiler-sfc": "3.2.45",+ "@vue/runtime-dom": "3.2.45",+ "@vue/server-renderer": "3.2.45",+ "@vue/shared": "3.2.45"+ }+ },+ "vue-eslint-parser": {+ "version": "9.1.0",+ "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz",+ "integrity": "sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==",+ "dev": true,+ "requires": {+ "debug": "^4.3.4",+ "eslint-scope": "^7.1.1",+ "eslint-visitor-keys": "^3.3.0",+ "espree": "^9.3.1",+ "esquery": "^1.4.0",+ "lodash": "^4.17.21",+ "semver": "^7.3.6"+ },+ "dependencies": {+ "acorn": {+ "version": "8.8.1",+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",+ "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",+ "dev": true+ },+ "eslint-scope": {+ "version": "7.1.1",+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",+ "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",+ "dev": true,+ "requires": {+ "esrecurse": "^4.3.0",+ "estraverse": "^5.2.0"+ }+ },+ "espree": {+ "version": "9.4.1",+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",+ "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",+ "dev": true,+ "requires": {+ "acorn": "^8.8.0",+ "acorn-jsx": "^5.3.2",+ "eslint-visitor-keys": "^3.3.0"+ }+ },+ "estraverse": {+ "version": "5.3.0",+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",+ "dev": true+ }+ }+ },+ "vue-i18n": {+ "version": "9.2.2",+ "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-9.2.2.tgz",+ "integrity": "sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==",+ "requires": {+ "@intlify/core-base": "9.2.2",+ "@intlify/shared": "9.2.2",+ "@intlify/vue-devtools": "9.2.2",+ "@vue/devtools-api": "^6.2.1"+ }+ },+ "vue-router": {+ "version": "4.1.6",+ "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.6.tgz",+ "integrity": "sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==",+ "requires": {+ "@vue/devtools-api": "^6.4.5"+ }+ },+ "vue-template-compiler": {+ "version": "2.7.14",+ "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz",+ "integrity": "sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==",+ "dev": true,+ "requires": {+ "de-indent": "^1.0.2",+ "he": "^1.2.0"+ }+ },+ "vue-tsc": {+ "version": "1.0.12",+ "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-1.0.12.tgz",+ "integrity": "sha512-uWSASSHMfC61eEEOuLwf+eF9ODg0UzBV42/lIkZamxsA3PFZyV/eaq+RpEFP+NRXfL0GeXZUxY6l2dm9xlY07Q==",+ "dev": true,+ "requires": {+ "@volar/vue-language-core": "1.0.12",+ "@volar/vue-typescript": "1.0.12"+ }+ },+ "vuetify": {+ "version": "3.1.0",+ "resolved": "https://registry.npmmirror.com/vuetify/-/vuetify-3.1.0.tgz",+ "integrity": "sha512-v0+5eNq4GPXGcJ0F2dwJDbQOhuZhEgoiUDWHXqgWJixzc9mzwt+4nSmPz0vYPYl9oC3UFf3Se+vh0xNoRjv4Ig=="+ },+ "vuex": {+ "version": "4.0.2",+ "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.0.2.tgz",+ "integrity": "sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==",+ "requires": {+ "@vue/devtools-api": "^6.0.0-beta.11"+ }+ },+ "vuex-persist": {+ "version": "3.1.3",+ "resolved": "https://registry.npmmirror.com/vuex-persist/-/vuex-persist-3.1.3.tgz",+ "integrity": "sha512-QWOpP4SxmJDC5Y1+0+Yl/F4n7z27syd1St/oP+IYCGe0X0GFio0Zan6kngZFufdIhJm+5dFGDo3VG5kdkCGeRQ==",+ "requires": {+ "deepmerge": "^4.2.2",+ "flatted": "^3.0.5"+ },+ "dependencies": {+ "flatted": {+ "version": "3.2.7",+ "resolved": "https://registry.npmmirror.com/flatted/-/flatted-3.2.7.tgz",+ "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="+ }+ }+ },+ "vxe-table": {+ "version": "4.3.7",+ "resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.3.7.tgz",+ "integrity": "sha512-v+d7eEQ5uqtVTQCts4xkW0S15LZcIuEukYHGXI53SdoUj2gLFggPYAxQr1y659CM/ESRWPz9LNVHpd97KkjGHw=="+ },+ "webpack-sources": {+ "version": "3.2.3",+ "resolved": "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz",+ "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",+ "dev": true+ },+ "webpack-virtual-modules": {+ "version": "0.5.0",+ "resolved": "https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",+ "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",+ "dev": true+ },+ "which": {+ "version": "2.0.2",+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",+ "dev": true,+ "requires": {+ "isexe": "^2.0.0"+ }+ },+ "which-boxed-primitive": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",+ "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",+ "dev": true,+ "requires": {+ "is-bigint": "^1.0.1",+ "is-boolean-object": "^1.1.0",+ "is-number-object": "^1.0.4",+ "is-string": "^1.0.5",+ "is-symbol": "^1.0.3"+ }+ },+ "word-wrap": {+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",+ "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",+ "dev": true+ },+ "wrappy": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",+ "dev": true+ },+ "write": {+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",+ "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",+ "dev": true,+ "requires": {+ "mkdirp": "^0.5.1"+ }+ },+ "xe-utils": {+ "version": "3.5.7",+ "resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.7.tgz",+ "integrity": "sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew=="+ },+ "yallist": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",+ "dev": true+ },+ "yocto-queue": {+ "version": "0.1.0",+ "resolved": "https://registry.npmmirror.com/yocto-queue/-/yocto-queue-0.1.0.tgz",+ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",+ "dev": true+ }+ }+}diff --git a/frontend/package.json b/frontend/package.jsonnew file mode 100644index 0000000..c71dd2d--- /dev/null+++ b/frontend/package.json@@ -0,0 +1,49 @@+{+ "name": "ykwms",+ "private": true,+ "version": "0.0.0",+ "type": "module",+ "scripts": {+ "dev": "vite",+ "build": "vue-tsc && vite build",+ "preview": "vite preview"+ },+ "dependencies": {+ "axios": "1.2.1",+ "exceljs": "4.3.0",+ "lottie-web": "5.10.1",+ "mitt": "3.0.0",+ "ts-md5": "1.3.1",+ "vue": "3.2.45",+ "vue-i18n": "9.2.2",+ "vue-router": "4.1.6",+ "vuetify": "3.0.4",+ "vuex": "4.0.2",+ "vuex-persist": "3.1.3",+ "vxe-table": "4.3.7",+ "vxe-table-plugin-export-xlsx": "3.0.4",+ "xe-utils": "3.5.7",+ "xlsx": "0.18.5"+ },+ "devDependencies": {+ "@mdi/font": "7.1.96",+ "@types/node": "18.11.13",+ "@typescript-eslint/eslint-plugin": "5.46.0",+ "@typescript-eslint/parser": "5.46.0",+ "@vitejs/plugin-vue": "4.0.0",+ "eslint": "7.2.0",+ "eslint-config-airbnb-base": "14.2.1",+ "eslint-plugin-import": "2.26.0",+ "eslint-plugin-vue": "7.20.0",+ "less": "4.1.3",+ "less-loader": "11.1.0",+ "material-design-icons-iconfont": "6.7.0",+ "typescript": "4.9.3",+ "unplugin-auto-import": "0.12.1",+ "unplugin-icons": "0.14.15",+ "unplugin-vue-components": "0.22.12",+ "vite": "4.0.0",+ "vue-eslint-parser": "9.1.0",+ "vue-tsc": "1.0.11"+ }+}diff --git a/frontend/readme.txt b/frontend/readme.txtnew file mode 100644index 0000000..e69de29diff --git a/frontend/src/App.vue b/frontend/src/App.vuenew file mode 100644index 0000000..d0b4801--- /dev/null+++ b/frontend/src/App.vue@@ -0,0 +1,83 @@+<template>+ <div class="appViewContainer">+ <v-dialog v-model="loadingFlag" :scrim="false" persistent max-width="200">+ <v-card color="primary">+ <v-card-text>+ Loading...+ <v-progress-linear indeterminate color="white"></v-progress-linear>+ </v-card-text>+ </v-card>+ </v-dialog>+ <div v-show="loadingFlag" class="mask"></div>+ <router-view v-if="data.isShow"></router-view>+ </div>+</template>++<script setup lang="ts">+import { reactive, nextTick, onMounted, ref, computed, watch } from 'vue'+import { emitter } from './utils/bus'+import { store } from './store'++const loadingFlag = ref(false)++const data = reactive({+ isShow: true // Used to refresh the interface when switching languages+})++const method = reactive({+ refreshSystem: () => {+ data.isShow = false+ nextTick(() => {+ data.isShow = true+ store.commit('system/setRefreshFlag', false)+ })+ },+ getClientSize: () => {+ const clientHeight = document.documentElement.clientHeight+ const clientWidth = document.documentElement.clientWidth+ store.commit('system/setClientHeight', clientHeight)+ store.commit('system/setClientWidth', clientWidth)+ }+})++const refreshFlag = computed(() => store.getters['system/refreshFlag'])++watch(+ () => refreshFlag.value,+ (flag) => {+ if (flag) {+ method.refreshSystem()+ }+ }+)++onMounted(() => {+ emitter.on('showLoading', () => {+ loadingFlag.value = true+ })+ emitter.on('closeLoading', () => {+ loadingFlag.value = false+ })++ method.getClientSize()++ window.onresize = function () {+ method.getClientSize()+ }+})+</script>++<style scoped>+.appViewContainer {+ height: 100%;+ width: 100%;+ background-color: #f4f5fa;+}++.mask {+ position: absolute;+ z-index: 9999;+ width: 100vw;+ height: 100vh;+}+</style>diff --git a/frontend/src/api/base/commodityCategorySetting.ts b/frontend/src/api/base/commodityCategorySetting.tsnew file mode 100644index 0000000..0fa6cd9--- /dev/null+++ b/frontend/src/api/base/commodityCategorySetting.ts@@ -0,0 +1,31 @@+import http from '@/utils/http/request'+import { CategoryVO } from '@/types/Base/CommodityCategorySetting'++// Get all+export const getCategoryAll = () => http({+ url: '/category/all',+ method: 'get'+ })++// Add a new form+export const addCategory = (data: CategoryVO) => http({+ url: '/category',+ method: 'post',+ data+ })++// Update form+export const updateCategory = (data: CategoryVO) => http({+ url: '/category',+ method: 'put',+ data+ })++// Delete form+export const deleteCategory = (id: number) => http({+ url: '/category',+ method: 'delete',+ params: {+ id+ }+ })diff --git a/frontend/src/api/base/commodityManagementSetting.ts b/frontend/src/api/base/commodityManagementSetting.tsnew file mode 100644index 0000000..2a3bc2b--- /dev/null+++ b/frontend/src/api/base/commodityManagementSetting.ts@@ -0,0 +1,33 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { CommodityVO } from '@/types/Base/CommodityManagement'++// Find Data by Pagination+export const getSpuList = (data: PageConfigProps) => http({+ url: '/spu/list',+ method: 'post',+ data+})++// Add a new form+export const addSpu = (data: CommodityVO) => http({+ url: '/spu',+ method: 'post',+ data+ })++// Update form+export const updateSpu = (data: CommodityVO) => http({+ url: '/spu',+ method: 'put',+ data+ })++// Delete form+export const deleteSpu = (id: number) => http({+ url: '/spu',+ method: 'delete',+ params: {+ id+ }+ })diff --git a/frontend/src/api/base/companySetting.ts b/frontend/src/api/base/companySetting.tsnew file mode 100644index 0000000..9bc8a3b--- /dev/null+++ b/frontend/src/api/base/companySetting.ts@@ -0,0 +1,31 @@+import http from '@/utils/http/request'+import { CompanyVO } from '@/types/Base/CompanySetting'++// Get all+export const getCompanyAll = () => http({+ url: '/company/all',+ method: 'get'+ })++// Add a new form+export const addCompany = (data: CompanyVO) => http({+ url: '/company',+ method: 'post',+ data+ })++// Update form+export const updateCompany = (data: CompanyVO) => http({+ url: '/company',+ method: 'put',+ data+ })++// Delete form+export const deleteCompany = (id: number) => http({+ url: '/company',+ method: 'delete',+ params: {+ id+ }+ })diff --git a/frontend/src/api/base/customer.ts b/frontend/src/api/base/customer.tsnew file mode 100644index 0000000..1efaa15--- /dev/null+++ b/frontend/src/api/base/customer.ts@@ -0,0 +1,46 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { CustomerVO, CustomerExcelVO } from '@/types/Base/Customer'++// Get all+export const getCustomerAll = () => http({+ url: '/customer/all',+ method: 'get'+ })++// Find Data by Pagination+export const getCustomerList = (data: PageConfigProps) => http({+ url: '/customer/list',+ method: 'post',+ data+ })++// Add a new form+export const addCustomer = (data: CustomerVO) => http({+ url: '/customer',+ method: 'post',+ data+ })++// Update form+export const updateCustomer = (data: CustomerVO) => http({+ url: '/customer',+ method: 'put',+ data+ })++// Delete form+export const deleteCustomer = (id: number) => http({+ url: '/customer',+ method: 'delete',+ params: {+ id+ }+ })++// Excel Import+export const excelImport = (data: Array<CustomerExcelVO>) => http({+ url: '/customer/excel',+ method: 'post',+ data+ })diff --git a/frontend/src/api/base/freightSetting.ts b/frontend/src/api/base/freightSetting.tsnew file mode 100644index 0000000..1ec7af9--- /dev/null+++ b/frontend/src/api/base/freightSetting.ts@@ -0,0 +1,47 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { FreightVO } from '@/types/Base/Freight'++// Find Data by Pagination+export const getFreightList = (data: PageConfigProps) => http({+ url: '/freightfee/list',+ method: 'post',+ data+ })++// get data all+export const getFreightAll = () => http({+ url: '/freightfee/all',+ method: 'get',+ hideLoading: true+ })++// Add a new freightfee+export const addFreight = (data: FreightVO) => http({+ url: '/freightfee',+ method: 'post',+ data+ })++// Update freightfee+export const updateFreight = (data: FreightVO) => http({+ url: '/freightfee',+ method: 'put',+ data+ })++// Delete freightfee+export const deleteFreight = (id: number) => http({+ url: '/freightfee',+ method: 'delete',+ params: {+ id+ }+ })++// Excel Import+export const excelImport = (data: Array<FreightVO>) => http({+ url: '/freightfee/excel',+ method: 'post',+ data+ })diff --git a/frontend/src/api/base/ownerOfCargo.ts b/frontend/src/api/base/ownerOfCargo.tsnew file mode 100644index 0000000..2cd19ba--- /dev/null+++ b/frontend/src/api/base/ownerOfCargo.ts@@ -0,0 +1,46 @@+import http from '@/utils/http/request'+import { OwnerOfCargoVO } from '@/types/Base/OwnerOfCargo'+import { PageConfigProps } from '@/types/System/Form'++// Get all+export const getOwnerOfCargoAll = () => http({+ url: '/goodsowner/all',+ method: 'get'+ })++// Get data by page+export const getOwnerOfCargoByPage = (data: PageConfigProps) => http({+ url: '/goodsowner/list',+ method: 'post',+ data+ })++// Add a new form+export const addOwnerOfCargo = (data: OwnerOfCargoVO) => http({+ url: '/goodsowner',+ method: 'post',+ data+ })++// Update form+export const updateOwnerOfCargo = (data: OwnerOfCargoVO) => http({+ url: '/goodsowner',+ method: 'put',+ data+ })++// Delete form+export const deleteOwnerOfCargo = (id: number) => http({+ url: '/goodsowner',+ method: 'delete',+ params: {+ id+ }+ })++// import form+export const excelImport = (data: OwnerOfCargoVO[]) => http({+ url: '/goodsowner/excel',+ method: 'post',+ data+ })diff --git a/frontend/src/api/base/roleMenu.ts b/frontend/src/api/base/roleMenu.tsnew file mode 100644index 0000000..90d9852--- /dev/null+++ b/frontend/src/api/base/roleMenu.ts@@ -0,0 +1,55 @@+import http from '@/utils/http/request'+import { RoleMenuVO } from '@/types/Base/RoleMenu'++// Get user authority+export const getUserAuthority = (userrole_id: number) => http({+ url: '/rolemenu/authority',+ method: 'get',+ params: {+ userrole_id+ }+ })++// Get all+export const getRoleMenuAll = () => http({+ url: '/rolemenu/all',+ method: 'get'+ })++// Get all menu setting+export const getMenus = () => http({+ url: '/rolemenu/menus',+ method: 'get'+ })++// Get form by id+export const getRoleMenuById = (userrole_id: number) => http({+ url: '/rolemenu',+ method: 'get',+ params: {+ userrole_id+ }+ })++// Get form by id+export const addRoleMenu = (data: RoleMenuVO) => http({+ url: '/rolemenu',+ method: 'post',+ data+ })++// Update form+export const updateRoleMenu = (data: RoleMenuVO) => http({+ url: '/rolemenu',+ method: 'put',+ data+ })++// Delete form+export const deleteRoleMenu = (userrole_id: number) => http({+ url: '/rolemenu',+ method: 'delete',+ params: {+ userrole_id+ }+ })diff --git a/frontend/src/api/base/supplier.ts b/frontend/src/api/base/supplier.tsnew file mode 100644index 0000000..a3a03d8--- /dev/null+++ b/frontend/src/api/base/supplier.ts@@ -0,0 +1,46 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { SupplierVO, SupplierExcelVO } from '@/types/Base/Supplier'++// Get all+export const getSupplierAll = () => http({+ url: '/supplier/all',+ method: 'get'+ })++// Find Data by Pagination+export const getSupplierList = (data: PageConfigProps) => http({+ url: '/supplier/list',+ method: 'post',+ data+ })++// Add a new form+export const addSupplier = (data: SupplierVO) => http({+ url: '/supplier',+ method: 'post',+ data+ })++// Update form+export const updateSupplier = (data: SupplierVO) => http({+ url: '/supplier',+ method: 'put',+ data+ })++// Delete form+export const deleteSupplier = (id: number) => http({+ url: '/supplier',+ method: 'delete',+ params: {+ id+ }+ })++// Excel Import+export const excelImport = (data: Array<SupplierExcelVO>) => http({+ url: '/supplier/excel',+ method: 'post',+ data+})\ No newline at end of filediff --git a/frontend/src/api/base/userManagement.ts b/frontend/src/api/base/userManagement.tsnew file mode 100644index 0000000..156078c--- /dev/null+++ b/frontend/src/api/base/userManagement.ts@@ -0,0 +1,69 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { UserVO, ChangePwdAPIParams, ImportVO } from '@/types/Base/UserManagement'++// Find Data by Pagination+export const getSelectItem = () => http({+ url: '/user/select-item',+ method: 'get'+ })++// Find Data by Pagination+export const getUserList = (data: PageConfigProps) => http({+ url: '/user/list',+ method: 'post',+ data+ })++// Add a new user+export const addUser = (data: UserVO) => http({+ url: '/user',+ method: 'post',+ data+ })++ // Register a new user+export const registerUser = (data: UserVO) => http({+ url: '/user/register',+ method: 'post',+ data+ })++// Update user+export const updateUser = (data: UserVO) => http({+ url: '/user',+ method: 'put',+ data+ })++// Delete user+export const deleteUser = (id: number) => http({+ url: '/user',+ method: 'delete',+ params: {+ id+ }+ })++// Reset password+export const resetPassword = (id_list: number[]) => http({+ url: '/user/reset-pwd',+ method: 'post',+ data: {+ id_list+ }+ })++// Change password+export const changePassword = (data: ChangePwdAPIParams) => http({+ url: '/user/change-pwd',+ method: 'post',+ data+ })++// Import form+export const excelImport = (data: ImportVO[]) => http({+ url: '/user/excel',+ method: 'post',+ data+ })diff --git a/frontend/src/api/base/userRoleSetting.ts b/frontend/src/api/base/userRoleSetting.tsnew file mode 100644index 0000000..fadc64b--- /dev/null+++ b/frontend/src/api/base/userRoleSetting.ts@@ -0,0 +1,31 @@+import http from '@/utils/http/request'+import { UserRoleVO } from '@/types/Base/UserRoleSetting'++// Get all+export const getUserRoleAll = () => http({+ url: '/userrole/all',+ method: 'get'+ })++// Add a new form+export const addUserRole = (data: UserRoleVO) => http({+ url: '/userrole',+ method: 'post',+ data+ })++// Update form+export const updateUserRole = (data: UserRoleVO) => http({+ url: '/userrole',+ method: 'put',+ data+ })++// Delete form+export const deleteUserRole = (id: number) => http({+ url: '/userrole',+ method: 'delete',+ params: {+ id+ }+ })diff --git a/frontend/src/api/base/warehouseSetting.ts b/frontend/src/api/base/warehouseSetting.tsnew file mode 100644index 0000000..2da30b7--- /dev/null+++ b/frontend/src/api/base/warehouseSetting.ts@@ -0,0 +1,124 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { GoodsLocationVO, WarehouseAreaVO, WarehouseVO } from '@/types/Base/Warehouse'++/**+ * Warehouse Setting+ */+// Find Data by Pagination+export const getWarehouseList = (data: PageConfigProps) => http({+ url: '/warehouse/list',+ method: 'post',+ data+ })++// Add a new warehouse+export const addWarehouse = (data: WarehouseVO) => http({+ url: '/warehouse',+ method: 'post',+ data+ })++// Update warehouse+export const updateWarehouse = (data: WarehouseVO) => http({+ url: '/warehouse',+ method: 'put',+ data+ })++// Delete warehouse+export const deleteWarehouse = (id: number) => http({+ url: '/warehouse',+ method: 'delete',+ params: {+ id+ }+ })++ // Get the combobox item with warehouse+export const getWarehouseSelect = () => http({+ url: '/warehouse/select-item',+ method: 'get',+ })++ // Excel Import+export const excelImport = (data: Array<WarehouseVO>) => http({+ url: '/warehouse/excel',+ method: 'post',+ data+})++ // Get the combobox item with warehouse area+export const getWarehouseAreaSelect = (warehouse_id: number) => http({+ url: '/warehousearea/all',+ method: 'get',+ params: {+ warehouse_id+ }+ })++/**+ * Warehouse Area Setting+ */+// Find Data by Pagination+export const getWarehouseAreaList = (data: PageConfigProps) => http({+ url: '/warehousearea/list',+ method: 'post',+ data+ })++// Add a new warehousearea+export const addWarehouseArea = (data: WarehouseAreaVO) => http({+ url: '/warehousearea',+ method: 'post',+ data+ })++// Update warehousearea+export const updateWarehouseArea = (data: WarehouseAreaVO) => http({+ url: '/warehousearea',+ method: 'put',+ data+ })++// Delete warehousearea+export const deleteWarehouseArea = (id: number) => http({+ url: '/warehousearea',+ method: 'delete',+ params: {+ id+ }+ })++/**+ * Goods Location Setting+ */+// Find Data by Pagination+export const getGoodsLocationList = (data: PageConfigProps) => http({+ url: '/goodslocation/list',+ method: 'post',+ data+ })++// Add a new goodslocation+export const addGoodsLocation = (data: GoodsLocationVO) => http({+ url: '/goodslocation',+ method: 'post',+ data+ })++// Update goodslocation+export const updateGoodsLocation = (data: GoodsLocationVO) => http({+ url: '/goodslocation',+ method: 'put',+ data+ })++// Delete goodslocation+export const deleteGoodsLocation = (id: number) => http({+ url: '/goodslocation',+ method: 'delete',+ params: {+ id+ }+ })diff --git a/frontend/src/api/sys/login.ts b/frontend/src/api/sys/login.tsnew file mode 100644index 0000000..ec37606--- /dev/null+++ b/frontend/src/api/sys/login.ts@@ -0,0 +1,17 @@+import http from '@/utils/http/request'+import { LoginParams } from '../../types/System/UserModel'++export const login = (data: LoginParams) => http({+ url: '/login',+ method: 'post',+ data+ })++// Get user menu dynamically+export const getUserAuthority = (userrole_id: number) => http({+ url: '/rolemenu/authority',+ method: 'get',+ params: {+ userrole_id+ }+ })diff --git a/frontend/src/api/sys/model/userModel.ts b/frontend/src/api/sys/model/userModel.tsnew file mode 100644index 0000000..fcfdabb--- /dev/null+++ b/frontend/src/api/sys/model/userModel.ts@@ -0,0 +1,31 @@+/**+ * @description: Login interface parameters+ */+export interface LoginParams {+ userName: string+ password: string+}++/**+ * @description: Login interface return value+ */+export interface LoginResultModel {+ userId: string | number+ token: string+}++/**+ * @description: Get user information return value+ */+// export interface GetUserInfoModel {+// // 用户id+// userId: string | number;+// // 用户名+// username: string;+// // 真实名字+// realName: string;+// // 头像+// avatar: string;+// // 介绍+// desc?: string;+// }diff --git a/frontend/src/api/sys/test.ts b/frontend/src/api/sys/test.tsnew file mode 100644index 0000000..c0848da--- /dev/null+++ b/frontend/src/api/sys/test.ts@@ -0,0 +1,13 @@+import http from '@/utils/http/request'++interface params {+ ifall?: boolean+ iftodo?: boolean+}+export const getNotify = (data: params) => {+ return http({+ url: '/OA/SMNotifyBoard/home-notifyboard-todo',+ method: 'get',+ data+ })+}diff --git a/frontend/src/api/wms/deliveryManagement.ts b/frontend/src/api/wms/deliveryManagement.tsnew file mode 100644index 0000000..8ac2d32--- /dev/null+++ b/frontend/src/api/wms/deliveryManagement.ts@@ -0,0 +1,221 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { addRequestVO, ConfirmOrderVO, PackageVO, WeighVO, DeliveryVO, SignInVO, CancleOrderVO, SetCarrierVO } from '@/types/DeliveryManagement/DeliveryManagement'++// Get Pre shipment+export const getShipment = (data: PageConfigProps) => http({+ url: '/dispatchlist/advanced-list',+ method: 'post',+ data+ })++// Get Pre shipment+export const getPreShipment = (data: PageConfigProps) => http({+ url: '/dispatchlist/advanced-list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=0'+ }+ })++// Get new shipment+export const getNewShipment = (data: PageConfigProps) => http({+ url: '/dispatchlist/advanced-list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=1'+ }+ })++// Get new shipment+export const getGoodsToBePicked = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=2'+ }+ })++// Get To Be Packaged+export const getToBePackaged = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'to_package'+ }+ })++// Get picked+export const getPicked = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=3'+ }+ })++// Get Packaged+export const getPackaged = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=4'+ }+ })++// Get To Be Weight+export const getToBeWeighed = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'to_weight'+ }+ })++// Get Weight+export const getWeighed = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=5'+ }+ })++// Get To Be Delivery+export const getToBeDelivery = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'to_delivery'+ }+ })++// Get Delivery+export const getDelivery = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=6'+ }+ })++// Get Sign In+export const getSignIn = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=7'+ }+ })++// Add+export const addShipment = (data: addRequestVO[]) => http({+ url: '/dispatchlist',+ method: 'post',+ data+ })++// Delete+export const delShipment = (dispatch_no: string) => http({+ url: '/dispatchlist',+ method: 'delete',+ params: {+ dispatch_no+ }+ })++// Get order confirmation information+export const getConfirmOrderInfoAndStock = (dispatch_no: string) => http({+ url: '/dispatchlist/confirm-check',+ method: 'get',+ params: {+ dispatch_no+ }+ })++// Confirm orders and create dispatchpicklist+export const confirmOrder = (data: ConfirmOrderVO[]) => http({+ url: '/dispatchlist/confirm-order',+ method: 'post',+ data+ })++// Confirm picking+export const confirmPicking = (dispatch_no: string) => http({+ url: '/dispatchlist/confirm-pick-dispatchlistno',+ method: 'put',+ params: {+ dispatch_no+ }+ })++// Pack+export const handlePackage = (data: PackageVO[]) => http({+ url: '/dispatchlist/package',+ method: 'post',+ data+ })++// Weigh+export const handleWeigh = (data: WeighVO[]) => http({+ url: '/dispatchlist/weight',+ method: 'post',+ data+ })++// Delivery+export const handleDelivery = (data: DeliveryVO[]) => http({+ url: '/dispatchlist/delivery',+ method: 'post',+ data+ })++// Sign in+export const handleSignIn = (data: SignInVO[]) => http({+ url: '/dispatchlist/sign',+ method: 'post',+ data+ })++// Undo to previous step by detail+export const cancelOrderByDetail = (id: number) => http({+ url: '/dispatchlist/cancel-order',+ method: 'put',+ params: {+ id+ }+ })++// Undo to previous step by dispatch+export const cancelOrderByDispatch = (data: CancleOrderVO) => http({+ url: '/dispatchlist/cancel-order',+ method: 'post',+ data+ })++// Set carrier+export const setCarrier = (data: SetCarrierVO[]) => http({+ url: '/dispatchlist/freightfee',+ method: 'post',+ data+ })++// Set carrier+export const viewInventoryDetails = (dispatch_id: number) => http({+ url: '/dispatchlist/pick-list',+ method: 'get',+ params: {+ dispatch_id+ }+ })diff --git a/frontend/src/api/wms/stockAsn.ts b/frontend/src/api/wms/stockAsn.tsnew file mode 100644index 0000000..57c7d1e--- /dev/null+++ b/frontend/src/api/wms/stockAsn.ts@@ -0,0 +1,76 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { StockAsnVO, SortingVo, PutawayVo } from '@/types/WMS/StockAsn'++export const getStockAsnList = (data: PageConfigProps) => http({+ url: '/asn/list',+ method: 'post',+ data+ })++export const addAsn = (data: StockAsnVO) => http({+ url: '/asn',+ method: 'post',+ data+ })++export const updateAsn = (data: StockAsnVO) => http({+ url: '/asn',+ method: 'put',+ data+ })++export const deleteAsn = (id: number) => http({+ url: '/asn',+ method: 'delete',+ params: {+ id+ }+ })++export const confirmAsn = (id: number) => http({+ url: `/asn/confirm/${ id }`,+ method: 'put'+ })+export const confirmAsnCancel = (id: number) => http({+ url: `/asn/confirm-cancel/${ id }`,+ method: 'put'+ })++export const unloadAsn = (id: number) => http({+ url: `/asn/unload/${ id }`,+ method: 'put'+ })+export const unloadAsnCancel = (id: number) => http({+ url: `/asn/unload-cancel/${ id }`,+ method: 'put'+ })++export const sortedAsn = (id: number) => http({+ url: `/asn/sorted/${ id }`,+ method: 'put'+ })+export const sortedAsnCancel = (id: number) => http({+ url: `/asn/sorted-cancel/${ id }`,+ method: 'put'+ })++export const sortingAsn = (data: SortingVo) => http({+ url: '/asn/sorting',+ method: 'put',+ data+ })++export const putawayAsn = (data: PutawayVo) => http({+ url: '/asn/putaway',+ method: 'put',+ data+ })++export const getSkuInfo = (id: number) => http({+ url: '/spu/sku',+ method: 'get',+ params: {+ sku_id: id+ }+ })diff --git a/frontend/src/api/wms/stockManagement.ts b/frontend/src/api/wms/stockManagement.tsnew file mode 100644index 0000000..506f7ed--- /dev/null+++ b/frontend/src/api/wms/stockManagement.ts@@ -0,0 +1,29 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'++// Get stock select+export const getStockSelectList = (data: PageConfigProps) => http({+ url: '/stock/select',+ method: 'post',+ data+ })++// Get sku select+export const getSkuSelectList = (data: PageConfigProps) => http({+ url: '/stock/sku-select',+ method: 'post',+ data+ })++ // Get stock location+export const getStockLocationList = (data: PageConfigProps) => http({+ url: '/stock/location-list',+ method: 'post',+ data+})+// Get stock+export const getStockList = (data: PageConfigProps) => http({+ url: '/stock/stock-list',+ method: 'post',+ data+})\ No newline at end of filediff --git a/frontend/src/api/wms/warehouseAdjust.ts b/frontend/src/api/wms/warehouseAdjust.tsnew file mode 100644index 0000000..c3513eb--- /dev/null+++ b/frontend/src/api/wms/warehouseAdjust.ts@@ -0,0 +1,50 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { WarehouseAdjustVO } from '@/types/WarehouseWorking/WarehouseAdjust'++// Get list+export const getStockAdjustList = (data: PageConfigProps) => http({+ url: '/stockadjust/list',+ method: 'post',+ data+ })++// Get all+export const getStockAdjustAll = () => http({+ url: '/stockadjust/all',+ method: 'get'+ })++// Get one+export const getStockAdjustOne = (id: number) => http({+ url: '/stockadjust',+ method: 'get',+ params: {+ id+ }+ })++// Add a new form+export const addStockAdjust = (data: WarehouseAdjustVO) => http({+ url: '/stockadjust',+ method: 'post',+ data+ })++// Delete form+export const deleteStockAdjust = (id: number) => http({+ url: '/stockadjust',+ method: 'delete',+ params: {+ id+ }+ })++ // Delete form+export const confirmStockAdjust = (id: number) => http({+ url: '/stockadjust/confirm',+ method: 'put',+ params: {+ id+ }+ })diff --git a/frontend/src/api/wms/warehouseFreeze.ts b/frontend/src/api/wms/warehouseFreeze.tsnew file mode 100644index 0000000..8412c20--- /dev/null+++ b/frontend/src/api/wms/warehouseFreeze.ts@@ -0,0 +1,41 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { WarehouseFreezeVO } from '@/types/WarehouseWorking/WarehouseFreeze'++// Get list+export const getStockFreezeList = (data: PageConfigProps) => http({+ url: '/stockfreeze/list',+ method: 'post',+ data+ })++// Get all+export const getStockFreezeAll = () => http({+ url: '/stockfreeze/all',+ method: 'get'+ })++// Get one+export const getStockFreezeOne = (id: number) => http({+ url: '/stockfreeze',+ method: 'get',+ params: {+ id+ }+ })++// Add a new form+export const addStockFreeze = (data: WarehouseFreezeVO) => http({+ url: '/stockfreeze',+ method: 'post',+ data+ })++// Delete form+export const deleteStockFreeze = (id: number) => http({+ url: '/stockfreeze',+ method: 'delete',+ params: {+ id+ }+ })diff --git a/frontend/src/api/wms/warehouseMove.ts b/frontend/src/api/wms/warehouseMove.tsnew file mode 100644index 0000000..15ede7c--- /dev/null+++ b/frontend/src/api/wms/warehouseMove.ts@@ -0,0 +1,50 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { WarehouseMoveVO } from '@/types/WarehouseWorking/WarehouseMove'++// Get list+export const getStockMoveList = (data: PageConfigProps) => http({+ url: '/stockmove/list',+ method: 'post',+ data+ })++// Get all+export const getStockMoveAll = () => http({+ url: '/stockmove/all',+ method: 'get'+ })++// Get one+export const getStockMoveOne = (id: number) => http({+ url: '/stockmove',+ method: 'get',+ params: {+ id+ }+ })++// Add a new form+export const addStockMove = (data: WarehouseMoveVO) => http({+ url: '/stockmove',+ method: 'post',+ data+ })++// Delete form+export const deleteStockMove = (id: number) => http({+ url: '/stockmove',+ method: 'delete',+ params: {+ id+ }+ })++// Confirm move+export const confirmMove = (id: number) => http({+ url: '/stockmove',+ method: 'put',+ params: {+ id+ }+ })diff --git a/frontend/src/api/wms/warehouseProcessing.ts b/frontend/src/api/wms/warehouseProcessing.tsnew file mode 100644index 0000000..246a65a--- /dev/null+++ b/frontend/src/api/wms/warehouseProcessing.ts@@ -0,0 +1,66 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { WarehouseProcessingVO, WarehouseProcessingDetailVO } from '@/types/WarehouseWorking/WarehouseProcessing'++// Get list+export const getStockProcessList = (data: PageConfigProps) => http({+ url: '/stockprocess/list',+ method: 'post',+ data+ })++// Get all+export const getStockProcessAll = () => http({+ url: '/stockprocess/all',+ method: 'get'+ })++// Get one+export const getStockProcessOne = (id: number) => http({+ url: '/stockprocess',+ method: 'get',+ params: {+ id+ }+ })++// Add a new form+export const addStockProcess = (data: WarehouseProcessingVO) => http({+ url: '/stockprocess',+ method: 'post',+ data+ })++// Update form+export const updateStockProcess = (data: WarehouseProcessingVO) => http({+ url: '/stockprocess',+ method: 'put',+ data+ })++// Delete form+export const deleteStockProcess = (id: number) => http({+ url: '/stockprocess',+ method: 'delete',+ params: {+ id+ }+ })++// Confirm process+export const confirmProcess = (id: number) => http({+ url: '/stockprocess/process-confirm',+ method: 'put',+ params: {+ id+ }+ })++// Confirm adjustment+export const confirmAdjustment = (id: number) => http({+ url: '/stockprocess/adjustment-confirm',+ method: 'put',+ params: {+ id+ }+ })diff --git a/frontend/src/api/wms/warehouseTaking.ts b/frontend/src/api/wms/warehouseTaking.tsnew file mode 100644index 0000000..d5c19aa--- /dev/null+++ b/frontend/src/api/wms/warehouseTaking.ts@@ -0,0 +1,54 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { WarehouseTakingVO } from '@/types/WarehouseWorking/WarehouseTaking'++// Get list+export const getStockTakingList = (data: PageConfigProps) => http({+ url: '/stocktaking/list',+ method: 'post',+ data+ })++// Get one+export const getStockTakingOne = (id: number) => http({+ url: '/stocktaking',+ method: 'get',+ params: {+ id+ }+ })++// Add a new form+export const addStockTaking = (data: WarehouseTakingVO) => http({+ url: '/stocktaking',+ method: 'post',+ data+ })++// Delete form+export const deleteStockTaking = (id: number) => http({+ url: '/stocktaking',+ method: 'delete',+ params: {+ id+ }+ })++// Confirm stock taking+export const confirmStockTaking = (data: WarehouseTakingVO) => http({+ url: '/stocktaking',+ method: 'put',+ data: {+ id: data.id,+ counted_qty: data.counted_qty+ }+ })++// Confirm stock adjust+export const confirmAdjustment = (id: number) => http({+ url: '/stocktaking/adjustment-confirm',+ method: 'put',+ params: {+ id+ }+ })diff --git a/frontend/src/assets/css/hookComponent.css b/frontend/src/assets/css/hookComponent.cssnew file mode 100644index 0000000..cb04553--- /dev/null+++ b/frontend/src/assets/css/hookComponent.css@@ -0,0 +1,8 @@+.messageItems {+ position: fixed;+ /* top: 10px; */+ left: 50%;+ max-width: 90%;+ transform: translate(-50%, 0);+ transition: all 0.2s;+}diff --git a/frontend/src/assets/img/WMSTitle.png b/frontend/src/assets/img/WMSTitle.pngnew file mode 100644index 0000000..be808e2Binary files /dev/null and b/frontend/src/assets/img/WMSTitle.png differdiff --git a/frontend/src/assets/img/WMSTitleBig.png b/frontend/src/assets/img/WMSTitleBig.pngnew file mode 100644index 0000000..ff7f7abBinary files /dev/null and b/frontend/src/assets/img/WMSTitleBig.png differdiff --git a/frontend/src/assets/img/gitee.png b/frontend/src/assets/img/gitee.pngnew file mode 100644index 0000000..cc143a7Binary files /dev/null and b/frontend/src/assets/img/gitee.png differdiff --git a/frontend/src/assets/img/github.png b/frontend/src/assets/img/github.pngnew file mode 100644index 0000000..b96155aBinary files /dev/null and b/frontend/src/assets/img/github.png differdiff --git a/frontend/src/assets/img/loginLeft.png b/frontend/src/assets/img/loginLeft.pngnew file mode 100644index 0000000..1f96509Binary files /dev/null and b/frontend/src/assets/img/loginLeft.png differdiff --git a/frontend/src/assets/img/loginLeft2.png b/frontend/src/assets/img/loginLeft2.pngnew file mode 100644index 0000000..5531b27Binary files /dev/null and b/frontend/src/assets/img/loginLeft2.png differdiff --git a/frontend/src/assets/img/loginLeft3.png b/frontend/src/assets/img/loginLeft3.pngnew file mode 100644index 0000000..0257c61Binary files /dev/null and b/frontend/src/assets/img/loginLeft3.png differdiff --git a/frontend/src/assets/img/logo.png b/frontend/src/assets/img/logo.pngnew file mode 100644index 0000000..9476e3cBinary files /dev/null and b/frontend/src/assets/img/logo.png differdiff --git a/frontend/src/assets/img/webLogoMini.png b/frontend/src/assets/img/webLogoMini.pngnew file mode 100644index 0000000..cbe2a93Binary files /dev/null and b/frontend/src/assets/img/webLogoMini.png differdiff --git a/frontend/src/assets/warehouse.json b/frontend/src/assets/warehouse.jsonnew file mode 100644index 0000000..b2b3059--- /dev/null+++ b/frontend/src/assets/warehouse.json@@ -0,0 +1 @@+{"v":"5.6.5","fr":60,"ip":0,"op":181,"w":1579,"h":1370,"nm":"MovingTrolleyWithMan","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Group 71","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[789.309,684.93,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[1578.619,1369.86],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"rear_tyre_cast","parent":1,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[40]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":61,"s":[40]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":64,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":116,"s":[0]},{"t":120,"s":[40]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[56.828,396.001,0],"to":[1.167,-0.542,0],"ti":[-0.75,1.833,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":20,"s":[63.828,392.751,0],"to":[0.75,-1.833,0],"ti":[1.75,2.042,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":40,"s":[61.328,385.001,0],"to":[-1.75,-2.042,0],"ti":[2.958,1,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":60,"s":[53.328,380.501,0],"to":[-2.958,-1,0],"ti":[1.625,0.25,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":80,"s":[43.578,379.001,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":100,"s":[43.578,379.001,0],"to":[1.625,0.25,0],"ti":[-2.958,-1,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":120,"s":[53.328,380.501,0],"to":[2.958,1,0],"ti":[-1.75,-2.042,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":140,"s":[61.328,385.001,0],"to":[1.75,2.042,0],"ti":[0.75,-1.833,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":160,"s":[63.828,392.751,0],"to":[-0.75,1.833,0],"ti":[1.167,-0.542,0]},{"t":180,"s":[56.828,396.001,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[5,5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"op","nm":"Offset Paths 1","a":{"a":0,"k":-0.5,"ix":1},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"rear_tyre_cast Stroke","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[5,5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"rear_tyre_cast Fill","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"front_tyre_cast","parent":1,"sr":1,"ks":{"o":{"a":0,"k":40,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-152.172,391.001,0],"to":[0.042,0.5,0],"ti":[-1.042,0.792,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":30,"s":[-151.922,394.001,0],"to":[0.626,-0.476,0],"ti":[-1.514,1.924,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":60,"s":[-147.566,392.946,0],"to":[1.005,-1.278,0],"ti":[-0.083,0.881,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":80,"s":[-145.922,386.251,0],"to":[0.208,-2.208,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-150.672,380.751,0],"to":[0,0,0],"ti":[-0.083,0.881,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":100,"s":[-145.922,386.251,0],"to":[0.208,-2.208,0],"ti":[-1.514,1.924,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":120,"s":[-146.566,390.946,0],"to":[0.502,-0.638,0],"ti":[1.53,-0.896,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":130,"s":[-149.126,394.037,0],"to":[-1.534,0.899,0],"ti":[-0.522,0.396,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":140,"s":[-151.672,393.501,0],"to":[0.626,-0.476,0],"ti":[0.083,0.417,0]},{"t":180,"s":[-152.172,391.001,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[5,5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"op","nm":"Offset Paths 1","a":{"a":0,"k":-0.5,"ix":1},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"front_tyre_cast Stroke","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[5,5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"front_tyre_cast Fill","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"trolley","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-41.063,249.989,0],"to":[-3,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-59.063,249.989,0],"to":[0,0,0],"ti":[-3,0,0]},{"t":180,"s":[-41.063,249.989,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[281.21,312.557],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.543,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.543,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.543,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.543,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.554,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.554,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.554,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.554,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.027,-60.802,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.027,-60.802,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.027,-60.802,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.027,-60.802,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[50.217,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[60.217,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[60.217,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[50.217,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[50.227,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[60.227,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[60.227,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[50.227,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[49.7,-60.802,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[59.7,-60.802,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[59.7,-60.802,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[49.7,-60.802,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.87,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.87,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.87,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.87,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.88,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.88,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.88,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.88,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.353,-60.802,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.353,-60.802,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.353,-60.802,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.353,-60.802,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":14,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.543,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.543,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.543,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.543,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":15,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.554,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.554,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.554,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.554,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":16,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.027,2.9,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.027,2.9,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.027,2.9,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.027,2.9,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":17,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[50.217,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[60.217,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[60.217,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[50.217,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":18,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[50.227,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[60.227,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[60.227,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[50.227,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":19,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[49.7,2.9,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[59.7,2.9,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[59.7,2.9,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[49.7,2.9,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":20,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.87,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.87,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.87,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.87,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":21,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.88,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.88,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.88,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.88,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":22,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.353,2.9,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.353,2.9,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.353,2.9,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.353,2.9,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":23,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.543,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.543,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.543,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.543,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":24,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.554,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.554,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.554,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.554,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":25,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.027,66.603,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.027,66.603,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.027,66.603,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.027,66.603,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":26,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[50.217,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[60.217,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[60.217,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[50.217,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":27,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[50.227,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[60.227,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[60.227,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[50.227,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":28,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[49.7,66.603,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[59.7,66.603,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[59.7,66.603,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[49.7,66.603,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":29,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.87,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.87,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.87,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.87,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":30,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.88,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.88,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.88,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.88,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":31,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.353,66.603,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.353,66.603,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.353,66.603,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.353,66.603,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":32,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-71.645,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-60.645,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-60.645,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-78.645,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":33,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-71.634,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-60.634,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-60.634,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-78.634,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":34,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-72.161,-124.504,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-61.161,-124.504,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-61.161,-124.504,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-79.161,-124.504,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":35,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-69.971,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-58.971,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-58.971,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-76.971,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":36,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-69.96,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-58.96,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-58.96,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-76.96,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":37,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-70.488,-124.504,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-59.488,-124.504,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-59.488,-124.504,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-77.488,-124.504,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":38,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-73.318,-147.059,0],"to":[2.667,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-57.318,-147.059,0],"to":[1.833,0,0],"ti":[3.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-62.318,-147.059,0],"to":[-3.833,0,0],"ti":[3,0,0]},{"t":100,"s":[-80.318,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":39,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-73.307,-147.059,0],"to":[2.667,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-57.307,-147.059,0],"to":[1.833,0,0],"ti":[3.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-62.307,-147.059,0],"to":[-3.833,0,0],"ti":[3,0,0]},{"t":100,"s":[-80.307,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":40,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-73.835,-124.504,0],"to":[2.667,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-57.835,-124.504,0],"to":[1.833,0,0],"ti":[3.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-62.835,-124.504,0],"to":[-3.833,0,0],"ti":[3,0,0]},{"t":100,"s":[-80.835,-124.504,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":41,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-71.645,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-60.645,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-60.645,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-78.645,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":186,"st":0,"bm":0},{"ddd":0,"ind":42,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-71.634,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-60.634,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-60.634,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-78.634,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":43,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-72.161,-124.504,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-61.161,-124.504,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-61.161,-124.504,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-79.161,-124.504,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":44,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-69.971,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-58.971,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-58.971,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-76.971,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":45,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-69.96,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-58.96,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-58.96,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-76.96,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":46,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-70.488,-124.504,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-59.488,-124.504,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-59.488,-124.504,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-77.488,-124.504,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":47,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-73.318,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-62.318,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-62.318,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-80.318,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":48,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-73.307,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-62.307,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-62.307,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-80.307,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":49,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-73.835,-124.504,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-62.835,-124.504,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-62.835,-124.504,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-80.835,-124.504,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":50,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-78.645,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-68.645,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-68.645,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-78.645,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":51,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-78.634,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-68.634,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-68.634,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-78.634,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":52,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-79.161,-60.802,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-69.161,-60.802,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-69.161,-60.802,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-79.161,-60.802,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":53,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-76.971,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-66.971,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-66.971,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-76.971,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":54,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-76.96,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-66.96,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-66.96,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-76.96,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":55,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-77.488,-60.802,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-67.488,-60.802,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-67.488,-60.802,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-77.488,-60.802,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":56,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.318,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-70.318,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.318,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-80.318,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":57,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.307,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-70.307,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.307,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-80.307,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":58,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.835,-60.802,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-70.835,-60.802,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.835,-60.802,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-80.835,-60.802,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":59,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-78.645,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-68.645,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-68.645,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-78.645,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":60,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-78.634,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-68.634,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-68.634,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-78.634,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":61,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-79.161,2.9,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-69.161,2.9,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-69.161,2.9,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-79.161,2.9,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":62,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-76.971,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-66.971,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-66.971,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-76.971,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":63,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-76.96,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-66.96,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-66.96,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-76.96,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":64,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-77.488,2.9,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-67.488,2.9,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-67.488,2.9,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-77.488,2.9,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":65,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.318,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-70.318,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.318,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-80.318,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":66,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.307,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-70.307,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.307,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-80.307,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":67,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.835,2.9,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-70.835,2.9,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.835,2.9,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-80.835,2.9,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":68,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-78.645,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-68.645,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-68.645,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-78.645,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":69,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-78.634,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-68.634,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-68.634,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-78.634,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":70,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-79.161,66.603,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-69.161,66.603,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-69.161,66.603,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-79.161,66.603,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":71,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-76.971,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-66.971,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-66.971,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-76.971,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":72,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-76.96,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-66.96,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-66.96,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-76.96,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":73,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-77.488,66.603,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-67.488,66.603,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-67.488,66.603,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-77.488,66.603,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":74,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.318,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-70.318,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.318,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-80.318,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":75,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.307,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-70.307,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.307,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-80.307,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":76,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.835,66.603,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":15,"s":[-70.835,66.603,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.835,66.603,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":105,"s":[-80.835,66.603,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":77,"ty":4,"nm":"Path 366","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":4,"ix":10},"p":{"a":0,"k":[115.309,33.596,0],"ix":2},"a":{"a":0,"k":[5.023,16.764,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[0,0],[10.041,0.001],[10.045,33.528],[0.004,33.527]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"op","nm":"Offset Paths 1","a":{"a":0,"k":-0.5,"ix":1},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 366 Stroke","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[0,0],[10.041,0.001],[10.045,33.528],[0.004,33.527]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 366 Fill","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":78,"ty":4,"nm":"Path 353","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[127.665,0.092,0],"ix":2},"a":{"a":0,"k":[12.94,99.542,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.141,0.827],[1.159,0.58],[0.972,-0.411],[0.381,-0.985],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[-0.14,-1.29],[-0.97,-0.414],[-0.972,0.411],[0,0],[0,0],[0,0],[0,0],[0,0],[0.37,-0.753]],"v":[[25.822,3.158],[23.739,0.158],[21.44,0.642],[18.83,5.589],[4.184,38.153],[0,199.085],[6.694,199.085],[9.204,38.496],[25.471,5.589]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 353","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":79,"ty":4,"nm":"Path 355","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-4.777,108.308,0],"ix":2},"a":{"a":0,"k":[135.71,8.929,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[0,17.858],[0,2.771],[271.42,0],[271.42,8.975],[4.941,10.314],[4.941,17.858]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 355","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":80,"ty":4,"nm":"Path 354","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-4.761,93.977,0],"ix":2},"a":{"a":0,"k":[135.726,8.172,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[0,16.345],[22.593,2.096],[266.508,0],[271.453,13.702]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.396078431373,0.380392156863,0.490196078431,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 354","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":81,"ty":4,"nm":"Path 345","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[122.146,-0.085,0],"ix":2},"a":{"a":0,"k":[15.788,98.043,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.142,0.827],[1.159,0.58],[0.972,-0.411],[0.381,-0.985],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[-0.14,-1.29],[-0.97,-0.414],[-0.972,0.411],[0,0],[0,0],[0,0],[0,0],[0,0],[0.37,-0.753]],"v":[[30.006,3.512],[31.275,0.095],[30.44,1.138],[26.849,4.376],[4.184,41.859],[0,196.086],[6.694,196.086],[11.152,41.859],[29.655,5.943]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 345","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":82,"ty":4,"nm":"Path 320","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[100.359,121.917,0],"ix":2},"a":{"a":0,"k":[19.658,15.521,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.17,-0.019],[-0.513,0.833],[0,0]],"o":[[0,0],[0.471,0.849],[1.169,0.019],[0,0],[0,0]],"v":[[0,1.871],[15.475,29.617],[18.164,31.041],[20.924,29.705],[39.316,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 320","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":83,"ty":4,"nm":"Ellipse 111","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[98.786,137.573,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[29.88,23.694],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.396078431373,0.380392156863,0.490196078431,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 111","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":84,"ty":4,"nm":"Ellipse 110","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[98.786,137.573,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[47.179,37.412],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 110","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":85,"ty":4,"nm":"Path 319","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-99.589,121.072,0],"ix":2},"a":{"a":0,"k":[19.658,14.926,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.169,-0.018],[-0.513,0.802],[0,0]],"o":[[0,0],[0.47,0.817],[1.17,0.018],[0,0],[0,0]],"v":[[0,1.799],[15.475,28.483],[18.164,29.852],[20.924,28.567],[39.316,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 319","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":86,"ty":4,"nm":"Ellipse 109","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-101.161,136.128,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[29.88,22.786],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.396078431373,0.380392156863,0.490196078431,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 109","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":87,"ty":4,"nm":"Ellipse 108","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-101.161,136.128,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[47.179,35.979],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 108","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":88,"ty":4,"nm":"Path 315","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-77.965,114.776,0],"ix":2},"a":{"a":0,"k":[19.658,14.926,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.169,-0.018],[-0.513,0.802],[0,0]],"o":[[0,0],[0.47,0.817],[1.17,0.018],[0,0],[0,0]],"v":[[0,1.799],[15.475,28.483],[18.164,29.852],[20.924,28.567],[39.316,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 315","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":89,"ty":4,"nm":"Path 314","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-77.965,114.776,0],"ix":2},"a":{"a":0,"k":[19.658,14.926,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.169,-0.018],[-0.513,0.802],[0,0]],"o":[[0,0],[0.47,0.817],[1.17,0.018],[0,0],[0,0]],"v":[[0,1.799],[15.475,28.483],[18.164,29.852],[20.924,28.567],[39.316,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 314","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":90,"ty":4,"nm":"Ellipse 107","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-79.538,129.832,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[29.88,22.786],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 107","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":91,"ty":4,"nm":"Ellipse 106","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-79.538,129.832,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[29.88,22.786],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.396078431373,0.380392156863,0.490196078431,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 106","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":92,"ty":4,"nm":"Ellipse 105","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-79.538,129.832,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[47.179,35.979],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 105","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":93,"ty":4,"nm":"Ellipse 104","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-79.538,129.832,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[47.179,35.979],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 104","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":94,"ty":4,"nm":"Path 313","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[85.812,115.37,0],"ix":2},"a":{"a":0,"k":[19.658,15.521,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.17,-0.019],[-0.513,0.833],[0,0]],"o":[[0,0],[0.47,0.849],[1.17,0.019],[0,0],[0,0]],"v":[[0,1.871],[15.475,29.617],[18.164,31.041],[20.924,29.705],[39.316,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 313","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":95,"ty":4,"nm":"Path 312","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[85.812,115.37,0],"ix":2},"a":{"a":0,"k":[19.658,15.521,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.17,-0.019],[-0.513,0.833],[0,0]],"o":[[0,0],[0.47,0.849],[1.17,0.019],[0,0],[0,0]],"v":[[0,1.871],[15.475,29.617],[18.164,31.041],[20.924,29.705],[39.316,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 312","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":96,"ty":4,"nm":"Ellipse 103","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[84.239,131.026,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[29.88,23.694],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 103","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":97,"ty":4,"nm":"Ellipse 102","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[84.239,131.026,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[29.88,23.694],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.396078431373,0.380392156863,0.490196078431,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 102","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":98,"ty":4,"nm":"Ellipse 101","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[84.239,129.832,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[47.179,35.979],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 101","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":99,"ty":4,"nm":"Ellipse 100","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[84.24,131.026,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[47.179,37.412],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 100","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":100,"ty":4,"nm":"holding_shoulder","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":90,"s":[-5]},{"t":180,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[158.424,105.538,0],"to":[-0.958,1.042,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[152.674,111.788,0],"to":[0,0,0],"ti":[-0.958,1.042,0]},{"t":180,"s":[158.424,105.538,0]}],"ix":2},"a":{"a":0,"k":[17.288,17.773,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.818,-1.971],[0.612,-0.772],[0.662,-1.152],[2.068,-2.067],[0.1,-0.417],[-0.371,-0.437],[0,0],[-3.333,-0.269],[-1.191,0.352],[-0.726,0.559],[-1.666,1.581],[0.02,2.157],[0.426,1.827],[2.891,5.107],[2.978,-1.709]],"o":[[-0.85,0.528],[-0.77,1.12],[-1.419,2.522],[-0.335,0.283],[-0.013,0.563],[0,0],[3.346,0.282],[1.238,0.096],[0.851,-0.363],[2.008,-1.203],[1.666,-1.581],[0.03,-1.872],[-1.472,-5.76],[-1.412,-2.49],[-2.978,1.709]],"v":[[11.284,6.7],[9.075,8.665],[7.483,12.377],[0.67,17.868],[0.001,18.943],[0.556,20.492],[10.554,35.519],[20.406,34.072],[24.113,34.226],[26.489,32.837],[32.787,29.913],[34.573,23.852],[33.978,18.284],[25.003,2.975],[19.85,0.742]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.309803921569,0.298039215686,0.43137254902,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"holding_shoulder","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":101,"ty":4,"nm":"holding_arm","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-36]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":90,"s":[-31]},{"t":180,"s":[-36]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[132.911,124.62,0],"to":[-1.333,1.25,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[124.911,132.12,0],"to":[0,0,0],"ti":[-1.333,1.25,0]},{"t":180,"s":[132.911,124.62,0]}],"ix":2},"a":{"a":0,"k":[27.027,9.643,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.244,0.03],[0,0],[0.03,-5.271],[5.244,-0.03],[0,0],[-0.03,5.271]],"o":[[0,0],[5.244,-0.03],[-0.03,5.271],[0,0],[-5.244,0.03],[0.03,-5.271]],"v":[[9.55,0.199],[44.612,0],[54.054,9.49],[44.505,19.088],[9.442,19.286],[0,9.796]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"op","nm":"Offset Paths 1","a":{"a":0,"k":-0.5,"ix":1},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"holding_arm Stroke","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.244,0.03],[0,0],[0.03,-5.271],[5.244,-0.03],[0,0],[-0.03,5.271]],"o":[[0,0],[5.244,-0.03],[-0.03,5.271],[0,0],[-5.244,0.03],[0.03,-5.271]],"v":[[9.55,0.199],[44.612,0],[54.054,9.49],[44.505,19.088],[9.442,19.286],[0,9.796]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.752941176471,0.776470588235,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"holding_arm Fill","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":102,"ty":4,"nm":"holding_hand","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-30]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":90,"s":[-7]},{"t":180,"s":[-30]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[106.048,144.62,0],"to":[-2.458,0.917,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[91.298,150.12,0],"to":[0,0,0],"ti":[-2.458,0.917,0]},{"t":180,"s":[106.048,144.62,0]}],"ix":2},"a":{"a":0,"k":[19.679,12.241,0],"ix":1},"s":{"a":0,"k":[112,112,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[2.592,0.001],[1.65,1.556],[1.875,-0.27],[1.021,-0.935],[0,0],[0.415,-1.089],[-0.135,-0.691],[-1.079,-0.344],[-1.193,0.428],[-0.944,-1.12],[0.002,-0.63],[1.31,-0.161],[1.297,-0.175],[0.131,-0.116],[0.027,-0.172],[-0.636,-0.63],[-0.831,-0.288],[-1.092,-0.052],[-2.114,0.905],[-2.937,0.199],[-2.874,1.088],[-1.291,3.016],[0.032,0.299],[0.264,0.153],[4.307,1.964]],"o":[[-2.411,1.453],[-2.331,0.004],[-1.332,-1.235],[-1.255,0.18],[0,0],[-0.907,0.69],[-0.149,0.729],[0.153,1.226],[1.079,0.344],[1.483,-0.505],[0.389,0.415],[-0.091,1.389],[-1.31,0.161],[-0.156,-0.01],[-0.131,0.116],[-0.227,0.996],[0.631,0.618],[0.958,0.461],[2.168,0],[2.847,-1.209],[2.937,-0.199],[2.874,-1.088],[0.148,-0.283],[-0.089,-0.315],[-3.752,-2.889],[0,0]],"v":[[29.088,0.675],[22.651,3.229],[15.544,2.558],[10.985,0.031],[7.6,2.133],[2.153,7.152],[0.117,9.892],[0.097,12.046],[1.625,15.039],[5.162,13.965],[9.101,14.963],[9.701,16.585],[6.822,19.148],[2.997,19.112],[2.548,19.276],[2.301,19.726],[2.957,22.337],[5.169,23.708],[8.268,24.483],[14.636,22.133],[23.415,20.483],[32.202,19.031],[39.171,12.767],[39.349,11.868],[38.803,11.143],[30.733,3.309]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.752941176471,0.776470588235,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"holding_hand","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":103,"ty":4,"nm":"upper_body","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":90,"s":[-4]},{"t":180,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[235.526,108.691,0],"to":[-1,0.333,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[229.526,110.691,0],"to":[0,0,0],"ti":[-1,0.333,0]},{"t":180,"s":[235.526,108.691,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[143.213,188.336],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":104,"ty":4,"nm":"Path 332","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[39.743,-4.147,0],"ix":2},"a":{"a":0,"k":[18.356,22.253,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.934,-1.331],[-1.459,-1.626],[-1.466,-1.92],[-1.606,-1.715],[-1.619,-3.142],[4.645,-4.357],[0.766,-0.219],[0.674,0.784],[0.689,0.749],[2.321,0.221],[2.308,-0.151],[0.459,0.212],[0.185,0.355],[-0.957,5.03],[0,0],[-0.894,2.05],[-2.289,-0.512]],"o":[[1.879,1.167],[1.519,1.875],[1.466,1.92],[2.443,2.598],[-3.965,4.933],[-0.518,0.583],[-1.055,0.108],[-0.723,-0.717],[-1.624,-1.602],[-2.302,-0.214],[-0.507,0.057],[-0.342,-0.224],[-2.677,-4.403],[0,0],[0.319,-2.199],[0.83,-1.696],[2.289,0.512]],"v":[[17.164,5.078],[22.196,9.289],[26.044,15.388],[30.997,20.405],[36.712,29.308],[23.782,43.26],[21.815,44.488],[19.044,43.407],[17.123,41.045],[11.013,38.223],[4.087,38.127],[2.608,37.89],[1.805,37.007],[0.921,22.044],[3.109,10.524],[4.937,4.124],[9.902,0.06]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.309803921569,0.298039215686,0.43137254902,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 332","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":105,"ty":4,"nm":"Path 331","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-25.843,-79.028,0],"ix":2},"a":{"a":0,"k":[24.939,15.14,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.06,1.229],[-0.183,0.434],[-1.071,-0.23],[-4.437,-0.243],[-0.897,-4.16],[-2.195,3.132],[0.167,2.112],[2.436,1.926],[0,0],[1.215,0.479],[1.794,0],[4.772,-2.336],[1.446,-1.638],[0,0],[0.194,-0.645],[-0.174,-0.915],[-0.576,-1.594],[-2.061,-1.523],[-0.917,0.026]],"o":[[-0.042,-0.466],[0.542,-0.922],[4.303,1.037],[4.437,0.243],[3.216,-2.182],[1.231,-1.766],[-0.241,-3.046],[0,0],[-0.967,-0.851],[-1.707,-0.557],[-5.354,0],[-2.008,0.979],[0,0],[-0.495,0.476],[-0.187,0.909],[0.308,1.664],[0.957,2.656],[0.763,0.563],[1.586,-0.032]],"v":[[12.697,25.198],[12.912,23.828],[15.943,23.419],[29.221,23.758],[39.541,30.279],[47.725,22.241],[49.86,16.347],[44.506,9.096],[37.145,3.336],[33.845,1.326],[28.492,1.038],[12.624,1.038],[7.678,5.339],[1.093,12.788],[0.042,14.497],[0.517,17.217],[0.651,22.254],[7.042,26.811],[9.927,29.275]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.376470588235,0.364705882353,0.509803921569,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 331","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":106,"ty":4,"nm":"Path 329","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[45.338,44.927,0],"ix":2},"a":{"a":0,"k":[26.268,44.068,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.6,1.318],[0,0],[-1.071,-1.382],[-1.529,-4.032],[0.415,-3.174],[0.634,-1.534],[1.477,-2.76],[1.542,-1.898],[5.009,-4.741],[0.797,-2.394],[3.46,-3.264],[1.33,-0.883],[2.37,0.044],[0.947,0.398],[0.248,2.496],[-0.973,2.079],[-5.709,4.864],[-2.53,3.539],[-1.119,2.537],[-1.118,3.302],[-0.475,1.389],[0.89,1.197],[0.964,0.378],[0.696,3.859],[-1.328,1.74],[-1.732,1.342]],"o":[[0,0],[1.178,1.28],[2.635,3.47],[1.191,2.989],[-0.278,1.627],[-1.004,2.948],[-1.233,2.094],[-4.245,5.379],[-1.874,1.773],[-1.506,4.422],[-1.113,1.125],[-1.992,1.229],[-1.034,0.006],[-2.369,-1.075],[-0.219,-2.268],[3.145,-6.662],[3.346,-2.848],[1.713,-2.212],[1.272,-3.258],[0.468,-1.402],[0.475,-1.389],[-0.667,-0.765],[-3.647,-1.766],[-0.279,-2.137],[1.32,-1.717],[1.586,-1.37]],"v":[[35.488,0],[40.969,5.99],[44.396,9.933],[50.673,21.241],[52.44,30.592],[51.068,35.347],[47.34,43.923],[43.171,49.919],[29.271,65.119],[25.797,72.159],[17.251,83.295],[13.577,86.316],[6.885,88.133],[3.88,87.538],[0.059,81.349],[1.21,74.719],[18.141,60.306],[26.58,50.335],[30.844,43.187],[32.737,32.774],[34.551,28.723],[34.297,24.493],[31.814,22.752],[23.388,14.848],[25.021,8.813],[29.619,4.205]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.752941176471,0.776470588235,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 329","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":107,"ty":4,"nm":"Path 327","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-19.409,27.884,0],"ix":2},"a":{"a":0,"k":[52.197,66.284,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.062,-1.134],[4.44,-0.113],[0.571,0.259],[0.173,0.352],[0.764,2.414],[1.131,0.275],[0.609,-0.685],[0.628,-0.668],[2.804,-2.08],[0.495,-0.314],[0.544,-0.144],[5.202,-2.284],[-4.39,-10.08],[-1.673,-4.947],[-0.047,-11.526],[2.677,-7.462],[0.167,-1.754],[-1.506,-1.05],[-1.04,-0.093],[-4.551,1.011],[-12.414,1.51],[0,0],[-1.356,0.607],[2.369,3.482],[0.957,1.766],[-1.64,1.222],[-0.161,4.045],[0.567,11.298],[-0.09,2.347],[-1.031,3.872],[0,0],[2.991,0.717],[2.951,0.877],[6.311,-0.422],[0.429,-0.203],[0.087,-1.562],[2.931,-2.029],[2.697,-2.31]],"o":[[-1.465,-4.009],[-0.621,0.113],[-0.324,-0.236],[-1.278,-2.206],[-0.335,-1.069],[-0.91,-0.224],[-0.54,0.735],[-2.677,2.266],[-0.462,0.339],[-0.482,0.281],[-5.443,1.694],[1.874,10.777],[2.088,4.8],[3.708,10.963],[0,7.885],[-0.602,1.69],[-0.167,1.754],[0.872,0.55],[4.625,0.64],[12.2,-2.701],[0,0],[1.493,-0.1],[3.808,-1.99],[-1.131,-1.67],[-0.957,-1.766],[3.346,-2.496],[0.446,-11.315],[-0.17,-2.343],[0.234,-3.981],[0,0],[-1.653,-2.496],[-2.991,-0.717],[-6.023,-1.792],[-0.479,0.008],[-1.419,0.774],[-0.201,3.462],[-2.931,2.029],[-0.948,0.684]],"v":[[50.735,21.698],[40.824,15.157],[38.99,14.933],[38.234,14.037],[35.162,7.087],[33.234,4.482],[30.785,5.506],[29.032,7.612],[18.866,9.89],[17.527,10.978],[15.981,11.618],[0,17.589],[8.178,49.429],[14.302,63.88],[18.217,98.1],[15.54,121.498],[14.034,126.618],[15.921,131.405],[18.832,132.384],[32.665,130.848],[69.728,125.088],[90.541,122.529],[94.851,121.46],[96.651,110.509],[92.964,105.703],[93.573,100.231],[96.076,89.063],[95.895,55.144],[95.775,48.104],[98.07,36.354],[104.395,12.546],[96.584,7.746],[87.516,5.941],[69.775,0.028],[68.396,0.348],[67.111,4.642],[61.316,13.019],[52.328,18.831]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.309803921569,0.298039215686,0.43137254902,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 327","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":108,"ty":4,"nm":"Ellipse 112","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-25.811,-60.816,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[42.162,40.32],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.752941176471,0.776470588235,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 112","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":109,"ty":4,"nm":"Path 326","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-24.742,-72.686,0],"ix":2},"a":{"a":0,"k":[24.942,15.14,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.047,1.229],[-0.184,0.434],[-1.071,-0.23],[-4.437,-0.243],[-0.89,-4.16],[-2.192,3.135],[0.167,2.112],[2.443,1.933],[0,0],[1.217,0.479],[1.794,0],[4.772,-2.336],[1.446,-1.638],[0,0],[0.196,-0.646],[-0.174,-0.915],[-0.576,-1.6],[-2.061,-1.523],[-0.917,0.026]],"o":[[-0.047,-0.466],[0.542,-0.915],[4.303,1.037],[4.437,0.243],[3.219,-2.179],[1.231,-1.76],[-0.241,-3.046],[0,0],[-0.97,-0.851],[-1.7,-0.557],[-5.354,0],[-2.008,0.979],[0,0],[-0.498,0.475],[-0.187,0.909],[0.308,1.664],[0.957,2.65],[0.763,0.563],[1.613,-0.032]],"v":[[12.711,25.198],[12.918,23.828],[15.95,23.419],[29.228,23.758],[39.547,30.279],[47.732,22.241],[49.867,16.353],[44.513,9.096],[37.151,3.336],[33.845,1.326],[28.492,1.038],[12.624,1.038],[7.678,5.339],[1.099,12.788],[0.042,14.497],[0.517,17.217],[0.651,22.26],[7.042,26.811],[9.927,29.275]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 326","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":110,"ty":4,"nm":"Path 321","parent":103,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-17.258,-24.946,0],"ix":2},"a":{"a":0,"k":[24.219,27.249,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.09,-2.654],[1.231,-4.006],[-4.39,-4.736],[-10.677,-0.483],[-1.487,0.445],[-0.982,0.994],[-0.703,4.422],[0.274,4.461],[0.345,0.862],[0.749,0.586],[2.807,1.516],[0.77,1.107],[0.139,1.007],[0,0],[0.68,1.031],[2.55,0.096],[0,0],[2.844,-0.55],[-0.482,-2.125]],"o":[[-0.489,4.16],[-1.847,6.048],[7.147,7.601],[1.553,0.128],[1.325,-0.516],[3.293,-3.168],[0.703,-4.422],[0,-0.923],[-0.448,-0.82],[-2.374,-2.086],[-1.205,-0.64],[-0.528,-0.882],[0,0],[-0.153,-1.211],[-1.519,-1.958],[0,0],[-2.911,-0.109],[-2.677,0.506],[0.697,2.57]],"v":[[5.574,13.023],[0.535,24.543],[6.264,41.823],[34.118,54.456],[38.722,53.976],[42.222,51.685],[47.991,39.711],[48.151,26.329],[47.629,23.628],[45.816,21.497],[38.019,16.076],[34.753,13.689],[33.743,10.828],[32.879,6.63],[31.614,3.225],[24.634,0.902],[15.265,0.55],[5.681,0.191],[4.39,5.164]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 321","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":111,"ty":4,"nm":"Path 84","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[39.743,-4.147,0],"ix":2},"a":{"a":0,"k":[18.356,22.253,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.934,-1.331],[-1.459,-1.626],[-1.466,-1.92],[-1.606,-1.715],[-1.619,-3.142],[4.645,-4.357],[0.766,-0.219],[0.674,0.784],[0.689,0.749],[2.321,0.221],[2.308,-0.151],[0.459,0.212],[0.185,0.355],[-0.957,5.03],[0,0],[-0.894,2.05],[-2.289,-0.512]],"o":[[1.879,1.167],[1.519,1.875],[1.466,1.92],[2.443,2.598],[-3.965,4.933],[-0.518,0.583],[-1.055,0.108],[-0.723,-0.717],[-1.624,-1.602],[-2.302,-0.214],[-0.507,0.057],[-0.342,-0.224],[-2.677,-4.403],[0,0],[0.319,-2.199],[0.83,-1.696],[2.289,0.512]],"v":[[17.164,5.078],[22.196,9.289],[26.044,15.388],[30.997,20.405],[36.712,29.308],[23.782,43.26],[21.815,44.488],[19.044,43.407],[17.123,41.045],[11.013,38.223],[4.087,38.127],[2.608,37.89],[1.805,37.007],[0.921,22.044],[3.109,10.524],[4.937,4.124],[9.902,0.06]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.309803921569,0.298039215686,0.43137254902,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 84","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":112,"ty":4,"nm":"Path 82","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-25.843,-79.028,0],"ix":2},"a":{"a":0,"k":[24.939,15.14,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.06,1.229],[-0.183,0.434],[-1.071,-0.23],[-4.437,-0.243],[-0.897,-4.16],[-2.195,3.132],[0.167,2.112],[2.436,1.926],[0,0],[1.215,0.479],[1.794,0],[4.772,-2.336],[1.446,-1.638],[0,0],[0.194,-0.645],[-0.174,-0.915],[-0.576,-1.594],[-2.061,-1.523],[-0.917,0.026]],"o":[[-0.042,-0.466],[0.542,-0.922],[4.303,1.037],[4.437,0.243],[3.216,-2.182],[1.231,-1.766],[-0.241,-3.046],[0,0],[-0.967,-0.851],[-1.707,-0.557],[-5.354,0],[-2.008,0.979],[0,0],[-0.495,0.476],[-0.187,0.909],[0.308,1.664],[0.957,2.656],[0.763,0.563],[1.586,-0.032]],"v":[[12.697,25.198],[12.912,23.828],[15.943,23.419],[29.221,23.758],[39.541,30.279],[47.725,22.241],[49.86,16.347],[44.506,9.096],[37.145,3.336],[33.845,1.326],[28.492,1.038],[12.624,1.038],[7.678,5.339],[1.093,12.788],[0.042,14.497],[0.517,17.217],[0.651,22.254],[7.042,26.811],[9.927,29.275]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.376470588235,0.364705882353,0.509803921569,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 82","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":113,"ty":4,"nm":"Path 80","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[45.338,44.927,0],"ix":2},"a":{"a":0,"k":[26.268,44.068,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.6,1.318],[0,0],[-1.071,-1.382],[-1.529,-4.032],[0.415,-3.174],[0.634,-1.534],[1.477,-2.76],[1.542,-1.898],[5.009,-4.741],[0.797,-2.394],[3.46,-3.264],[1.33,-0.883],[2.37,0.044],[0.947,0.398],[0.248,2.496],[-0.973,2.079],[-5.709,4.864],[-2.53,3.539],[-1.119,2.537],[-1.118,3.302],[-0.475,1.389],[0.89,1.197],[0.964,0.378],[0.696,3.859],[-1.328,1.74],[-1.732,1.342]],"o":[[0,0],[1.178,1.28],[2.635,3.47],[1.191,2.989],[-0.278,1.627],[-1.004,2.948],[-1.233,2.094],[-4.245,5.379],[-1.874,1.773],[-1.506,4.422],[-1.113,1.125],[-1.992,1.229],[-1.034,0.006],[-2.369,-1.075],[-0.219,-2.268],[3.145,-6.662],[3.346,-2.848],[1.713,-2.212],[1.272,-3.258],[0.468,-1.402],[0.475,-1.389],[-0.667,-0.765],[-3.647,-1.766],[-0.279,-2.137],[1.32,-1.717],[1.586,-1.37]],"v":[[35.488,0],[40.969,5.99],[44.396,9.933],[50.673,21.241],[52.44,30.592],[51.068,35.347],[47.34,43.923],[43.171,49.919],[29.271,65.119],[25.797,72.159],[17.251,83.295],[13.577,86.316],[6.885,88.133],[3.88,87.538],[0.059,81.349],[1.21,74.719],[18.141,60.306],[26.58,50.335],[30.844,43.187],[32.737,32.774],[34.551,28.723],[34.297,24.493],[31.814,22.752],[23.388,14.848],[25.021,8.813],[29.619,4.205]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.752941176471,0.776470588235,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 80","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":114,"ty":4,"nm":"Path 78","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-19.409,27.884,0],"ix":2},"a":{"a":0,"k":[52.197,66.284,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.062,-1.134],[4.44,-0.113],[0.571,0.259],[0.173,0.352],[0.764,2.414],[1.131,0.275],[0.609,-0.685],[0.628,-0.668],[2.804,-2.08],[0.495,-0.314],[0.544,-0.144],[5.202,-2.284],[-4.39,-10.08],[-1.673,-4.947],[-0.047,-11.526],[2.677,-7.462],[0.167,-1.754],[-1.506,-1.05],[-1.04,-0.093],[-4.551,1.011],[-12.414,1.51],[0,0],[-1.356,0.607],[2.369,3.482],[0.957,1.766],[-1.64,1.222],[-0.161,4.045],[0.567,11.298],[-0.09,2.347],[-1.031,3.872],[0,0],[2.991,0.717],[2.951,0.877],[6.311,-0.422],[0.429,-0.203],[0.087,-1.562],[2.931,-2.029],[2.697,-2.31]],"o":[[-1.465,-4.009],[-0.621,0.113],[-0.324,-0.236],[-1.278,-2.206],[-0.335,-1.069],[-0.91,-0.224],[-0.54,0.735],[-2.677,2.266],[-0.462,0.339],[-0.482,0.281],[-5.443,1.694],[1.874,10.777],[2.088,4.8],[3.708,10.963],[0,7.885],[-0.602,1.69],[-0.167,1.754],[0.872,0.55],[4.625,0.64],[12.2,-2.701],[0,0],[1.493,-0.1],[3.808,-1.99],[-1.131,-1.67],[-0.957,-1.766],[3.346,-2.496],[0.446,-11.315],[-0.17,-2.343],[0.234,-3.981],[0,0],[-1.653,-2.496],[-2.991,-0.717],[-6.023,-1.792],[-0.479,0.008],[-1.419,0.774],[-0.201,3.462],[-2.931,2.029],[-0.948,0.684]],"v":[[50.735,21.698],[40.824,15.157],[38.99,14.933],[38.234,14.037],[35.162,7.087],[33.234,4.482],[30.785,5.506],[29.032,7.612],[18.866,9.89],[17.527,10.978],[15.981,11.618],[0,17.589],[8.178,49.429],[14.302,63.88],[18.217,98.1],[15.54,121.498],[14.034,126.618],[15.921,131.405],[18.832,132.384],[32.665,130.848],[69.728,125.088],[90.541,122.529],[94.851,121.46],[96.651,110.509],[92.964,105.703],[93.573,100.231],[96.076,89.063],[95.895,55.144],[95.775,48.104],[98.07,36.354],[104.395,12.546],[96.584,7.746],[87.516,5.941],[69.775,0.028],[68.396,0.348],[67.111,4.642],[61.316,13.019],[52.328,18.831]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.309803921569,0.298039215686,0.43137254902,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 78","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":115,"ty":4,"nm":"Ellipse 51","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-25.81,-60.816,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[42.162,40.32],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.752941176471,0.776470588235,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 51","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":116,"ty":4,"nm":"Path 77","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-24.742,-72.686,0],"ix":2},"a":{"a":0,"k":[24.942,15.14,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.047,1.229],[-0.184,0.434],[-1.071,-0.23],[-4.437,-0.243],[-0.89,-4.16],[-2.192,3.135],[0.167,2.112],[2.443,1.933],[0,0],[1.217,0.479],[1.794,0],[4.772,-2.336],[1.446,-1.638],[0,0],[0.196,-0.646],[-0.174,-0.915],[-0.576,-1.6],[-2.061,-1.523],[-0.917,0.026]],"o":[[-0.047,-0.466],[0.542,-0.915],[4.303,1.037],[4.437,0.243],[3.219,-2.179],[1.231,-1.76],[-0.241,-3.046],[0,0],[-0.97,-0.851],[-1.7,-0.557],[-5.354,0],[-2.008,0.979],[0,0],[-0.498,0.475],[-0.187,0.909],[0.308,1.664],[0.957,2.65],[0.763,0.563],[1.613,-0.032]],"v":[[12.711,25.198],[12.918,23.828],[15.95,23.419],[29.228,23.758],[39.547,30.279],[47.732,22.241],[49.867,16.353],[44.513,9.096],[37.151,3.336],[33.845,1.326],[28.492,1.038],[12.624,1.038],[7.678,5.339],[1.099,12.788],[0.042,14.497],[0.517,17.217],[0.651,22.26],[7.042,26.811],[9.927,29.275]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 77","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":117,"ty":4,"nm":"Path 71","parent":103,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-17.258,-24.946,0],"ix":2},"a":{"a":0,"k":[24.219,27.249,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.09,-2.654],[1.231,-4.006],[-4.39,-4.736],[-10.677,-0.483],[-1.487,0.445],[-0.982,0.994],[-0.703,4.422],[0.274,4.461],[0.345,0.862],[0.749,0.586],[2.807,1.516],[0.77,1.107],[0.139,1.007],[0,0],[0.68,1.031],[2.55,0.096],[0,0],[2.844,-0.55],[-0.482,-2.125]],"o":[[-0.489,4.16],[-1.847,6.048],[7.147,7.601],[1.553,0.128],[1.325,-0.516],[3.293,-3.168],[0.703,-4.422],[0,-0.923],[-0.448,-0.82],[-2.374,-2.086],[-1.205,-0.64],[-0.528,-0.882],[0,0],[-0.153,-1.211],[-1.519,-1.958],[0,0],[-2.911,-0.109],[-2.677,0.506],[0.697,2.57]],"v":[[5.574,13.023],[0.535,24.543],[6.264,41.823],[34.118,54.456],[38.722,53.976],[42.222,51.685],[47.991,39.711],[48.151,26.329],[47.629,23.628],[45.816,21.497],[38.019,16.076],[34.753,13.689],[33.743,10.828],[32.879,6.63],[31.614,3.225],[24.634,0.902],[15.265,0.55],[5.681,0.191],[4.39,5.164]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 71","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":118,"ty":4,"nm":"Path 70","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-17.258,-24.946,0],"ix":2},"a":{"a":0,"k":[24.219,27.249,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.09,-2.654],[1.231,-4.006],[-4.39,-4.736],[-10.677,-0.483],[-1.487,0.445],[-0.982,0.994],[-0.703,4.422],[0.274,4.461],[0.345,0.862],[0.749,0.586],[2.807,1.516],[0.77,1.107],[0.139,1.007],[0,0],[0.68,1.031],[2.55,0.096],[0,0],[2.844,-0.55],[-0.482,-2.125]],"o":[[-0.489,4.16],[-1.847,6.048],[7.147,7.601],[1.553,0.128],[1.325,-0.516],[3.293,-3.168],[0.703,-4.422],[0,-0.923],[-0.448,-0.82],[-2.374,-2.086],[-1.205,-0.64],[-0.528,-0.882],[0,0],[-0.153,-1.211],[-1.519,-1.958],[0,0],[-2.911,-0.109],[-2.677,0.506],[0.697,2.57]],"v":[[5.574,13.023],[0.535,24.543],[6.264,41.823],[34.118,54.456],[38.722,53.976],[42.222,51.685],[47.991,39.711],[48.151,26.329],[47.629,23.628],[45.816,21.497],[38.019,16.076],[34.753,13.689],[33.743,10.828],[32.879,6.63],[31.614,3.225],[24.634,0.902],[15.265,0.55],[5.681,0.191],[4.39,5.164]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.752941176471,0.776470588235,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 70","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":119,"ty":4,"nm":"lower_body","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[235.144,302.048,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[103.212,230.799],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":120,"ty":4,"nm":"Path 322","parent":119,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-0.05,13.727,0],"ix":2},"a":{"a":0,"k":[24.584,79.501,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.403,-3.757],[0,0],[2.034,-10.79],[0.977,-3.667],[1.272,-10.438],[0.034,-0.275],[0.85,-2.15],[0.689,-1.574],[0.167,-3.411],[5.479,0.78],[1.774,1.92],[-0.335,2.803],[-1.044,8.695],[-0.988,3.636],[-0.442,1.19],[-0.462,1.683],[-0.242,2.763],[-1.138,8.749],[0,0],[0.375,13.357],[0.134,1.984],[-2.469,1.798],[-3.145,1.299],[-0.408,-1.395],[-0.023,-3.077],[0.403,-3.757]],"o":[[0,0],[-1.037,10.931],[-0.669,3.718],[-2.717,10.182],[-0.04,0.301],[-0.261,2.304],[-0.669,1.594],[-1.339,3.149],[-4.824,-2.604],[-2.677,-0.378],[-2.008,-2.086],[1.053,-8.704],[0.348,-3.742],[0.361,-1.21],[0.609,-1.638],[0.64,-2.704],[1.078,-8.755],[0,0],[1.707,-13.261],[-0.054,-1.978],[-0.188,-2.874],[2.751,-1.984],[1.693,-0.704],[0.866,2.963],[0.038,3.776],[0,0]],"v":[[48.615,20.609],[44.64,62.286],[40.511,94.983],[38.008,106.067],[30.077,136.64],[29.97,137.555],[28.632,144.339],[26.33,148.96],[24.61,159.001],[9.023,153.881],[1.661,151.321],[0.223,143.238],[3.368,117.139],[5.376,106.055],[6.614,102.464],[8.3,97.504],[9.625,89.293],[13.139,63.054],[13.199,62.593],[15.829,22.651],[15.555,16.712],[17.563,10.517],[27.079,5.845],[47.826,0.2],[49.164,9.301],[48.615,20.609]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.376470588235,0.364705882353,0.509803921569,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 322","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":121,"ty":4,"nm":"Path 323","parent":119,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-6.297,-19.719,0],"ix":2},"a":{"a":0,"k":[45.309,95.68,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.195,-7.895],[-1.419,-8.384],[0,0],[-4.685,-8.48],[-4.571,-5.69],[-10.648,-14.4],[-5.28,0.877],[-2.717,2.125],[-2.53,3.149],[3.427,2.24],[1.325,0.486],[2.182,5.018],[2.911,4.666],[5.448,10.592],[0.228,6.573],[0,0],[-0.783,1.683],[-5.1,0.57],[-5.124,2.644],[-1.559,2.816],[-0.167,2.906],[0,0],[0.957,2.458],[6.9,-0.294],[12.127,-3.571],[3.099,-0.595],[2.57,-0.832],[0.649,-3.993]],"o":[[0.274,8.486],[0,0],[1.599,9.472],[3.507,6.349],[11.23,13.99],[3.099,4.186],[3.467,-0.57],[3.212,-2.509],[2.53,-3.149],[-1.171,-0.762],[-5.307,-1.92],[-2.182,-5.018],[-6.331,-10.131],[-3.052,-5.926],[0,0],[-0.067,-1.843],[2.081,-4.48],[5.783,-0.646],[2.938,-1.517],[1.432,-2.56],[0,0],[0.154,-2.624],[-2.429,-6.182],[-12.836,0.55],[-3.005,0.883],[-2.677,0.518],[-4.604,1.485],[-1.339,7.793]],"v":[[0.037,51.541],[3.149,76.827],[6.074,94.107],[14.031,121.716],[27.155,139.168],[57.471,183.411],[70.274,191.251],[78.974,185.792],[88.584,178.298],[88.183,167.686],[84.261,166.15],[73.332,154.247],[66.908,139.181],[42.179,113.108],[38.605,93.735],[38.01,76.897],[38.679,71.457],[52.151,65.985],[68.661,61.006],[76.023,54.741],[77.816,46.261],[79.583,15.739],[78.914,7.938],[61.42,0.028],[24.612,9.429],[15.49,11.701],[6.897,12.84],[1.757,27.957]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.376470588235,0.364705882353,0.509803921569,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 323","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":122,"ty":4,"nm":"Path 324","parent":119,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[32.989,83.972,0],"ix":2},"a":{"a":0,"k":[18.617,26.559,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-2.269,-2.182],[-0.294,-1.51],[-0.056,-8.527],[-0.384,-0.709],[-0.499,-0.208],[-2.73,2.285],[-0.288,6.419],[-0.301,1.632],[-1.298,2.112],[-1.337,3.98],[1.231,1.043],[0.528,0.15],[0,0],[0.502,-0.858],[2.483,-0.486],[2.369,-1.21]],"o":[[1.131,1.094],[1.636,8.382],[-0.073,0.795],[0.321,0.42],[3.273,1.491],[5.053,-4.23],[0.074,-1.651],[0.442,-2.419],[2.221,-3.6],[0.495,-1.498],[-0.431,-0.328],[0,0],[-1.285,-0.454],[-1.238,2.093],[-2.483,0.486],[-4.015,2.042]],"v":[[2.556,19.731],[4.349,23.936],[6.893,49.35],[7.368,51.654],[8.619,52.614],[18.417,49.74],[28.034,33.407],[28.215,28.454],[31.434,21.817],[36.788,10.413],[36.386,5.99],[34.934,5.267],[20.143,0.019],[15.171,8.249],[10.219,12.013],[2.302,13.005]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.266666666667,0.254901960784,0.403921568627,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 324","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":123,"ty":4,"nm":"Path 325","parent":119,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-10.082,97.469,0],"ix":2},"a":{"a":0,"k":[12.609,17.931,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.991,5.011],[0.468,0.377],[0.807,0.067],[1.948,-2.003],[1.519,-2.112],[0.415,-0.704],[-0.076,-1.183],[-0.241,-3.251],[-1.787,-2.138],[-4.578,-0.218],[0,0],[-0.982,0.291],[-0.447,1.222],[1.887,4.608]],"o":[[-0.274,-0.523],[-0.684,-0.416],[-2.811,-0.461],[-1.82,1.875],[-0.482,0.64],[-0.516,1.078],[-0.08,3.258],[0.194,2.726],[2.864,3.43],[0,0],[1.021,0.114],[1.23,-0.541],[1.934,-4.595],[-2.175,-5.306]],"v":[[16.811,2.438],[15.687,1.075],[13.418,0.339],[5.327,1.581],[2.302,8.621],[0.75,10.541],[0.08,13.984],[0.161,23.763],[2.617,31.487],[15.225,35.628],[18.94,35.814],[21.978,35.545],[24.601,32.787],[21.59,18.636]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.266666666667,0.254901960784,0.403921568627,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 325","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":124,"ty":4,"nm":"Path 76","parent":119,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-10.082,97.469,0],"ix":2},"a":{"a":0,"k":[12.609,17.931,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.991,5.011],[0.468,0.377],[0.807,0.067],[1.948,-2.003],[1.519,-2.112],[0.415,-0.704],[-0.076,-1.183],[-0.241,-3.251],[-1.787,-2.138],[-4.578,-0.218],[0,0],[-0.982,0.291],[-0.447,1.222],[1.887,4.608]],"o":[[-0.274,-0.523],[-0.684,-0.416],[-2.811,-0.461],[-1.82,1.875],[-0.482,0.64],[-0.516,1.078],[-0.08,3.258],[0.194,2.726],[2.864,3.43],[0,0],[1.021,0.114],[1.23,-0.541],[1.934,-4.595],[-2.175,-5.306]],"v":[[16.811,2.438],[15.687,1.075],[13.418,0.339],[5.327,1.581],[2.302,8.621],[0.75,10.541],[0.08,13.984],[0.161,23.763],[2.617,31.487],[15.225,35.628],[18.94,35.814],[21.978,35.545],[24.601,32.787],[21.59,18.636]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,0],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 76","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":125,"ty":4,"nm":"Path 75","parent":119,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[32.989,83.972,0],"ix":2},"a":{"a":0,"k":[18.617,26.559,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-2.269,-2.182],[-0.294,-1.51],[-0.056,-8.527],[-0.384,-0.709],[-0.499,-0.208],[-2.73,2.285],[-0.288,6.419],[-0.301,1.632],[-1.298,2.112],[-1.337,3.98],[1.231,1.043],[0.528,0.15],[0,0],[0.502,-0.858],[2.483,-0.486],[2.369,-1.21]],"o":[[1.131,1.094],[1.636,8.382],[-0.073,0.795],[0.321,0.42],[3.273,1.491],[5.053,-4.23],[0.074,-1.651],[0.442,-2.419],[2.221,-3.6],[0.495,-1.498],[-0.431,-0.328],[0,0],[-1.285,-0.454],[-1.238,2.093],[-2.483,0.486],[-4.015,2.042]],"v":[[2.556,19.731],[4.349,23.936],[6.893,49.35],[7.368,51.654],[8.619,52.614],[18.417,49.74],[28.034,33.407],[28.215,28.454],[31.434,21.817],[36.788,10.413],[36.386,5.99],[34.934,5.267],[20.143,0.019],[15.171,8.249],[10.219,12.013],[2.302,13.005]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,0],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 75","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":126,"ty":4,"nm":"Path 74","parent":119,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-6.298,-19.719,0],"ix":2},"a":{"a":0,"k":[45.309,95.68,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.195,-7.895],[-1.419,-8.384],[0,0],[-4.685,-8.48],[-4.571,-5.69],[-10.648,-14.4],[-5.28,0.877],[-2.717,2.125],[-2.53,3.149],[3.427,2.24],[1.325,0.486],[2.182,5.018],[2.911,4.666],[5.448,10.592],[0.228,6.573],[0,0],[-0.783,1.683],[-5.1,0.57],[-5.124,2.644],[-1.559,2.816],[-0.167,2.906],[0,0],[0.957,2.458],[6.9,-0.294],[12.127,-3.571],[3.099,-0.595],[2.57,-0.832],[0.649,-3.993]],"o":[[0.274,8.486],[0,0],[1.599,9.472],[3.507,6.349],[11.23,13.99],[3.099,4.186],[3.467,-0.57],[3.212,-2.509],[2.53,-3.149],[-1.171,-0.762],[-5.307,-1.92],[-2.182,-5.018],[-6.331,-10.131],[-3.052,-5.926],[0,0],[-0.067,-1.843],[2.081,-4.48],[5.783,-0.646],[2.938,-1.517],[1.432,-2.56],[0,0],[0.154,-2.624],[-2.429,-6.182],[-12.836,0.55],[-3.005,0.883],[-2.677,0.518],[-4.604,1.485],[-1.339,7.793]],"v":[[0.037,51.541],[3.149,76.827],[6.074,94.107],[14.031,121.716],[27.155,139.168],[57.471,183.411],[70.274,191.251],[78.974,185.792],[88.584,178.298],[88.183,167.686],[84.261,166.15],[73.332,154.247],[66.908,139.181],[42.179,113.108],[38.605,93.735],[38.01,76.897],[38.679,71.457],[52.151,65.985],[68.661,61.006],[76.023,54.741],[77.816,46.261],[79.583,15.739],[78.914,7.938],[61.42,0.028],[24.612,9.429],[15.49,11.701],[6.897,12.84],[1.757,27.957]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.376470588235,0.364705882353,0.509803921569,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 74","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":127,"ty":4,"nm":"Path 73","parent":119,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-1.105,34.3,0],"ix":2},"a":{"a":0,"k":[16.982,37.481,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.178,-0.311],[0.977,-3.667],[1.271,-10.438],[0.033,-0.275],[8.111,11.475],[-0.462,1.683],[-0.261,2.782],[-1.138,8.749],[0,0],[-0.865,-1.722],[-6.331,-10.131]],"o":[[-0.669,3.718],[-2.717,10.182],[-0.04,0.301],[-8.312,-11.353],[0.609,-1.638],[0.665,-2.72],[1.078,-8.755],[0,0],[0.47,1.857],[5.448,10.585],[0.21,0.316]],"v":[[33.964,32.39],[31.461,43.475],[23.53,74.047],[23.423,74.962],[0,39.923],[1.686,34.963],[3.078,26.7],[6.592,0.461],[6.652,0],[8.66,5.382],[33.382,31.449]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 73","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":128,"ty":4,"nm":"Path 72","parent":119,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-0.049,13.727,0],"ix":2},"a":{"a":0,"k":[24.584,79.501,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.403,-3.757],[0,0],[2.034,-10.79],[0.977,-3.667],[1.272,-10.438],[0.034,-0.275],[0.85,-2.15],[0.689,-1.574],[0.167,-3.411],[5.479,0.78],[1.774,1.92],[-0.335,2.803],[-1.044,8.695],[-0.988,3.636],[-0.442,1.19],[-0.462,1.683],[-0.242,2.763],[-1.138,8.749],[0,0],[0.375,13.357],[0.134,1.984],[-2.469,1.798],[-3.145,1.299],[-0.408,-1.395],[-0.023,-3.077],[0.403,-3.757]],"o":[[0,0],[-1.037,10.931],[-0.669,3.718],[-2.717,10.182],[-0.04,0.301],[-0.261,2.304],[-0.669,1.594],[-1.339,3.149],[-4.824,-2.604],[-2.677,-0.378],[-2.008,-2.086],[1.053,-8.704],[0.348,-3.742],[0.361,-1.21],[0.609,-1.638],[0.64,-2.704],[1.078,-8.755],[0,0],[1.707,-13.261],[-0.054,-1.978],[-0.188,-2.874],[2.751,-1.984],[1.693,-0.704],[0.866,2.963],[0.038,3.776],[0,0]],"v":[[48.615,20.609],[44.64,62.286],[40.511,94.983],[38.008,106.067],[30.077,136.64],[29.97,137.555],[28.632,144.339],[26.33,148.96],[24.61,159.001],[9.023,153.881],[1.661,151.321],[0.223,143.238],[3.368,117.139],[5.376,106.055],[6.614,102.464],[8.3,97.504],[9.625,89.293],[13.139,63.054],[13.199,62.593],[15.829,22.651],[15.555,16.712],[17.563,10.517],[27.079,5.845],[47.826,0.2],[49.164,9.301],[48.615,20.609]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.376470588235,0.364705882353,0.509803921569,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 72","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":129,"ty":4,"nm":"platform shadow","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[84.419,398.159,0],"to":[-12.167,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[11.419,398.159,0],"to":[0,0,0],"ti":[-12.167,0,0]},{"t":181,"s":[84.419,398.159,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[689.214,37.708],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":130,"ty":4,"nm":"Path 367","parent":129,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2},"a":{"a":0,"k":[344.607,18.854,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[6.958,-2.755],[0.133,-0.088],[0.944,-0.144],[0,0],[26.418,0.101],[0,0],[0,5.827],[-37.007,3.522],[-4.166,0.346],[-2.682,0.198],[0,0],[-3.557,0.243],[0,0],[0,0],[-3.278,0.198],[0,0],[0,0],[-4.122,0.214],[-3.532,0.177],[-44.931,0.859],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-16.197,0.004],[-29.585,-0.482],[0,0],[-15.949,-0.42],[0,0],[-34.064,-2.194],[0,0],[-7.766,-0.618],[-6.37,-0.624],[-2.086,-0.216],[0,0]],"o":[[-0.109,0.102],[-0.739,0.416],[0,0],[-23.077,8.534],[0,0],[-58.667,-4.004],[0,-4.517],[3.837,-0.371],[2.564,-0.214],[0,0],[3.377,-0.255],[0,0],[0,0],[3.148,-0.216],[0,0],[0,0],[3.948,-0.235],[3.421,-0.177],[35.815,-1.761],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[15.613,-0.124],[32.015,0],[0,0],[16.985,0.272],[0,0],[45.984,1.199],[0,0],[8.744,0.562],[7.31,0.581],[2.207,0.216],[0,0],[8.828,0.945]],"v":[[684.893,23.704],[684.53,23.988],[681.969,24.841],[681.969,24.841],[606.465,37.706],[94.463,37.706],[0,22.567],[58.499,10.319],[70.503,9.244],[78.371,8.626],[82.925,8.274],[93.327,7.526],[93.615,7.526],[97.34,7.279],[106.978,6.661],[109.362,6.519],[115.443,6.161],[127.549,5.487],[137.979,4.956],[260.015,1.007],[272.847,0.717],[277.168,0.655],[286.294,0.519],[289.953,0.47],[293.799,0.42],[296.537,0.389],[309.388,0.253],[315.99,0.192],[317.341,0.192],[365.056,0],[457.703,0.735],[457.703,0.735],[507.104,1.773],[507.253,1.773],[628.461,6.933],[629.085,6.977],[653.874,8.756],[674.417,10.573],[680.851,11.228],[681.382,11.29]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 367","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":131,"ty":4,"nm":"Path 98","parent":1,"sr":1,"ks":{"o":{"a":0,"k":99.501,"ix":11},"r":{"a":0,"k":15,"ix":10},"p":{"a":0,"k":[0,-11.5,0],"ix":2},"a":{"a":0,"k":[679.1,515.222,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-191.178,-0.525],[-0.606,-223.115],[347.595,0.954],[0.607,223.115],[-131.954,130.9]],"o":[[347.594,0.954],[0.607,223.115],[-347.595,-0.954],[-0.273,-100.401],[161.873,-160.581]],"v":[[898.199,0.002],[1358.199,678.509],[728.002,1030.439],[99.445,675.055],[47.746,282.32]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"op","nm":"Offset Paths 1","a":{"a":0,"k":-0.5,"ix":1},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 98 Stroke","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-191.178,-0.525],[-0.606,-223.115],[347.595,0.954],[0.607,223.115],[-131.954,130.9]],"o":[[347.594,0.954],[0.607,223.115],[-347.595,-0.954],[-0.273,-100.401],[161.873,-160.581]],"v":[[898.199,0.002],[1358.199,678.509],[728.002,1030.439],[99.445,675.055],[47.746,282.32]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 98 Fill","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":132,"ty":4,"nm":"Path 99","parent":1,"sr":1,"ks":{"o":{"a":0,"k":70.124,"ix":11},"r":{"a":0,"k":15,"ix":10},"p":{"a":0,"k":[0,11.5,0],"ix":2},"a":{"a":0,"k":[679.1,515.222,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-191.178,-0.525],[-0.606,-223.115],[347.595,0.954],[0.607,223.115],[-131.954,130.9]],"o":[[347.594,0.954],[0.607,223.115],[-347.595,-0.954],[-0.273,-100.401],[161.873,-160.581]],"v":[[898.199,0.002],[1358.199,678.509],[728.002,1030.439],[99.445,675.055],[47.746,282.32]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"op","nm":"Offset Paths 1","a":{"a":0,"k":-0.5,"ix":1},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 99 Stroke","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-191.178,-0.525],[-0.606,-223.115],[347.595,0.954],[0.607,223.115],[-131.954,130.9]],"o":[[347.594,0.954],[0.607,223.115],[-347.595,-0.954],[-0.273,-100.401],[161.873,-160.581]],"v":[[898.199,0.002],[1358.199,678.509],[728.002,1030.439],[99.445,675.055],[47.746,282.32]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 99 Fill","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0}],"markers":[]}\ No newline at end of filediff --git a/frontend/src/components/common/function/index.ts b/frontend/src/components/common/function/index.tsnew file mode 100644index 0000000..97cfcc8--- /dev/null+++ b/frontend/src/components/common/function/index.ts@@ -0,0 +1,21 @@+import '@/assets/css/hookComponent.css' // import hookComponent style++// Use import.meta.globEager to read the files in the components folder, distinguished by the suffix ts+const componentsList: any = import.meta.globEager('../hookComponent/**')++const List: any = {}+export default function (app: any) {+ Object.keys(componentsList).forEach((key) => {+ // Filter out ts suffix+ if (key.includes('.ts')) {+ // Assignment function component, thrown later, imported for use+ List[`$${ componentsList[key].default.name }`] = componentsList[key].default++ // Define function components into global variables, and use them in script in vue through proxy+ app.config.globalProperties[`$${ componentsList[key].default.name }`] = componentsList[key].default+ }+ })+}++// Export function components for import+export const funComponentList = Listdiff --git a/frontend/src/components/common/hookComponent/dialog.ts b/frontend/src/components/common/hookComponent/dialog.tsnew file mode 100644index 0000000..44c9ea3--- /dev/null+++ b/frontend/src/components/common/hookComponent/dialog.ts@@ -0,0 +1,20 @@+import { createApp } from 'vue'+import DialogComponent from './dialog.vue'+import { DialogOptions } from '@/types/system/hookComponent'+// Use vuetify+import { vuetify } from '@/plugins/vuetify/index'++// Use the createApp of vue3 and the mount and unmount methods to create a mounted instance+export default function dialog(options: DialogOptions) {+ const mountNode = document.createElement('div')+ document.body.appendChild(mountNode)+ const app = createApp(DialogComponent, {+ ...options,+ visible: true,+ removeComponent: () => {+ app.unmount()+ document.body.removeChild(mountNode)+ }+ }).use(vuetify)+ return app.mount(mountNode)+}diff --git a/frontend/src/components/common/hookComponent/dialog.vue b/frontend/src/components/common/hookComponent/dialog.vuenew file mode 100644index 0000000..417b869--- /dev/null+++ b/frontend/src/components/common/hookComponent/dialog.vue@@ -0,0 +1,86 @@+<template>+ <v-dialog v-model="data.dialogVisible" persistent :width="dialogWidth">+ <v-card>+ <v-card-title class="text-h5"> {{ title }} </v-card-title>+ <v-card-text>{{ content }}</v-card-text>+ <v-card-actions>+ <v-spacer></v-spacer>+ <v-btn color="green-darken-1" variant="text" @click="data.dialogVisible = false">+ {{ cancleText }}+ </v-btn>+ <v-btn+ v-if="typeof dialogProps.handleConfirm === 'function'"+ color="green-darken-1"+ variant="text"+ @click="method._sure()"+ >+ {{ confirmText }}+ </v-btn>+ </v-card-actions>+ </v-card>+ </v-dialog>+</template>++<script lang="ts" setup>+import { watch, reactive } from 'vue'+import i18n from '@/languages/i18n'++const dialogProps = defineProps({+ visible: {+ type: Boolean,+ default: false+ },+ confirmText: {+ type: String,+ default: i18n.global.t('system.hookComponent.dialog.defaultConfirm')+ },+ cancleText: {+ type: String,+ default: i18n.global.t('system.hookComponent.dialog.defaultClose')+ },+ handleConfirm: {+ type: Function,+ default: null+ },+ // Remove dom function+ removeComponent: {+ type: Function,+ default: null+ },+ content: {+ type: String,+ default: ''+ },+ title: {+ type: String,+ default: i18n.global.t('system.hookComponent.dialog.defaultTitle')+ },+ dialogWidth: {+ type: [String, Number],+ default: 700+ }+})++const data = reactive({+ dialogVisible: false,+ dialogText: ''+})++// Init dialog visible+data.dialogVisible = Boolean(dialogProps.visible) // Avoid shallow copies++const method = reactive({+ _sure: async () => {+ await dialogProps.handleConfirm()+ data.dialogVisible = false+ }+})++// Shut dialog run remove function+watch(+ () => data.dialogVisible,+ (val) => {+ !val && dialogProps.removeComponent()+ }+)+</script>diff --git a/frontend/src/components/common/hookComponent/message.ts b/frontend/src/components/common/hookComponent/message.tsnew file mode 100644index 0000000..f650bf7--- /dev/null+++ b/frontend/src/components/common/hookComponent/message.ts@@ -0,0 +1,55 @@+import { createApp } from 'vue'+import MessageComponent from './message.vue'+import { MessageOptions } from '@/types/system/hookComponent'+// Use vuetify+import { vuetify } from '@/plugins/vuetify/index'++// Use the createApp of vue3 and the mount and unmount methods to create a mounted instance+export default function message(options: MessageOptions) {+ const mountNode = document.createElement('div')+ mountNode.className = 'messageItems'+ mountNode.style.top = `${ getNewMsgTop() }px`+ document.body.appendChild(mountNode)+ const app = createApp(MessageComponent, {+ ...options,+ removeComponent: () => {+ setTimeout(() => {+ mountNode.style.opacity = '0'+ setTimeout(() => {+ app.unmount()+ document.body.removeChild(mountNode)+ resetMsgTop()+ }, 200)+ }, options.shutDelay ? options.shutDelay - 200 : 1300)+ }+ }).use(vuetify)+ return app.mount(mountNode)+}++// Reset message top+function resetMsgTop() {+ const messageDomList: any = document.body.getElementsByClassName('messageItems')+ for (let i = 0; i < messageDomList.length; i++) {+ messageDomList[i].style.top = `${ getNewMsgTop(i) }px`+ }+}++// Get message top+function getNewMsgTop(index = -1) {+ const messageDomList = document.body.querySelectorAll('.messageItems')+ let top = 10+ if (index < 0) {+ for (let i = 0; i < messageDomList.length; i++) {+ top += messageDomList[i].clientHeight + 10+ }+ } else {+ for (let i = 0; i < messageDomList.length; i++) {+ if (i < index) {+ top += messageDomList[i].clientHeight + 10+ } else {+ break+ }+ }+ }+ return top+}diff --git a/frontend/src/components/common/hookComponent/message.vue b/frontend/src/components/common/hookComponent/message.vuenew file mode 100644index 0000000..320fb99--- /dev/null+++ b/frontend/src/components/common/hookComponent/message.vue@@ -0,0 +1,33 @@+<template>+ <v-alert+ :type="type || 'info'"+ :variant="variant || 'flat'"+ :border="border || false"+ :color="color || undefined"+ :width="messageWidth"+ :min-width="250"+ >+ <!-- :max-height="60" -->+ {{ content }}+ </v-alert>+</template>++<script lang="ts" setup>+import { onBeforeMount } from 'vue'++// Vue3 does not support external interfaces+const messageProps = defineProps<{+ type?: 'success' | 'info' | 'warning' | 'error'+ variant?: 'flat' | 'elevated' | 'tonal' | 'outlined' | 'text' | 'plain'+ content: string+ border?: boolean | 'top' | 'end' | 'bottom' | 'start'+ color?: string+ messageWidth?: string | number // message width pixel or percentage+ removeComponent(): void+}>()++onBeforeMount(() => {+ messageProps.removeComponent()+})+</script>+<style lang="less" scoped></style>diff --git a/frontend/src/components/common/languages.vue b/frontend/src/components/common/languages.vuenew file mode 100644index 0000000..1a989c6--- /dev/null+++ b/frontend/src/components/common/languages.vue@@ -0,0 +1,59 @@+<template>+ <div class="languageIcon">+ <v-menu>+ <template #activator="{ props }">+ <v-icon icon="mdi-web" v-bind="props"></v-icon>+ </template>+ <v-list>+ <v-list-item+ v-for="(item, index) in data.languageList"+ :key="index"+ :value="index"+ @click="method.changeLanguage(item.value)"+ >+ <v-list-item-title>{{ item.title }}</v-list-item-title>+ </v-list-item>+ </v-list>+ </v-menu>+ </div>+</template>++<script lang="ts" setup>+import { reactive } from 'vue'+import { useI18n } from 'vue-i18n'+import { useLocale } from 'vuetify'+import { getSelcectedLang } from '@/languages/method/index'+import { getSelcectedLangForVuetify } from '@/plugins/vuetify/method/index'+import { store } from '@/store'++const { locale } = useI18n()+const { current } = useLocale()++const data = reactive({+ showLanguage: false,+ languageList: [+ { title: '简体中文', value: 'zh' },+ { title: 'Englist', value: 'en' }+ ]+})++const method = reactive({+ changeLanguage: (lang: string) => {+ localStorage.setItem('language', lang)+ store.commit('system/setLanguage', lang) // set store+ locale.value = getSelcectedLang(lang) // global+ current.value = getSelcectedLangForVuetify(lang) // vuetify+ }+})+</script>++<style lang="less" scoped>+.languageIcon {+ height: 30px;+ width: 40px;+ font-size: 16px;+ display: flex;+ justify-content: center;+ align-items: center;+}+</style>diff --git a/frontend/src/components/custom-pager.vue b/frontend/src/components/custom-pager.vuenew file mode 100644index 0000000..acc0e4b--- /dev/null+++ b/frontend/src/components/custom-pager.vue@@ -0,0 +1,112 @@+<template>+ <div class="pagerContainer">+ <v-row>+ <v-col cols="8" class="fl-c">+ <v-pagination+ v-model="data.pageIndex"+ :total-visible="7"+ :length="PAGER_LENGTH"+ size="small"+ rounded="circle"+ :active-color="primaryColor"+ @update:modelValue="method.pageChange"+ ></v-pagination>+ </v-col>+ <v-col cols="2" class="fl-s">+ <v-select+ v-model="data.pageSizeSelect"+ hide-details+ variant="underlined"+ density="compact"+ :items="PAGER_SIZE_OPTION"+ item-title="label"+ item-value="value"+ @update:modelValue="method.changePageSizeSelect"+ ></v-select>+ </v-col>+ <v-col cols="2" class="fl-c">+ <div>{{ TOTAL_RECORD }}</div>+ </v-col>+ </v-row>+ </div>+</template>+<script setup lang="ts">+import { reactive, computed } from 'vue'+import { PAGE_SIZE, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { primaryColor } from '@/constant/style'+import i18n from '@/languages/i18n'++const emit = defineEmits(['click', 'page-change'])++const props = defineProps({+ currentPage: {+ type: Number,+ default: 1+ },+ pageSize: {+ type: Number,+ default: DEFAULT_PAGE_SIZE+ },+ total: {+ type: Number,+ default: 0+ },+ pageSizes: {+ type: Array<number>,+ default: PAGE_SIZE+ },+ // !For the time being is not enabled+ layouts: {+ type: Array<string>,+ default: ['PrevJump', 'PrevPage', 'Number', 'NextPage', 'NextJump', 'Sizes', 'FullJump', 'Total']+ },+ // !For the time being is not enabled+ perfect: {+ type: Boolean,+ default: false+ }+})++const data = reactive({+ pageIndex: 1,+ pageSizeSelect: DEFAULT_PAGE_SIZE+})++const method = reactive({+ pageChange: (currentPage: number) => {+ emit('page-change', { currentPage, pageSize: props.pageSize })+ },+ changePageSizeSelect: (pageSize: number) => {+ emit('page-change', { pageIndex: data.pageIndex, pageSize })+ }+})++const PAGER_SIZE_OPTION = computed(() => {+ const res = []+ for (const pageSize of props.pageSizes) {+ res.push({ label: `${ pageSize }${ i18n.global.t('system.pager.pageSizes') }`, value: pageSize })+ }+ return res+})+const TOTAL_RECORD = computed(() => `${ i18n.global.t('system.pager.total') } ${ props.total } ${ i18n.global.t('system.pager.record') }`)+const PAGER_LENGTH = computed(() => {+ if (!props.total) {+ return 1+ }+ return Math.ceil(props.total / props.pageSize)+})+</script>+<style lang="less" scoped>+.pagerContainer {+ color: #666;+}+.fl-s{+ display: flex;+ align-items: flex-start;+}+.fl-c {+ display: flex;+ align-items: center;+ justify-content: flex-end;+}+</style>diff --git a/frontend/src/components/login/login-form.vue b/frontend/src/components/login/login-form.vuenew file mode 100644index 0000000..d8bdb72--- /dev/null+++ b/frontend/src/components/login/login-form.vue@@ -0,0 +1,209 @@+<template>+ <div class="loginForm">+ <div class="titleText">+ <h5>{{ $t('login.welcomeTitle') }}</h5>+ </div>+ <div class="formContainer">+ <v-form ref="VFormRef" v-model="data.valid" lazy-validation @keydown.enter.prevent="method.login()">+ <v-text-field v-model="data.userName" required :rules="data.userNameVaildRules" :label="$t('login.userName')" variant="solo"></v-text-field>+ <v-text-field+ v-model="data.password"+ required+ :rules="data.passwordVaildRules"+ :autocomplete="false"+ :append-inner-icon="data.showPassword ? 'mdi-eye' : 'mdi-eye-off'"+ :type="data.showPassword ? 'text' : 'password'"+ :label="$t('login.password')"+ variant="solo"+ @click:append-inner="method.handleShowPassword()"+ ></v-text-field>+ <v-checkbox v-model="data.remember" :label="$t('login.rememberTips')"></v-checkbox>+ <v-btn color="purple" class="loginBtn" @click="method.login()">{{ $t('login.mainButtonLabel') }}</v-btn>+ <v-btn class="mt-2" color="#666" variant="plain" @click="method.openRegisterDialog">+ {{ i18n.global.t('login.registerTips') }}+ </v-btn>+ </v-form>+ </div>+ <userRegisterForm :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ </div>+</template>++<script lang="ts" setup>+import { reactive, ref, onMounted } from 'vue'+import { Md5 } from 'ts-md5'+import i18n from '@/languages/i18n'+import { login, getUserAuthority } from '@/api/sys/login'+import { store } from '@/store'+import { hookComponent } from '@/components/system'+import { router } from '@/router/index'+import userRegisterForm from './user-register-form.vue'++// Get v-form ref+const VFormRef = ref()++const data = reactive({+ showDialog: false,+ valid: true,+ showPassword: false,+ userName: '',+ password: '',+ remember: false,+ dialogForm: {+ id: 0,+ user_num: '',+ user_name: '',+ auth_string: '',+ email: '',+ sex: '',+ is_valid: true+ },+ userNameVaildRules: [(v: string) => !!v || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('login.userName') }!`],+ passwordVaildRules: [(v: string) => !!v || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('login.password') }!`]+})++const method = reactive({+ handleShowPassword: () => {+ data.showPassword = !data.showPassword+ },+ login: async () => {+ const { valid } = await VFormRef.value.validate()+ if (!valid) {+ return+ }+ const { data: loginRes } = await login({+ user_name: data.userName,+ password: Md5.hashStr(data.password)+ })++ if (loginRes.isSuccess) {+ const expiredTime = new Date().getTime() + loginRes.data.expire * 60 * 1000++ store.commit('user/setToken', loginRes.data.access_token)+ store.commit('user/setRefreshToken', loginRes.data.refresh_token)+ store.commit('user/setExpirationTime', expiredTime)+ store.commit('user/setEffectiveMinutes', loginRes.data.expire)+ store.commit('user/setUserInfo', loginRes.data)++ const { data: authorityRes } = await getUserAuthority(loginRes.data.userrole_id)+ if (!authorityRes.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: authorityRes.errorMessage+ })+ return+ }+ if (authorityRes.data.length <= 0) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('login.notAuthority')+ })+ return+ }+ store.commit('user/setUserMenuList', authorityRes.data)++ hookComponent.$message({+ type: 'success',+ content: i18n.global.t('login.loginSuccess')+ })++ // Remember user login info+ if (data.remember) {+ const rememberJSON = JSON.stringify({+ userName: window.btoa(encodeURIComponent(data.userName)),+ password: window.btoa(encodeURIComponent(data.password))+ })+ localStorage.setItem('userLoginInfo', rememberJSON)+ } else {+ localStorage.setItem('userLoginInfo', '')+ }+ // Jump home+ store.commit('system/setCurrentRouterPath', 'homepage')+ router.push('home')+ } else {+ hookComponent.$message({+ type: 'error',+ content: loginRes.errorMessage+ })+ }+ },+ openRegisterDialog: () => {+ data.dialogForm = {+ id: 0,+ user_num: '',+ user_name: '',+ auth_string: '',+ email: '',+ sex: '',+ is_valid: true+ }+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // after Add or update success.+ saveSuccess: () => {+ method.closeDialog()+ }+})++onMounted(() => {+ // Get remember username and password+ const rememberJSON = localStorage.getItem('userLoginInfo')+ if (rememberJSON) {+ const obj = JSON.parse(rememberJSON)+ try {+ data.userName = decodeURIComponent(window.atob(obj.userName))+ data.password = decodeURIComponent(window.atob(obj.password))+ } catch {+ data.userName = window.atob(obj.userName)+ data.password = window.atob(obj.password)+ }+ data.remember = true+ }+})+</script>++<style scoped lang="less">+.loginForm {+ // min-height: ;+ height: 50%;+ width: 100%;+ box-sizing: border-box;+ padding: 16px;+ .titleText {+ box-sizing: border-box;+ padding: 20px;+ h5 {+ font-size: 1.5rem !important;+ font-weight: 500;+ line-height: 2rem;+ letter-spacing: normal !important;+ font-family: inter, sans-serif, -apple-system, blinkmacsystemfont, Segoe UI, roboto, Helvetica Neue, arial, sans-serif, 'Apple Color Emoji',+ 'Segoe UI Emoji', Segoe UI Symbol !important;+ text-transform: none !important;+ }+ }+ .formContainer {+ box-sizing: border-box;+ padding: 12px 20px;+ .v-btn {+ width: 100%;+ }+ .v-text-field {+ margin-top: 10px;+ }+ .v-checkbox {+ color: #b2b0b5;+ margin-inline-start: -0.5625rem;+ margin-top: -10px;+ height: 60px;+ }+ }+}++.loginBtn {+ height: 45px;+}+</style>diff --git a/frontend/src/components/login/loginForm.vue b/frontend/src/components/login/loginForm.vuenew file mode 100644index 0000000..4e047d7--- /dev/null+++ b/frontend/src/components/login/loginForm.vue@@ -0,0 +1,120 @@+<template>+ <div class="loginForm">+ <div class="titleText">+ <h5>{{ $t('login.welcomeTitle') }}</h5>+ </div>+ <div class="formContainer">+ <v-form ref="VFormRef" v-model="data.valid" lazy-validation>+ <v-text-field+ v-model="data.userName"+ required+ :rules="data.userNameVaildRules"+ :label="$t('login.userName')"+ variant="solo"+ ></v-text-field>+ <v-text-field+ v-model="data.password"+ required+ :rules="data.passwordVaildRules"+ :autocomplete="false"+ :append-inner-icon="data.showPassword ? 'mdi-eye' : 'mdi-eye-off'"+ :type="data.showPassword ? 'text' : 'password'"+ :label="$t('login.password')"+ variant="solo"+ @click:append-inner="method.handleShowPassword()"+ ></v-text-field>+ <v-checkbox v-model="data.remember" :label="$t('login.rememberTips')"></v-checkbox>+ <v-btn color="purple" @click="method.login()">{{ $t('login.mainButtonLabel') }}</v-btn>+ </v-form>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { reactive, ref } from 'vue'+import { Md5 } from 'ts-md5'+import i18n from '@/languages/i18n'+import { login } from '@/api/sys/login'+// import { getNotify } from '@/api/sys/test'+import { store } from '@/store'+// import { funComponentList } from '@/components/common/function/index'++// Get v-form ref+const VFormRef = ref()++const data = reactive({+ valid: true,+ showPassword: false,+ userName: '',+ password: '',+ remember: false,+ userNameVaildRules: [(v: string) => !!v || i18n.global.t('login.userNameMustInput')],+ passwordVaildRules: [(v: string) => !!v || i18n.global.t('login.passwordMustInput')]+})++const method = reactive({+ handleShowPassword: () => {+ data.showPassword = !data.showPassword+ },+ login: async () => {+ const { valid } = await VFormRef.value.validate()+ if (!valid) {+ return+ }+ const { data: loginRes } = await login({+ userName: data.userName,+ password: Md5.hashStr(data.password)+ })++ if (loginRes.isSuccess) {+ // TODO 把用户权限信息加进来+ // let expiredTime = new Date().getTime() + loginRes.data.expire * 60 * 1000+ const expiredTime = new Date().getTime() + 1 * 60 * 1000++ store.commit('user/setToken', loginRes.data.accessToken)+ store.commit('user/setRefreshToken', loginRes.data.refreshToken)+ store.commit('user/setExpirationTime', expiredTime)+ store.commit('user/setEffectiveMinutes', loginRes.data.expire)+ }+ }+})+</script>++<style scoped lang="less">+.loginForm {+ // min-height: ;+ height: 50%;+ width: 100%;+ box-sizing: border-box;+ padding: 16px;+ .titleText {+ box-sizing: border-box;+ padding: 20px;+ h5 {+ font-size: 1.5rem !important;+ font-weight: 500;+ line-height: 2rem;+ letter-spacing: normal !important;+ font-family: inter, sans-serif, -apple-system, blinkmacsystemfont, Segoe UI, roboto, Helvetica Neue, arial,+ sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', Segoe UI Symbol !important;+ text-transform: none !important;+ }+ }+ .formContainer {+ box-sizing: border-box;+ padding: 12px 20px;+ .v-btn {+ width: 100%;+ }+ .v-text-field {+ margin-top: 10px;+ }+ .v-checkbox {+ color: #b2b0b5;+ margin-inline-start: -0.5625rem;+ margin-top: -10px;+ height: 60px;+ }+ }+}+</style>diff --git a/frontend/src/components/login/user-register-form.vue b/frontend/src/components/login/user-register-form.vuenew file mode 100644index 0000000..1f9d491--- /dev/null+++ b/frontend/src/components/login/user-register-form.vue@@ -0,0 +1,169 @@+<template>+ <v-dialog v-model="isShow" width="20%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('login.register')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.user_name"+ :label="$t('base.userManagement.user_register_name')"+ :rules="data.rules.user_name"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.auth_string"+ :label="$t('base.userManagement.auth_string')"+ :rules="data.rules.auth_string"+ variant="outlined"+ :append-icon="data.isShowPassword ? 'mdi-eye' : 'mdi-eye-off'"+ :type="data.isShowPassword ? 'text' : 'password'"+ @click:append="data.isShowPassword = !data.isShowPassword"+ ></v-text-field>+ <v-select+ v-model="data.form.sex"+ :items="data.combobox.sex"+ item-title="label"+ item-value="value"+ :rules="data.rules.sex"+ :label="$t('base.userManagement.sex')"+ variant="outlined"+ clearable+ ></v-select>+ <v-text-field+ v-model="data.form.email"+ :label="$t('base.userManagement.email')"+ :rules="data.rules.email"+ variant="outlined"+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { Md5 } from 'ts-md5'+import { UserVO } from '@/types/Base/UserManagement'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { registerUser } from '@/api/base/userManagement'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: UserVO+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ isShowPassword: false,+ form: ref<UserVO>({+ id: 0,+ user_num: '',+ user_name: '',+ auth_string: '',+ email: '',+ sex: '',+ is_valid: true+ }),+ rules: {+ user_num: [],+ user_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.userManagement.user_register_name') }!`+ ],+ auth_string: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.userManagement.auth_string') }!`],+ email: [],+ sex: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.userManagement.sex') }!`],+ contact_tel: [],+ is_valid: []+ },+ combobox: ref<{+ sex: {+ label: string+ value: string+ }[]+ }>({+ sex: []+ })+})++const method = reactive({+ // Get the options required by the drop-down box+ getCombobox: () => {+ // Static drop-down box+ const sexOptions = ['male', 'female']+ data.combobox.sex = []+ for (const sex of sexOptions) {+ data.combobox.sex.push({+ label: i18n.global.t(`system.combobox.sex.${ sex }`),+ value: sex+ })+ }+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()++ if (valid) {+ const form = {+ id: 0,+ user_num: '',+ user_name: data.form.user_name,+ auth_string: Md5.hashStr(data.form.auth_string as string),+ email: data.form.email,+ sex: data.form.sex,+ is_valid: true+ }++ const { data: res } = await registerUser(form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.getCombobox()+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/components/lottie.vue b/frontend/src/components/lottie.vuenew file mode 100644index 0000000..db06ac5--- /dev/null+++ b/frontend/src/components/lottie.vue@@ -0,0 +1,40 @@+<template>+ <div ref="lottieBox"></div>+</template>++<script lang="ts" setup>+import lottie from 'lottie-web'+import { onMounted, ref } from 'vue'++const props = defineProps({+ src: {+ type: Object,+ default: () => {}+ },+ path: {+ type: String,+ default: ''+ },+ loop: {+ type: Boolean,+ default: true+ },+ autoplay: {+ type: Boolean,+ default: true+ }+})+const lottieBox = ref(null)+onMounted(() => {+ if (lottieBox.value) {+ lottie.loadAnimation({+ container: lottieBox.value,+ renderer: 'svg',+ loop: props.loop,+ autoplay: props.autoplay,+ path: props.path,+ animationData: Object.keys(props.src).length == 0 ? '' : props.src+ })+ }+})+</script>diff --git a/frontend/src/components/page/nav-list.vue b/frontend/src/components/page/nav-list.vuenew file mode 100644index 0000000..21cd49a--- /dev/null+++ b/frontend/src/components/page/nav-list.vue@@ -0,0 +1,126 @@+<template>+ <div style="height: 100%">+ <!-- title -->+ <div class="nav-list-title">{{ title }}</div>++ <!-- list -->+ <div class="nav-list">+ <div+ v-for="(item, index) of listData"+ :key="index"+ class="nav-item"+ :class="[indexValue === String(item[indexKey]) ? 'is-active-item' : '']"+ @click.stop="method.itemClick(item)"+ >+ <div class="nav-item__name">+ {{ item[labelKey] }}+ </div>+ <v-icon v-if="indexValue === String(item[indexKey])" class="nav-item__icon" icon="mdi-menu-left"></v-icon>+ </div>+ </div>++ <!-- no data -->+ <div v-if="!listData.length" class="null-data">{{ $t('system.tips.noData') }}</div>+ </div>+</template>++<script lang="ts" setup>+import { reactive } from 'vue'++const emit = defineEmits(['itemClick'])++const props = defineProps<{+ title: string // Sidebar Title+ listData: any[] // Sidebar Data+ labelKey: string // Key displayed in the sidebar+ // The selected key and value in the sidebar+ // For example, if a List is [{a: 1, b: 2}, {a: 3, b: 4}], I want to activate the row with b=4. Then indexKey=b indexValue=4+ indexKey: string+ indexValue: string+}>()++const method = reactive({+ itemClick: (item: any) => {+ if (props.indexValue === String(item[props.indexKey])) {+ return+ }+ emit('itemClick', item)+ }+})+</script>++<style lang="less" scoped>+@normal-transition: all 0.2s ease;+.nav-list-title {+ height: 35px;+ width: 100%;+ box-sizing: border-box;+ padding-left: 10px;+ background-color: #f8f8f9;+ color: #444;+ display: flex;+ justify-content: flex-start;+ align-items: center;+}++.nav-list {+ height: 100%;+ overflow-y: scroll;+}+.nav-list::-webkit-scrollbar {+ display: none;+}++.nav-item {+ box-sizing: border-box;+ width: 93%;+ min-height: 40px;+ padding: 10px 20px;+ margin: 8px auto;+ transition: @normal-transition;+ border-radius: 5px;+ display: flex;+ justify-content: flex-start;+ align-items: center;+}++.nav-item:hover {+ cursor: pointer;+ background-color: #e3ecfb;+ transition: @normal-transition;+}++.nav-item__name {+ width: 80%;+}++.is-active-item {+ background-color: #e3ecfb;+ color: #9C27B0;+ transition: @normal-transition;+ position: relative;+ // justify-content: space-between;++ // .nav-item__name {+ // width: 80%;+ // }+ .nav-item__icon {+ width: 20px;+ position: absolute;+ right: 5px;+ > img {+ width: 15px;+ height: 12px;+ }+ }+}++.null-data {+ font-size: 12px;+ color: #606266;+ position: absolute;+ top: 50%;+ left: 50%;+ transform: translate(-50%, -50%);+}+</style>diff --git a/frontend/src/components/select/commodity-select.vue b/frontend/src/components/select/commodity-select.vuenew file mode 100644index 0000000..bcc2b4e--- /dev/null+++ b/frontend/src/components/select/commodity-select.vue@@ -0,0 +1,237 @@+<!-- Select Modal -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('wms.stock.stockSelectModal')}`"></v-toolbar>+ <v-card-text>+ <v-row>+ <v-col cols="3">+ <div class="searchForm" :style="{ height: searchFormHeight }">+ <tooltip-btn icon="mdi-refresh" size="x-small" :tooltip-text="$t('system.page.reset')" @click="method.resetForm"></tooltip-btn>+ <tooltip-btn icon="mdi-magnify" size="x-small" :tooltip-text="$t('system.page.confirm')" @click="method.sureSearch"></tooltip-btn>+ <v-form ref="formRef" class="mt-4">+ <v-text-field+ v-model="data.searchForm.warehouse_name"+ :label="$t('wms.stock.warehouse')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ ></v-text-field>+ <v-text-field+ v-model="data.searchForm.location_name"+ :label="$t('wms.stock.location_name')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ ></v-text-field>+ <v-text-field+ v-model="data.searchForm.spu_name"+ :label="$t('base.commodityManagement.spu_name')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ ></v-text-field>+ <v-text-field+ v-model="data.searchForm.sku_code"+ :label="$t('base.commodityManagement.sku_code')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ ></v-text-field>+ </v-form>+ </div>+ </v-col>+ <v-col cols="9">+ <div class="dataTable">+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.tableData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="warehouse_name" :title="$t('wms.stock.warehouse')"></vxe-column>+ <vxe-column field="location_name" :title="$t('wms.stock.location_name')"></vxe-column>+ <vxe-column field="goods_owner_name" :title="$t('base.ownerOfCargo.goods_owner_name')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('base.commodityManagement.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('base.commodityManagement.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('base.commodityManagement.sku_code')"></vxe-column>+ <vxe-column field="sku_name" :title="$t('base.commodityManagement.sku_name')"></vxe-column>+ <vxe-column field="qty_available" :title="$t('wms.stock.qty_available')"></vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ </v-col>+ </v-row>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.confirm') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+/**+ * @description Select Modal+ * @example+ * <xxx-select :show-dialog="data.showDialogSelect" @close="method.closeDialogSelect" @sureSelect="method.sureSelect" />+ *+ * openSelect: () => {+ data.showDialogSelect = true+ },+ closeDialogSelect: () => {+ data.showDialogSelect = false+ },+ */+import { reactive, computed, ref, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { hookComponent } from '@/components/system/index'+import { getStockSelectList } from '@/api/wms/stockManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { SearchObject } from '@/types/System/Form'+import { computedSelectTableSearchHeight, SYSTEM_HEIGHT } from '@/constant/style'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import customPager from '@/components/custom-pager.vue'+import i18n from '@/languages/i18n'++const emit = defineEmits(['close', 'sureSelect'])+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+ sqlTitle?: string+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ tableData: [],+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ searchForm: {+ location_name: '',+ warehouse_name: '',+ spu_name: '',+ sku_code: ''+ },+ timer: ref<any>(null)+})++const method = reactive({+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getList()+ }),++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getList()+ },++ getList: async () => {+ const { data: res } = await getStockSelectList({+ ...data.tablePage,+ sqlTitle: props.sqlTitle+ })+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ resetForm: () => {+ // Clear search input+ for (const key in data.searchForm) {+ const str = key as string+ data.searchForm[str as keyof typeof data.searchForm] = ''+ }++ // Clear search params+ data.tablePage.searchObjects = []+ },++ submit: () => {+ const checkRecords = xTable.value.getCheckboxRecords()+ emit('sureSelect', checkRecords)+ method.closeDialog()+ },++ closeDialog: () => {+ emit('close')+ }+})++const searchFormHeight = computed(() => computedSelectTableSearchHeight({}))++watch(+ () => isShow.value,+ (newVal) => {+ newVal && method.getList()+ }+)++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.searchForm {+ border: 1px solid #eee;+ box-sizing: border-box;+ padding: 20px;+ overflow: auto;+}+</style>diff --git a/frontend/src/components/select/freight-select.vue b/frontend/src/components/select/freight-select.vuenew file mode 100644index 0000000..5e1d409--- /dev/null+++ b/frontend/src/components/select/freight-select.vue@@ -0,0 +1,229 @@+<!-- Select Modal -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('base.freightSetting.freightSelectModal')}`"></v-toolbar>+ <v-card-text>+ <v-row>+ <v-col cols="3">+ <div class="searchForm" :style="{ height: searchFormHeight }">+ <tooltip-btn icon="mdi-refresh" size="x-small" :tooltip-text="$t('system.page.reset')" @click="method.resetForm"></tooltip-btn>+ <tooltip-btn icon="mdi-magnify" size="x-small" :tooltip-text="$t('system.page.confirm')" @click="method.sureSearch"></tooltip-btn>+ <v-form ref="formRef" class="mt-4">+ <v-text-field+ v-model="data.searchForm.carrier"+ :label="$t('base.freightSetting.carrier')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ ></v-text-field>+ <v-text-field+ v-model="data.searchForm.departure_city"+ :label="$t('base.freightSetting.departure_city')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ ></v-text-field>+ <v-text-field+ v-model="data.searchForm.arrival_city"+ :label="$t('base.freightSetting.arrival_city')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ ></v-text-field>+ </v-form>+ </div>+ </v-col>+ <v-col cols="9">+ <div class="dataTable">+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.tableData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="carrier" :title="$t('base.freightSetting.carrier')"></vxe-column>+ <vxe-column field="departure_city" :title="$t('base.freightSetting.departure_city')"></vxe-column>+ <vxe-column field="arrival_city" :title="$t('base.freightSetting.arrival_city')"></vxe-column>+ <vxe-column field="price_per_weight" :title="$t('base.freightSetting.price_per_weight')"></vxe-column>+ <vxe-column field="price_per_volume" :title="$t('base.freightSetting.price_per_volume')"></vxe-column>+ <vxe-column field="min_payment" :title="$t('base.freightSetting.min_payment')"></vxe-column>+ <vxe-column field="creator" :title="$t('base.freightSetting.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('base.freightSetting.create_time')"></vxe-column>+ <vxe-column field="is_valid" :title="$t('base.warehouseSetting.is_valid')">+ <template #default="{ row, column }">+ <span>{{ formatIsValid(row[column.property]) }}</span>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ </v-col>+ </v-row>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.confirm') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+/**+ * @description Select Modal+ * @example+ * <xxx-select :show-dialog="data.showDialogSelect" @close="method.closeDialogSelect" @sureSelect="method.sureSelect" />+ *+ * openSelect: () => {+ data.showDialogSelect = true+ },+ closeDialogSelect: () => {+ data.showDialogSelect = false+ },+ */+import { reactive, computed, ref, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { hookComponent } from '@/components/system/index'+import { getFreightList } from '@/api/base/freightSetting'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { formatIsValid } from '@/utils/format/formatSystem'+import { SearchObject } from '@/types/System/Form'+import { computedSelectTableSearchHeight, SYSTEM_HEIGHT } from '@/constant/style'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import customPager from '@/components/custom-pager.vue'+import i18n from '@/languages/i18n'++const emit = defineEmits(['close', 'sureSelect'])+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ tableData: [],+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ searchForm: {+ carrier: '',+ departure_city: '',+ arrival_city: ''+ },+ timer: ref<any>(null)+})++const method = reactive({+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getList()+ }),++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getList()+ },++ getList: async () => {+ const { data: res } = await getFreightList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ resetForm: () => {+ // Clear search input+ for (const key in data.searchForm) {+ const str = key as string+ data.searchForm[str as keyof typeof data.searchForm] = ''+ }++ // Clear search params+ data.tablePage.searchObjects = []+ },++ submit: () => {+ const checkRecords = xTable.value.getCheckboxRecords()+ emit('sureSelect', checkRecords)+ method.closeDialog()+ },++ closeDialog: () => {+ emit('close')+ }+})++const searchFormHeight = computed(() => computedSelectTableSearchHeight({}))++watch(+ () => isShow.value,+ (newVal) => {+ newVal && method.getList()+ }+)++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.searchForm {+ border: 1px solid #eee;+ box-sizing: border-box;+ padding: 20px;+ overflow: auto;+}+</style>diff --git a/frontend/src/components/select/location-select.vue b/frontend/src/components/select/location-select.vuenew file mode 100644index 0000000..85b7580--- /dev/null+++ b/frontend/src/components/select/location-select.vue@@ -0,0 +1,219 @@+<!-- Select Modal -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('base.warehouseSetting.locationSelectModal')}`"></v-toolbar>+ <v-card-text>+ <v-row>+ <v-col cols="3">+ <div class="searchForm" :style="{ height: searchFormHeight }">+ <tooltip-btn icon="mdi-refresh" size="x-small" :tooltip-text="$t('system.page.reset')" @click="method.resetForm"></tooltip-btn>+ <tooltip-btn icon="mdi-magnify" size="x-small" :tooltip-text="$t('system.page.confirm')" @click="method.sureSearch"></tooltip-btn>+ <v-form ref="formRef" class="mt-4">+ <v-text-field+ v-model="data.searchForm.location_name"+ :label="$t('base.warehouseSetting.location_name')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ ></v-text-field>+ </v-form>+ </div>+ </v-col>+ <v-col cols="9">+ <div class="dataTable">+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.tableData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="warehouse_name" :title="$t('base.warehouseSetting.warehouse_name')"></vxe-column>+ <vxe-column field="warehouse_area_name" :title="$t('base.warehouseSetting.area_name')"></vxe-column>+ <vxe-column field="warehouse_area_property" :title="$t('base.warehouseSetting.area_property')">+ <template #default="{ row, column }">+ <span>{{ formatAreaProperty(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="location_name" :title="$t('base.warehouseSetting.location_name')"></vxe-column>+ <vxe-column width="150px" field="location_length" :title="$t('base.warehouseSetting.location_length')"></vxe-column>+ <vxe-column width="150px" field="location_width" :title="$t('base.warehouseSetting.location_width')"></vxe-column>+ <vxe-column width="150px" field="location_heigth" :title="$t('base.warehouseSetting.location_heigth')"></vxe-column>+ <vxe-column width="150px" field="location_volume" :title="$t('base.warehouseSetting.location_volume')"></vxe-column>+ <vxe-column width="150px" field="location_load" :title="$t('base.warehouseSetting.location_load')"></vxe-column>+ <vxe-column field="roadway_number" :title="$t('base.warehouseSetting.roadway_number')"></vxe-column>+ <vxe-column field="shelf_number" :title="$t('base.warehouseSetting.shelf_number')"></vxe-column>+ <vxe-column field="layer_number" :title="$t('base.warehouseSetting.layer_number')"></vxe-column>+ <vxe-column field="tag_number" :title="$t('base.warehouseSetting.tag_number')"></vxe-column>+ <vxe-column field="is_valid" :title="$t('base.warehouseSetting.is_valid')">+ <template #default="{ row, column }">+ <span>{{ formatIsValid(row[column.property]) }}</span>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ </v-col>+ </v-row>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.confirm') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+/**+ * @description Select Modal+ * @example+ * <xxx-select :show-dialog="data.showDialogSelect" @close="method.closeDialogSelect" @sureSelect="method.sureSelect" />+ *+ * openSelect: () => {+ data.showDialogSelect = true+ },+ closeDialogSelect: () => {+ data.showDialogSelect = false+ },+ */+import { reactive, computed, ref, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { hookComponent } from '@/components/system/index'+import { getGoodsLocationList } from '@/api/base/warehouseSetting'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { formatIsValid } from '@/utils/format/formatSystem'+import { formatAreaProperty } from '@/utils/format/formatWarehouse'+import { SearchObject } from '@/types/System/Form'+import { computedSelectTableSearchHeight, SYSTEM_HEIGHT } from '@/constant/style'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import customPager from '@/components/custom-pager.vue'+import i18n from '@/languages/i18n'++const emit = defineEmits(['close', 'sureSelect'])+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ tableData: [],+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ searchForm: {+ location_name: ''+ },+ timer: ref<any>(null)+})++const method = reactive({+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getList()+ }),++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getList()+ },++ getList: async () => {+ const { data: res } = await getGoodsLocationList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ resetForm: () => {+ // Clear search input+ for (const key in data.searchForm) {+ const str = key as string+ data.searchForm[str as keyof typeof data.searchForm] = ''+ }++ // Clear search params+ data.tablePage.searchObjects = []+ },++ submit: () => {+ const checkRecords = xTable.value.getCheckboxRecords()+ emit('sureSelect', checkRecords)+ method.closeDialog()+ },++ closeDialog: () => {+ emit('close')+ }+})++const searchFormHeight = computed(() => computedSelectTableSearchHeight({}))++watch(+ () => isShow.value,+ (newVal) => {+ newVal && method.getList()+ }+)++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.searchForm {+ border: 1px solid #eee;+ box-sizing: border-box;+ padding: 20px;+ overflow: auto;+}+</style>diff --git a/frontend/src/components/select/sku-select.vue b/frontend/src/components/select/sku-select.vuenew file mode 100644index 0000000..47c4544--- /dev/null+++ b/frontend/src/components/select/sku-select.vue@@ -0,0 +1,216 @@+<!-- Select Modal -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('wms.stock.skuSelectModal')}`"></v-toolbar>+ <v-card-text>+ <v-row>+ <v-col cols="3">+ <div class="searchForm" :style="{ height: searchFormHeight }">+ <tooltip-btn icon="mdi-refresh" size="x-small" :tooltip-text="$t('system.page.reset')" @click="method.resetForm"></tooltip-btn>+ <tooltip-btn icon="mdi-magnify" size="x-small" :tooltip-text="$t('system.page.confirm')" @click="method.sureSearch"></tooltip-btn>+ <v-form ref="formRef" class="mt-4">+ <v-text-field+ v-model="data.searchForm.spu_name"+ :label="$t('base.commodityManagement.spu_name')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ ></v-text-field>+ <v-text-field+ v-model="data.searchForm.sku_code"+ :label="$t('base.commodityManagement.sku_code')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ ></v-text-field>+ </v-form>+ </div>+ </v-col>+ <v-col cols="9">+ <div class="dataTable">+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.tableData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="spu_code" :title="$t('base.commodityManagement.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('base.commodityManagement.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('base.commodityManagement.sku_code')"></vxe-column>+ <vxe-column field="sku_name" :title="$t('base.commodityManagement.sku_name')"></vxe-column>+ <vxe-column field="supplier_name" :title="$t('base.commodityManagement.supplier_name')"></vxe-column>+ <vxe-column field="brand" :title="$t('base.commodityManagement.brand')"></vxe-column>+ <vxe-column field="origin" :title="$t('base.commodityManagement.origin')"></vxe-column>+ <vxe-column field="unit" :title="$t('base.commodityManagement.unit')"></vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ </v-col>+ </v-row>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.confirm') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+/**+ * @description Select Modal+ * @example+ * <xxx-select :show-dialog="data.showDialogSelect" @close="method.closeDialogSelect" @sureSelect="method.sureSelect" />+ *+ * openSelect: () => {+ data.showDialogSelect = true+ },+ closeDialogSelect: () => {+ data.showDialogSelect = false+ },+ */+import { reactive, computed, ref, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { hookComponent } from '@/components/system/index'+import { getSkuSelectList } from '@/api/wms/stockManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { formatIsValid } from '@/utils/format/formatSystem'+import { formatAreaProperty } from '@/utils/format/formatWarehouse'+import { SearchObject } from '@/types/System/Form'+import { computedSelectTableSearchHeight, SYSTEM_HEIGHT } from '@/constant/style'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import customPager from '@/components/custom-pager.vue'+import i18n from '@/languages/i18n'++const emit = defineEmits(['close', 'sureSelect'])+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ tableData: [],+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ searchForm: {+ location_name: '',+ spu_name: '',+ sku_code: ''+ },+ timer: ref<any>(null)+})++const method = reactive({+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getList()+ }),++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getList()+ },++ getList: async () => {+ const { data: res } = await getSkuSelectList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ resetForm: () => {+ // Clear search input+ for (const key in data.searchForm) {+ const str = key as string+ data.searchForm[str as keyof typeof data.searchForm] = ''+ }++ // Clear search params+ data.tablePage.searchObjects = []+ },++ submit: () => {+ const checkRecords = xTable.value.getCheckboxRecords()+ emit('sureSelect', checkRecords)+ method.closeDialog()+ },++ closeDialog: () => {+ emit('close')+ }+})++const searchFormHeight = computed(() => computedSelectTableSearchHeight({}))++watch(+ () => isShow.value,+ (newVal) => {+ newVal && method.getList()+ }+)++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.searchForm {+ border: 1px solid #eee;+ box-sizing: border-box;+ padding: 20px;+ overflow: auto;+}+</style>diff --git a/frontend/src/components/system/hookComponent/dialog.ts b/frontend/src/components/system/hookComponent/dialog.tsnew file mode 100644index 0000000..cce6530--- /dev/null+++ b/frontend/src/components/system/hookComponent/dialog.ts@@ -0,0 +1,34 @@+import { createApp } from 'vue'+import DialogComponent from './dialog.vue'+import { DialogOptions } from '@/types/System/HookComponent'+// Use vuetify+import { vuetify } from '@/plugins/vuetify/index'+import i18n from '@/languages/i18n'++// Use the createApp of vue3 and the mount and unmount methods to create a mounted instance+export default {+ name: 'dialog',+ dialog: (options: DialogOptions) => {+ const mountNode = document.createElement('div')+ mountNode.style.zIndex = '9000'+ document.body.appendChild(mountNode)+ if (!options.confirmText) {+ options.confirmText = i18n.global.t('system.hookComponent.dialog.defaultConfirm')+ }+ if (!options.cancleText) {+ options.cancleText = i18n.global.t('system.hookComponent.dialog.defaultClose')+ }+ if (!options.title) {+ options.title = i18n.global.t('system.hookComponent.dialog.defaultTitle')+ }+ const app = createApp(DialogComponent, {+ ...options,+ visible: true,+ removeComponent: () => {+ app.unmount()+ document.body.removeChild(mountNode)+ }+ }).use(vuetify)+ return app.mount(mountNode)+ }+}diff --git a/frontend/src/components/system/hookComponent/dialog.vue b/frontend/src/components/system/hookComponent/dialog.vuenew file mode 100644index 0000000..5f4cbee--- /dev/null+++ b/frontend/src/components/system/hookComponent/dialog.vue@@ -0,0 +1,80 @@+<template>+ <v-dialog v-model="data.dialogVisible" persistent :width="dialogWidth">+ <v-card>+ <v-card-title class="text-h5"> {{ title }} </v-card-title>+ <v-card-text>{{ content }}</v-card-text>+ <v-card-actions>+ <v-spacer></v-spacer>+ <v-btn variant="text" @click="data.dialogVisible = false">+ {{ cancleText }}+ </v-btn>+ <v-btn v-if="typeof dialogProps.handleConfirm === 'function'" color="green-darken-1" variant="text" @click="method._sure()">+ {{ confirmText }}+ </v-btn>+ </v-card-actions>+ </v-card>+ </v-dialog>+</template>++<script lang="ts" setup>+import { watch, reactive } from 'vue'++const dialogProps = defineProps({+ visible: {+ type: Boolean,+ default: false+ },+ confirmText: {+ type: String,+ default: ''+ },+ cancleText: {+ type: String,+ default: ''+ },+ handleConfirm: {+ type: Function,+ default: null+ },+ // Remove dom function+ removeComponent: {+ type: Function,+ default: null+ },+ content: {+ type: String,+ default: ''+ },+ title: {+ type: String,+ default: ''+ },+ dialogWidth: {+ type: [String, Number],+ default: 700+ }+})++const data = reactive({+ dialogVisible: false,+ dialogText: ''+})++// Init dialog visible+data.dialogVisible = Boolean(dialogProps.visible) // Avoid shallow copies++const method = reactive({+ _sure: async () => {+ await dialogProps.handleConfirm()+ data.dialogVisible = false+ }+})++// Shut dialog run remove function+watch(+ () => data.dialogVisible,+ (val) => {+ !val && dialogProps.removeComponent()+ }+)+</script>diff --git a/frontend/src/components/system/hookComponent/message.ts b/frontend/src/components/system/hookComponent/message.tsnew file mode 100644index 0000000..8fbc452--- /dev/null+++ b/frontend/src/components/system/hookComponent/message.ts@@ -0,0 +1,61 @@+import { createApp } from 'vue'+import MessageComponent from './message.vue'+import { MessageOptions } from '@/types/System/HookComponent'+// Use vuetify+import { vuetify } from '@/plugins/vuetify/index'++// Use the createApp of vue3 and the mount and unmount methods to create a mounted instance+export default {+ name: 'message',+ message: (options: MessageOptions) => {+ const mountNode = document.createElement('div')+ mountNode.className = 'messageItems'+ mountNode.style.top = `${ getNewMsgTop() }px`+ mountNode.style.zIndex = '9999'+ document.body.appendChild(mountNode)+ const app = createApp(MessageComponent, {+ ...options,+ removeComponent: () => {+ setTimeout(+ () => {+ mountNode.style.opacity = '0'+ setTimeout(() => {+ app.unmount()+ document.body.removeChild(mountNode)+ resetMsgTop()+ }, 200)+ },+ options.shutDelay ? options.shutDelay - 200 : 1300+ )+ }+ }).use(vuetify)+ return app.mount(mountNode)+ }+}++function resetMsgTop() {+ const messageDomList: any = document.body.getElementsByClassName('messageItems')+ for (let i = 0; i < messageDomList.length; i++) {+ messageDomList[i].style.top = `${ getNewMsgTop(i) }px`+ }+}++// Get message top+function getNewMsgTop(index = -1) {+ const messageDomList = document.body.querySelectorAll('.messageItems')+ let top = 10+ if (index < 0) {+ for (let i = 0; i < messageDomList.length; i++) {+ top += messageDomList[i].clientHeight + 10+ }+ } else {+ for (let i = 0; i < messageDomList.length; i++) {+ if (i < index) {+ top += messageDomList[i].clientHeight + 10+ } else {+ break+ }+ }+ }+ return top+}diff --git a/frontend/src/components/system/hookComponent/message.vue b/frontend/src/components/system/hookComponent/message.vuenew file mode 100644index 0000000..320fb99--- /dev/null+++ b/frontend/src/components/system/hookComponent/message.vue@@ -0,0 +1,33 @@+<template>+ <v-alert+ :type="type || 'info'"+ :variant="variant || 'flat'"+ :border="border || false"+ :color="color || undefined"+ :width="messageWidth"+ :min-width="250"+ >+ <!-- :max-height="60" -->+ {{ content }}+ </v-alert>+</template>++<script lang="ts" setup>+import { onBeforeMount } from 'vue'++// Vue3 does not support external interfaces+const messageProps = defineProps<{+ type?: 'success' | 'info' | 'warning' | 'error'+ variant?: 'flat' | 'elevated' | 'tonal' | 'outlined' | 'text' | 'plain'+ content: string+ border?: boolean | 'top' | 'end' | 'bottom' | 'start'+ color?: string+ messageWidth?: string | number // message width pixel or percentage+ removeComponent(): void+}>()++onBeforeMount(() => {+ messageProps.removeComponent()+})+</script>+<style lang="less" scoped></style>diff --git a/frontend/src/components/system/index.ts b/frontend/src/components/system/index.tsnew file mode 100644index 0000000..5e8d5a4--- /dev/null+++ b/frontend/src/components/system/index.ts@@ -0,0 +1,22 @@+import '@/assets/css/hookComponent.css' // import hookComponent style+import { Components } from '@/types/System/HookComponent'++// Use import.meta.globEager to read the files in the components folder, distinguished by the suffix ts+const componentsList: any = import.meta.globEager('./hookComponent/**')++const List: any = {}+export default function (app: any) {+ Object.keys(componentsList).forEach((key) => {+ // Filter out ts suffix+ if (key.includes('.ts')) {+ const hookObj = componentsList[key].default+ // Assignment function component, thrown later, imported for use+ List[`$${ hookObj.name }`] = hookObj[hookObj.name]+ // Define function components into global variables, and use them in script in vue through proxy+ app.config.globalProperties[`$${ hookObj.name }`] = hookObj[hookObj.name]+ }+ })+}++// Export function components for import+export const hookComponent: Components = Listdiff --git a/frontend/src/components/system/languages.vue b/frontend/src/components/system/languages.vuenew file mode 100644index 0000000..bb6ed94--- /dev/null+++ b/frontend/src/components/system/languages.vue@@ -0,0 +1,71 @@+<template>+ <div class="languageIcon">+ <v-menu>+ <template #activator="{ props }">+ <!-- <v-icon icon="mdi-translate" color="#666666" v-bind="props"></v-icon> -->+ <v-icon icon="mdi-web" color="#666666" v-bind="props"></v-icon>+ </template>+ <v-list>+ <v-list-item v-for="(item, index) in data.languageList" :key="index" :value="index" @click="method.changeLanguage(item.value)">+ <v-list-item-title>{{ item.title }}</v-list-item-title>+ </v-list-item>+ </v-list>+ </v-menu>+ </div>+</template>++<script lang="ts" setup>+import { reactive } from 'vue'+import { useI18n } from 'vue-i18n'+import { useLocale } from 'vuetify'+import { getSelcectedLang } from '@/languages/method/index'+import { getSelcectedLangForVuetify } from '@/plugins/vuetify/method/index'+import { store } from '@/store'+import { router } from '@/router'++const { locale } = useI18n()+const { current } = useLocale()++const data = reactive({+ showLanguage: false,+ languageList: [+ { title: '简体中文', value: 'zh' },+ { title: 'English', value: 'en' }+ ]+})++const method = reactive({+ changeLanguage: (lang: string) => {+ if (store.getters['system/language'] === lang) {+ return+ }+ localStorage.setItem('language', lang)+ store.commit('system/setLanguage', lang) // set store+ locale.value = getSelcectedLang(lang) // global+ current.value = getSelcectedLangForVuetify(lang) // vuetify++ if (!['/', '/login'].includes(router.currentRoute.value.path)) {+ store.commit('system/setRefreshFlag', true) // change language refresh page+ }+ }+})+</script>++<style lang="less" scoped>+.languageIcon {+ height: 40px;+ width: 40px;+ font-size: 16px;+ display: flex;+ justify-content: center;+ align-items: center;+ transition: all 0.5s;+ border-radius: 40px;+ &:hover {+ background-color: #e4e5ea;+ }+ &:active {+ background-color: #cdced3;+ }+}+</style>diff --git a/frontend/src/components/system/logo.vue b/frontend/src/components/system/logo.vuenew file mode 100644index 0000000..816d484--- /dev/null+++ b/frontend/src/components/system/logo.vue@@ -0,0 +1,28 @@+<template>+ <img+ class="SysTitleLogo"+ :style="{ height: height + 'px', top: top + 'px', left: left + 'px' }"+ src="@/assets/img/WMSTitle.png"+ />+</template>+<script setup lang="ts">+defineProps({+ height: {+ type: Number,+ default: 80+ },+ top: {+ type: Number,+ default: 20+ },+ left: {+ type: Number,+ default: 20+ }+})+</script>+<style lang="less">+.SysTitleLogo {+ position: absolute;+}+</style>diff --git a/frontend/src/components/tooltip-btn.vue b/frontend/src/components/tooltip-btn.vuenew file mode 100644index 0000000..4efd3ef--- /dev/null+++ b/frontend/src/components/tooltip-btn.vue@@ -0,0 +1,51 @@+<template>+ <v-tooltip location="bottom">+ <template #activator="{ props }">+ <v-btn :disabled="disabled" :flat="flat" class="mr-3" :size="size" icon v-bind="props" @click="method.clickEvent">+ <v-icon :color="iconColor"> {{ icon }} </v-icon>+ </v-btn>+ </template>+ <span>{{ tooltipText }}</span>+ </v-tooltip>+</template>+<script setup lang="ts">+import { reactive } from 'vue'++const emit = defineEmits(['click'])++defineProps({+ icon: {+ type: String,+ default: ''+ },+ tooltipText: {+ type: String,+ default: ''+ },+ size: {+ type: String,+ default: 'small'+ },+ // Whether show button shadow.+ // It's hasn't shadow when 'flat = true'.+ flat: {+ type: Boolean,+ default: false+ },+ iconColor: {+ type: String,+ default: ''+ },+ disabled: {+ type: Boolean,+ default: false+ }+})++const method = reactive({+ clickEvent: () => {+ emit('click')+ }+})+</script>+<style lang="less"></style>diff --git a/frontend/src/constant/commodityManagement.ts b/frontend/src/constant/commodityManagement.tsnew file mode 100644index 0000000..9ef539b--- /dev/null+++ b/frontend/src/constant/commodityManagement.ts@@ -0,0 +1,11 @@+// Acquisition unit+export function GetUnit(type: 'weight' | 'length' | 'volume', val: number) {+ switch (type) {+ case 'length':+ return ['mm', 'cm', 'dm', 'm'][val]+ case 'volume':+ return ['cm³', 'dm³', 'm³'][val]+ case 'weight':+ return ['mg', 'g', 'kg'][val]+ }+}\ No newline at end of filediff --git a/frontend/src/constant/style.ts b/frontend/src/constant/style.tsnew file mode 100644index 0000000..d6d954b--- /dev/null+++ b/frontend/src/constant/style.ts@@ -0,0 +1,73 @@+import { store } from '@/store'++interface pageHasElement {+ hasPager?: boolean+ hasTab?: boolean+ hasOperateBtn?: boolean+ hasToolBar?: boolean+}++export const primaryColor = '#9C27B0'+export const primaryLightColor = '#ECE7F6'+export const lightGrey = '#999999'+export const errorColor = '#BA2828'++export const SYSTEM_HEIGHT = {+ HEADER: 60,+ TAB: 70,+ OPERATE_BAR: 52,+ VXE_PAGER: 48,+ SELECT_TABLE: 500,+ TOOLBAR: 40+}++// The height of the content card+export const computedCardHeight = ({ hasTab = true, hasOperateBtn = true }: pageHasElement) => {+ const clientHeight = store.getters['system/clientHeight']+ const EXTRA_MARGIN = 100++ let res = clientHeight - SYSTEM_HEIGHT.HEADER - EXTRA_MARGIN++ if (hasTab) {+ res -= SYSTEM_HEIGHT.TAB+ }+ if (hasOperateBtn) {+ res -= SYSTEM_HEIGHT.OPERATE_BAR+ }++ return `${ res }px`+}++// The height of the table+export const computedTableHeight = ({ hasPager = true, hasTab = true, hasOperateBtn = true }: pageHasElement) => {+ const clientHeight = store.getters['system/clientHeight']+ const EXTRA_MARGIN = 100++ let res = clientHeight - SYSTEM_HEIGHT.HEADER - EXTRA_MARGIN++ if (hasPager) {+ res -= SYSTEM_HEIGHT.VXE_PAGER+ }+ if (hasTab) {+ res -= SYSTEM_HEIGHT.TAB+ }+ if (hasOperateBtn) {+ res -= SYSTEM_HEIGHT.OPERATE_BAR+ }++ return `${ res }px`+}++// The height of the table container in select modal.+export const computedSelectTableSearchHeight = ({ hasPager = true, hasToolBar = false }: pageHasElement) => {+ let res = SYSTEM_HEIGHT.SELECT_TABLE++ if (hasPager) {+ res += SYSTEM_HEIGHT.VXE_PAGER+ }+ if (hasToolBar) {+ res += SYSTEM_HEIGHT.TOOLBAR+ }++ return `${ res }px`+}diff --git a/frontend/src/constant/system.ts b/frontend/src/constant/system.tsnew file mode 100644index 0000000..1c0f15c--- /dev/null+++ b/frontend/src/constant/system.ts@@ -0,0 +1,2 @@+// unit: ms+export const DEBOUNCE_TIME = 350diff --git a/frontend/src/constant/vxeTable.ts b/frontend/src/constant/vxeTable.tsnew file mode 100644index 0000000..467eeaf--- /dev/null+++ b/frontend/src/constant/vxeTable.ts@@ -0,0 +1,14 @@+import { VxePagerPropTypes } from 'vxe-table'++export const PAGE_SIZE = [20, 50, 100]+export const DEFAULT_PAGE_SIZE = 20+export const PAGE_LAYOUT: VxePagerPropTypes.Layouts = [+ 'PrevJump',+ 'PrevPage',+ 'Number',+ 'NextPage',+ 'NextJump',+ 'Sizes',+ 'FullJump',+ 'Total'+]diff --git a/frontend/src/constant/warehouseWorking.ts b/frontend/src/constant/warehouseWorking.tsnew file mode 100644index 0000000..35c7119--- /dev/null+++ b/frontend/src/constant/warehouseWorking.ts@@ -0,0 +1,8 @@+export const PROCESS_JOB_COMBINE = true+export const PROCESS_JOB_SPLIT = false++export const FREEZE_JOB_FREEZE = true+export const FREEZE_JOB_UNFREEZE = false++export const TAKING_JOB_FINISH = true+export const TAKING_JOB_UNFINISH = false\ No newline at end of filediff --git a/frontend/src/env.d.ts b/frontend/src/env.d.tsnew file mode 100644index 0000000..2f7d41b--- /dev/null+++ b/frontend/src/env.d.ts@@ -0,0 +1,6 @@+declare module '*.vue' {+ import type { DefineComponent } from 'vue'+ // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types+ const component: DefineComponent<{}, {}, any>+ export default component+}diff --git a/frontend/src/languages/i18n.ts b/frontend/src/languages/i18n.tsnew file mode 100644index 0000000..6e85204--- /dev/null+++ b/frontend/src/languages/i18n.ts@@ -0,0 +1,21 @@+import { createI18n } from 'vue-i18n'+import messages from './langs/index'+import { getSelcectedLang } from './method/index'++const i18n = createI18n({+ legacy: false,+ globalInjection: true,+ locale: getStorageLang(),+ messages+})++// get language in storage or default+function getStorageLang() {+ const lang = localStorage.getItem('language')+ if (lang) {+ return getSelcectedLang(lang)+ }+ return 'en_US'+}++export default i18ndiff --git a/frontend/src/languages/langs/cnZh.ts b/frontend/src/languages/langs/cnZh.tsnew file mode 100644index 0000000..1e7ee5f--- /dev/null+++ b/frontend/src/languages/langs/cnZh.ts@@ -0,0 +1,536 @@+export default {+ system: {+ hookComponent: {+ dialog: {+ defaultClose: '关闭',+ defaultConfirm: '确认',+ defaultTitle: '提示'+ }+ },+ page: {+ add: '新增',+ update: '修改',+ refresh: '刷新',+ export: '导出',+ operate: '操作',+ edit: '编辑',+ delete: '删除',+ close: '关闭',+ submit: '提交',+ reset: '重置',+ confirm: '确认',+ insertOneRow: '新增一行',+ view: '查看',+ import: '导入',+ chooseFile: '选择文件',+ exportTemplate: '导出模板',+ noData: '暂无数据',+ },+ tips: {+ success: '成功!',+ fail: '失败!',+ beforeDeleteMessage: '您确定要删除此条数据吗?',+ beforeDeleteDetailMessage: '您确定要删除此行吗?',+ detailLengthIsZero: '请添加明细数据!',+ detailHasItemRepeat: '明细中含有重复项目!',+ noData: '暂无数据',+ beforeAsnConfirm: '确认到货?',+ beforeAsnUnload: '确认卸货?',+ beforeAsnSorted: '确认分拣完成?',+ requestTimeout: '请求超时!',+ requestFail: '接口请求失败,请重试'+ },+ checkText: {+ checkFormFail: '操作失败, 请检查数据后重试!',+ mustInput: '请填写',+ mustSelect: '请选择',+ integer: '整数',+ decimal: ' 小数',+ pleaseEnter: '请输入长度为',+ inputIntMsg: '的整数位',+ inputDecimalMsg: '的小数位',+ lengthValid: '字段长度应该在'+ },+ homeHeader: {+ logout: '注销'+ },+ combobox: {+ sex: {+ male: '男',+ female: '女'+ },+ yesOrNo: {+ yes: '是',+ no: '否'+ }+ },+ pager: {+ pageSizes: '条/页',+ goTo: '前往',+ total: '共',+ record: '条记录'+ }+ },+ router: {+ sideBar: {+ homepage: '首页',+ baseModule: '基础设置',+ ownerOfCargo: '货主信息',+ menuBasicSettings: '菜单基础设置',+ userManagement: '用户管理',+ commodityCategorySetting: '商品类别设置',+ commodityManagement: '商品管理',+ userRoleSetting: '角色设置',+ companySetting: '公司信息',+ freightSetting: '运费设置',+ warehouseSetting: '仓库设置',+ customer: '客户信息',+ supplier: '供应商信息',+ roleMenu: '菜单设置',+ stockManagement: '库存管理',+ warehouseWorkingModule: '仓内作业',+ warehouseProcessing: '仓内加工',+ warehouseMove: '库存移动',+ warehouseFreeze: '库存冻结',+ warehouseAdjust: '库存调整',+ warehouseTaking: '库存盘点',+ deliveryManagement: '发货管理',+ stockAsn: '收货管理'+ }+ },+ login: {+ welcomeTitle: '欢迎来到ModernWMS!👋🏻',+ mainButtonLabel: '登录',+ rememberTips: '记住账号密码',+ userName: '用户名',+ password: '密码',+ loginSuccess: '登录成功',+ notAuthority: '该账号未分配菜单权限,请联系管理员',+ registerTips: '没有账号?点此注册一个!',+ register: '注册'+ },+ homepage: {+ subTitle: '现代化仓库管理系统'+ },+ base: {+ freightSetting: {+ carrier: '承运商',+ departure_city: '始发城市',+ arrival_city: '到货城市',+ price_per_weight: '单公斤运费',+ price_per_volume: '单立方米运费',+ min_payment: '最小运费',+ creator: '创建人',+ create_time: '创建时间',+ last_update_time: '最后更新时间',+ is_valid: '是否有效',+ freightSelectModal: '运费选择框',+ },+ userManagement: {+ user_num: '员工编号',+ user_name: '员工名称',+ user_role: '角色',+ contact_tel: '联系方式',+ sex: '性别',+ is_valid: '是否有效',+ restPwd: '重置密码',+ checkboxIsNull: '请选中数据!',+ beforeResetPwd: '您确定要重置这些用户的密码吗?',+ afterResetPwd: '重置密码成功, 新密码为: ',+ user_register_name: '用户名',+ email: 'Email',+ auth_string: '密码'+ },+ warehouseSetting: {+ warehouseSetting: '仓库设置',+ reservoirSetting: '库区设置',+ locationSetting: '库位设置',+ locationSelectModal: '库位选择框',+ email: 'Email',+ warehouse_name: '仓库名称',+ city: '所在城市',+ address: '详细地址',+ contact_tel: '联系方式',+ manager: '负责人',+ is_valid: '是否有效',+ area_name: '库区名称',+ area_property: '库区类型',+ location_name: '库位编码',+ location_length: '库位长(m)',+ location_width: '库位宽(m)',+ location_heigth: '库位高(m)',+ location_volume: '库位容积(m³)',+ location_load: '库位承重(kg)',+ roadway_number: '巷道号',+ shelf_number: '货架号',+ layer_number: '层号',+ tag_number: '位号',+ picking_area: '拣货区',+ stocking_area: '备货区',+ receiving_area: '收货区',+ return_area: '退货区',+ defective_area: '次品区',+ inventory_area: '存货区',+ creator: '创建人',+ create_time: '创建时间',+ last_update_time: '最后更新时间'+ },+ customer: {+ customer_name: '客户名称',+ city: '所在城市',+ address: '详细地址',+ manager: '负责人',+ email: 'Email',+ contact_tel: '联系方式',+ creator: '创建人',+ create_time: '创建时间',+ last_update_time: '最后更新时间',+ is_valid: '是否有效'+ },+ supplier: {+ supplier_name: '供应商名称',+ city: '所在城市',+ address: '详细地址',+ email: 'Email',+ manager: '负责人',+ contact_tel: '联系方式',+ creator: '创建人',+ create_time: '创建时间',+ last_update_time: '最后更新时间',+ is_valid: '是否有效'+ },+ userRoleSetting: {+ role_name: '用户角色',+ is_valid: '是否有效'+ },+ companySetting: {+ company_name: '公司名称',+ city: '所在城市',+ address: '详细地址',+ manager: '负责人',+ contact_tel: '联系方式'+ },+ ownerOfCargo: {+ goods_owner_name: '货主名称',+ city: '所在城市',+ address: '详细地址',+ manager: '负责人',+ contact_tel: '联系方式',+ creator: '创建人',+ create_time: '创建时间'+ },+ commodityCategorySetting: {+ category_name: '商品类别',+ parent_name: '所属类别',+ creator: '创建人',+ create_time: '创建时间'+ },+ roleMenu: {+ role_name: '角色名称',+ menu_name: '菜单名称',+ beforeUpdateOrDel: '请先选择需要处理的数据!'+ },+ commodityManagement: {+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_code: '规格编码',+ sku_name: '规格名称',+ category_name: '商品类别',+ spu_description: '商品描述',+ bar_code: '商品条码',+ supplier_name: '供应商名称',+ brand: '品牌',+ unit: '商品单位',+ cost: '商品成本',+ price: '商品价格',+ origin: '产地',+ length_unit: '长度单位',+ volume_unit: '体积单位',+ weight_unit: '重量单位',+ weight: '商品重量',+ lenght: '商品长度',+ width: '商品宽度',+ height: '商品高度',+ volume: '商品体积'+ }+ },+ wms: {+ stock: {+ stockSelectModal: '库存选择框',+ skuSelectModal: '商品选择框',+ warehouse: '仓库名称',+ location_name: '库位编码',+ qty_available: '可用数量'+ },+ warehouseWorking: {+ warehouseProcessing: {+ job_code: '作业单号',+ job_type: '作业类型',+ process_status: '加工状态',+ processor: '操作人',+ process_time: '操作时间',+ qty: '数量',+ is_source: '是否来源商品',+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_code: '规格编码',+ sku_name: '规格名称',+ target_warehouse: '目标仓库',+ target_location: '目标库位',+ unit: '商品单位',+ is_update_stock: '是否已更新库存',+ creator: '创建人',+ create_time: '创建时间',+ last_update_time: '最后更新时间',+ adjust_status: '是否已调整',+ source: '来源',+ target: '目标',+ process_split: '拆分加工',+ process_combine: '组合加工',+ confirmProcess: '确认加工',+ confirmAdjust: '确认调整',+ qtyMoreThanAvailable: '不可超过可用数量',+ beforeConfirmProcess: '您确认对该条数据进行加工吗?',+ beforeConfirmAdjust: '您确认对该条数据进行调整吗?',+ alreadyProcess: '该数据已完成加工,不可删除',+ alreadyAdjust: '该数据已完成调整,不可删除'+ },+ warehouseMove: {+ job_code: '作业单号',+ move_status: '作业状态',+ qty: '数量',+ handler: '操作人',+ handle_time: '操作时间',+ orig_goods_warehouse: '来源仓库',+ orig_goods_location_name: '来源库位',+ dest_googs_warehouse: '目标仓库',+ dest_googs_location_name: '目标库位',+ confirmMove: '确认移库',+ creator: '创建人',+ create_time: '创建时间',+ beforeConfirmMove: '您确认对该条数据进行移库吗?',+ unadjust: '未调整',+ adjusted: '已调整'+ },+ warehouseFreeze: {+ job_code: '作业单号',+ job_type: '作业类型',+ handler: '操作人',+ handle_time: '操作时间',+ creator: '创建人',+ create_time: '创建时间',+ warehouse: '所在仓库',+ location_name: '所在库位',+ freeze: '冻结',+ unfreeze: '解冻'+ },+ warehouseAdjust: {+ job_code: '作业单号',+ job_type: '作业类型',+ warehouse: '所在仓库',+ location_name: '所在库位',+ handler: '操作人',+ handle_time: '操作时间',+ creator: '创建人',+ create_time: '创建时间',+ qty: '调整差异数量',+ warehouseTake: '盘点',+ processCombine: '仓内加工',+ processSplit: '仓内加工',+ warehouseMove: '移库',+ confirmAdjust: '确认调整',+ beforeConfirmAdjust: '您确认对该条数据进行调整吗?'+ },+ warehouseTaking: {+ job_code: '作业单号',+ job_status: '作业状态',+ warehouse: '所在仓库',+ location_name: '所在库位',+ book_qty: '账面数量',+ counted_qty: '盘点数量',+ difference_qty: '差异数量',+ confirmTaking: '确认盘点',+ handler: '操作人',+ handle_time: '操作时间',+ creator: '创建人',+ create_time: '创建时间',+ unfinish: '待作业',+ finish: '已完成',+ confirmAdjust: '确认调整',+ beforeConfirmAdjust: '您确认对该条数据进行调整吗?',+ addFromCommodity: '选择商品',+ addFromStock: '选择库存',+ addTips: '当目标库存不存在时,可通过手动选择商品和库位来新增记录'+ }+ },+ stockManagement: {+ stockLocation: '库位列表',+ stock: '库存列表'+ },+ stockLocation: {+ warehouse_name: '仓库名称',+ location_name: '库位名称',+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_id: '规格标识',+ sku_code: '规格编码',+ sku_name: '规格名称',+ qty: '数量',+ qty_available: '可用数量',+ qty_locked: '锁定数量',+ qty_frozen: '冻结数量'+ },+ stockList: {+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_code: '规格编码',+ sku_id: '规格标识',+ qty: '数量',+ qty_available: '可用数量',+ qty_locked: '锁定数量',+ qty_frozen: '冻结数量',+ qty_asn: '到货通知书数量',+ qty_to_unload: '待卸货数量',+ qty_to_sort: '待分拣数量',+ qty_sorted: '已分拣数量',+ shortage_qty: '欠货数量'+ },+ stockAsn: {+ tabNotice: '到货通知',+ tabToDoArrival: '待到货',+ tabToDoUnload: '待卸货',+ tabToDoSorting: '待分拣',+ tabToDoGrounding: '待上架',+ tabReceiptDetails: '收货明细'+ },+ stockAsnInfo: {+ id: '标识',+ asn_no: '到货通知书编号',+ asn_status: '到货通知书状态',+ spu_id: '商品spu标识',+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_id: '商品sku标识',+ sku_code: '规格编码',+ sku_name: '规格名称',+ origin: '产地',+ length_unit: '长度单位',+ volume_unit: '体积单位',+ weight_unit: '重量单位',+ asn_qty: '到货通知书数据',+ actual_qty: '上架数量',+ sorted_qty: '分拣数量',+ shortage_qty: '短少数量',+ more_qty: '超量数量',+ damage_qty: '破损数量',+ weight: '总重量',+ volume: '总体积',+ supplier_id: '供应商标识',+ supplier_name: '供应商名称',+ goods_owner_id: '货主标识',+ goods_owner_name: '货主名称',+ is_valid: '是否有效'+ },+ skuInfo: {+ spu_id: '商品spu标识',+ spu_code: '商品编码',+ spu_name: '商品名称',+ category_id: '商品类别标识',+ category_name: '商品类别',+ spu_description: '商品描述',+ bar_code: '商品条码',+ supplier_id: '供应商标识',+ supplier_name: '供应商名称',+ brand: '品牌',+ origin: '产地',+ length_unit: '长度单位',+ volume_unit: '体积单位',+ weight_unit: '重量单位',+ sku_id: '规格标识',+ sku_code: '规格编码',+ sku_name: '规格名称',+ weight: '总重量',+ lenght: '商品长度',+ width: '商品宽度',+ height: '商品高度',+ volume: '商品体积',+ unit: '商品单位',+ cost: '商品成本',+ price: '商品价格'+ },+ deliveryManagement: {+ shipment: '发货单',+ preShipment: '预发货',+ newShipment: '新发货',+ goodsToBePicked: '待拣货',+ picked: '已拣货',+ toBePackaged: '待打包',+ package: '打包',+ packaged: '已打包',+ toBeWeighed: '待称重',+ weigh: '称重',+ weighed: '已称重',+ delivery: '出库',+ toBeDelivered: '待出库',+ outOfWarehouse: '已出库',+ signIn: '签收',+ signedIn: '已签收',+ dispatch_no: '发货单号',+ dispatch_status: '发货单状态',+ qty: '总数量',+ detailQty: '数量',+ weight: '总重量',+ volume: '总体积',+ customer_name: '客户名称',+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_code: '规格编码',+ creator: '创建人',+ create_time: '创建时间',+ confirmOrder: '确认发货单',+ orderDetail: '发货单商品详情',+ quantityOverflow: '发货数量之和不能超出发货单数量',+ quantityIsZero: '请保证选择的商品至少有一项出库数量大于0!',+ NoItemSelected: '请至少选中一项商品进行出库!',+ confirmSuccess: '确认发货单成功!',+ confirmPicking: '确认拣货',+ confirmDelivery: '确认出库',+ confirmSignIn: '确认签收',+ detailWeight: '重量',+ unpackage_qty: '待打包数量',+ unweighing_qty: '待称重数量',+ validQtyMsgPackage: '请输入有效数值, 且不能超过总数量',+ validQtyMsgSignIn: '请输入有效数值, 且不能超过总数量',+ signInQty: '实际签收数量',+ incorrectStatusMsg: '操作失败, 状态应该为',+ backToThePreviousStep: '撤回到上一个流程',+ confirmBack: '确认撤回',+ or: '或',+ irreversible: '此操作不可逆',+ detailQuantityIsZero: '发货数量不能为0',+ qty_available: '可用数量',+ spu_description: '商品描述',+ bar_code: '条码',+ order_qty: '订单数量',+ unpicked_qty: '待拣货数量',+ picked_qty: '已拣货数量',+ detailVolume: '体积',+ package_qty: '已打包数量',+ package_person: '打包员',+ package_time: '打包时间',+ weighing_no: '称重单号',+ package_no: '打包流水号',+ weighing_person: '称重员',+ weighing_weight: '称重重量',+ waybill_no: '运单号',+ carrier: '承运单位',+ damagedQuantity: '到货破损数量',+ setFreight: '设置承运单位',+ departure_city: '始发城市',+ arrival_city: '到货城市',+ ViewInventoryDetails: '查看商品明细',+ invalidValue: '请输入有效数值',+ exceedingQuantity: '不能超过总数量'+ }+ }+}diff --git a/frontend/src/languages/langs/enUs.ts b/frontend/src/languages/langs/enUs.tsnew file mode 100644index 0000000..33cd86d--- /dev/null+++ b/frontend/src/languages/langs/enUs.ts@@ -0,0 +1,536 @@+export default {+ system: {+ hookComponent: {+ dialog: {+ defaultClose: 'Close',+ defaultConfirm: 'Agree',+ defaultTitle: 'Tips'+ }+ },+ page: {+ add: 'Add',+ update: 'Update',+ refresh: 'Refresh',+ export: 'Export',+ operate: 'Operate',+ edit: 'Edit',+ delete: 'Delete',+ close: 'Colse',+ submit: 'Submit',+ reset: 'Reset',+ confirm: 'Confirm',+ insertOneRow: 'Insert One Row',+ view: 'View',+ import: 'Import',+ chooseFile: 'Choose File',+ exportTemplate: 'Export Template',+ noData: 'No data',+ },+ tips: {+ success: ' success!',+ fail: ' fail!',+ beforeDeleteMessage: 'Do you want to delete this data?',+ beforeDeleteDetailMessage: 'Are you sure you want to delete this row?',+ detailLengthIsZero: 'Details verification before document submission!',+ detailHasItemRepeat: 'The details contain duplicate items!',+ noData: 'no data',+ beforeAsnConfirm: 'Confirm Arrival?',+ beforeAsnUnload: 'Confirm Unload?',+ beforeAsnSorted: 'Confirm Sorted?',+ requestTimeout: 'Request Timeout!',+ requestFail: 'Request fail.Please try it again'+ },+ checkText: {+ checkFormFail: 'Operation failed. Please check the data and try again!',+ mustInput: 'Please fill in the ',+ mustSelect: 'Please select ',+ integer: ' integer',+ decimal: ' decimal',+ pleaseEnter: 'Please enter ',+ inputIntMsg: 'decimal places of integer part',+ inputDecimalMsg: ' decimal places of the decimal part',+ lengthValid: 'The length should be between '+ },+ homeHeader: {+ logout: 'Logout'+ },+ combobox: {+ sex: {+ male: 'Male',+ female: 'Female'+ },+ yesOrNo: {+ yes: 'yes',+ no: 'no'+ }+ },+ pager: {+ pageSizes: '/page',+ goTo: 'Go to',+ total: 'Total',+ record: 'record'+ }+ },+ router: {+ sideBar: {+ homepage: 'Home Page',+ baseModule: 'Basic Settings',+ ownerOfCargo: 'Owner Information',+ menuBasicSettings: 'Menu',+ userManagement: 'User Management',+ commodityCategorySetting: 'Commodity Category',+ commodityManagement: 'Commodity Management',+ userRoleSetting: 'User Role',+ companySetting: 'Company Information',+ freightSetting: 'Freight Setting',+ warehouseSetting: 'Warehouse Setting',+ customer: 'Customer Info',+ supplier: 'Supplier Info',+ roleMenu: 'Role Menu Settings',+ stockManagement: 'Stock Management',+ warehouseWorkingModule: 'Warehouse Working',+ warehouseProcessing: 'Warehouse Processing',+ warehouseMove: 'Inventory Move',+ warehouseFreeze: 'Inventory freeze',+ warehouseAdjust: 'Inventory Adjust',+ warehouseTaking: 'Inventory Take',+ deliveryManagement: 'Delivery Management',+ stockAsn: 'Receiving Management'+ }+ },+ login: {+ welcomeTitle: 'Welcome to ModernWMS!👋🏻',+ mainButtonLabel: 'Login',+ rememberTips: 'Remember me',+ userName: 'UserName',+ password: 'Password',+ loginSuccess: 'Login succeeded!',+ notAuthority: 'Undistributed menu access the account, please contact the administrator to add it!',+ registerTips: 'No account? Click here to register!',+ register: 'Register'+ },+ homepage: {+ subTitle: 'Modern Warehouse Management System'+ },+ base: {+ freightSetting: {+ carrier: 'carrier',+ departure_city: 'Departure City',+ arrival_city: 'Arrival City',+ price_per_weight: 'Weight Fee',+ price_per_volume: 'Volume Fee',+ min_payment: 'Min Payment',+ creator: 'Creator',+ create_time: 'Create Time',+ last_update_time: 'Last Update Time',+ is_valid: 'Valid',+ freightSelectModal: 'Freight Select Modal',+ },+ userManagement: {+ user_num: 'User Num',+ user_name: 'User Name',+ user_role: 'Role',+ contact_tel: 'Contact Information',+ sex: 'Sex',+ is_valid: 'Valid',+ restPwd: 'Reset password',+ checkboxIsNull: 'Please select data!',+ beforeResetPwd: 'Are you sure you want to reset the passwords of these users?',+ afterResetPwd: 'Password reset succeeded, The new password is ',+ user_register_name: 'User Name',+ email: 'Email',+ auth_string: 'Password'+ },+ warehouseSetting: {+ warehouseSetting: 'Warehouse Setting',+ reservoirSetting: 'Reservoir Setting',+ locationSetting: 'Location Setting',+ locationSelectModal: 'Location Select Modal',+ email: 'Email',+ warehouse_name: 'Warehouse Name',+ city: 'City',+ address: 'Address',+ contact_tel: 'Acontact Tel',+ manager: 'Manager',+ is_valid: 'Valid',+ area_name: 'Reservoir Name',+ area_property: 'Reservoir Category',+ location_name: 'Location Code',+ location_length: 'Location Length(m)',+ location_width: 'Location Width(m)',+ location_heigth: 'Location Height(m)',+ location_volume: 'Location Volume(m³)',+ location_load: 'Location Load(kg)',+ roadway_number: 'Roadway Number',+ shelf_number: 'Shelf Number',+ layer_number: 'Layer Number',+ tag_number: 'Tag Number',+ picking_area: 'Picking Area',+ stocking_area: 'Stocking Area',+ receiving_area: 'Receiving Area',+ return_area: 'Return Area',+ defective_area: 'Defective Area',+ inventory_area: 'Inventory Area',+ creator: 'Creator',+ create_time: 'Create Time',+ last_update_time: 'Last Update Time'+ },+ customer: {+ customer_name: 'Customer Name',+ city: 'City',+ address: 'Address',+ manager: 'Manager',+ email: 'Email',+ contact_tel: 'Contact Tel',+ creator: 'Creator',+ create_time: 'Create Time',+ last_update_time: 'Last Update Time',+ is_valid: 'Valid'+ },+ supplier: {+ supplier_name: 'Supplier Name',+ city: 'City',+ address: 'Address',+ email: 'Email',+ manager: 'Manager',+ contact_tel: 'Contact Tel',+ creator: 'Creator',+ create_time: 'Create Time',+ last_update_time: 'Last Update Time',+ is_valid: 'Valid'+ },+ userRoleSetting: {+ role_name: 'User Role',+ is_valid: 'Valid'+ },+ companySetting: {+ company_name: 'Corporate Name',+ city: 'City',+ address: 'Detailed Address',+ manager: 'Person In Charge',+ contact_tel: 'Contact Information'+ },+ ownerOfCargo: {+ goods_owner_name: 'Owner Of Cargo',+ city: 'City',+ address: 'Detailed Address',+ manager: 'Person In Charge',+ contact_tel: 'Contact Information',+ creator: 'Creator',+ create_time: 'Create Time'+ },+ commodityCategorySetting: {+ category_name: 'Commodity category',+ parent_name: 'Parent Category',+ creator: 'Creator',+ create_time: 'Create Time'+ },+ roleMenu: {+ role_name: 'Role Name',+ menu_name: 'Menu Name',+ beforeUpdateOrDel: 'Please select the data to be processed first!'+ },+ commodityManagement: {+ spu_code: 'Commodity Code',+ spu_name: 'Commodity Name',+ category_name: 'Commodity Category',+ spu_description: 'Commodity Description',+ bar_code: 'Specification Code',+ sku_code: 'Specification Code',+ sku_name: 'Specification Name',+ supplier_name: 'Supplier Name',+ brand: 'Brand',+ unit: 'Commodity Unit',+ cost: 'Commodity Cost',+ price: 'Commodity Price',+ origin: 'origin',+ length_unit: 'Length Unit',+ volume_unit: 'Volume Unit',+ weight_unit: 'Weight Unit',+ weight: 'Commodity Weight',+ lenght: 'Commodity Length',+ width: 'Commodity Width',+ height: 'Commodity Height',+ volume: 'Commodity Volume'+ }+ },+ wms: {+ stock: {+ stockSelectModal: 'Stock Select Modal',+ skuSelectModal: 'Commodity Select Modal',+ warehouse: 'Warehouse Name',+ location_name: 'Location Code',+ qty_available: 'Available Qty'+ },+ warehouseWorking: {+ warehouseProcessing: {+ job_code: 'Job Code',+ job_type: 'Job Type',+ process_status: 'Process Status',+ processor: 'Processor',+ process_time: 'Process Time',+ qty: 'Qty',+ is_source: 'Is Source',+ spu_code: 'Commodity Code',+ spu_name: 'Commodity Name',+ sku_code: 'Specification Code',+ sku_name: 'Specification Name',+ target_warehouse: 'Target Warehouse',+ target_location: 'Target Location',+ unit: 'Unit',+ is_update_stock: 'Is Updated Stock',+ creator: 'Creator',+ create_time: 'Create Time',+ last_update_time: 'Last Update Time',+ adjust_status: 'Is Updated Stock',+ source: 'Source',+ target: 'Target',+ process_split: 'Split Processing',+ process_combine: 'Combine Processing',+ confirmProcess: 'Confirm Process',+ confirmAdjust: 'Confirm Adjust',+ qtyMoreThanAvailable: 'Can\'t more than the number of Available',+ beforeConfirmProcess: 'Are you sure to process this data?',+ beforeConfirmAdjust: 'Are you sure to adjust this data?',+ alreadyProcess: 'The data can\'t delete because it had been processed',+ alreadyAdjust: 'The data can\'t delete because it had been adjusted'+ },+ warehouseMove: {+ job_code: 'Job No',+ move_status: 'Move Status',+ qty: 'Qty',+ handler: 'Handler',+ handle_time: 'Handle Time',+ orig_goods_warehouse: 'Origin Warehouse',+ orig_goods_location_name: 'Origin Location',+ dest_googs_warehouse: 'Target Warehouse',+ dest_googs_location_name: 'Target Location',+ confirmMove: 'Confirm Move',+ creator: 'Creator',+ create_time: 'Create Time',+ beforeConfirmMove: 'Are you sure to move this data?',+ unadjust: 'Unadjust',+ adjusted: 'Adjusted'+ },+ warehouseFreeze: {+ job_code: 'Job Code',+ job_type: 'Job Type',+ handler: 'Handler',+ handle_time: 'Handle Time',+ creator: 'Creator',+ create_time: 'Create Time',+ warehouse: 'Warehouse',+ location_name: 'Location Code',+ freeze: 'Freeze',+ unfreeze: 'Unfreeze'+ },+ warehouseAdjust: {+ job_code: 'Job Code',+ job_type: 'Job Type',+ warehouse: 'Warehouse',+ location_name: 'Location Code',+ handler: 'Handler',+ handle_time: 'Handle Time',+ creator: 'Creator',+ create_time: 'Create Time',+ qty: 'Difference Qty',+ warehouseTake: 'Warehouse Take',+ processCombine: 'Warehouse Process',+ processSplit: 'Warehouse Process',+ warehouseMove: 'Warehouse Move',+ confirmAdjust: 'Confirm Adjust',+ beforeConfirmAdjust: 'Are you sure to adjust this data?'+ },+ warehouseTaking: {+ job_code: 'Job Code',+ job_status: 'Job Status',+ warehouse: 'Warehouse',+ location_name: 'Location Code',+ book_qty: 'Book Qty',+ counted_qty: 'Actual Qty',+ difference_qty: 'Difference Qty',+ handler: 'Handler',+ handle_time: 'Handle Time',+ creator: 'Creator',+ create_time: 'Create Time',+ confirmTaking: 'Confirm Taking',+ unfinish: 'Unfinish',+ finish: 'Finish',+ confirmAdjust: 'Confirm Adjust',+ beforeConfirmAdjust: 'Are you sure to adjust this data?',+ addFromCommodity: 'Choose From Commodity',+ addFromStock: 'Choose From Inventory',+ addTips: 'You can choose goods and the location to add a new record when there is no target inventory'+ }+ },+ stockManagement: {+ stockLocation: 'Stock Location',+ stock: 'Stock'+ },+ stockLocation: {+ warehouse_name: 'Warehouse',+ location_name: 'Location Code',+ spu_code: 'Commodity code',+ spu_name: 'Trade name',+ sku_id: 'Sku Id',+ sku_code: 'Specification code',+ sku_name: 'Form Name',+ qty: 'Quantity',+ qty_available: 'Available Quantity',+ qty_locked: 'Locked Quantity',+ qty_frozen: 'Frozen Quantity'+ },+ stockList: {+ spu_code: 'Commodity code',+ spu_name: 'Trade name',+ sku_code: 'Specification code',+ sku_id: 'Sku Id',+ qty: 'Quantity',+ qty_available: 'Available Quantity',+ qty_locked: 'Locked Quantity',+ qty_frozen: 'Frozen Quantity',+ qty_asn: 'Asn Quantity',+ qty_to_unload: 'Unload Quantity',+ qty_to_sort: 'Sort Quantity',+ qty_sorted: 'Sorted Quantity',+ shortage_qty: 'Shortage Quantity'+ },+ stockAsn: {+ tabNotice: 'Notice Of Arrival',+ tabToDoArrival: 'To Be Delivered',+ tabToDoUnload: 'To Be Unloaded',+ tabToDoSorting: 'To Be Sorted',+ tabToDoGrounding: 'To Be Put On The Shelf',+ tabReceiptDetails: 'Receipt Details'+ },+ stockAsnInfo: {+ id: 'ID',+ asn_no: 'Asn No',+ asn_status: 'Asn Status',+ spu_id: 'Spu Id',+ spu_code: 'Commodity code',+ spu_name: 'Trade name',+ sku_id: 'Sku Id',+ sku_code: 'Specification code',+ sku_name: 'Form Name',+ origin: 'Origin',+ length_unit: 'Length Unit',+ volume_unit: 'Volume Unit',+ weight_unit: 'Weight Unit',+ asn_qty: 'Asn Quantity',+ actual_qty: 'Actual Quantity',+ sorted_qty: 'Sorted Quantity',+ shortage_qty: 'Shortage Quantity',+ more_qty: 'More Quantity',+ damage_qty: 'Damage Quantity',+ weight: 'Weight',+ volume: 'Volume',+ supplier_id: 'Supplier Id',+ supplier_name: 'Supplier Name',+ goods_owner_id: 'Goods Owner Id',+ goods_owner_name: 'Goods Owner Name',+ is_valid: 'Valid'+ },+ skuInfo: {+ spu_id: 'Spu Id',+ spu_code: 'Commodity code',+ spu_name: 'Trade name',+ category_id: 'Commodity Category ID',+ category_name: 'Commodity Category',+ spu_description: 'Commodity Description',+ bar_code: 'Specification Code',+ supplier_id: 'Supplier Id',+ supplier_name: 'Supplier Name',+ brand: 'Brand',+ origin: 'origin',+ length_unit: 'Length Unit',+ volume_unit: 'Volume Unit',+ weight_unit: 'Weight Unit',+ sku_id: 'Sku Id',+ sku_code: 'Specification code',+ sku_name: 'Form Name',+ weight: 'Commodity Weight',+ lenght: 'Commodity Length',+ width: 'Commodity Width',+ height: 'Commodity Height',+ volume: 'Commodity Volume',+ unit: 'Commodity Unit',+ cost: 'Commodity Cost',+ price: 'Commodity Price'+ },+ deliveryManagement: {+ shipment: 'Invoice',+ preShipment: 'Pre Shipment',+ newShipment: 'New Shipment',+ goodsToBePicked: 'To Be Picked',+ picked: 'Picked',+ toBePackaged: 'To Be Packaged',+ package: 'Pack',+ packaged: 'Packaged',+ toBeWeighed: 'To Be Weighed',+ weigh: 'Weigh',+ weighed: 'Weighed',+ delivery: 'Delivery',+ toBeDelivered: 'To Be Delivered',+ outOfWarehouse: 'Delivered',+ signIn: 'Sign In',+ signedIn: 'Signed In',+ dispatch_no: 'Shipment No',+ dispatch_status: 'Shipment Doc Status',+ qty: 'Total Quantity',+ detailQty: 'Quantity',+ weight: 'Total Weight',+ volume: 'Total Volume',+ customer_name: 'Customer Name',+ spu_code: 'Commodity Code',+ spu_name: 'Commodity Name',+ sku_code: 'Specification Code',+ creator: 'Created By',+ create_time: 'Creation Time',+ confirmOrder: 'Confirm Shipment Doc',+ orderDetail: 'Shipment Order Product Details',+ quantityOverflow: 'The sum of shipment quantity cannot exceed the shipment document quantity',+ quantityIsZero: 'Please ensure that at least one of the selected goods has an issue quantity greater than 0!',+ NoItemSelected: 'Please select at least one commodity to delivered!',+ confirmSuccess: 'Confirm the shipment order successfully!',+ confirmPicking: 'Confirm Picking',+ confirmDelivery: 'Confirm Delivery',+ confirmSignIn: 'Confirm Signing',+ detailWeight: 'Weight',+ unpackage_qty: 'Quantity to be packaged',+ unweighing_qty: 'Quantity to be weighed',+ validQtyMsgPackage: 'Please enter a valid value, which cannot exceed the total quantity',+ validQtyMsgSignIn: 'Please enter a valid value',+ signInQty: 'Actual signed in quantity',+ incorrectStatusMsg: 'Operation failed, the status should be',+ backToThePreviousStep: 'Recall to previous process',+ confirmBack: 'Confirm withdrawal',+ or: ' or ',+ irreversible: 'This operation is irreversible',+ detailQuantityIsZero: 'Shipment quantity cannot be 0',+ qty_available: 'Available Quantity',+ spu_description: 'Product Description',+ bar_code: 'Bar Code',+ order_qty: 'Order Quantity',+ unpicked_qty: 'Quantity to be picked',+ picked_qty: 'Picked Quantity',+ detailVolume: 'Volume',+ package_qty: 'Packed Quantity',+ package_person: 'Packer',+ package_time: 'Packaging Time',+ weighing_no: 'Weighing sheet No',+ package_no: 'Packaging serial No',+ weighing_person: 'Weigher',+ weighing_weight: 'Weighing Weight',+ waybill_no: 'Waybill No',+ carrier: 'Carrier',+ damagedQuantity: 'Damaged quantity upon arrival',+ setFreight: 'Set Carrier',+ departure_city: 'Originating city',+ arrival_city: 'City of arrival',+ ViewInventoryDetails: 'View product details',+ invalidValue: 'Please enter a valid value',+ exceedingQuantity: 'Cannot exceed the total quantity'+ }+ }+}diff --git a/frontend/src/languages/langs/index.ts b/frontend/src/languages/langs/index.tsnew file mode 100644index 0000000..72934b0--- /dev/null+++ b/frontend/src/languages/langs/index.ts@@ -0,0 +1,16 @@+import zhCN from 'vxe-table/lib/locale/lang/zh-CN'+import enUS from 'vxe-table/lib/locale/lang/en-US'++import en from './enUs'+import cn from './cnZh'++export default {+ zh_CN: {+ ...cn,+ ...zhCN+ },+ en_US: {+ ...en,+ ...enUS+ }+}diff --git a/frontend/src/languages/method/index.ts b/frontend/src/languages/method/index.tsnew file mode 100644index 0000000..91a0a58--- /dev/null+++ b/frontend/src/languages/method/index.ts@@ -0,0 +1,11 @@+// Get different languages according to the key+export function getSelcectedLang(lang: string) {+ switch (lang) {+ case 'zh':+ return 'zh_CN'+ case 'en':+ return 'en_US'+ default:+ return 'en_US'+ }+}diff --git a/frontend/src/main.ts b/frontend/src/main.tsnew file mode 100644index 0000000..3a8b75c--- /dev/null+++ b/frontend/src/main.ts@@ -0,0 +1,26 @@+import { createApp } from 'vue'+import './style.css' // Global Styles+import { VXETable } from '@/plugins/VXETable/index'+import { vuetify } from '@/plugins/vuetify/index'+import i18n from './languages/i18n'+import App from './App.vue'++// import router+import { router } from './router'+import { store } from './store/index'+import hookComponent from '@/components/system/index'++const app = createApp(App)++VXETable.setup({+ i18n: (key, args) => i18n.global.t(key, args)+})++app.use(router)+app.use(store)+app.use(vuetify)+app.use(i18n)+app.use(hookComponent)+app.use(VXETable)++app.mount('#app')diff --git a/frontend/src/plugins/VXETable/index.ts b/frontend/src/plugins/VXETable/index.tsnew file mode 100644index 0000000..7e94da1--- /dev/null+++ b/frontend/src/plugins/VXETable/index.ts@@ -0,0 +1,20 @@+import VXETable from 'vxe-table'+import XEUtils from 'xe-utils'+import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx'+import 'vxe-table/lib/style.css'++/**+ * Format date.+ * @param {String} format: default value is 'yyyy-MM-dd HH:mm:ss'+ */+VXETable.formats.add('formatDate', ({ cellValue }, format) => {+ const date = new Date(cellValue)+ if (!cellValue || !date || XEUtils.toDateString(date, 'yyyy-MM-dd') === '1900-01-01') {+ return ''+ }+ return XEUtils.toDateString(date, format || 'yyyy-MM-dd HH:mm:ss')+})++VXETable.use(VXETablePluginExportXLSX)++export { VXETable }diff --git a/frontend/src/plugins/vuetify/index.ts b/frontend/src/plugins/vuetify/index.tsnew file mode 100644index 0000000..b3baa32--- /dev/null+++ b/frontend/src/plugins/vuetify/index.ts@@ -0,0 +1,40 @@+// Vuetify+import 'vuetify/styles'+import { createVuetify } from 'vuetify'+import * as components from 'vuetify/components'+import * as directives from 'vuetify/directives'+import { aliases, mdi } from 'vuetify/iconsets/mdi'+// Translations provided by Vuetify+import { zhHans, en } from 'vuetify/locale'+import { getSelcectedLangForVuetify } from './method/index'++import 'material-design-icons-iconfont/dist/material-design-icons.css'+import 'vuetify/dist/vuetify.min.css'+import '@mdi/font/css/materialdesignicons.css'++const vuetify = createVuetify({+ locale: {+ locale: getStorageLang(),+ messages: { zhHans, en }+ },+ components,+ directives,+ icons: {+ defaultSet: 'mdi',+ aliases,+ sets: {+ mdi+ }+ }+})++// get language in storage or default+function getStorageLang() {+ const lang = localStorage.getItem('language')+ if (lang) {+ return getSelcectedLangForVuetify(lang)+ }+ return 'en'+}++export { vuetify }diff --git a/frontend/src/plugins/vuetify/method/index.ts b/frontend/src/plugins/vuetify/method/index.tsnew file mode 100644index 0000000..49444bd--- /dev/null+++ b/frontend/src/plugins/vuetify/method/index.ts@@ -0,0 +1,11 @@+// Get different languages according to the key+export function getSelcectedLangForVuetify(lang: string) {+ switch (lang) {+ case 'zh':+ return 'zhHans'+ case 'en':+ return 'en'+ default:+ return 'en'+ }+}diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.tsnew file mode 100644index 0000000..6e9e89d--- /dev/null+++ b/frontend/src/router/index.ts@@ -0,0 +1,99 @@+// index.ts+import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router'+import { store } from '@/store'+import { CustomerRouterProps } from '@/types/System/Router'+import { menusToRouter } from '@/utils/router'++// array => dynamic router+let dynamicRouter: CustomerRouterProps[] = []+let loadedRouter: string[] = []++// default router+const routes: RouteRecordRaw[] = [+ {+ path: '/',+ redirect: '/login'+ },+ {+ path: '/login',+ name: 'login',+ component: () => import('@/view/login/login.vue')+ },+ {+ name: 'home',+ path: '/home',+ redirect: 'homepage',+ component: () => import('@/view/home/home.vue'),+ children: []+ }+]++// create router+const router = createRouter({+ // mode is hash+ history: createWebHashHistory(),+ routes+ // Return to top after route jump+ // scrollBehavior() {+ // return { top: 0 }+ // }+})++// vite2 dynamic import+const modules = import.meta.glob('../view/*/*/*.vue')++// load router function+function loadRouter() {+ dynamicRouter = menusToRouter(store.getters['user/menulist'])+ dynamicRouter.push({+ name: 'homepage',+ path: '/homepage',+ directory: 'home/homepage',+ redirect: '',+ component: null+ })+ // Clear the loaded routes before creating them, mainly for logged out users+ for (const item of loadedRouter) {+ router.removeRoute(item)+ }+ loadedRouter = []+ // This works normally, but it doesn't seem right when getting router+ for (const item of dynamicRouter) {+ item.component = modules[`../view/${ item.directory }${ item.path }.vue`]+ item.meta = {+ menuModule: item.module,+ menuPath: item.name+ }+ router.addRoute('home', item)+ loadedRouter.push(item.name) // cache dynamic router+ }+}++// Set the front routing guard+router.beforeEach((to, from, next) => {+ // join system+ if (to.path === '/login') {+ dynamicRouter = []+ return next()+ }++ // dont have token, back login+ if (!store.getters['user/token']) {+ return next('/login')+ }++ if (dynamicRouter.length === 0) {+ loadRouter()+ return next(to.path)+ }++ next()+})++// Route interceptor, after jump+router.afterEach(() => {+ // disable back or forward+ window.history.pushState(null, '', window.location.href)+})++export { router }diff --git a/frontend/src/shims.axios.d.ts b/frontend/src/shims.axios.d.tsnew file mode 100644index 0000000..057fd05--- /dev/null+++ b/frontend/src/shims.axios.d.ts@@ -0,0 +1,7 @@+import { AxiosRequestConfig } from 'axios'++declare module 'axios' {+ export interface AxiosRequestConfig {+ hideLoading?: boolean+ }+}diff --git a/frontend/src/store/index.ts b/frontend/src/store/index.tsnew file mode 100644index 0000000..bb4f5c4--- /dev/null+++ b/frontend/src/store/index.ts@@ -0,0 +1,18 @@+import { createStore } from 'vuex'+import VuexPersistence from 'vuex-persist'++import { user } from '@/store/module/user'+import { system } from '@/store/module/system'++const vuexLocal = new VuexPersistence({+ storage: window.localStorage,+ modules: ['user', 'system']+})++export const store = createStore({+ modules: {+ user,+ system+ },+ plugins: [vuexLocal.plugin]+})diff --git a/frontend/src/store/module/system.ts b/frontend/src/store/module/system.tsnew file mode 100644index 0000000..bbf5196--- /dev/null+++ b/frontend/src/store/module/system.ts@@ -0,0 +1,66 @@+import { StateProps } from '@/types/System/Store'++export const system = {+ namespaced: true,+ state: {+ language: '',+ openedMenus: [],+ // Window Size+ clientWidth: 0,+ clientHeight: 0,+ currentRouterPath: '',+ refreshFlag: false+ },+ mutations: {+ setCurrentRouterPath(state: StateProps, path: string) {+ state.currentRouterPath = path+ },+ setRefreshFlag(state: StateProps, flag: boolean) {+ state.refreshFlag = flag+ },+ setLanguage(state: StateProps, lang: string) {+ state.language = lang+ },+ addOpenedMenu(state: StateProps, menuName: string) {+ if (!state.openedMenus.includes(menuName)) {+ state.openedMenus.push(menuName)+ }+ },+ delOpenedMenu(state: StateProps, menuName: string) {+ const menuIndex = state.openedMenus.findIndex((item) => item === menuName)+ if (menuIndex > -1) {+ state.openedMenus.splice(menuIndex, 1)+ }+ },+ clearOpenedMenu(state: StateProps) {+ state.openedMenus = []+ },+ setClientWidth(state: StateProps, clientWidth: number) {+ state.clientWidth = clientWidth+ },+ setClientHeight(state: StateProps, clientHeight: number) {+ state.clientHeight = clientHeight+ }+ },+ actions: {},+ getters: {+ currentRouterPath(state: StateProps) {+ return state.currentRouterPath+ },+ language(state: StateProps) {+ return state.language+ },+ openedMenus(state: StateProps) {+ return state.openedMenus+ },+ clientWidth(state: StateProps) {+ return state.clientWidth+ },+ clientHeight(state: StateProps) {+ return state.clientHeight+ },+ refreshFlag(state: StateProps) {+ return state.refreshFlag+ }+ }+}diff --git a/frontend/src/store/module/user.ts b/frontend/src/store/module/user.tsnew file mode 100644index 0000000..fb7d90e--- /dev/null+++ b/frontend/src/store/module/user.ts@@ -0,0 +1,75 @@+import { UserStateProps, MenuItem } from '@/types/System/Store'++export const user = {+ namespaced: true,+ state: {+ userInfo: {},+ token: '',+ // 用于刷新token用的串+ refreshToken: '',+ // token失效的时间+ expirationTime: '',+ // token有效期+ effectiveMinutes: '',+ // 当前是否正在refreshToken+ isRefreshingToken: false,+ // 菜单权限+ menulist: [+ // {+ // name: 'testmenu',+ // path: '/testmenu',+ // directory: 'testmenu/testmenu'+ // }+ ]+ },+ mutations: {+ setUserInfo(state: UserStateProps, userInfo: any) {+ state.userInfo = userInfo+ },+ resetUserInfo(state: UserStateProps, userInfo = {}) {+ state.userInfo = { ...state.userInfo, ...userInfo }+ },+ setToken(state: UserStateProps, token: string) {+ state.token = token+ },+ setExpirationTime(state: UserStateProps, expirationTime: number) {+ state.expirationTime = expirationTime+ },+ setIsRefreshingToken(state: UserStateProps, isRefreshingToken: boolean) {+ state.isRefreshingToken = isRefreshingToken+ },+ setRefreshToken(state: UserStateProps, refreshToken: string) {+ state.refreshToken = refreshToken+ },+ setEffectiveMinutes(state: UserStateProps, effectiveMinutes: number) {+ state.effectiveMinutes = effectiveMinutes+ },+ setUserMenuList(state: UserStateProps, menulist: MenuItem[]) {+ state.menulist = menulist+ }+ },+ actions: {},+ getters: {+ userInfo(state: UserStateProps) {+ return state.userInfo+ },+ token(state: UserStateProps) {+ return state.token+ },+ expirationTime(state: UserStateProps) {+ return state.expirationTime+ },+ isRefreshingToken(state: UserStateProps) {+ return state.isRefreshingToken+ },+ refreshToken(state: UserStateProps) {+ return state.refreshToken+ },+ effectiveMinutes(state: UserStateProps) {+ return state.effectiveMinutes+ },+ menulist(state: UserStateProps) {+ return state.menulist+ }+ }+}diff --git a/frontend/src/style.css b/frontend/src/style.cssnew file mode 100644index 0000000..000a44d--- /dev/null+++ b/frontend/src/style.css@@ -0,0 +1,12 @@+html,+body {+ padding: 0;+ margin: 0;+ height: 100%;+ width: 100%;+}++#app {+ height: 100vh;+ width: 100vw;+}diff --git a/frontend/src/types/Base/CommodityCategorySetting.ts b/frontend/src/types/Base/CommodityCategorySetting.tsnew file mode 100644index 0000000..a90dc8c--- /dev/null+++ b/frontend/src/types/Base/CommodityCategorySetting.ts@@ -0,0 +1,16 @@+import { VxeTablePropTypes } from 'vxe-table'+import { UniformFileNaming } from '../System/Form'++export interface CategoryVO extends UniformFileNaming {+ id: number+ parent_id?: number+ category_name: string+ is_valid?: boolean+}++export interface DataProps {+ tableData: CategoryVO[]+ tableTreeConfig: VxeTablePropTypes.TreeConfig+ showDialog: boolean+ dialogForm: CategoryVO+}diff --git a/frontend/src/types/Base/CommodityManagement.ts b/frontend/src/types/Base/CommodityManagement.tsnew file mode 100644index 0000000..c3dba4a--- /dev/null+++ b/frontend/src/types/Base/CommodityManagement.ts@@ -0,0 +1,62 @@+import { VxeTablePropTypes } from 'vxe-table'+import { UniformFileNaming, TablePage } from '../System/Form'++export interface CommodityVO extends UniformFileNaming {+ id: number+ spu_code: string+ spu_name: string+ category_id?: number+ category_name?: string+ spu_description: string+ bar_code: string+ supplier_id?: number+ supplier_name?: string+ brand: string+ origin?: string+ length_unit: number+ volume_unit: number+ weight_unit: number+ detailList?: CommodityDetailVO[]+}++export interface CommodityDetailVO {+ id: number+ sku_code: string+ sku_name: string+ unit: string+ cost?: number+ price?: number+ weight?: number+ lenght?: number+ width?: number+ height?: number+ volume?: number+}++export interface CommodityDetailJoinMainVO {+ sku_id: number+ spu_id: number+ spu_code: string+ spu_name: string+ sku_code: string+ sku_name: string+ supplier_id: number+ supplier_name: string+ brand: string+ origin: string+ unit: string+}++export interface DataProps {+ tableData: CommodityVO[]+ tableTreeConfig: VxeTablePropTypes.TreeConfig+ showDialog: boolean+ dialogForm: CommodityVO+ tablePage: TablePage+ searchForm: {+ spu_code: string+ spu_name: string+ category_name: string+ },+ timer: any+}diff --git a/frontend/src/types/Base/CompanySetting.ts b/frontend/src/types/Base/CompanySetting.tsnew file mode 100644index 0000000..335dafe--- /dev/null+++ b/frontend/src/types/Base/CompanySetting.ts@@ -0,0 +1,16 @@+import { UniformFileNaming } from '../System/Form'++export interface CompanyVO extends UniformFileNaming {+ id: number+ company_name: string+ city: string+ address: string+ manager: string+ contact_tel: string+}++export interface DataProps {+ tableData: CompanyVO[]+ showDialog: boolean+ dialogForm: CompanyVO+}diff --git a/frontend/src/types/Base/Customer.ts b/frontend/src/types/Base/Customer.tsnew file mode 100644index 0000000..229e7cf--- /dev/null+++ b/frontend/src/types/Base/Customer.ts@@ -0,0 +1,28 @@+import { UniformFileNaming, TablePage } from '../System/Form'++export interface CustomerVO extends UniformFileNaming {+ id: number+ customer_name: string+ city: string+ address: string+ manager: string+ email: string+ contact_tel: string+ is_valid: boolean+}+export interface CustomerExcelVO {+ customer_name: string+ city: string+ address: string+ manager: string+ email: string+ contact_tel: string+ _XID: string+ errorMsg: string+}+export interface DataProps {+ tableData: CustomerVO[]+ tablePage: TablePage+ showDialog: boolean+ dialogForm: CustomerVO+}diff --git a/frontend/src/types/Base/Freight.ts b/frontend/src/types/Base/Freight.tsnew file mode 100644index 0000000..ef39332--- /dev/null+++ b/frontend/src/types/Base/Freight.ts@@ -0,0 +1,12 @@+import { UniformFileNaming } from '../System/Form'++export interface FreightVO extends UniformFileNaming{+ id?: number+ carrier: string+ departure_city: string+ arrival_city: string+ price_per_weight: number+ price_per_volume: number+ min_payment: number+ is_valid?: boolean+}\ No newline at end of filediff --git a/frontend/src/types/Base/OwnerOfCargo.ts b/frontend/src/types/Base/OwnerOfCargo.tsnew file mode 100644index 0000000..c98c607--- /dev/null+++ b/frontend/src/types/Base/OwnerOfCargo.ts@@ -0,0 +1,30 @@+import { UniformFileNaming, TablePage } from '../System/Form'++export interface OwnerOfCargoVO extends UniformFileNaming {+ id: number+ goods_owner_name: string+ city: string+ address: string+ contact_tel: string+ manager: string+}++export interface ImportVO {+ goods_owner_name: string+ city: string+ address: string+ contact_tel: string+ manager: string+}++export interface DataProps {+ tableData: OwnerOfCargoVO[]+ showDialog: boolean+ showDialogImport: boolean+ dialogForm: OwnerOfCargoVO+ searchForm: {+ goods_owner_name: string+ }+ tablePage: TablePage+ timer: any+}diff --git a/frontend/src/types/Base/RoleMenu.ts b/frontend/src/types/Base/RoleMenu.tsnew file mode 100644index 0000000..8466ab7--- /dev/null+++ b/frontend/src/types/Base/RoleMenu.ts@@ -0,0 +1,21 @@+import { NavListOptions, UniformFileNaming, VxeTableRow } from '../System/Form'++export interface RoleMenuVO extends UniformFileNaming {+ userrole_id?: number+ role_name?: string+ detailList: RoleMenuDetailVo[]+}++export interface RoleMenuDetailVo extends VxeTableRow {+ id: number+ menu_id?: number+ menu_name?: string+}++export interface DataProps {+ activeRoleMenuForm: RoleMenuVO+ roleList: RoleMenuVO[]+ showDialog: boolean+ dialogForm: RoleMenuVO+ navListOptions: NavListOptions+}diff --git a/frontend/src/types/Base/Supplier.ts b/frontend/src/types/Base/Supplier.tsnew file mode 100644index 0000000..ddeac2a--- /dev/null+++ b/frontend/src/types/Base/Supplier.ts@@ -0,0 +1,28 @@+import { UniformFileNaming, TablePage } from '../System/Form'++export interface SupplierVO extends UniformFileNaming {+ id: number+ supplier_name: string+ city: string+ address: string+ manager: string+ email: string+ contact_tel: string+ is_valid: boolean+}++export interface SupplierExcelVO {+ supplier_name: string+ city: string+ address: string+ manager: string+ email: string+ contact_tel: string+}++export interface DataProps {+ tableData: SupplierVO[]+ tablePage: TablePage+ showDialog: boolean+ dialogForm: SupplierVO+}diff --git a/frontend/src/types/Base/UserManagement.ts b/frontend/src/types/Base/UserManagement.tsnew file mode 100644index 0000000..999f292--- /dev/null+++ b/frontend/src/types/Base/UserManagement.ts@@ -0,0 +1,42 @@+import { UniformFileNaming, TablePage } from '../System/Form'++export interface UserVO extends UniformFileNaming {+ id: number+ user_num: string+ user_name: string+ contact_tel?: string+ user_role?: string+ sex?: string+ auth_string?: string+ email?: string+ is_valid: boolean+}++export interface ImportVO {+ user_num: string+ user_name: string+ contact_tel: string+ user_role: string+ sex: string+ is_valid: boolean+}++export interface DataProps {+ showDialogImport: boolean+ tableData: UserVO[]+ searchForm: {+ user_num: string+ user_name: string+ user_role: string+ }+ tablePage: TablePage+ showDialog: boolean+ dialogForm: UserVO+ timer: any+}++export interface ChangePwdAPIParams {+ id: number+ old_password: string+ new_password: string+}diff --git a/frontend/src/types/Base/UserRoleSetting.ts b/frontend/src/types/Base/UserRoleSetting.tsnew file mode 100644index 0000000..cb81de7--- /dev/null+++ b/frontend/src/types/Base/UserRoleSetting.ts@@ -0,0 +1,13 @@+import { UniformFileNaming } from '../System/Form'++export interface UserRoleVO extends UniformFileNaming {+ id: number+ role_name: string+ is_valid: boolean+}++export interface DataProps {+ tableData: UserRoleVO[]+ showDialog: boolean+ dialogForm: UserRoleVO+}diff --git a/frontend/src/types/Base/Warehouse.ts b/frontend/src/types/Base/Warehouse.tsnew file mode 100644index 0000000..2baae73--- /dev/null+++ b/frontend/src/types/Base/Warehouse.ts@@ -0,0 +1,51 @@+import { UniformFileNaming } from '../System/Form'++export interface WarehouseVO extends UniformFileNaming {+ id?: number+ warehouse_name: string+ city: string+ address: string+ contact_tel?: string+ email?: string+ manager?: string+ is_valid?: boolean+}++export interface WarehouseAreaVO extends UniformFileNaming {+ id: number+ warehouse_id?: number+ parent_id?: number+ warehouse_name: string+ area_name: string+ area_property: AreaProperty+ is_valid: boolean+}++export interface GoodsLocationVO extends UniformFileNaming {+ id: number+ warehouse_id?: number+ warehouse_area_id?: number+ warehouse_name: string+ warehouse_area_name: string+ warehouse_area_property?: number+ location_name: string+ location_length?: number+ location_width?: number+ location_heigth?: number+ location_volume?: number+ location_load?: number+ roadway_number?: string+ shelf_number?: string+ layer_number?: string+ tag_number?: string+ is_valid: boolean+}++export enum AreaProperty {+ 'picking_area' = 1,+ 'stocking_area' = 2,+ 'receiving_area' = 3,+ 'return_area' = 4,+ 'defective_area' = 5,+ 'inventory_area' = 6+}diff --git a/frontend/src/types/DeliveryManagement/DeliveryManagement.ts b/frontend/src/types/DeliveryManagement/DeliveryManagement.tsnew file mode 100644index 0000000..f22957b--- /dev/null+++ b/frontend/src/types/DeliveryManagement/DeliveryManagement.ts@@ -0,0 +1,121 @@+import { UniformFileNaming } from '../System/Form'++export interface DeliveryManagementVO extends UniformFileNaming {+ id: number+ dispatch_no?: string+ dispatch_status?: number+ qty?: number+ weight?: number+ volume?: number+ customer_id?: number+ customer_name?: string+ picked_qty?: number+ detailList: DeliveryManagementDetailListVO[]+}++export interface DeliveryManagementDetailListVO {+ id: number+ qty: number+ sku_id?: number+ spu_code?: string+ spu_name?: string+ sku_code?: string+ sku_name?: string+}++export interface DeliveryManagementDetailVO extends DeliveryManagementVO {+ id: number+ spu_code?: string+ spu_name?: string+ sku_code?: string+ unpackage_qty?: number+ unweighing_qty?: number+ spu_description?: string+ bar_code?: string+ qty?: number+ unpicked_qty?: number+ picked_qty?: number+ weight?: number+ volume?: number+ weight_unit?: number+}++export interface addRequestVO {+ customer_id: number+ customer_name: string+ sku_id: number+ qty: number+}++export interface ConfirmOrderVO {+ spu_code: string+ sku_code: string+ qty: number+ confirm: boolean+ pick_list: ConfirmOrderPickListVO[]+}++export interface ConfirmOrderPickListVO {+ warehouse_name: string+ location_name: string+ pick_qty: number+}++export interface PackageVO {+ id?: number+ dispatch_no?: string+ dispatch_status?: number+ package_qty?: number+ picked_qty?: number+}++export interface WeighVO {+ id?: number+ dispatch_no?: string+ dispatch_status?: number+ weighing_qty?: number+ weighing_weight?: number+ picked_qty?: number+}++export interface DeliveryVO {+ id?: number+ dispatch_no?: string+ dispatch_status?: number+ picked_qty?: number+}++export interface SignInVO {+ id?: number+ dispatch_no?: string+ dispatch_status?: number+ damage_qty?: number+}++export interface CancleOrderVO {+ dispatch_no?: string+ dispatch_status?: number+}++export interface SetCarrierVO {+ id: number+ dispatch_no: string+ dispatch_status: number+ freightfee_id: number+ carrier: string+ waybill_no: string+}++export interface ConfirmItem {+ id: number+ dispatch_no: string+ dispatch_status: number+ spu_name: string+ spu_code: string+ sku_code: string+ maxQty: number+ qty: number+ picked_qty?: number+ weight?: number+ weight_unit?: string+}diff --git a/frontend/src/types/Home/Home.ts b/frontend/src/types/Home/Home.tsnew file mode 100644index 0000000..437638e--- /dev/null+++ b/frontend/src/types/Home/Home.ts@@ -0,0 +1,12 @@+// test interface+export interface SideBarMenu {+ icon?: string+ lable: string+ routerPath?: string+ showDetail?: boolean+ children?: SideBarMenu[]+}++export interface SideBarDataProps {+ menuList: SideBarMenu[]+}\ No newline at end of filediff --git a/frontend/src/types/Home/HomeHeader.ts b/frontend/src/types/Home/HomeHeader.tsnew file mode 100644index 0000000..228baad--- /dev/null+++ b/frontend/src/types/Home/HomeHeader.ts@@ -0,0 +1,9 @@+export interface DataProps {+ breadcrumbItems: BreadcrumbItems[]+ userOperationMenu: any+}++interface BreadcrumbItems {+ title: string+ disabled: boolean+}diff --git a/frontend/src/types/WMS/StockAsn.ts b/frontend/src/types/WMS/StockAsn.tsnew file mode 100644index 0000000..1c8809d--- /dev/null+++ b/frontend/src/types/WMS/StockAsn.ts@@ -0,0 +1,70 @@+import { UniformFileNaming } from '../System/Form'++export interface StockAsnVO extends UniformFileNaming {+ id: number+ asn_no: string+ asn_status: number+ spu_id: number+ spu_code: string+ spu_name: string+ sku_id: number+ sku_code: string+ sku_name: string+ origin: string+ length_unit: number+ volume_unit: number+ weight_unit: number+ asn_qty: number+ actual_qty: number+ sorted_qty: number+ shortage_qty: number+ more_qty: number+ damage_qty: number+ weight: number+ volume: number+ supplier_id: number+ supplier_name: string+ goods_owner_id: number+ goods_owner_name: string+ is_valid: boolean+}++export interface PutawayVo {+ asn_id: number+ goods_location_id: number+ putaway_qty: number+ location_name: string+}++export interface SortingVo {+ asn_id: number+ sorted_qty: number+}++export interface SkuInfoVo {+ spu_id: number+ spu_code: string+ spu_name: string+ category_id: number+ category_name: string+ spu_description: string+ bar_code: string+ supplier_id: number+ supplier_name: string+ brand: string+ origin: string+ length_unit: number+ volume_unit: number+ weight_unit: number+ sku_id: number+ sku_code: string+ sku_name: string+ weight: number+ lenght: number+ width: number+ height: number+ volume: number+ unit: string+ cost: number+ price: number+}diff --git a/frontend/src/types/WMS/StockManagement.ts b/frontend/src/types/WMS/StockManagement.tsnew file mode 100644index 0000000..b94fff6--- /dev/null+++ b/frontend/src/types/WMS/StockManagement.ts@@ -0,0 +1,29 @@+export interface StockLocationVO {+ warehouse: string+ location_name: string+ spu_code: string+ spu_name: string+ sku_id: number+ sku_code: string+ sku_name: string+ qty: number+ qty_available: number+ qty_locked: number+ qty_frozen: number+}++export interface StockVO {+ spu_code: string+ spu_name: string+ sku_code: string+ sku_id: number+ qty: number+ qty_available: number+ qty_locked: number+ qty_frozen: number+ qty_asn: number+ qty_to_unload: number+ qty_to_sort: number+ qty_sorted: number+ shortage_qty: number+}diff --git a/frontend/src/types/WarehouseWorking/WarehouseAdjust.ts b/frontend/src/types/WarehouseWorking/WarehouseAdjust.tsnew file mode 100644index 0000000..f4ae0dd--- /dev/null+++ b/frontend/src/types/WarehouseWorking/WarehouseAdjust.ts@@ -0,0 +1,26 @@+import { UniformFileNaming } from '../System/Form'++export interface WarehouseAdjustVO extends UniformFileNaming {+ id: number+ job_type?: AdjustJobType+ job_code: string+ sku_id: number+ goods_owner_id: number+ goods_location_id: number+ qty: number+ is_update_stock: boolean+ source_table_id: number+ spu_code?: string+ spu_name?: string+ sku_code?: string+ warehouse_name?: string+ location_name?: string+}++export enum AdjustJobType {+ UNKNOW = 0,+ TAKE = 1,+ PROCESS_COMBINE = 2,+ PROCESS_SPLIT = 3,+ MOVE = 4+}diff --git a/frontend/src/types/WarehouseWorking/WarehouseFreeze.ts b/frontend/src/types/WarehouseWorking/WarehouseFreeze.tsnew file mode 100644index 0000000..09d2745--- /dev/null+++ b/frontend/src/types/WarehouseWorking/WarehouseFreeze.ts@@ -0,0 +1,17 @@+import { UniformFileNaming } from '../System/Form'++export interface WarehouseFreezeVO extends UniformFileNaming {+ id: number+ job_code: string+ job_type: boolean+ sku_id: number+ goods_owner_id: number+ goods_location_id: number+ handler: string+ handle_time: string+ warehouse_name: string+ location_name: string+ spu_code: string+ spu_name: string+ sku_code: string+}diff --git a/frontend/src/types/WarehouseWorking/WarehouseMove.ts b/frontend/src/types/WarehouseWorking/WarehouseMove.tsnew file mode 100644index 0000000..44633d8--- /dev/null+++ b/frontend/src/types/WarehouseWorking/WarehouseMove.ts@@ -0,0 +1,27 @@+import { UniformFileNaming } from '../System/Form'++export interface WarehouseMoveVO extends UniformFileNaming {+ id: number+ job_code: string+ move_status: MoveStatus+ sku_id: number+ orig_goods_location_id: number+ dest_googs_location_id: number+ qty: number+ goods_owner_id: number+ handler: string+ handle_time: string+ orig_goods_warehouse: string+ orig_goods_location_name: string+ dest_googs_warehouse: string+ dest_googs_location_name: string+ spu_code: string+ spu_name: string+ sku_code: string+ sku_name: string+}++export enum MoveStatus {+ UNADJUST = 0,+ ADJUSTED = 1+}diff --git a/frontend/src/types/WarehouseWorking/WarehouseProcessing.ts b/frontend/src/types/WarehouseWorking/WarehouseProcessing.tsnew file mode 100644index 0000000..111b0b0--- /dev/null+++ b/frontend/src/types/WarehouseWorking/WarehouseProcessing.ts@@ -0,0 +1,31 @@+import { UniformFileNaming } from '../System/Form'++export interface WarehouseProcessingVO extends UniformFileNaming {+ id: number+ job_code: string+ job_type: boolean+ process_status: boolean+ processor: string+ process_time: string+ source_detail_list?: Array<WarehouseProcessingDetailVO>+ target_detail_list?: Array<WarehouseProcessingDetailVO>+ adjust_status?: boolean+ detailList?: Array<any>+}++export interface WarehouseProcessingDetailVO extends UniformFileNaming {+ id: number+ stock_process_id: number+ sku_id: number+ goods_owner_id: number+ goods_location_id: number+ qty: number | string+ is_source: boolean+ spu_code: string+ spu_name: string+ sku_code: string+ unit: string+ is_update_stock: boolean+ qty_available?: number+ location_name?: string+}diff --git a/frontend/src/types/WarehouseWorking/WarehouseTaking.ts b/frontend/src/types/WarehouseWorking/WarehouseTaking.tsnew file mode 100644index 0000000..b4cc40a--- /dev/null+++ b/frontend/src/types/WarehouseWorking/WarehouseTaking.ts@@ -0,0 +1,21 @@+import { UniformFileNaming } from '../System/Form'++export interface WarehouseTakingVO extends UniformFileNaming {+ id: number+ job_code: string+ job_status: boolean+ sku_id: number+ goods_owner_id: number+ goods_location_id: number+ book_qty: number+ counted_qty: number+ difference_qty: number+ spu_code: string+ spu_name: string+ sku_code: string+ warehouse_name: string+ location_name: string+ adjust_status: boolean+ handler: string+ handle_time: string+}diff --git a/frontend/src/types/system/Form.ts b/frontend/src/types/system/Form.tsnew file mode 100644index 0000000..f0e5706--- /dev/null+++ b/frontend/src/types/system/Form.ts@@ -0,0 +1,45 @@+export interface UniformFileNaming {+ creator?: string+ create_time?: string+ last_update_time?: string+ tenant_id?: number+}++// VxeTable Required paging parameters+export interface TablePage {+ total: number+ pageIndex: number+ pageSize: number+ searchObjects?: SearchObject[]+}++export interface NavListOptions {+ title: string+ labelKey: string+ indexKey: string+ indexValue: string+}++// API Required paging parameters+export interface PageConfigProps {+ pageIndex: number+ pageSize: number+ sqlTitle?: string+ searchObjects?: any+}++export interface VxeTableRow {+ _X_ROW_KEY?: string+}++export interface SearchObject {+ name?: string,+ operator?: SearchOperator,+ text?: string,+ value?: string+}++export enum SearchOperator {+ INCLUDE = 6,+ EQUAL = 1+}\ No newline at end of filediff --git a/frontend/src/types/system/Store.ts b/frontend/src/types/system/Store.tsnew file mode 100644index 0000000..d3e2f50--- /dev/null+++ b/frontend/src/types/system/Store.ts@@ -0,0 +1,28 @@+// user+export interface MenuItem {+ id: number+ menu_name: string+ module: string+ vue_path: string+ vue_path_detail: string+ vue_directory: string+}++export interface UserStateProps {+ userInfo: any+ token: string+ refreshToken: string+ expirationTime: number+ effectiveMinutes: number+ isRefreshingToken: boolean+ menulist: MenuItem[]+}++export interface StateProps {+ language: string+ currentRouterPath: string+ openedMenus: string[]+ clientWidth: number+ clientHeight: number+ refreshFlag: boolean+}\ No newline at end of filediff --git a/frontend/src/types/system/UserModel.ts b/frontend/src/types/system/UserModel.tsnew file mode 100644index 0000000..a2b89cf--- /dev/null+++ b/frontend/src/types/system/UserModel.ts@@ -0,0 +1,31 @@+/**+ * @description: Login interface parameters+ */+export interface LoginParams {+ user_name: string+ password: string+}++/**+ * @description: Login interface return value+ */+export interface LoginResultModel {+ userId: string | number+ token: string+}++/**+ * @description: Get user information return value+ */+// export interface GetUserInfoModel {+// // 用户id+// userId: string | number;+// // 用户名+// username: string;+// // 真实名字+// realName: string;+// // 头像+// avatar: string;+// // 介绍+// desc?: string;+// }diff --git a/frontend/src/types/system/hookComponent.ts b/frontend/src/types/system/hookComponent.tsnew file mode 100644index 0000000..7347aff--- /dev/null+++ b/frontend/src/types/system/hookComponent.ts@@ -0,0 +1,28 @@+// Dialog modal options+export interface DialogOptions {+ confirmText?: string // confirm btn text+ cancleText?: string // cancle btn text+ handleConfirm?(): void // confirm trigger method+ content: string // dialog content text+ title?: string // dialog title text+ dialogWidth?: string | number // dialog width pixel or percentage+}++// System message options+export interface MessageOptions {+ type?: 'success' | 'info' | 'warning' | 'error'+ variant?: 'flat' | 'elevated' | 'tonal' | 'outlined' | 'text' | 'plain'+ content: string+ border?: boolean | 'top' | 'end' | 'bottom' | 'start'+ shutDelay?: number+ color?: string+ messageWidth?: string | number // message width pixel or percentage+}++// Component list+export interface Components {+ // eslint-disable-next-line no-unused-vars+ $message(prop: MessageOptions): void+ // eslint-disable-next-line no-unused-vars+ $dialog(prop: DialogOptions): void+}diff --git a/frontend/src/types/system/router.ts b/frontend/src/types/system/router.tsnew file mode 100644index 0000000..ca8f595--- /dev/null+++ b/frontend/src/types/system/router.ts@@ -0,0 +1,12 @@+import { RouteMeta } from 'vue-router'++export interface CustomerRouterProps {+ name: string+ module?: string+ path: string+ directory: string+ redirect: string+ component: any+ children?: CustomerRouterProps[]+ meta?: RouteMeta+}diff --git a/frontend/src/utils/bus.ts b/frontend/src/utils/bus.tsnew file mode 100644index 0000000..f2a3b92--- /dev/null+++ b/frontend/src/utils/bus.ts@@ -0,0 +1,4 @@+// using ES6 modules+import mitt from 'mitt'++export const emitter = mitt()diff --git a/frontend/src/utils/common.ts b/frontend/src/utils/common.tsnew file mode 100644index 0000000..6595c84--- /dev/null+++ b/frontend/src/utils/common.ts@@ -0,0 +1,57 @@+import XEUtils from 'xe-utils'+import { SearchObject, SearchOperator } from '@/types/System/Form'++export const setSearchObject = (searchForm: any, preciseSearchCols: string[] = []) => {+ const searchObjects: Array<SearchObject> = []+ try {+ for (const key in searchForm) {+ const str = key as string+ const searchValue = searchForm[str as keyof typeof searchForm]+ let operator = SearchOperator.INCLUDE+ if (preciseSearchCols.includes(key)) {+ operator = SearchOperator.EQUAL+ }++ if (searchValue && searchValue.trim() !== '') {+ searchObjects.push({+ name: key,+ operator,+ text: searchValue,+ value: searchValue+ })+ }+ }+ return searchObjects+ } catch (error) {+ return searchObjects+ }+}++// Remove item what value is 'null' or '' in array+export const removeArrayNull = (array: any) => {+ for (const obj of array) {+ Object.keys(obj).forEach((item) => {+ if (XEUtils.isString(obj[item])) {+ obj[item] = obj[item].replace(/(^\s*)|(\s*$)/g, '')+ }+ if (obj[item] === '' || obj[item] === null) {+ delete obj[item]+ }+ })+ }+ return array+}++// Remove item what value is 'null' or '' in object+export const removeObjectNull = (obj: any) => {+ const copy = JSON.parse(JSON.stringify(obj))+ Object.keys(copy).forEach((item) => {+ if (XEUtils.isString(copy[item])) {+ copy[item] = copy[item].replace(/(^\s*)|(\s*$)/g, '')+ }+ if (copy[item] === '' || copy[item] == null) {+ delete copy[item]+ }+ })+ return copy+}diff --git a/frontend/src/utils/dataVerification/formRule.ts b/frontend/src/utils/dataVerification/formRule.tsnew file mode 100644index 0000000..ad3cf27--- /dev/null+++ b/frontend/src/utils/dataVerification/formRule.ts@@ -0,0 +1,94 @@+import i18n from '@/languages/i18n'++// Judge whether it is integer+export function IsInteger(value: string | number, validNumerical: 'nonNegative' | 'greaterThanZero' | 'noZero', length?: number): string {+ if (typeof value === 'number') {+ value = String(value)+ }+ let validText = ''+ if (value === '' || value == null) {+ return ''+ }+ let re = /^-?[0-9]\d*$/+ let max = 2147483647+ let min = -2147483648+ length = length || 32+ if (length === 8) {+ max = 255+ min = 0+ } else if (length === 16) {+ max = 32767+ min = -32768+ }+ switch (validNumerical) {+ case 'nonNegative':+ re = /^[0-9]\d*$/+ validText = '>=0'+ break+ case 'greaterThanZero':+ re = /^[1-9]\d*$/+ validText = '>0'+ break+ case 'noZero':+ re = /^[-]?[1-9][0-9]*$/+ validText = '!=0'+ break+ }+ const rsCheck = re.test(value)+ if (!rsCheck) {+ return `${ i18n.global.t('system.checkText.mustInput') }${ validText }${ i18n.global.t('system.checkText.integer') }`+ }+ if (Number(value) > max || Number(value) < min) {+ return `${ i18n.global.t('system.checkText.mustInput') }${ min }-${ max }${ i18n.global.t('system.checkText.integer') }`+ }+ return ''+}++// Judge whether it is decimal+export function IsDecimal(+ value: string | number,+ validNumerical: 'nonNegative' | 'greaterThanZero',+ length?: number,+ decimalLength?: number+): string {+ if (typeof value === 'number') {+ value = String(value)+ }+ if (value === '' || value == null) {+ return ''+ }+ let validText = ''+ let reg = /^[-]?\d+(\.\d+)?$/+ switch (validNumerical) {+ case 'nonNegative':+ reg = /^\d+(\.\d+)?$/+ validText = '>=0'+ break+ case 'greaterThanZero':+ reg = /^[+]{0,1}([1-9][0-9]{0,})$|^[+]{0,1}([1-9][0-9]{0,}\.\d+)$|^[+]{0,1}([0]\.(?!0+$)\d{1,})$/+ validText = '>0'+ break+ }+ const rsCheck = reg.test(value)+ if (!rsCheck) {+ return `${ i18n.global.t('system.checkText.pleaseEnter') }${ validText }${ i18n.global.t('system.checkText.decimal') }`+ }+ length = length || 18+ decimalLength = decimalLength || 2+ const arr = value.toString().split('.')+ if (arr.length > 0 && arr[0].length > length - decimalLength) {+ return `${ i18n.global.t('system.checkText.pleaseEnter') }${ length - decimalLength }${ i18n.global.t('system.checkText.inputIntMsg') }`+ }+ if (arr.length > 1 && arr[1].length > decimalLength) {+ return `${ i18n.global.t('system.checkText.pleaseEnter') }${ decimalLength }${ i18n.global.t('system.checkText.inputDecimalMsg') }`+ }+ return ''+}++// Judge string length+export function StringLength(value: string, min: number, max: number) {+ if (value.length < min || value.length > max) {+ return `${ i18n.global.t('system.checkText.lengthValid') }${ min }-${ max }`+ }+ return ''+}\ No newline at end of filediff --git a/frontend/src/utils/dataVerification/page.ts b/frontend/src/utils/dataVerification/page.tsnew file mode 100644index 0000000..c6e6bc9--- /dev/null+++ b/frontend/src/utils/dataVerification/page.ts@@ -0,0 +1,41 @@+/**+ * Duplicate inspection details+ * @param detail Array to be verified+ * @param checkKey Collection of items to be checked in the array object+ * @returns Repeat array+ */+export function checkDetailRepeatGetArry(detail: any[], checkKey: string[]): any[] {+ const repeatArray: any[] = []+ for (const item of detail) {+ let repeat = true+ for (const key of checkKey) {+ if (detail.filter(df => df[key] === item[key]).length === 1) {+ repeat = false+ }+ }+ if (repeat) {+ repeatArray.push(item)+ }+ }+ return repeatArray+}+/**+ * Duplicate inspection details+ * @param detail Array to be verified+ * @param checkKey Collection of items to be checked in the array object+ * @returns Duplicate or not+ */+export function checkDetailRepeatGetBool(detail: any[], checkKey: string[]): boolean {+ for (const item of detail) {+ let repeat = true+ for (const key of checkKey) {+ if (detail.filter(df => df[key] === item[key]).length === 1) {+ repeat = false+ }+ }+ if (repeat) {+ return true+ }+ }+ return false+}diff --git a/frontend/src/utils/dataVerification/tableRule.ts b/frontend/src/utils/dataVerification/tableRule.tsnew file mode 100644index 0000000..4415f31--- /dev/null+++ b/frontend/src/utils/dataVerification/tableRule.ts@@ -0,0 +1,83 @@+import i18n from '@/languages/i18n'++// Judge whether it is integer+export function isInteger(rule: any, value: any) {+ if (rule.hasOwnProperty('cellValue')) {+ value = rule.cellValue+ rule = rule.rule+ }+ return new Promise((resolve, reject) => {+ let validText = ''+ if (value === '' || value == null) {+ resolve(true)+ } else {+ let re = /^-?[0-9]\d*$/+ let max = 2147483647+ let min = -2147483648+ const length = rule.length || 32+ if (length === 8) {+ max = 255+ min = 0+ } else if (length === 16) {+ max = 32767+ min = -32768+ }+ if (rule.validNumerical === 'nonNegative') {+ re = /^[0-9]\d*$/+ validText = '>=0'+ } else if (rule.validNumerical === 'greaterThanZero') {+ re = /^[1-9]\d*$/+ validText = '>0'+ } else if (rule.validNumerical === 'noZero') {+ re = /^[-]?[1-9][0-9]*$/+ validText = '!=0'+ }+ const rsCheck = re.test(value)+ if (!rsCheck) {+ reject(new Error(`${ i18n.global.t('system.checkText.mustInput') }${ validText }${ i18n.global.t('system.checkText.integer') }`))+ } else if (value > max || value < min) {+ reject(new Error(`${ i18n.global.t('system.checkText.mustInput') }${ min }-${ max }${ i18n.global.t('system.checkText.integer') }`))+ } else {+ resolve(true)+ }+ }+ })+}++// Judge whether it is decimal+export function isDecimal(rule: any, value: any): any {+ if (rule.hasOwnProperty('cellValue')) {+ value = rule.cellValue+ rule = rule.rule+ }+ return new Promise((resolve, reject) => {+ if (value === '' || value == null) {+ resolve(true)+ } else {+ let validText = ''+ let reg = /^[-]?\d+(\.\d+)?$/+ if (rule.validNumerical === 'nonNegative') {+ reg = /^\d+(\.\d+)?$/+ validText = '>=0'+ } else if (rule.validNumerical === 'greaterThanZero') {+ reg = /^[+]{0,1}([1-9][0-9]{0,})$|^[+]{0,1}([1-9][0-9]{0,}\.\d+)$|^[+]{0,1}([0]\.(?!0+$)\d{1,})$/+ validText = '>0'+ }+ const rsCheck = reg.test(value)+ if (!rsCheck) {+ reject(new Error(`${ i18n.global.t('system.checkText.pleaseEnter') }${ validText }${ i18n.global.t('system.checkText.decimal') }`))+ } else {+ const length = rule.length || 18+ const decimalLength = rule.decimalLength || 2+ const arr = value.toString().split('.')+ if (arr.length > 0 && arr[0].length > length - decimalLength) {+ reject(new Error(`${ i18n.global.t('system.checkText.pleaseEnter') }${ length - decimalLength }${ i18n.global.t('system.checkText.inputIntMsg') }`))+ } else if (arr.length > 1 && arr[1].length > decimalLength) {+ reject(new Error(`${ i18n.global.t('system.checkText.pleaseEnter') }${ decimalLength }${ i18n.global.t('system.checkText.inputDecimalMsg') }`))+ } else {+ resolve(true)+ }+ }+ }+ })+}diff --git a/frontend/src/utils/exportTable.ts b/frontend/src/utils/exportTable.tsnew file mode 100644index 0000000..8757af1--- /dev/null+++ b/frontend/src/utils/exportTable.ts@@ -0,0 +1,69 @@+import * as XLSX from 'xlsx'+import { hookComponent } from '@/components/system'+import i18n from '@/languages/i18n'+/**+ * Export table+ * Default type is 'xlsx'+ */+export const exportData = ({ table, filename, columnFilterMethod, mode = 'all' }: IExportTable): void => {+ try {+ // 1.Get table header+ const columns = table?.getColumns()+ const theadDOM = table.$el.querySelector('.body--wrapper>.vxe-table--header')+ const theadDOMCopy = theadDOM.cloneNode(true)+ const headerRow = theadDOMCopy.querySelector('.vxe-header--row')+ const headerColumn = theadDOMCopy.querySelectorAll('.vxe-header--column')++ // 2.Get table data+ const bodyDOM = table.$el.querySelector('.body--wrapper>.vxe-table--body')+ const bodyDOMCopy = bodyDOM.cloneNode(true)+ const rowDOMList = bodyDOMCopy.querySelectorAll('.vxe-body--row')++ // 3.Filter header in table+ for (let i = 0; i < columns.length; i++) {+ const column = columns[i]+ if (columnFilterMethod && !columnFilterMethod({ column })) {+ headerRow.removeChild(headerColumn[i])+ }+ }++ // 4.Filter table data in table+ for (let j = 0; j < rowDOMList.length; j++) {+ const row = rowDOMList[j]+ const columnDOMList = row.querySelectorAll('.vxe-body--column')++ for (let i = 0; i < columns.length; i++) {+ const column = columns[i]+ if (columnFilterMethod && !columnFilterMethod({ column })) {+ row.removeChild(columnDOMList[i])+ }+ }+ }++ // 5.Combine table header and data+ const combineDOM = document.createElement('div')+ combineDOM.appendChild(theadDOMCopy)+ if (mode === 'all') {+ combineDOM.appendChild(bodyDOMCopy)+ }++ // 6.Export+ const workBook = XLSX.utils.table_to_book(combineDOM as HTMLElement)+ XLSX.writeFile(workBook, `${ filename }.xlsx`)+ } catch (error) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.page.export') }${ i18n.global.t('system.tips.fail') }`+ })+ }+}++interface IExportTable {+ table: any+ filename?: string+ exceptIndex?: Array<number>+ mode?: 'all' | 'header'+ columnFilterMethod?: FilterMEthod+}++type FilterMEthod = ({ column, row }: any) => booleandiff --git a/frontend/src/utils/format/formatSystem.ts b/frontend/src/utils/format/formatSystem.tsnew file mode 100644index 0000000..8af8882--- /dev/null+++ b/frontend/src/utils/format/formatSystem.ts@@ -0,0 +1,17 @@+import XEUtils from 'xe-utils'+import i18n from '@/languages/i18n'++export const formatIsValid = (value: boolean) => (value ? i18n.global.t('system.combobox.yesOrNo.yes') : i18n.global.t('system.combobox.yesOrNo.no'))++export const formatDate = (value: string, format?: string) => {+ const date = new Date(value)+ if (!value || !date || XEUtils.toDateString(date, 'yyyy-MM-dd') === '1900-01-01') {+ return ''+ }+ return XEUtils.toDateString(date, format || 'yyyy-MM-dd HH:mm:ss')+}++export const formatString = (value: any): string => {+ if (value == null) return ''+ return value?.toString() || ''+}\ No newline at end of filediff --git a/frontend/src/utils/format/formatWarehouse.ts b/frontend/src/utils/format/formatWarehouse.tsnew file mode 100644index 0000000..9237b49--- /dev/null+++ b/frontend/src/utils/format/formatWarehouse.ts@@ -0,0 +1,21 @@+import { AreaProperty } from '@/types/Base/Warehouse'+import i18n from '@/languages/i18n'++export const formatAreaProperty = (value: number) => {+ switch (value) {+ case AreaProperty.picking_area:+ return i18n.global.t('base.warehouseSetting.picking_area')+ case AreaProperty.stocking_area:+ return i18n.global.t('base.warehouseSetting.stocking_area')+ case AreaProperty.receiving_area:+ return i18n.global.t('base.warehouseSetting.receiving_area')+ case AreaProperty.return_area:+ return i18n.global.t('base.warehouseSetting.return_area')+ case AreaProperty.defective_area:+ return i18n.global.t('base.warehouseSetting.defective_area')+ case AreaProperty.inventory_area:+ return i18n.global.t('base.warehouseSetting.inventory_area')+ default:+ return ''+ }+}diff --git a/frontend/src/utils/format/formatWarehouseWorking.ts b/frontend/src/utils/format/formatWarehouseWorking.tsnew file mode 100644index 0000000..47b91e7--- /dev/null+++ b/frontend/src/utils/format/formatWarehouseWorking.ts@@ -0,0 +1,35 @@+import i18n from '@/languages/i18n'+import { PROCESS_JOB_COMBINE, FREEZE_JOB_FREEZE, TAKING_JOB_FINISH } from '@/constant/warehouseWorking'+import { MoveStatus } from '@/types/WarehouseWorking/WarehouseMove'+import { AdjustJobType } from '@/types/WarehouseWorking/WarehouseAdjust'++export const formatProcessJobType = (value: boolean) => (value === PROCESS_JOB_COMBINE+ ? i18n.global.t('wms.warehouseWorking.warehouseProcessing.process_combine')+ : i18n.global.t('wms.warehouseWorking.warehouseProcessing.process_split'))++export const formatFreezeJobType = (value: boolean) => (value === FREEZE_JOB_FREEZE+ ? i18n.global.t('wms.warehouseWorking.warehouseFreeze.freeze')+ : i18n.global.t('wms.warehouseWorking.warehouseFreeze.unfreeze'))++export const formatMoveStatus = (value: number) => (value === MoveStatus.UNADJUST+ ? i18n.global.t('wms.warehouseWorking.warehouseMove.unadjust')+ : i18n.global.t('wms.warehouseWorking.warehouseMove.adjusted'))++export const formatTakingJobStatus = (value: boolean) => (value === TAKING_JOB_FINISH+ ? i18n.global.t('wms.warehouseWorking.warehouseTaking.finish')+ : i18n.global.t('wms.warehouseWorking.warehouseTaking.unfinish'))++export const formatAdjustJobType = (value: number) => {+ switch (value) {+ case AdjustJobType.TAKE:+ return i18n.global.t('wms.warehouseWorking.warehouseAdjust.warehouseTake')+ case AdjustJobType.PROCESS_COMBINE:+ return i18n.global.t('wms.warehouseWorking.warehouseAdjust.processCombine')+ case AdjustJobType.PROCESS_SPLIT:+ return i18n.global.t('wms.warehouseWorking.warehouseAdjust.processSplit')+ case AdjustJobType.MOVE:+ return i18n.global.t('wms.warehouseWorking.warehouseAdjust.warehouseMove')+ default:+ return ''+ }+}diff --git a/frontend/src/utils/http/request.ts b/frontend/src/utils/http/request.tsnew file mode 100644index 0000000..a4a4fd5--- /dev/null+++ b/frontend/src/utils/http/request.ts@@ -0,0 +1,207 @@+import axios from 'axios' // 引入axios+import { store } from '@/store'+import { emitter } from '@/utils/bus.js'+import { router } from '@/router'+import { hookComponent } from '@/components/system'+import i18n from '@/languages/i18n'++// Basis of axios+const SERVER_URL = `${ import.meta.env.VITE_BASE_PATH }:${ import.meta.env.VITE_SERVER_PORT }`+axios.defaults.baseURL = SERVER_URL+const http = axios.create({+ baseURL: SERVER_URL,+ timeout: 10000+})++// The interface array request failed+let subscribesArr: Array<any> = []++// The count of current request+let acitveAxios = 0++function pushSubscribeInterface(cb: any) {+ subscribesArr.push(cb)+}++function reloadSubscribesWithNewToken(token: string) {+ subscribesArr.map((cb) => cb(token))+}++function resetSubscribes() {+ subscribesArr = []+}++/**+ * expired or will expired+ * @returns {boolean}+ */+function isTokenExpired() {+ const expiredTime = store.getters['user/expirationTime']+ if (expiredTime) {+ // Distance and x seconds is judged to be due+ const willExpiredSecond = 10 * 60+ const nowTime = new Date().getTime()+ const willExpired = (expiredTime - nowTime) / 1000 < willExpiredSecond++ return willExpired+ }+ return false+}++function rediretToLogin() {+ store.commit('system/clearOpenedMenu')+ store.commit('system/setCurrentRouterPath', '')++ router.push('/login')+}++const showLoading = () => {+ acitveAxios+++ if (acitveAxios > 0) {+ emitter.emit('showLoading')+ }+}++const closeLoading = () => {+ acitveAxios--+ if (acitveAxios <= 0) {+ emitter.emit('closeLoading')+ }+}++const handleRefreshToken = (token: string) => {+ const refreshToken = store.getters['user/refreshToken']+ store.commit('user/setIsRefreshingToken', true)+ axios+ .post('/refresh-token', {+ accessToken: token,+ refreshToken+ })+ .then(({ data: res }) => {+ if (res.isSuccess) {+ const tokenVo = res.data+ const expiredTime = new Date().getTime() + store.getters['user/effectiveMinutes'] * 60 * 1000++ store.commit('user/setToken', tokenVo)+ store.commit('user/setExpirationTime', expiredTime)++ // With the new token request those suspended interface+ reloadSubscribesWithNewToken(tokenVo)+ } else {+ return Promise.reject()+ }+ })+ .catch(() => {+ resetSubscribes()+ rediretToLogin()+ })+ .finally(() => {+ store.commit('user/setIsRefreshingToken', false)+ })+}++http.interceptors.request.use(+ (config: any) => {+ const donNeedTokenApi = ['/login', '/user/register']+ const token = store.getters['user/token']++ let culture = 'en-us'+ switch (store.getters['system/language']) {+ case 'zh':+ culture = 'zh-cn'+ break+ case 'en':+ culture = 'en-us'+ break+ }+ config.params ? (config.params.culture = culture) : (config.params = { culture })++ if (!config.hideLoading) {+ showLoading()+ }++ // It don't need token to request with some apis.+ if (donNeedTokenApi.includes(config.url)) {+ return config+ }++ // 1.Logout when token isn't exist+ if (!token) {+ rediretToLogin()+ return config+ }++ // 2.Request normally when token is exist and in valid date+ if (!isTokenExpired() || config.url === '/refresh-token') {+ config.headers = {+ 'Content-Type': 'application/json',+ ...config.headers+ }+ if (config.url && !donNeedTokenApi.includes(config.url)) {+ config.headers.Authorization = `Bearer ${ token }`+ }++ return config+ }++ // 3.Take a 'refresh token' request when it not in the refreshing.+ if (!store.getters['user/isRefreshingToken']) {+ handleRefreshToken(token)+ }++ // 4.Put the fail requests up and initiate them after refresh token+ const retry = new Promise((resolve) => {+ pushSubscribeInterface((newToken: string) => {+ config.headers.Authorization = `Bearer ${ newToken }`+ resolve(config)+ })+ })+ return retry+ },+ (error) => {+ closeLoading()+ return error+ }+)++http.interceptors.response.use(+ (response) => {+ closeLoading()+ if (response.data.code === 0 || response.headers.success === 'true') {+ if (response.headers.msg) {+ response.data.msg = decodeURI(response.headers.msg)+ }+ return response.data+ }+ return response.data.msg ? response.data : response+ },+ (error) => {+ closeLoading()+ // 1.There isn't 'error.response' object when request timeout+ if (!error.response) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.requestTimeout')+ })+ return+ }++ // 2.There is response status when request fail but not timeout+ switch (error.response.status) {+ case 500:+ console.error('error:', 500)+ break+ case 404:+ console.error('error:', 404)+ break+ }++ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.requestFail')+ })+ return error+ }+)++export default httpdiff --git a/frontend/src/utils/router/index.ts b/frontend/src/utils/router/index.tsnew file mode 100644index 0000000..cde88c6--- /dev/null+++ b/frontend/src/utils/router/index.ts@@ -0,0 +1,167 @@+import { MenuItem } from '@/types/System/Store'+import { CustomerRouterProps } from '@/types/System/Router'+import { SideBarMenu } from '@/types/Home/Home'+import { store } from '@/store'+import i18n from '@/languages/i18n'++// Convert menu permissions to data required for dynamic routing+export function menusToRouter(menuList: MenuItem[]): CustomerRouterProps[] {+ const result: CustomerRouterProps[] = []+ for (const menu of menuList) {+ result.push({+ name: menu.vue_path,+ module: menu.module,+ path: `/${ menu.vue_path }`,+ directory: menu.vue_directory,+ redirect: '',+ component: null+ })+ }+ return result+}++// Convert the menu permission returned from the back end to the sidebar+export function menusToSideBar(): SideBarMenu[] {+ const result: SideBarMenu[] = [+ { icon: GetModuleAndIcon('homepage'), lable: i18n.global.t('router.sideBar.homepage'), routerPath: 'homepage', showDetail: false }+ ]+ const menuList: MenuItem[] = store.getters['user/menulist']+ for (const menu of menuList) {+ // Get the module index and check whether this group exists+ const moduleIndex = result.findIndex((item) => item.lable === i18n.global.t(`router.sideBar.${ menu.module }`))+ const lable = GetMenuNameAndModule(menu.vue_path)+ if (lable) {+ // Primary menu+ if (!menu.module) {+ result.push({+ lable,+ icon: GetModuleAndIcon(menu.vue_path),+ routerPath: menu.vue_path+ })+ continue+ }+ // Secondary menu+ if (moduleIndex > -1) {+ result[moduleIndex].children?.push({+ lable,+ icon: GetModuleAndIcon(menu.vue_path),+ routerPath: menu.vue_path+ })+ } else {+ result.push({+ lable: i18n.global.t(`router.sideBar.${ menu.module }`),+ icon: GetModuleAndIcon(menu.module),+ showDetail: false,+ children: [+ {+ lable,+ icon: GetModuleAndIcon(menu.vue_path),+ routerPath: menu.vue_path+ }+ ]+ })+ }+ }+ }+ return result+}++// Get the menu name, module and icon+function GetMenuNameAndModule(path: string): string {+ switch (path) {+ case 'homepage':+ return i18n.global.t('router.sideBar.homepage')+ case 'ownerOfCargo':+ return i18n.global.t('router.sideBar.ownerOfCargo')+ case 'menuBasicSettings':+ return i18n.global.t('router.sideBar.menuBasicSettings')+ case 'userManagement':+ return i18n.global.t('router.sideBar.userManagement')+ case 'commodityCategorySetting':+ return i18n.global.t('router.sideBar.commodityCategorySetting')+ case 'commodityManagement':+ return i18n.global.t('router.sideBar.commodityManagement')+ case 'userRoleSetting':+ return i18n.global.t('router.sideBar.userRoleSetting')+ case 'companySetting':+ return i18n.global.t('router.sideBar.companySetting')+ case 'freightSetting':+ return i18n.global.t('router.sideBar.freightSetting')+ case 'warehouseSetting':+ return i18n.global.t('router.sideBar.warehouseSetting')+ case 'customer':+ return i18n.global.t('router.sideBar.customer')+ case 'supplier':+ return i18n.global.t('router.sideBar.supplier')+ case 'roleMenu':+ return i18n.global.t('router.sideBar.roleMenu')+ case 'stockManagement':+ return i18n.global.t('router.sideBar.stockManagement')+ case 'warehouseProcessing':+ return i18n.global.t('router.sideBar.warehouseProcessing')+ case 'warehouseMove':+ return i18n.global.t('router.sideBar.warehouseMove')+ case 'warehouseFreeze':+ return i18n.global.t('router.sideBar.warehouseFreeze')+ case 'warehouseAdjust':+ return i18n.global.t('router.sideBar.warehouseAdjust')+ case 'warehouseTaking':+ return i18n.global.t('router.sideBar.warehouseTaking')+ case 'deliveryManagement':+ return i18n.global.t('router.sideBar.deliveryManagement')+ case 'stockAsn':+ return i18n.global.t('router.sideBar.stockAsn')+ default:+ return ''+ }+}+function GetModuleAndIcon(name: string) {+ switch (name) {+ case 'baseModule':+ return 'cog'+ case 'homepage':+ return 'home'+ case 'stockManagement':+ return 'warehouse'+ case 'stockAsn':+ return 'home-silo'+ case 'warehouseWorkingModule':+ return 'account-hard-hat-outline '+ case 'deliveryManagement':+ return 'cube-send'+ case 'companySetting':+ return 'office-building'+ case 'roleMenu':+ return 'menu'+ case 'userRoleSetting':+ return 'account-box'+ case 'userManagement':+ return 'account'+ case 'commodityCategorySetting':+ return 'format-list-bulleted-type'+ case 'commodityManagement':+ return 'cart-minus'+ case 'ownerOfCargo':+ return 'account-credit-card'+ case 'freightSetting':+ return 'cash-multiple'+ case 'warehouseSetting':+ return 'warehouse'+ case 'warehouseProcessing':+ return 'vector-combine'+ case 'warehouseMove':+ return 'file-document-arrow-right-outline'+ case 'warehouseFreeze':+ return 'lock-outline'+ case 'warehouseAdjust':+ return 'image-auto-adjust'+ case 'warehouseTaking':+ return 'ballot-recount-outline'+ case 'customer':+ return 'account-box-outline'+ case 'supplier':+ return 'account-badge'+ default:+ return ''+ }+}diff --git a/frontend/src/view/Home/home.vue b/frontend/src/view/Home/home.vuenew file mode 100644index 0000000..7a11ce2--- /dev/null+++ b/frontend/src/view/Home/home.vue@@ -0,0 +1,47 @@+<template>+ <div class="HomeContainer">+ <HomeSideBar />+ <div class="homeRight">+ <HomeHeader />+ <div class="homeRouterContainer pt-2">+ <RouterView v-slot="{ Component }">+ <keep-alive :include="openedMenus">+ <component :is="Component"></component>+ </keep-alive>+ </RouterView>+ </div>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed } from 'vue'+import { store } from '@/store'+import HomeHeader from './homeHeader.vue'+import HomeSideBar from './homeSideBar.vue'++const openedMenus = computed(() => store.getters['system/openedMenus'])+</script>++<style scoped lang="less">+@headerHeight: 60px;+@sideBarWidth: 300px;+@sideBarTitleHeight: 80px;++.HomeContainer {+ width: 100vw;+ height: 100vh;+ display: flex;+ flex-wrap: wrap;++ .homeRight {+ width: calc(100% - @sideBarWidth);+ padding: 0 5%;++ .homeRouterContainer {+ height: calc(100% - @headerHeight);+ box-sizing: border-box;+ }+ }+}+</style>diff --git a/frontend/src/view/Home/homeHeader.vue b/frontend/src/view/Home/homeHeader.vuenew file mode 100644index 0000000..fc05968--- /dev/null+++ b/frontend/src/view/Home/homeHeader.vue@@ -0,0 +1,224 @@+<template>+ <div class="homeHeader">+ <div class="menuTitle">+ <v-breadcrumbs :items="data.breadcrumbItems">+ <template #prepend>+ <v-icon :color="lightGrey" size="small" icon="mdi-form-select"></v-icon>+ </template>+ </v-breadcrumbs>+ </div>+ <div class="toolsBar">+ <div class="gitSrc mr-4">+ <img src="@/assets/img/gitee.png" alt="Gitee" @click="method.toGit('gitee')">+ </div>+ <div class="gitSrc mr-4">+ <img src="@/assets/img/github.png" alt="Gitee" @click="method.toGit('github')">+ </div>+ <LanguagesSwitch />+ <v-menu>+ <template #activator="{ props }">+ <div class="toolItems headPortrait ml-4" v-bind="props">+ <p class="firstName">{{ firstName }}</p>+ <div class="alive"></div>+ </div>+ </template>+ <v-list>+ <v-list-item v-for="(item, index) in data.userOperationMenu" :key="index" :value="index" @click="method.operation(item.value)">+ <v-list-item-title>{{ item.title }}</v-list-item-title>+ </v-list-item>+ </v-list>+ </v-menu>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { reactive, watch, computed } from 'vue'+import { useRouter } from 'vue-router'+import LanguagesSwitch from '@/components/system/languages.vue'+import { lightGrey } from '@/constant/style'+import i18n from '@/languages/i18n'+import { router } from '@/router'+import { store } from '@/store'+import { DataProps } from '@/types/Home/HomeHeader'++const routerInfo = useRouter()++const data: DataProps = reactive({+ breadcrumbItems: [],+ // User Action List+ userOperationMenu: [+ {+ title: i18n.global.t('system.homeHeader.logout'),+ value: 'logout'+ }+ ]+})++// Get current page route info+watch(+ () => routerInfo,+ (newValue) => {+ const MODULE = i18n.global.t(`router.sideBar.${ newValue.currentRoute.value.meta.menuModule }`)+ const PATH = i18n.global.t(`router.sideBar.${ newValue.currentRoute.value.meta.menuPath }`)++ data.breadcrumbItems = [+ {+ title: PATH,+ disabled: true+ }+ ]++ if (newValue.currentRoute.value.meta.menuModule) {+ data.breadcrumbItems.unshift({+ title: MODULE,+ disabled: true+ })+ }+ },+ { immediate: true, deep: true }+)++const method = reactive({+ // User operation method+ operation: (value: string) => {+ if (value === 'logout') {+ store.commit('system/clearOpenedMenu')+ store.commit('system/setCurrentRouterPath', '')++ router.push('/login')+ }+ },+ toGit: (type: string) => {+ if (type === 'gitee') {+ window.open('https://gitee.com/modernwms/ModernWMS', '_blank')+ } else if (type === 'github') {+ window.open('https://github.com/fjykTec/ModernWMS', '_blank')+ }+ }+})++const firstName = computed(() => {+ const userInfo = store.getters['user/userInfo']+ return userInfo?.user_name?.charAt(0) || ''+})+</script>++<style scoped lang="less">+@headerHeight: 60px;++.homeHeader {+ width: 100%;+ height: @headerHeight;+ position: relative;+ display: flex;+ justify-content: space-between;+ align-items: center;+ padding: 0 20px;+ box-sizing: border-box;+ border-radius: 0 0 10px 10px;+ transition: all 0.5s;++ box-shadow: 0 3px 3px -2px var(--v-shadow-key-umbra-opacity, rgba(0, 0, 0, 0.2)),+ 0 3px 4px 0 var(--v-shadow-key-penumbra-opacity, rgba(0, 0, 0, 0.14)), 0 1px 8px 0 var(--v-shadow-key-penumbra-opacity, rgba(0, 0, 0, 0.12));+ background-color: rgba(255, 255, 255, 0.5);++ .menuTitle {+ display: flex;++ .v-icon {+ margin-right: 10px;+ }++ span {+ color: #b9b8bc;+ }+ }++ .gitSrc {+ display: flex;+ align-items: center;+ justify-content: flex-end;++ > img {+ width: 24px;+ height: 24px;+ opacity: 0.5;+ }++ :hover {+ cursor: pointer;+ opacity: 1;+ scale: 1.1;+ transition: all ease-in-out 0.2s;+ }+ }+ .toolsBar {+ display: flex;+ align-items: center;+ justify-content: flex-end;++ .toolItems {+ height: 40px;+ width: 40px;+ font-size: 16px;+ display: flex;+ justify-content: center;+ align-items: center;+ transition: all 0.5s;+ border-radius: 40px;+ margin-right: 10px;+ cursor: pointer;++ &:hover {+ background-color: #e4e5ea;+ }++ &:active {+ background-color: #cdced3;+ }+ }++ .bell {+ position: relative;++ .hasNotify {+ margin: 0;+ width: 11px;+ height: 11px;+ border-radius: 11px;+ background-color: #ff4c51;+ border: 1px solid #fff;+ position: absolute;+ top: 5px;+ right: 7px;+ }+ }++ .headPortrait {+ border-radius: 40px;+ width: 40px;+ height: 40px;+ background-color: #e8e2fb;+ position: relative;++ .alive {+ margin: 0;+ width: 11px;+ height: 11px;+ border-radius: 11px;+ background-color: #56ca00;+ border: 1px solid #fff;+ position: absolute;+ bottom: 1px;+ right: 1px;+ }+ }+ }+}++.firstName{+ font-weight: 600;+ color: #9c27b0;+}+</style>diff --git a/frontend/src/view/Home/homeSideBar.vue b/frontend/src/view/Home/homeSideBar.vuenew file mode 100644index 0000000..71d59ff--- /dev/null+++ b/frontend/src/view/Home/homeSideBar.vue@@ -0,0 +1,180 @@+<template>+ <div style="height: 100%">+ <div class="homeSidebar">+ <div class="sideBarTitle">+ <Logo :height="50" :top="15" :left="5" />+ </div>+ <!-- 测试数据 -->+ <div class="sideBarMenus">+ <div v-for="(item, index) in data.menuList" :key="index">+ <div class="menuItems" :class="method.getItemClass(item)" @click="method.openMenu(item)">+ <div style="display: flex; align-items: center; height: 100%">+ <div class="menuIcon">+ <v-icon+ :icon="item.icon ? 'mdi-' + item.icon : 'mdi-checkbox-blank-circle-outline'"+ :size="18"+ :color="currentRouterPath === item.routerPath ? '#fff' : '#524e59'"+ ></v-icon>+ </div>+ <div class="menuLabel">{{ item.lable }}</div>+ </div>+ <div v-if="item.children && item.children.length > 0" :class="item.showDetail && 'rotate90'">+ <v-icon icon="mdi-chevron-right" color="#524e59" :size="22"></v-icon>+ </div>+ </div>+ <!-- <Transition name="menu"> -->+ <v-expand-transition>+ <div v-show="item.showDetail">+ <div+ v-for="(detailItem, detailIndex) in item.children"+ :key="detailIndex"+ class="menuItems padding-l"+ :class="method.getItemClass(detailItem)"+ @click="method.openMenu(detailItem)"+ >+ <div style="display: flex; align-items: center; height: 100%">+ <div class="menuIcon">+ <v-icon+ :icon="detailItem.icon ? `mdi-${detailItem.icon}` : 'mdi-checkbox-blank-circle-outline'"+ :size="14"+ :color="currentRouterPath === detailItem.routerPath ? '#fff' : '#524e59'"+ ></v-icon>+ </div>+ <div class="menuLabel">{{ detailItem.lable }}</div>+ </div>+ </div>+ </div>+ </v-expand-transition>+ <!-- </Transition> -->+ </div>+ </div>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { reactive, onMounted, computed } from 'vue'+import Logo from '@/components/system/logo.vue'+import { SideBarMenu, SideBarDataProps } from '@/types/Home/Home'+import { menusToSideBar } from '@/utils/router'+import { store } from '@/store'+import { router } from '@/router'++const data: SideBarDataProps = reactive({+ menuList: []+})++const method = reactive({+ // Open menu+ openMenu: (item: SideBarMenu) => {+ if (item.children && item.children.length > 0) {+ item.showDetail = !item.showDetail+ } else if (item.routerPath && currentRouterPath.value !== item.routerPath) {+ // If the selected menu is skipped, no action will be taken+ store.commit('system/setCurrentRouterPath', item.routerPath)+ store.commit('system/addOpenedMenu', item.routerPath)+ router.push(item.routerPath)+ }+ // if (menuName === 'login') {+ // store.commit('system/clearOpenedMenu', menuName)+ // } else {+ // store.commit('system/addOpenedMenu', menuName)+ // }+ // router.push(menuName)+ },+ // Get item class+ getItemClass: (item: SideBarMenu) => {+ if (item.children && item.children.length > 0 && item.showDetail) {+ return 'openedMenuItems'+ }+ if (currentRouterPath.value === item.routerPath) {+ return 'activeMenuItems'+ }+ return ''+ }+})++// Currently selected menu+const currentRouterPath = computed(() => store.getters['system/currentRouterPath'])++onMounted(() => {+ data.menuList = menusToSideBar()+})+</script>++<style scoped lang="less">+@headerHeight: 60px;+@sideBarWidth: 300px;+@sideBarTitleHeight: 70px;+.homeSidebar {+ width: @sideBarWidth;+ box-shadow: 5px 5px 5px #dbdce2;+ height: 100%;+ .sideBarTitle {+ height: @sideBarTitleHeight;+ position: relative;+ }+ .sideBarMenus {+ height: calc(100% - @sideBarTitleHeight);+ overflow: auto;+ .menuItems {+ // height: 42px;+ width: calc(100% - 20px);+ box-sizing: border-box;+ padding: 10px 0;+ padding-left: 22px;+ padding-right: 8px;+ border-radius: 0 50px 50px 0;+ margin-bottom: 7px;+ display: flex;+ justify-content: space-between;+ align-items: center;+ color: #696671;+ cursor: pointer;+ .menuIcon {+ height: 100%;+ width: 20px;+ margin-right: 10px;+ display: flex;+ justify-content: center;+ align-items: center;+ .v-icon {+ width: 10px;+ height: 10px;+ }+ }+ &:hover {+ background-color: #edeef3;+ }+ }++ .openedMenuItems {+ background-color: #e8e9ed;+ }+ .activeMenuItems {+ background: linear-gradient(to right, #af85fc, #9155fd);+ color: #fff;+ &:hover {+ background: linear-gradient(to right, #af85fc, #9155fd);+ }+ }++ &::-webkit-scrollbar {+ width: 7px;+ }++ &::-webkit-scrollbar-thumb {+ border-radius: 20px;+ background-color: #e5e5e9;+ }+ }+}++.rotate90 {+ transform: rotate(90deg);+}++.padding-l{+ padding-left: 44px !important;+}+</style>diff --git a/frontend/src/view/Home/homepage/homepage.vue b/frontend/src/view/Home/homepage/homepage.vuenew file mode 100644index 0000000..46e7f8e--- /dev/null+++ b/frontend/src/view/Home/homepage/homepage.vue@@ -0,0 +1,68 @@+<template>+ <div class="container">+ <div class="textBox">+ <div class="mainTitle">ModernWMS</div>+ <div class="subTitle">{{ i18n.global.t('homepage.subTitle') }}</div>+ </div>+ <div class="content">+ <div class="lottieBox">+ <lottie :src="dataJson"></lottie>+ </div>+ </div>+ </div>+</template>++<script lang="ts" setup>+import lottie from '@/components/lottie.vue'+import dataJson from '@/assets/warehouse.json'+import i18n from '@/languages/i18n'+</script>++<style scoped lang="less">+.container {+ width: 100%;+ height: 100%;+ display: flex;+ justify-content: center;+ position: relative;+ align-items: center;+}++.content {+ width: 60%;+}++.textBox {+ width: 100%;+ position: absolute;+ left: 50%;+ top: 5%;+ transform: translate(-50%, 0);+ letter-spacing: 5px;+ z-index: 999;+ font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;+}++.mainTitle {+ display: flex;+ justify-content: center;+ width: 100%;+ color: #9c27b0;+ font-weight: bold;+ font-size: 120px;+}++.subTitle {+ display: flex;+ justify-content: center;+ width: 100%;+ font-size: 30px;+ letter-spacing: 5px;+ color: #c9a7cf;+}++.lottieBox {+ min-width: 100%;+ max-width: 100%;+}+</style>diff --git a/frontend/src/view/Login/login.vue b/frontend/src/view/Login/login.vuenew file mode 100644index 0000000..d68cf91--- /dev/null+++ b/frontend/src/view/Login/login.vue@@ -0,0 +1,46 @@+<template>+ <div class="loginContainer">+ <Logo />+ <div class="loginLeft">+ <img src="../../assets/img/loginLeft.png" style="width: 80%" />+ </div>+ <div class="loginRight">+ <div class="LanguagesSwitchContainer">+ <LanguagesSwitch />+ </div>+ <LoginForm />+ </div>+ </div>+</template>++<script lang="ts" setup>+import LoginForm from '@/components/login/login-form.vue'+import LanguagesSwitch from '@/components/system/languages.vue'+import Logo from '@/components/system/logo.vue'+</script>++<style scoped lang="less">+.LanguagesSwitchContainer {+ position: absolute;+ right: 10px;+ top: 10px;+}+.loginContainer {+ width: 100%;+ height: 100%;+ display: flex;+ background-color: #fff;+ .loginLeft {+ width: 70%;+ display: flex;+ align-items: center;+ justify-content: center;+ }+ .loginRight {+ width: 30%;+ background-color: #fafafa;+ display: flex;+ align-items: center;+ }+}+</style>diff --git a/frontend/src/view/base/commodityCategorySetting/add-or-update-category.vue b/frontend/src/view/base/commodityCategorySetting/add-or-update-category.vuenew file mode 100644index 0000000..254f0f1--- /dev/null+++ b/frontend/src/view/base/commodityCategorySetting/add-or-update-category.vue@@ -0,0 +1,143 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('router.sideBar.commodityCategorySetting')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.category_name"+ :label="$t('base.commodityCategorySetting.category_name')"+ :rules="data.rules.category_name"+ variant="outlined"+ ></v-text-field>+ <v-select+ v-model="data.form.parent_id"+ :items="data.combobox.parent"+ item-title="label"+ item-value="value"+ :rules="data.rules.parent_id"+ :label="$t('base.commodityCategorySetting.parent_name')"+ variant="outlined"+ clearable+ ></v-select>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { CategoryVO } from '@/types/Base/CommodityCategorySetting'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addCategory, updateCategory, getCategoryAll } from '@/api/base/commodityCategorySetting'+import { StringLength } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: CategoryVO+}>()++const isShow = computed(() => props.showDialog)++const dialogTitle = computed(() => {+ if (props.form.id && props.form.id > 0) {+ return 'update'+ }+ return 'add'+})++const data = reactive({+ form: ref<CategoryVO>({+ id: 0,+ category_name: ''+ }),+ rules: {+ category_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityCategorySetting.category_name') }!`,+ (val: string) => StringLength(val, 0, 32) === '' || StringLength(val, 0, 32)+ ],+ parent_id: [],+ is_valid: []+ },+ combobox: ref<{+ parent: {+ label: string+ value: number+ }[]+ }>({+ parent: []+ })+})++const method = reactive({+ // Get the options required by the drop-down box+ getCombobox: async () => {+ data.combobox.parent = []+ const { data: res } = await getCategoryAll()+ if (!res.isSuccess) {+ return+ }+ for (const item of res.data) {+ data.combobox.parent.push({+ label: item.category_name,+ value: item.id+ })+ }+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addCategory(data.form) : await updateCategory(data.form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.getCombobox()+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/commodityCategorySetting/commodityCategorySetting.vue b/frontend/src/view/base/commodityCategorySetting/commodityCategorySetting.vuenew file mode 100644index 0000000..78dfdc1--- /dev/null+++ b/frontend/src/view/base/commodityCategorySetting/commodityCategorySetting.vue@@ -0,0 +1,241 @@+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="12" sm="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <!-- <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName1"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName2"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row> -->+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :data="data.tableData" :height="tableHeight" :tree-config="data.tableTreeConfig" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="80"></vxe-column>+ <vxe-column field="category_name" align="left" :title="$t('base.commodityCategorySetting.category_name')" tree-node></vxe-column>+ <vxe-column field="creator" :title="$t('base.commodityCategorySetting.creator')"></vxe-column>+ <vxe-column field="create_time" :title="$t('base.commodityCategorySetting.create_time')"></vxe-column>+ <vxe-column :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ @click="method.editRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ </div>+ </v-card-text>+ </v-card>+ </div>+ <!-- Add or modify data mode window -->+ <addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ </div>+</template>++<script lang="ts" setup>+import { computed, reactive, onMounted, ref } from 'vue'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { DataProps, CategoryVO } from '@/types/Base/CommodityCategorySetting'+import { getCategoryAll, deleteCategory } from '@/api/base/commodityCategorySetting'+import { hookComponent } from '@/components/system'+import addOrUpdateDialog from './add-or-update-category.vue'+import i18n from '@/languages/i18n'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++const data: DataProps = reactive({+ // searchForm: {+ // userName: '',+ // userName1: '',+ // userName2: ''+ // },+ tableData: [],+ tableTreeConfig: {+ transform: true,+ rowField: 'id',+ parentField: 'parent_id'+ },+ // Dialog info+ showDialog: false,+ dialogForm: {+ id: 0,+ category_name: ''+ }+})++const method = reactive({+ sureSearch: () => {+ // console.log(data.searchForm)+ },+ // Find Data by Pagination+ getCommodityCategorySetting: async () => {+ const { data: res } = await getCategoryAll()+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data+ // nextTick(() => {+ // xTable.value.setAllTreeExpand(true)+ // })+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ category_name: ''+ }+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // after Add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Refresh data+ refresh: () => {+ method.getCommodityCategorySetting()+ },+ editRow(row: CategoryVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ // If there is no parent, the parent will not be brought in_ id+ if (data.dialogForm.parent_id === 0) {+ delete data.dialogForm.parent_id+ }+ data.showDialog = true+ },+ deleteRow(row: CategoryVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteCategory(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ // Export table+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.commodityCategorySetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type)+ }+ })+ }+})++onMounted(async () => {+ await method.getCommodityCategorySetting()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))++const tableHeight = computed(() => computedTableHeight({ hasTab: false, hasPager: false }))+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/base/commodityManagement/add-or-update-commodity.vue b/frontend/src/view/base/commodityManagement/add-or-update-commodity.vuenew file mode 100644index 0000000..14d25d9--- /dev/null+++ b/frontend/src/view/base/commodityManagement/add-or-update-commodity.vue@@ -0,0 +1,631 @@+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('router.sideBar.commodityManagement')}`"></v-toolbar>+ <v-card-text>+ <v-row>+ <v-col cols="3">+ <div class="mainForm" :style="{ height: mainFormHeight }">+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.spu_code"+ :rules="data.rules.spu_code"+ :label="$t('base.commodityManagement.spu_code')"+ variant="outlined"+ density="compact"+ clearable+ class="mb-4"+ ></v-text-field>+ <v-text-field+ v-model="data.form.spu_name"+ :rules="data.rules.spu_name"+ :label="$t('base.commodityManagement.spu_name')"+ variant="outlined"+ density="compact"+ clearable+ class="mb-4"+ ></v-text-field>+ <v-select+ v-model="data.form.category_name"+ :items="data.combobox.category_name"+ item-title="label"+ item-value="label"+ :rules="data.rules.category_name"+ :label="$t('base.commodityManagement.category_name')"+ variant="outlined"+ density="compact"+ class="mb-4"+ clearable+ @update:model-value="method.categoryNameChange"+ ></v-select>+ <v-text-field+ v-model="data.form.spu_description"+ :rules="data.rules.spu_description"+ :label="$t('base.commodityManagement.spu_description')"+ variant="outlined"+ density="compact"+ clearable+ class="mb-4"+ ></v-text-field>+ <v-text-field+ v-model="data.form.bar_code"+ :rules="data.rules.bar_code"+ :label="$t('base.commodityManagement.bar_code')"+ variant="outlined"+ density="compact"+ clearable+ class="mb-4"+ ></v-text-field>+ <v-select+ v-model="data.form.supplier_name"+ :items="data.combobox.supplier_name"+ :rules="data.rules.supplier_name"+ item-title="label"+ item-value="label"+ :label="$t('base.commodityManagement.supplier_name')"+ variant="outlined"+ density="compact"+ class="mb-4"+ clearable+ @update:model-value="method.supplierNameChange"+ ></v-select>+ <v-text-field+ v-model="data.form.brand"+ :rules="data.rules.brand"+ :label="$t('base.commodityManagement.brand')"+ variant="outlined"+ density="compact"+ clearable+ class="mb-4"+ ></v-text-field>+ <v-select+ v-model="data.form.length_unit"+ :items="data.combobox.length_unit"+ item-title="label"+ item-value="value"+ :rules="data.rules.length_unit"+ :label="$t('base.commodityManagement.length_unit')"+ variant="outlined"+ density="compact"+ class="mb-4"+ clearable+ ></v-select>+ <v-select+ v-model="data.form.volume_unit"+ :items="data.combobox.volume_unit"+ item-title="label"+ item-value="value"+ :rules="data.rules.volume_unit"+ :label="$t('base.commodityManagement.volume_unit')"+ variant="outlined"+ density="compact"+ class="mb-4"+ clearable+ ></v-select>+ <v-select+ v-model="data.form.weight_unit"+ :items="data.combobox.weight_unit"+ item-title="label"+ item-value="value"+ :rules="data.rules.weight_unit"+ :label="$t('base.commodityManagement.weight_unit')"+ variant="outlined"+ density="compact"+ class="mb-4"+ clearable+ ></v-select>+ </v-form>+ </div>+ </v-col>+ <v-col cols="9">+ <div class="dataTable">+ <div class="toolbar">+ <tooltip-btn+ icon="mdi-plus"+ :tooltip-text="$t('system.page.insertOneRow')"+ size="x-small"+ @click="method.insertOneRow"+ ></tooltip-btn>+ <tooltip-btn+ icon="mdi-export-variant"+ :tooltip-text="$t('system.page.export')"+ size="x-small"+ @click="method.exportTable"+ ></tooltip-btn>+ </div>+ <vxe-table+ ref="xTable"+ keep-source+ :column-config="{ minWidth: '100px' }"+ :data="data.form.detailList"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ align="center"+ :edit-rules="data.validRules"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :mouse-config="{ selected: true }"+ :keyboard-config="{ isArrow: true, isDel: true, isEnter: true, isTab: true, isEdit: true, isChecked: true }"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="sku_code" :title="$t('base.commodityManagement.sku_code')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.sku_code" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="sku_name" :title="$t('base.commodityManagement.sku_name')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.sku_name" type="text"></vxe-input>+ </template>+ </vxe-column>+ <!-- <vxe-column field="supplier_name" :title="$t('base.commodityManagement.supplier_name')"></vxe-column> -->+ <!-- <vxe-column field="brand" :title="$t('base.commodityManagement.brand')"></vxe-column> -->+ <vxe-column field="unit" :title="$t('base.commodityManagement.unit')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.unit" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="weight" :title="$t('base.commodityManagement.weight')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.weight" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="lenght" :title="$t('base.commodityManagement.lenght')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.lenght" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="width" :title="$t('base.commodityManagement.width')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.width" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="height" :title="$t('base.commodityManagement.height')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.height" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('base.commodityManagement.volume')"> </vxe-column>+ <vxe-column field="cost" :title="$t('base.commodityManagement.cost')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.cost" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="price" :title="$t('base.commodityManagement.price')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.price" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="100" :resizable="false" show-overflow>+ <template #default="{ row }">+ <!-- <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ @click="method.editRow(row)"+ ></tooltip-btn> -->+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ </div>+ </v-col>+ </v-row>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { CommodityVO, CommodityDetailVO } from '@/types/Base/CommodityManagement'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addSpu, updateSpu } from '@/api/base/commodityManagementSetting'+import { getCategoryAll } from '@/api/base/commodityCategorySetting'+import { getSupplierAll } from '@/api/base/supplier'+import { CategoryVO } from '@/types/Base/CommodityCategorySetting'+import { SupplierVO } from '@/types/Base/Supplier'+import { computedSelectTableSearchHeight, SYSTEM_HEIGHT, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { removeArrayNull } from '@/utils/common'+import { StringLength } from '@/utils/dataVerification/formRule'+import { isDecimal } from '@/utils/dataVerification/tableRule'+import { exportData } from '@/utils/exportTable'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+ form: CommodityVO+}>()++const isShow = computed(() => props.showDialog)++const dialogTitle = computed(() => {+ if (props.form.id && props.form.id > 0) {+ return 'update'+ }+ return 'add'+})++const data = reactive({+ form: ref<CommodityVO>({+ id: 0,+ spu_code: '',+ spu_name: '',+ category_id: 0,+ category_name: '',+ spu_description: '',+ bar_code: '',+ supplier_id: 0,+ supplier_name: '',+ brand: '',+ origin: '',+ length_unit: 1,+ volume_unit: 0,+ weight_unit: 1,+ detailList: []+ }),+ tableData: [],+ rules: {+ spu_code: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_code') }!`,+ (val: string) => StringLength(val, 0, 32) === '' || StringLength(val, 0, 32)+ ],+ spu_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_name') }!`,+ (val: string) => StringLength(val, 0, 200) === '' || StringLength(val, 0, 200)+ ],+ spu_description: [(val: string) => StringLength(val, 0, 1000) === '' || StringLength(val, 0, 1000)],+ bar_code: [(val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)],+ brand: [(val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)],+ category_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.category_name') }!`+ ],+ length_unit: [+ (val: number) => [0, 1, 2, 3].includes(val) || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.length_unit') }!`+ ],+ volume_unit: [+ (val: number) => [0, 1, 2].includes(val) || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.volume_unit') }!`+ ],+ weight_unit: [+ (val: number) => [0, 1, 2].includes(val) || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.weight_unit') }!`+ ],+ supplier_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.supplier_name') }!`+ ]+ },+ validRules: ref<any>({+ sku_code: [+ { required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_code') }` },+ {+ type: 'string',+ min: 0,+ max: 32,+ message: `${ i18n.global.t('system.checkText.lengthValid') }${ 0 }-${ 32 }`,+ trigger: 'change'+ }+ ],+ sku_name: [+ { required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_name') }` },+ {+ type: 'string',+ min: 0,+ max: 200,+ message: `${ i18n.global.t('system.checkText.lengthValid') }${ 0 }-${ 200 }`,+ trigger: 'change'+ }+ ],+ unit: [+ { required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.unit') }` },+ {+ type: 'string',+ min: 0,+ max: 5,+ message: `${ i18n.global.t('system.checkText.lengthValid') }${ 0 }-${ 5 }`,+ trigger: 'change'+ }+ ],+ weight: [+ {+ validator: isDecimal,+ validNumerical: 'nonNegative',+ length: 8,+ decimalLength: 3,+ trigger: 'change'+ }+ ],+ lenght: [+ {+ validator: isDecimal,+ validNumerical: 'nonNegative',+ length: 8,+ decimalLength: 3,+ trigger: 'change'+ }+ ],+ width: [+ {+ validator: isDecimal,+ validNumerical: 'nonNegative',+ length: 8,+ decimalLength: 3,+ trigger: 'change'+ }+ ],+ height: [+ {+ validator: isDecimal,+ validNumerical: 'nonNegative',+ length: 8,+ decimalLength: 3,+ trigger: 'change'+ }+ ],+ volume: [+ // {+ // validator: isDecimal,+ // validNumerical: 'nonNegative',+ // length: 8,+ // decimalLength: 3,+ // trigger: 'change'+ // }+ ],+ cost: [+ {+ validator: isDecimal,+ validNumerical: 'nonNegative',+ length: 10,+ decimalLength: 2,+ trigger: 'change'+ }+ ],+ price: [+ {+ validator: isDecimal,+ validNumerical: 'nonNegative',+ length: 10,+ decimalLength: 2,+ trigger: 'change'+ }+ ]+ }),+ combobox: ref<{+ length_unit: {+ label: string+ value: number+ }[]+ volume_unit: {+ label: string+ value: number+ }[]+ weight_unit: {+ label: string+ value: number+ }[]+ category_name: {+ label: string+ value: number+ }[]+ supplier_name: {+ label: string+ value: number+ }[]+ }>({+ length_unit: [+ {+ label: 'mm',+ value: 0+ },+ {+ label: 'cm',+ value: 1+ },+ {+ label: 'dm',+ value: 2+ },+ {+ label: 'm',+ value: 3+ }+ ],+ volume_unit: [+ {+ label: 'cm³',+ value: 0+ },+ {+ label: 'dm³',+ value: 1+ },+ {+ label: 'm³',+ value: 2+ }+ ],+ weight_unit: [+ {+ label: 'mg',+ value: 0+ },+ {+ label: 'g',+ value: 1+ },+ {+ label: 'kg',+ value: 2+ }+ ],+ category_name: [],+ supplier_name: []+ })+})++const method = reactive({+ // When the commodity type changes, it is mainly used to assign the ID+ categoryNameChange: (val: string) => {+ if (!val) {+ data.form.category_id = 0+ } else {+ data.form.category_id = data.combobox.category_name.filter((item) => item.label === val)[0].value+ }+ },+ supplierNameChange: (val: string) => {+ if (!val) {+ data.form.supplier_id = 0+ } else {+ data.form.supplier_id = data.combobox.supplier_name.filter((item) => item.label === val)[0].value+ }+ },+ // Get the options required by the drop-down box+ getCombobox: async () => {+ data.combobox.category_name = []+ data.combobox.supplier_name = []+ const { data: res } = await getCategoryAll()+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.combobox.category_name = res.data+ .filter((item: CategoryVO) => item.is_valid)+ .map((item: CategoryVO) => ({ value: item.id, label: item.category_name }))+ // Get supplier information+ const { data: supplierRes } = await getSupplierAll()+ if (!supplierRes.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: supplierRes.errorMessage+ })+ return+ }+ data.combobox.supplier_name = supplierRes.data+ .filter((item: SupplierVO) => item.is_valid)+ .map((item: SupplierVO) => ({ value: item.id, label: item.supplier_name }))+ },+ closeDialog: () => {+ emit('close')+ },+ insertOneRow: () => {+ xTable.value.insertAt(-1)+ },+ // Export table+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.commodityManagement'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ submit: async () => {+ const $table = xTable.value+ const errMap = await $table.validate(true)+ const { valid } = await formRef.value.validate()+ if (valid && !errMap) {+ if ($table.getTableData().fullData.length === 0) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.detailLengthIsZero')+ })+ return+ }+ const form = { ...data.form }+ const insertRecords = $table.getInsertRecords()+ form.detailList = []+ // Processing detailed data+ if (dialogTitle.value === 'add') {+ form.detailList = [...insertRecords]+ } else {+ const updateRecords = $table.getUpdateRecords()+ const removeRecords = $table.getRemoveRecords()+ form.detailList = [...insertRecords, ...updateRecords]+ for (const item of removeRecords) {+ item.id = item.id > 0 ? 0 - item.id : item.id+ form.detailList.push(item)+ }+ }+ form.detailList = removeArrayNull(form.detailList)+ const { data: res } = dialogTitle.value === 'add' ? await addSpu(form) : await updateSpu(form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ },+ editRow: (row: CommodityDetailVO) => {+ const $table = xTable.value+ $table.setEditRow(row)+ },+ deleteRow: (row: CommodityDetailVO) => {+ const $table = xTable.value+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ $table.remove(row)+ }+ })+ }+})++const mainFormHeight = computed(() => computedSelectTableSearchHeight({ hasPager: false, hasToolBar: true }))++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.getCombobox()+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.mainForm {+ background-color: #f9f9f9;+ border-radius: 5px;+ padding: 20px;+ box-sizing: border-box;+ overflow: auto;+}++.toolbar {+ height: 40px;+}+</style>diff --git a/frontend/src/view/base/commodityManagement/commodityManagement.vue b/frontend/src/view/base/commodityManagement/commodityManagement.vuenew file mode 100644index 0000000..c74f284--- /dev/null+++ b/frontend/src/view/base/commodityManagement/commodityManagement.vue@@ -0,0 +1,386 @@+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="12" sm="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.spu_code"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.commodityManagement.spu_code')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.spu_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.commodityManagement.spu_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.category_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.commodityManagement.category_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table+ ref="xTable"+ :data="data.tableData"+ :column-config="{+ minWidth: '100px'+ }"+ :height="tableHeight"+ align="center"+ :tree-config="data.tableTreeConfig"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="spu_code" width="150px" :title="$t('base.commodityManagement.spu_code')" tree-node>+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ row.sku_code }}</span>+ <span v-else>{{ row.spu_code }}</span>+ </template>+ </vxe-column>+ <vxe-column field="spu_name" :title="$t('base.commodityManagement.spu_name')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ row.sku_name }}</span>+ <span v-else>{{ row.spu_name }}</span>+ </template>+ </vxe-column>+ <vxe-column field="category_name" :title="$t('base.commodityManagement.category_name')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ row.unit }}</span>+ <span v-else>{{ row.category_name }}</span>+ </template>+ </vxe-column>+ <vxe-column field="spu_description" :title="$t('base.commodityManagement.spu_description')"> </vxe-column>+ <vxe-column field="bar_code" :title="$t('base.commodityManagement.bar_code')"> </vxe-column>+ <vxe-column field="supplier_name" :title="$t('base.commodityManagement.supplier_name')"> </vxe-column>+ <vxe-column field="brand" :title="$t('base.commodityManagement.brand')"> </vxe-column>++ <vxe-column field="weight" :title="$t('base.commodityManagement.weight')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="lenght" :title="$t('base.commodityManagement.lenght')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ `${row.lenght} ${GetUnit('length', row.length_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="width" :title="$t('base.commodityManagement.width')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ `${row.width} ${GetUnit('length', row.length_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="height" :title="$t('base.commodityManagement.height')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ `${row.height} ${GetUnit('length', row.length_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('base.commodityManagement.volume')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>++ <vxe-column field="cost" :title="$t('base.commodityManagement.cost')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ row.cost }}</span>+ </template>+ </vxe-column>+ <vxe-column field="price" :title="$t('base.commodityManagement.price')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ row.price }}</span>+ </template>+ </vxe-column>+ <!-- <vxe-column field="sku_name" :title="$t('base.commodityManagement.sku_name')"></vxe-column> -->+ <!-- <vxe-column field="supplier_name" :title="$t('base.commodityManagement.supplier_name')"></vxe-column>+ <vxe-column field="brand" :title="$t('base.commodityManagement.brand')"></vxe-column>+ <vxe-column field="unit" :title="$t('base.commodityManagement.unit')"></vxe-column>+ <vxe-column field="cost" :title="$t('base.commodityManagement.cost')"></vxe-column> -->+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <div v-if="!row.parent_id || row.parent_id <= 0">+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ @click="method.editRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </div>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ </v-card-text>+ </v-card>+ </div>+ <!-- Add or modify data mode window -->+ <addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ </div>+</template>++<script lang="ts" setup>+import { computed, reactive, onMounted, ref, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { CommodityVO, DataProps } from '@/types/Base/CommodityManagement'+import { getSpuList, deleteSpu } from '@/api/base/commodityManagementSetting'+import { hookComponent } from '@/components/system'+import addOrUpdateDialog from './add-or-update-commodity.vue'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import i18n from '@/languages/i18n'+import { GetUnit } from '@/constant/commodityManagement'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data: DataProps = reactive({+ searchForm: {+ spu_code: '',+ spu_name: '',+ category_name: ''+ },+ timer: null,+ tableData: [],+ tablePage: {+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE+ },+ tableTreeConfig: {+ transform: true,+ rowField: 'tree_id',+ parentField: 'parent_id'+ },+ // Dialog info+ showDialog: false,+ dialogForm: {+ id: 0,+ spu_code: '',+ spu_name: '',+ category_id: 0,+ category_name: '',+ spu_description: '',+ bar_code: '',+ supplier_id: 0,+ supplier_name: '',+ brand: '',+ origin: '',+ length_unit: 1,+ volume_unit: 0,+ weight_unit: 1,+ detailList: []+ }+})++const method = reactive({+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getCompanyList()+ },+ // Find Data by Pagination+ getCompanyList: async () => {+ const { data: res } = await getSpuList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = []+ for (const item of res.data.rows) {+ item.tree_id = item.id+ data.tableData.push(item)+ for (const ditem of item.detailList) {+ ditem.tree_id = 0+ ditem.parent_id = item.id+ ditem.length_unit = item.length_unit+ ditem.volume_unit = item.volume_unit+ ditem.weight_unit = item.weight_unit+ data.tableData.push(ditem)+ }+ }+ data.tablePage.total = res.data.totals+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ spu_code: '',+ spu_name: '',+ spu_description: '',+ bar_code: '',+ brand: '',+ length_unit: 1,+ volume_unit: 0,+ weight_unit: 1,+ detailList: []+ }+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // after Add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Refresh data+ refresh: () => {+ method.getCompanyList()+ },+ editRow(row: CommodityVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: CommodityVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteSpu(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ // Export table+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.commodityManagement'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ // When change paging+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.refresh()+ })+})++onMounted(async () => {+ await method.getCompanyList()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))++const tableHeight = computed(() => computedTableHeight({ hasTab: false }))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/base/companySetting/add-or-update-company.vue b/frontend/src/view/base/companySetting/add-or-update-company.vuenew file mode 100644index 0000000..80fc453--- /dev/null+++ b/frontend/src/view/base/companySetting/add-or-update-company.vue@@ -0,0 +1,135 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('router.sideBar.companySetting')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.company_name"+ :label="$t('base.companySetting.company_name')"+ :rules="data.rules.company_name"+ variant="outlined"+ ></v-text-field>+ <v-text-field v-model="data.form.city" :label="$t('base.companySetting.city')" :rules="data.rules.city" variant="outlined"></v-text-field>+ <v-text-field+ v-model="data.form.address"+ :label="$t('base.companySetting.address')"+ :rules="data.rules.address"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.manager"+ :label="$t('base.companySetting.manager')"+ :rules="data.rules.manager"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.contact_tel"+ :label="$t('base.companySetting.contact_tel')"+ :rules="data.rules.contact_tel"+ variant="outlined"+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { CompanyVO } from '@/types/Base/CompanySetting'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addCompany, updateCompany } from '@/api/base/companySetting'+import { StringLength } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: CompanyVO+}>()++const isShow = computed(() => props.showDialog)++const dialogTitle = computed(() => {+ if (props.form.id && props.form.id > 0) {+ return 'update'+ }+ return 'add'+})++const data = reactive({+ form: ref<CompanyVO>({+ id: 0,+ company_name: '',+ city: '',+ address: '',+ manager: '',+ contact_tel: ''+ }),+ rules: {+ company_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.companySetting.company_name') }!`,+ (val: string) => StringLength(val, 0, 256) === '' || StringLength(val, 0, 256)+ ],+ city: [(val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)],+ address: [(val: string) => StringLength(val, 0, 256) === '' || StringLength(val, 0, 256)],+ manager: [(val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)],+ contact_tel: [(val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addCompany(data.form) : await updateCompany(data.form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/companySetting/companySetting.vue b/frontend/src/view/base/companySetting/companySetting.vuenew file mode 100644index 0000000..d6a9884--- /dev/null+++ b/frontend/src/view/base/companySetting/companySetting.vue@@ -0,0 +1,239 @@+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="12" sm="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <!-- <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName1"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName2"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row> -->+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="company_name" :title="$t('base.companySetting.company_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.companySetting.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.companySetting.address')"></vxe-column>+ <vxe-column field="manager" :title="$t('base.companySetting.manager')"></vxe-column>+ <vxe-column field="contact_tel" :title="$t('base.companySetting.contact_tel')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ @click="method.editRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ </div>+ </v-card-text>+ </v-card>+ </div>+ <!-- Add or modify data mode window -->+ <addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ </div>+</template>++<script lang="ts" setup>+import { computed, reactive, onMounted, ref } from 'vue'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { CompanyVO, DataProps } from '@/types/Base/CompanySetting'+import { getCompanyAll, deleteCompany } from '@/api/base/companySetting'+import { hookComponent } from '@/components/system'+import addOrUpdateDialog from './add-or-update-company.vue'+import i18n from '@/languages/i18n'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++const data: DataProps = reactive({+ // searchForm: {+ // userName: '',+ // userName1: '',+ // userName2: ''+ // },+ tableData: [],+ // Dialog info+ showDialog: false,+ dialogForm: {+ id: 0,+ company_name: '',+ city: '',+ address: '',+ manager: '',+ contact_tel: ''+ }+})++const method = reactive({+ sureSearch: () => {+ // console.log(data.searchForm)+ },+ // Find Data by Pagination+ getCompanyList: async () => {+ const { data: res } = await getCompanyAll()+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ company_name: '',+ city: '',+ address: '',+ manager: '',+ contact_tel: ''+ }+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // after Add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Refresh data+ refresh: () => {+ method.getCompanyList()+ },+ editRow(row: CompanyVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: CompanyVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteCompany(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ // Export table+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.companySetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ }+})++onMounted(async () => {+ await method.getCompanyList()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))++const tableHeight = computed(() => computedTableHeight({ hasTab: false, hasPager: false }))+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/base/customer/add-or-update-customer.vue b/frontend/src/view/base/customer/add-or-update-customer.vuenew file mode 100644index 0000000..16c0606--- /dev/null+++ b/frontend/src/view/base/customer/add-or-update-customer.vue@@ -0,0 +1,141 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('router.sideBar.customer')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.customer_name"+ :label="$t('base.customer.customer_name')"+ :rules="data.rules.customer_name"+ variant="outlined"+ ></v-text-field>+ <v-text-field v-model="data.form.city" :label="$t('base.customer.city')" :rules="data.rules.city" variant="outlined"></v-text-field>+ <v-text-field+ v-model="data.form.email"+ :label="$t('base.customer.email')"+ :rules="data.rules.email"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.address"+ :label="$t('base.customer.address')"+ :rules="data.rules.address"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.manager"+ :label="$t('base.customer.manager')"+ :rules="data.rules.manager"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.contact_tel"+ :label="$t('base.customer.contact_tel')"+ :rules="data.rules.contact_tel"+ variant="outlined"+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { CustomerVO } from '@/types/Base/Customer'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addCustomer, updateCustomer } from '@/api/base/customer'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: CustomerVO+}>()++const isShow = computed(() => props.showDialog)++const dialogTitle = computed(() => {+ if (props.form.id && props.form.id > 0) {+ return 'update'+ }+ return 'add'+})++const data = reactive({+ form: ref<CustomerVO>({+ id: 0,+ customer_name: '',+ city: '',+ address: '',+ manager: '',+ email: '',+ contact_tel: '',+ is_valid: true+ }),+ rules: {+ customer_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.customer.customer_name') }!`],+ city: [],+ address: [],+ manager: [],+ email: [],+ contact_tel: [],+ is_valid: []+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addCustomer(data.form) : await updateCustomer(data.form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/customer/customer.vue b/frontend/src/view/base/customer/customer.vuenew file mode 100644index 0000000..a700b1e--- /dev/null+++ b/frontend/src/view/base/customer/customer.vue@@ -0,0 +1,297 @@+<!-- customer Setting -->+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <!-- <v-window v-model="data.activeTab">+ <v-window-item> -->+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="12" sm="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn>+ <tooltip-btn icon="mdi-database-import-outline" :tooltip-text="$t('system.page.import')" @click="method.openDialogImport">+ </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="12" sm="4"></v-col>+ <v-col cols="12" sm="4"></v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.customer.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="customer_name" :title="$t('base.customer.customer_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.customer.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.customer.address')"></vxe-column>+ <vxe-column field="manager" :title="$t('base.customer.manager')"></vxe-column>+ <vxe-column field="email" :title="$t('base.customer.email')"></vxe-column>+ <vxe-column field="contact_tel" :title="$t('base.customer.contact_tel')"></vxe-column>+ <vxe-column field="creator" :title="$t('base.customer.creator')"></vxe-column>+ <vxe-column field="create_time" :title="$t('base.customer.create_time')">+ <!-- :formatter="['formatDate', 'yyyy-MM-dd HH:mm:ss']" -->+ <template #default="{ row, column }">+ <span>{{ formatDate(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="last_update_time" :title="$t('base.customer.last_update_time')">+ <template #default="{ row, column }">+ <span>{{ formatDate(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ @click="method.editRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ <!-- </v-window-item>+ </v-window> -->+ </v-card-text>+ </v-card>+ </div>+ </div>+ <addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <importCustomerTable :show-dialog="data.showDialogImport" @close="method.closeDialogImport" @saveSuccess="method.saveSuccessImport" />+</template>++<script lang="tsx" setup>+import { computed, ref, reactive, onMounted, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { CustomerVO, DataProps } from '@/types/Base/Customer'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import tooltipBtn from '@/components/tooltip-btn.vue'+import addOrUpdateDialog from './add-or-update-customer.vue'+import { hookComponent } from '@/components/system'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import { SearchObject } from '@/types/System/Form'+import i18n from '@/languages/i18n'+import { getCustomerList, deleteCustomer } from '@/api/base/customer'+import importCustomerTable from './import-customer-table.vue'+import { formatDate } from '@/utils/format/formatSystem'+import customPager from '@/components/custom-pager.vue'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++const data = reactive({+ searchForm: {+ customer_name: ''+ },+ tableData: [],+ // activeTab: null,+ showDialog: false,+ showDialogImport: false,+ dialogForm: {+ id: 0,+ customer_name: '',+ city: '',+ address: '',+ manager: '',+ email: '',+ contact_tel: '',+ is_valid: true+ },+ tablePage: {+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ },+ timer: ref<any>(null)+})++const method = reactive({+ // Import Dialog+ openDialogImport: () => {+ data.showDialogImport = true+ },+ closeDialogImport: () => {+ data.showDialogImport = false+ },+ saveSuccessImport: () => {+ method.refresh()+ method.closeDialog()+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getData()+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ customer_name: '',+ city: '',+ address: '',+ manager: '',+ email: '',+ contact_tel: '',+ is_valid: true+ }+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // after Add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Refresh data+ refresh: () => {+ method.getData()+ },+ editRow(row: CustomerVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: CustomerVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteCustomer(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.getData()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.customer'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ getData: async () => {+ const { data: res } = await getCustomerList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ }+})+onMounted(() => {+ method.getData()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))+const tableHeight = computed(() => computedTableHeight({ hasTab: false }))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/base/customer/import-customer-table.vue b/frontend/src/view/base/customer/import-customer-table.vuenew file mode 100644index 0000000..0a3c6b2--- /dev/null+++ b/frontend/src/view/base/customer/import-customer-table.vue@@ -0,0 +1,227 @@+<!-- Customer Setting Import Dialog -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('system.page.import')}`"></v-toolbar>+ <v-card-text>+ <div class="mb-4">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.chooseFile')" size="x-small" @click="method.chooseFile"></tooltip-btn>+ <tooltip-btn+ icon="mdi-export-variant"+ :tooltip-text="$t('system.page.exportTemplate')"+ size="x-small"+ @click="method.exportTemplate"+ ></tooltip-btn>+ <input v-show="false" id="open" ref="uploadExcel" type="file" accept=".xls, .xlsx" @change="method.readExcel" />+ </div>+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.importData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRules"+ :export-config="{}"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="operate" width="60" :title="$t('system.page.operate')" :resizable="false">+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ <vxe-column field="customer_name" :title="$t('base.customer.customer_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.customer.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.customer.address')"></vxe-column>+ <vxe-column field="manager" :title="$t('base.customer.manager')"></vxe-column>+ <vxe-column field="email" :title="$t('base.customer.email')"></vxe-column>+ <vxe-column field="contact_tel" :title="$t('base.customer.contact_tel')"></vxe-column>+ </vxe-table>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { VxeTablePropTypes } from 'vxe-table'+import * as XLSX from 'xlsx'+import i18n from '@/languages/i18n'+import { excelImport } from '@/api/base/customer'+import { hookComponent } from '@/components/system/index'+import { SYSTEM_HEIGHT, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { CustomerExcelVO } from '@/types/Base/Customer'+import { exportData } from '@/utils/exportTable'++const emit = defineEmits(['close', 'saveSuccess'])+const uploadExcel = ref()+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ importData: ref<Array<CustomerExcelVO>>([]),+ validRules: ref<VxeTablePropTypes.EditRules>({}),+ eMsg: ''+})++const method = reactive({+ initForm: () => {+ data.importData = []+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const isValid = method.valid()+ if (!isValid) {+ return+ }++ const $table = xTable.value+ // It must be use 'getTableData()' to get all datas with table because it will delete row sometimes.+ const importData = $table.getTableData().fullData++ const { data: res } = await excelImport(importData)+ if (!res.isSuccess) {+ data.eMsg = ''+ if (res.data.length > 0) {+ for (const item of res.data) {+ if (item.errorMsg) {+ data.eMsg = data.eMsg ? data.eMsg + ',' + item.errorMsg : item.errorMsg+ }+ }+ }+ hookComponent.$message({+ type: 'error',+ content: data.eMsg+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ },++ valid: () => {+ const $table = xTable.value+ const importData = $table.getTableData().fullData++ if (importData.length <= 0) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.tips.detailLengthIsZero') }`+ })+ return false+ }+ return true+ },++ chooseFile: async () => {+ uploadExcel.value.value = ''+ uploadExcel.value.click()+ },++ readExcel: async (evnt: any) => {+ const files = evnt.target.files+ if (files.length <= 0) {+ return false+ }++ const file = files[0]+ const fileReader = new FileReader()++ fileReader.onload = (ev: ProgressEvent<FileReader>) => {+ const fileData = ev?.target?.result+ if (fileData) {+ const workbook = XLSX.read(fileData, { type: 'binary' })+ const wsname = workbook.SheetNames[0]++ let ws = XLSX.utils.sheet_to_json(workbook.Sheets[wsname])+ let str = JSON.stringify(ws)+ str = str.replace(/(/g, '(')+ str = str.replace(/)/g, ')')+ ws = JSON.parse(str)++ data.importData = []+ ws.forEach((value: any, index: number, ws: any) => {+ data.importData.push({+ customer_name: ws[index][i18n.global.t('base.customer.customer_name')] ? ws[index][i18n.global.t('base.customer.customer_name')] + '' : '',+ city: ws[index][i18n.global.t('base.customer.city')] ? ws[index][i18n.global.t('base.customer.city')] + '' : '',+ address: ws[index][i18n.global.t('base.customer.address')] ? ws[index][i18n.global.t('base.customer.address')] + '' : '',+ manager: ws[index][i18n.global.t('base.customer.manager')] ? ws[index][i18n.global.t('base.customer.manager')] + '' : '',+ email: ws[index][i18n.global.t('base.customer.email')] ? ws[index][i18n.global.t('base.customer.email')] + '' : '',+ contact_tel: ws[index][i18n.global.t('base.customer.contact_tel')] ? ws[index][i18n.global.t('base.customer.contact_tel')] + '' : '',+ _XID: '',+ errorMsg: ''+ })+ })+ }+ }+ fileReader.readAsBinaryString(file)+ },++ exportTemplate: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.customer'),+ mode: 'header',+ columnFilterMethod({ column }: any) {+ return !['checkbox', 'seq'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ deleteRow: (row: CustomerExcelVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (row) {+ const $table = xTable.value+ $table.remove(row)+ }+ }+ })+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/freightSetting/add-or-update-freight.vue b/frontend/src/view/base/freightSetting/add-or-update-freight.vuenew file mode 100644index 0000000..c4bbe1c--- /dev/null+++ b/frontend/src/view/base/freightSetting/add-or-update-freight.vue@@ -0,0 +1,175 @@+<!-- Freight Setting Operate Dialog -->+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('router.sideBar.freightSetting')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.carrier"+ :label="$t('base.freightSetting.carrier')"+ :rules="data.rules.carrier"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.departure_city"+ :label="$t('base.freightSetting.departure_city')"+ :rules="data.rules.departure_city"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.arrival_city"+ :label="$t('base.freightSetting.arrival_city')"+ :rules="data.rules.arrival_city"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.price_per_weight"+ :label="$t('base.freightSetting.price_per_weight')"+ :rules="data.rules.price_per_weight"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.price_per_volume"+ :label="$t('base.freightSetting.price_per_volume')"+ :rules="data.rules.price_per_volume"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.min_payment"+ :label="$t('base.freightSetting.min_payment')"+ :rules="data.rules.min_payment"+ variant="outlined"+ ></v-text-field>+ <v-switch+ v-model="data.form.is_valid"+ color="primary"+ :label="$t('base.freightSetting.is_valid')"+ :rules="data.rules.is_valid"+ ></v-switch>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addFreight, updateFreight } from '@/api/base/freightSetting'+import { FreightVO } from '@/types/Base/Freight'+import { StringLength, IsDecimal } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: FreightVO+}>()++const isShow = computed(() => props.showDialog)++const dialogTitle = computed(() => {+ if (props.form.id && props.form.id > 0) {+ return 'update'+ }+ return 'add'+})++const data = reactive({+ form: ref<FreightVO>({+ id: 0,+ carrier: '',+ departure_city: '',+ arrival_city: '',+ price_per_weight: 0,+ price_per_volume: 0,+ min_payment: 0,+ is_valid: true+ }),+ rules: {+ carrier: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.freightSetting.carrier') }!`,+ (val: string) => StringLength(val, 0, 256) === '' || StringLength(val, 0, 256)+ ],+ departure_city: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.freightSetting.departure_city') }!`,+ (val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)+ ],+ arrival_city: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.freightSetting.arrival_city') }!`,+ (val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)+ ],+ price_per_weight: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.freightSetting.price_per_weight') }!`,+ (val: number) => IsDecimal(val, 'nonNegative', 6, 2) === '' || IsDecimal(val, 'nonNegative', 6, 2)+ ],+ price_per_volume: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.freightSetting.price_per_volume') }!`,+ (val: number) => IsDecimal(val, 'nonNegative', 6, 2) === '' || IsDecimal(val, 'nonNegative', 6, 2)+ ],+ min_payment: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.freightSetting.min_payment') }!`,+ (val: number) => IsDecimal(val, 'nonNegative', 8, 2) === '' || IsDecimal(val, 'nonNegative', 8, 2)+ ],+ is_valid: []+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ initForm: () => {+ data.form = props.form+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addFreight(data.form) : await updateFreight(data.form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/freightSetting/freightSetting.vue b/frontend/src/view/base/freightSetting/freightSetting.vuenew file mode 100644index 0000000..8ab3a00--- /dev/null+++ b/frontend/src/view/base/freightSetting/freightSetting.vue@@ -0,0 +1,321 @@+<!-- Freight Setting -->+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-database-import-outline" :tooltip-text="$t('system.page.import')" @click="method.openDialogImport">+ </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.carrier"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.freightSetting.carrier')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.departure_city"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.freightSetting.departure_city')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.arrival_city"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.freightSetting.arrival_city')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="carrier" :title="$t('base.freightSetting.carrier')"></vxe-column>+ <vxe-column field="departure_city" :title="$t('base.freightSetting.departure_city')"></vxe-column>+ <vxe-column field="arrival_city" :title="$t('base.freightSetting.arrival_city')"></vxe-column>+ <vxe-column field="price_per_weight" :title="$t('base.freightSetting.price_per_weight')"></vxe-column>+ <vxe-column field="price_per_volume" :title="$t('base.freightSetting.price_per_volume')"></vxe-column>+ <vxe-column field="min_payment" :title="$t('base.freightSetting.min_payment')"></vxe-column>+ <vxe-column field="creator" :title="$t('base.freightSetting.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('base.freightSetting.create_time')"></vxe-column>+ <vxe-column field="is_valid" :title="$t('base.freightSetting.is_valid')">+ <template #default="{ row, column }">+ <span>{{ row[column.property] ? $t('system.combobox.yesOrNo.yes') : $t('system.combobox.yesOrNo.no') }}</span>+ </template>+ </vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ @click="method.editRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ ></custom-pager>+ </div>+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ <addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <import-table :show-dialog="data.showDialogImport" @close="method.closeDialogImport" @saveSuccess="method.saveSuccessImport" />+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, onMounted, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { FreightVO } from '@/types/Base/Freight'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { deleteFreight, getFreightList } from '@/api/base/freightSetting'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import { SearchObject } from '@/types/System/Form'+import tooltipBtn from '@/components/tooltip-btn.vue'+import customPager from '@/components/custom-pager.vue'+import addOrUpdateDialog from './add-or-update-freight.vue'+import importTable from './import-table.vue'+import i18n from '@/languages/i18n'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++const data = reactive({+ showDialog: false,+ showDialogImport: false,++ dialogForm: {+ id: 0,+ carrier: '',+ departure_city: '',+ arrival_city: '',+ price_per_weight: 0,+ price_per_volume: 0,+ min_payment: 0,+ is_valid: true+ },+ searchForm: {+ carrier: '',+ departure_city: '',+ arrival_city: ''+ },+ activeTab: null,+ tableData: ref<FreightVO[]>([]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ // Open a dialog to add+ add: () => {+ data.dialogForm = {+ id: 0,+ carrier: '',+ departure_city: '',+ arrival_city: '',+ price_per_weight: 0,+ price_per_volume: 0,+ min_payment: 0,+ is_valid: true+ }+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Import Dialog+ openDialogImport: () => {+ data.showDialogImport = true+ },+ closeDialogImport: () => {+ data.showDialogImport = false+ },+ saveSuccessImport: () => {+ method.refresh()+ method.closeDialogImport()+ },+ // Refresh data+ refresh: () => {+ method.getFreightList()+ },+ getFreightList: async () => {+ const { data: res } = await getFreightList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ editRow(row: FreightVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: FreightVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteFreight(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getFreightList()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.freightSetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ importTable: () => {+ const $table = xTable.value+ $table.importData()+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getFreightList()+ }+})++onMounted(() => {+ method.getFreightList()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))+const tableHeight = computed(() => computedTableHeight({ hasTab: false }))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/base/freightSetting/import-table.vue b/frontend/src/view/base/freightSetting/import-table.vuenew file mode 100644index 0000000..60c63f9--- /dev/null+++ b/frontend/src/view/base/freightSetting/import-table.vue@@ -0,0 +1,214 @@+<!-- Freight Setting Import Dialog -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('system.page.import')}`"></v-toolbar>+ <v-card-text>+ <div class="mb-4">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.chooseFile')" size="x-small" @click="method.chooseFile"></tooltip-btn>+ <tooltip-btn+ icon="mdi-export-variant"+ :tooltip-text="$t('system.page.exportTemplate')"+ size="x-small"+ @click="method.exportTemplate"+ ></tooltip-btn>+ <input v-show="false" id="open" ref="uploadExcel" type="file" accept=".xls, .xlsx" @change="method.readExcel" />+ </div>+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.importData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRules"+ :export-config="{}"+ align="center"+ >+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="operate" width="60" :title="$t('system.page.operate')" :resizable="false">+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ <vxe-column field="carrier" :title="$t('base.freightSetting.carrier')"></vxe-column>+ <vxe-column field="departure_city" :title="$t('base.freightSetting.departure_city')"></vxe-column>+ <vxe-column field="arrival_city" :title="$t('base.freightSetting.arrival_city')"></vxe-column>+ <vxe-column field="price_per_weight" :title="$t('base.freightSetting.price_per_weight')"></vxe-column>+ <vxe-column field="price_per_volume" :title="$t('base.freightSetting.price_per_volume')"></vxe-column>+ <vxe-column field="min_payment" :title="$t('base.freightSetting.min_payment')"></vxe-column>+ </vxe-table>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { VxeTablePropTypes } from 'vxe-table'+import * as XLSX from 'xlsx'+import i18n from '@/languages/i18n'+import { excelImport } from '@/api/base/freightSetting'+import { hookComponent } from '@/components/system/index'+import { SYSTEM_HEIGHT, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { FreightVO } from '@/types/Base/Freight'+import { exportData } from '@/utils/exportTable'+import { formatString } from '@/utils/format/formatSystem'++const emit = defineEmits(['close', 'saveSuccess'])+const uploadExcel = ref()+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ importData: ref<Array<FreightVO>>([]),+ validRules: ref<VxeTablePropTypes.EditRules>({})+})++const method = reactive({+ initForm: () => {+ data.importData = []+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const isValid = method.valid()+ if (!isValid) {+ return+ }++ const $table = xTable.value+ // It must be use 'getTableData()' to get all datas with table because it will delete row sometimes.+ const importData = $table.getTableData().fullData++ const { data: res } = await excelImport(importData)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ },++ valid: () => {+ const $table = xTable.value+ const importData = $table.getTableData().fullData++ if (importData.length <= 0) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.tips.detailLengthIsZero') }`+ })+ return false+ }+ return true+ },++ chooseFile: async () => {+ uploadExcel.value.value = ''+ uploadExcel.value.click()+ },++ readExcel: async (evnt: any) => {+ const files = evnt.target.files+ if (files.length <= 0) {+ return false+ }++ const file = files[0]+ const fileReader = new FileReader()++ fileReader.onload = (ev: ProgressEvent<FileReader>) => {+ const fileData = ev?.target?.result+ if (fileData) {+ const workbook = XLSX.read(fileData, { type: 'binary' })+ const wsname = workbook.SheetNames[0]++ let ws = XLSX.utils.sheet_to_json(workbook.Sheets[wsname])+ let str = JSON.stringify(ws)+ str = str.replace(/(/g, '(')+ str = str.replace(/)/g, ')')+ ws = JSON.parse(str)++ data.importData = []+ ws.forEach((value: any, index: number, ws: any) => {+ data.importData.push({+ carrier: formatString(ws[index][i18n.global.t('base.freightSetting.carrier')]),+ departure_city: formatString(ws[index][i18n.global.t('base.freightSetting.departure_city')]),+ arrival_city: formatString(ws[index][i18n.global.t('base.freightSetting.arrival_city')]),+ price_per_weight: ws[index][i18n.global.t('base.freightSetting.price_per_weight')],+ price_per_volume: ws[index][i18n.global.t('base.freightSetting.price_per_volume')],+ min_payment: ws[index][i18n.global.t('base.freightSetting.min_payment')]+ })+ })+ }+ }+ fileReader.readAsBinaryString(file)+ },++ exportTemplate: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.freightSetting'),+ mode: 'header',+ columnFilterMethod({ column }: any) {+ return !['checkbox', 'seq'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ deleteRow: (row: FreightVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (row) {+ const $table = xTable.value+ $table.remove(row)+ }+ }+ })+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/ownerOfCargo/add-or-update-owner-of-cargo.vue b/frontend/src/view/base/ownerOfCargo/add-or-update-owner-of-cargo.vuenew file mode 100644index 0000000..bd05ba5--- /dev/null+++ b/frontend/src/view/base/ownerOfCargo/add-or-update-owner-of-cargo.vue@@ -0,0 +1,135 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('router.sideBar.ownerOfCargo')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.goods_owner_name"+ :label="$t('base.ownerOfCargo.goods_owner_name')"+ :rules="data.rules.goods_owner_name"+ variant="outlined"+ ></v-text-field>+ <v-text-field v-model="data.form.city" :label="$t('base.ownerOfCargo.city')" :rules="data.rules.city" variant="outlined"></v-text-field>+ <v-text-field+ v-model="data.form.address"+ :label="$t('base.ownerOfCargo.address')"+ :rules="data.rules.address"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.manager"+ :label="$t('base.ownerOfCargo.manager')"+ :rules="data.rules.manager"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.contact_tel"+ :label="$t('base.ownerOfCargo.contact_tel')"+ :rules="data.rules.contact_tel"+ variant="outlined"+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { OwnerOfCargoVO } from '@/types/Base/OwnerOfCargo'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addOwnerOfCargo, updateOwnerOfCargo } from '@/api/base/ownerOfCargo'+import { StringLength } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: OwnerOfCargoVO+}>()++const isShow = computed(() => props.showDialog)++const dialogTitle = computed(() => {+ if (props.form.id && props.form.id > 0) {+ return 'update'+ }+ return 'add'+})++const data = reactive({+ form: ref<OwnerOfCargoVO>({+ id: 0,+ goods_owner_name: '',+ city: '',+ address: '',+ manager: '',+ contact_tel: ''+ }),+ rules: {+ goods_owner_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.ownerOfCargo.goods_owner_name') }!`,+ (val: string) => StringLength(val, 0, 256) === '' || StringLength(val, 0, 256)+ ],+ city: [(val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)],+ address: [(val: string) => StringLength(val, 0, 256) === '' || StringLength(val, 0, 256)],+ manager: [(val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)],+ contact_tel: [(val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addOwnerOfCargo(data.form) : await updateOwnerOfCargo(data.form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/ownerOfCargo/import-table.vue b/frontend/src/view/base/ownerOfCargo/import-table.vuenew file mode 100644index 0000000..23d3a35--- /dev/null+++ b/frontend/src/view/base/ownerOfCargo/import-table.vue@@ -0,0 +1,215 @@+<!-- OwnerOfCargo Setting Import Dialog -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('system.page.import')}`"></v-toolbar>+ <v-card-text>+ <div class="mb-4">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.chooseFile')" size="x-small" @click="method.chooseFile"></tooltip-btn>+ <tooltip-btn+ icon="mdi-export-variant"+ :tooltip-text="$t('system.page.exportTemplate')"+ size="x-small"+ @click="method.exportTemplate"+ ></tooltip-btn>+ <input v-show="false" id="open" ref="uploadExcel" type="file" accept=".xls, .xlsx" @change="method.readExcel" />+ </div>+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.importData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRules"+ :export-config="{}"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="operate" width="60" :title="$t('system.page.operate')" :resizable="false">+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ <vxe-column field="goods_owner_name" :title="$t('base.ownerOfCargo.goods_owner_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.ownerOfCargo.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.ownerOfCargo.address')"></vxe-column>+ <vxe-column field="manager" :title="$t('base.ownerOfCargo.manager')"></vxe-column>+ <vxe-column field="contact_tel" :title="$t('base.ownerOfCargo.contact_tel')"></vxe-column>+ </vxe-table>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { VxeTablePropTypes } from 'vxe-table'+import * as XLSX from 'xlsx'+import i18n from '@/languages/i18n'+import { excelImport } from '@/api/base/ownerOfCargo'+import { hookComponent } from '@/components/system/index'+import { SYSTEM_HEIGHT, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { ImportVO } from '@/types/Base/OwnerOfCargo'+import { exportData } from '@/utils/exportTable'+import { formatString } from '@/utils/format/formatSystem'++const emit = defineEmits(['close', 'saveSuccess'])+const uploadExcel = ref()+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ importData: ref<Array<ImportVO>>([]),+ validRules: ref<VxeTablePropTypes.EditRules>({})+})++const method = reactive({+ initForm: () => {+ data.importData = []+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const isValid = method.valid()+ if (!isValid) {+ return+ }++ const $table = xTable.value+ // It must be use 'getTableData()' to get all datas with table because it will delete row sometimes.+ const importData = $table.getTableData().fullData++ const { data: res } = await excelImport(importData)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ },++ valid: () => {+ const $table = xTable.value+ const importData = $table.getTableData().fullData++ if (importData.length <= 0) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.tips.detailLengthIsZero') }`+ })+ return false+ }+ return true+ },++ chooseFile: async () => {+ uploadExcel.value.value = ''+ uploadExcel.value.click()+ },++ readExcel: async (evnt: any) => {+ const files = evnt.target.files+ if (files.length <= 0) {+ return false+ }++ const file = files[0]+ const fileReader = new FileReader()++ fileReader.onload = (ev: ProgressEvent<FileReader>) => {+ const fileData = ev?.target?.result+ if (fileData) {+ const workbook = XLSX.read(fileData, { type: 'binary' })+ const wsname = workbook.SheetNames[0]++ let ws = XLSX.utils.sheet_to_json(workbook.Sheets[wsname])+ let str = JSON.stringify(ws)+ str = str.replace(/(/g, '(')+ str = str.replace(/)/g, ')')+ ws = JSON.parse(str)++ data.importData = []+ ws.forEach((value: any, index: number, ws: any) => {+ data.importData.push({+ goods_owner_name: formatString(ws[index][i18n.global.t('base.ownerOfCargo.goods_owner_name')]),+ city: formatString(ws[index][i18n.global.t('base.ownerOfCargo.city')]),+ address: formatString(ws[index][i18n.global.t('base.ownerOfCargo.address')]),+ manager: formatString(ws[index][i18n.global.t('base.ownerOfCargo.manager')]),+ contact_tel: formatString(ws[index][i18n.global.t('base.ownerOfCargo.contact_tel')])+ })+ })+ }+ }+ fileReader.readAsBinaryString(file)+ },++ exportTemplate: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.ownerOfCargo'),+ mode: 'header',+ columnFilterMethod({ column }: any) {+ return !['checkbox', 'seq'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ deleteRow: (row: ImportVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (row) {+ const $table = xTable.value+ $table.remove(row)+ }+ }+ })+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/ownerOfCargo/ownerOfCargo.vue b/frontend/src/view/base/ownerOfCargo/ownerOfCargo.vuenew file mode 100644index 0000000..36ed0f2--- /dev/null+++ b/frontend/src/view/base/ownerOfCargo/ownerOfCargo.vue@@ -0,0 +1,279 @@+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="12" sm="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn>+ <tooltip-btn icon="mdi-database-import-outline" :tooltip-text="$t('system.page.import')" @click="method.openDialogImport">+ </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"> </v-col>+ <v-col cols="4"> </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.goods_owner_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.ownerOfCargo.goods_owner_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="goods_owner_name" :title="$t('base.ownerOfCargo.goods_owner_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.ownerOfCargo.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.ownerOfCargo.address')"></vxe-column>+ <vxe-column field="contact_tel" :title="$t('base.ownerOfCargo.contact_tel')"></vxe-column>+ <vxe-column field="manager" :title="$t('base.ownerOfCargo.manager')"></vxe-column>+ <vxe-column field="creator" :title="$t('base.ownerOfCargo.creator')"></vxe-column>+ <vxe-column field="create_time" :title="$t('base.ownerOfCargo.create_time')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ @click="method.editRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ </v-card-text>+ </v-card>+ </div>+ <!-- Add or modify data mode window -->+ <addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <import-table :show-dialog="data.showDialogImport" @close="method.closeDialogImport" @saveSuccess="method.saveSuccessImport" />+ </div>+</template>++<script lang="ts" setup>+import { computed, reactive, onMounted, ref, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { OwnerOfCargoVO, DataProps } from '@/types/Base/OwnerOfCargo'+import { getOwnerOfCargoByPage, deleteOwnerOfCargo } from '@/api/base/ownerOfCargo'+import { hookComponent } from '@/components/system'+import addOrUpdateDialog from './add-or-update-owner-of-cargo.vue'+import i18n from '@/languages/i18n'+import importTable from './import-table.vue'+import { setSearchObject } from '@/utils/common'+import customPager from '@/components/custom-pager.vue'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data: DataProps = reactive({+ searchForm: {+ goods_owner_name: ''+ },+ showDialogImport: false,+ tableData: [],+ // Dialog info+ showDialog: false,+ dialogForm: {+ id: 0,+ goods_owner_name: '',+ city: '',+ address: '',+ contact_tel: '',+ manager: ''+ },+ tablePage: {+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE+ },+ timer: null+})++const method = reactive({+ // When change paging+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.refresh()+ }),+ // Import Dialog+ openDialogImport: () => {+ data.showDialogImport = true+ },+ closeDialogImport: () => {+ data.showDialogImport = false+ },+ saveSuccessImport: () => {+ method.refresh()+ method.closeDialogImport()+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getOwnerOfCargoList()+ },+ // Find Data by Pagination+ getOwnerOfCargoList: async () => {+ const { data: res } = await getOwnerOfCargoByPage(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ goods_owner_name: '',+ city: '',+ address: '',+ contact_tel: '',+ manager: ''+ }+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // after Add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Refresh data+ refresh: () => {+ method.getOwnerOfCargoList()+ },+ editRow(row: OwnerOfCargoVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: OwnerOfCargoVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteOwnerOfCargo(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ // Export table+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.ownerOfCargo'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ }+})++onMounted(async () => {+ await method.getOwnerOfCargoList()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))++const tableHeight = computed(() => computedTableHeight({ hasTab: false }))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/base/roleMenu/add-or-update-role-menu.vue b/frontend/src/view/base/roleMenu/add-or-update-role-menu.vuenew file mode 100644index 0000000..7d8b649--- /dev/null+++ b/frontend/src/view/base/roleMenu/add-or-update-role-menu.vue@@ -0,0 +1,208 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('router.sideBar.roleMenu')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-select+ v-model="data.form.userrole_id"+ :items="data.combobox.role_name"+ item-title="label"+ item-value="value"+ :rules="data.rules.role_name"+ :label="$t('base.roleMenu.role_name')"+ variant="outlined"+ clearable+ ></v-select>+ <v-select+ v-model="data.menusSelectedList"+ :items="data.combobox.menu_name"+ item-title="label"+ item-value="value"+ :label="$t('base.roleMenu.menu_name')"+ variant="outlined"+ chips+ multiple+ clearable+ >+ </v-select>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { RoleMenuVO, RoleMenuDetailVo } from '@/types/Base/RoleMenu'+import { UserRoleVO } from '@/types/Base/UserRoleSetting'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addRoleMenu, updateRoleMenu, getMenus } from '@/api/base/roleMenu'+import { getUserRoleAll } from '@/api/base/userRoleSetting'+import { MenuItem } from '@/types/System/Store'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: RoleMenuVO+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ dialogTitle: '',+ form: ref<RoleMenuVO>({+ userrole_id: 0,+ role_name: '',+ detailList: []+ }),+ // Multiple drop-down box values, mainly used to temporarily save the selected values+ menusSelectedList: ref<any[]>([]),+ // If it is modified, you need to pass a negative ID to the API to delete the existing details+ removeDetailList: ref<RoleMenuDetailVo[]>([]),+ // Drop down box options+ combobox: ref<{+ role_name: {+ label: string+ value: number+ }[]+ menu_name: {+ label: string+ value: number+ }[]+ }>({+ role_name: [],+ menu_name: []+ }),+ rules: {+ role_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.roleMenu.role_name') }!`],+ menu_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.roleMenu.menu_name') }!`]+ }+})++const method = reactive({+ // Get dialog type, add or update+ getDialogType: () => {+ // This is special because this document is not actually a table,+ // but the data associated with another table.+ // so directly use the details to determine whether it is a new document+ if (props.form.detailList.length > 0) {+ data.dialogTitle = 'update'+ } else {+ data.dialogTitle = 'add'+ }+ },+ // Get the options required by the drop-down box+ getCombobox: async () => {+ data.combobox.role_name = []+ const { data: res } = await getUserRoleAll()+ if (!res.isSuccess) {+ return+ }+ const roleNameList: UserRoleVO[] = res.data+ for (const role of roleNameList) {+ data.combobox.role_name.push({+ label: role.role_name,+ value: role.id+ })+ }+ data.combobox.menu_name = []+ const { data: menuRes } = await getMenus()+ if (!menuRes.isSuccess) {+ return+ }+ const menus: MenuItem[] = menuRes.data+ for (const menu of menus) {+ data.combobox.menu_name.push({+ label: i18n.global.t(`router.sideBar.${ menu.menu_name }`),+ value: menu.id+ })+ }+ },+ closeDialog: () => {+ emit('close')+ },+ // Details verification before document submission+ beforeSubmit: (): boolean => {+ let flag = true+ // Process the new dropdown options+ for (const item of data.menusSelectedList) {+ if (data.form.detailList.findIndex((dl) => dl.menu_id === item) < 0) {+ data.form.detailList.push({+ id: 0,+ menu_id: item+ })+ }+ }+ if (data.dialogTitle === 'update') {+ for (const item of data.form.detailList) {+ if (!data.menusSelectedList.includes(item.menu_id)) {+ // Delete if ID is negative+ item.id = -item.id+ }+ }+ }+ if (data.form.detailList.length === 0) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.detailLengthIsZero')+ })+ flag = false+ }+ return flag+ },+ submit: async () => {+ const beforeSubmitFlag = method.beforeSubmit()+ if (!beforeSubmitFlag) {+ return+ }+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = data.dialogTitle === 'add'+ ? await addRoleMenu(data.form)+ : await updateRoleMenu({ ...data.form, detailList: [...data.form.detailList, ...data.removeDetailList] }) // Merge the deleted list and the original list+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.getDialogType()+ method.getCombobox()+ data.form = props.form+ data.menusSelectedList = data.form.detailList.map((item) => item.menu_id)+ }+ }+)+</script>++<style scoped lang="less">+</style>diff --git a/frontend/src/view/base/roleMenu/roleMenu.vue b/frontend/src/view/base/roleMenu/roleMenu.vuenew file mode 100644index 0000000..aa526f8--- /dev/null+++ b/frontend/src/view/base/roleMenu/roleMenu.vue@@ -0,0 +1,321 @@+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="12" sm="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <tooltip-btn icon="mdi-pencil-outline" :tooltip-text="$t('system.page.edit')" @click="method.editForm()"></tooltip-btn>+ <tooltip-btn icon="mdi-delete-outline" :tooltip-text="$t('system.page.delete')" @click="method.deleteForm()"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn>+ <!-- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn> -->+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <!-- <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName1"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName2"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row> -->+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <v-row :no-gutters="true">+ <v-col :cols="3" class="dataListCol">+ <v-card :height="tableHeight">+ <NavListVue+ :list-data="data.roleList"+ :title="data.navListOptions.title"+ :label-key="data.navListOptions.labelKey"+ :index-key="data.navListOptions.indexKey"+ :index-value="data.navListOptions.indexValue"+ @item-click="method.navListClick"+ />+ </v-card>+ </v-col>+ <v-col :cols="9">+ <vxe-table ref="xTable" :data="data.activeRoleMenuForm.detailList" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="menu_name" :title="$t('base.roleMenu.menu_name')">+ <template #default="{ row }">+ <span>{{ $t(`router.sideBar.${row.menu_name}`) }}</span>+ </template>+ </vxe-column>+ </vxe-table>+ </v-col>+ </v-row>+ </div>+ </v-card-text>+ </v-card>+ </div>+ <!-- Add or modify data mode window -->+ <addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ </div>+</template>++<script lang="ts" setup>+import { computed, reactive, onMounted, ref } from 'vue'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { DataProps, RoleMenuVO } from '@/types/Base/RoleMenu'+import { getRoleMenuAll, getRoleMenuById, deleteRoleMenu } from '@/api/base/roleMenu'+import { hookComponent } from '@/components/system'+import addOrUpdateDialog from './add-or-update-role-menu.vue'+import i18n from '@/languages/i18n'+import NavListVue from '@/components/page/nav-list.vue'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++const data: DataProps = reactive({+ navListOptions: {+ title: i18n.global.t('base.roleMenu.role_name'),+ labelKey: 'role_name',+ indexKey: 'userrole_id',+ indexValue: ''+ },+ // Activation id+ activeRoleMenuForm: {+ userrole_id: 0,+ role_name: '',+ detailList: []+ },+ // searchForm: {+ // userName: '',+ // userName1: '',+ // userName2: ''+ // },+ roleList: [],+ // Dialog info+ showDialog: false,+ dialogForm: {+ detailList: []+ }+})++const method = reactive({+ sureSearch: () => {+ // console.log(data.searchForm)+ },+ // Find Data by Pagination+ getCompanyList: async () => {+ // Clear detailed data before refreshing+ method.clearDialogForm()+ const { data: res } = await getRoleMenuAll()+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.roleList = res.data+ if (data.roleList.findIndex((item) => item.userrole_id === data.activeRoleMenuForm.userrole_id) > -1 && data.activeRoleMenuForm.userrole_id) {+ method.getRoleMenus(data.activeRoleMenuForm.userrole_id)+ } else if (data.roleList.length > 0) {+ method.navListClick(data.roleList[0])+ } else {+ data.activeRoleMenuForm = {+ userrole_id: 0,+ role_name: '',+ detailList: []+ }+ }+ },+ // Add user+ add: () => {+ method.clearDialogForm()+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // after Add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Refresh data+ refresh: () => {+ method.getCompanyList()+ },+ editForm() {+ if (!data.activeRoleMenuForm.userrole_id) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.roleMenu.beforeUpdateOrDel')+ })+ return+ }+ data.dialogForm = JSON.parse(JSON.stringify(data.activeRoleMenuForm))+ // Delete rowid of existing data+ for (const item of data.dialogForm.detailList) {+ if (item._X_ROW_KEY) {+ delete item._X_ROW_KEY+ }+ }+ data.showDialog = true+ },+ deleteForm() {+ if (!data.activeRoleMenuForm.userrole_id) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.roleMenu.beforeUpdateOrDel')+ })+ return+ }+ const row = data.activeRoleMenuForm+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.userrole_id) {+ const { data: res } = await deleteRoleMenu(row.userrole_id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ // Export table+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.roleMenu'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ // Get detailed data+ getRoleMenus: async (userrole_id: number) => {+ const { data: res } = await getRoleMenuById(userrole_id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.activeRoleMenuForm = res.data+ },+ // Refresh dialog data+ clearDialogForm: () => {+ data.dialogForm = {+ detailList: []+ }+ },+ // Click navList+ navListClick: (item: RoleMenuVO) => {+ if (!item.userrole_id) {+ return+ }+ data.navListOptions.indexValue = String(item.userrole_id)+ method.getRoleMenus(item.userrole_id)+ }+})++onMounted(async () => {+ await method.getCompanyList()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))++const tableHeight = computed(() => computedTableHeight({ hasTab: false, hasPager: false }))+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+// Adjust the spacing between lists and tables+.dataListCol {+ box-sizing: border-box;+ padding-right: 10px !important;+}+.roleNameCol {+ width: 100%;+ height: 100%;+ cursor: pointer;+ // &:hover: {+ // background-color: #9156fd;+ // }+}+.roleNameCol:hover {+ background-color: #9156fd;+ color: white;+}+.activeRow {+ background-color: #9156fd;+}+</style>diff --git a/frontend/src/view/base/supplier/add-or-update-supplier.vue b/frontend/src/view/base/supplier/add-or-update-supplier.vuenew file mode 100644index 0000000..da9ad91--- /dev/null+++ b/frontend/src/view/base/supplier/add-or-update-supplier.vue@@ -0,0 +1,136 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('router.sideBar.supplier')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.supplier_name"+ :label="$t('base.supplier.supplier_name')"+ :rules="data.rules.supplier_name"+ variant="outlined"+ ></v-text-field>+ <v-text-field v-model="data.form.city" :label="$t('base.supplier.city')" :rules="data.rules.city" variant="outlined"></v-text-field>+ <v-text-field v-model="data.form.email" :label="$t('base.supplier.email')" :rules="data.rules.email" variant="outlined"></v-text-field>+ <v-text-field+ v-model="data.form.address"+ :label="$t('base.supplier.address')"+ :rules="data.rules.address"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.manager"+ :label="$t('base.supplier.manager')"+ :rules="data.rules.manager"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.contact_tel"+ :label="$t('base.supplier.contact_tel')"+ :rules="data.rules.contact_tel"+ variant="outlined"+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { SupplierVO } from '@/types/Base/Supplier'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addSupplier, updateSupplier } from '@/api/base/supplier'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: SupplierVO+}>()++const isShow = computed(() => props.showDialog)++const dialogTitle = computed(() => {+ if (props.form.id && props.form.id > 0) {+ return 'update'+ }+ return 'add'+})++const data = reactive({+ form: ref<SupplierVO>({+ id: 0,+ supplier_name: '',+ city: '',+ address: '',+ manager: '',+ email: '',+ contact_tel: '',+ is_valid: true+ }),+ rules: {+ supplier_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.supplier.supplier_name') }!`],+ city: [],+ address: [],+ manager: [],+ email: [],+ contact_tel: [],+ is_valid: []+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addSupplier(data.form) : await updateSupplier(data.form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/supplier/import-supplier-table.vue b/frontend/src/view/base/supplier/import-supplier-table.vuenew file mode 100644index 0000000..a0853ab--- /dev/null+++ b/frontend/src/view/base/supplier/import-supplier-table.vue@@ -0,0 +1,216 @@+<!-- Supplier Setting Import Dialog -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('system.page.import')}`"></v-toolbar>+ <v-card-text>+ <div class="mb-4">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.chooseFile')" size="x-small" @click="method.chooseFile"></tooltip-btn>+ <tooltip-btn+ icon="mdi-export-variant"+ :tooltip-text="$t('system.page.exportTemplate')"+ size="x-small"+ @click="method.exportTemplate"+ ></tooltip-btn>+ <input v-show="false" id="open" ref="uploadExcel" type="file" accept=".xls, .xlsx" @change="method.readExcel" />+ </div>+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.importData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRules"+ :export-config="{}"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="operate" width="60" :title="$t('system.page.operate')" :resizable="false">+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ <vxe-column field="supplier_name" :title="$t('base.supplier.supplier_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.supplier.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.supplier.address')"></vxe-column>+ <vxe-column field="manager" :title="$t('base.supplier.manager')"></vxe-column>+ <vxe-column field="email" :title="$t('base.supplier.email')"></vxe-column>+ <vxe-column field="contact_tel" :title="$t('base.supplier.contact_tel')"></vxe-column>+ </vxe-table>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { VxeTablePropTypes } from 'vxe-table'+import * as XLSX from 'xlsx'+import i18n from '@/languages/i18n'+import { excelImport } from '@/api/base/supplier'+import { hookComponent } from '@/components/system/index'+import { SYSTEM_HEIGHT, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { SupplierExcelVO } from '@/types/Base/Supplier'+import { exportData } from '@/utils/exportTable'++const emit = defineEmits(['close', 'saveSuccess'])+const uploadExcel = ref()+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ importData: ref<Array<SupplierExcelVO>>([]),+ validRules: ref<VxeTablePropTypes.EditRules>({})+})++const method = reactive({+ initForm: () => {+ data.importData = []+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const isValid = method.valid()+ if (!isValid) {+ return+ }++ const $table = xTable.value+ // It must be use 'getTableData()' to get all datas with table because it will delete row sometimes.+ const importData = $table.getTableData().fullData++ const { data: res } = await excelImport(importData)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ },++ valid: () => {+ const $table = xTable.value+ const importData = $table.getTableData().fullData++ if (importData.length <= 0) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.tips.detailLengthIsZero') }`+ })+ return false+ }+ return true+ },++ chooseFile: async () => {+ uploadExcel.value.value = ''+ uploadExcel.value.click()+ },++ readExcel: async (evnt: any) => {+ const files = evnt.target.files+ if (files.length <= 0) {+ return false+ }++ const file = files[0]+ const fileReader = new FileReader()++ fileReader.onload = (ev: ProgressEvent<FileReader>) => {+ const fileData = ev?.target?.result+ if (fileData) {+ const workbook = XLSX.read(fileData, { type: 'binary' })+ const wsname = workbook.SheetNames[0]++ let ws = XLSX.utils.sheet_to_json(workbook.Sheets[wsname])+ let str = JSON.stringify(ws)+ str = str.replace(/(/g, '(')+ str = str.replace(/)/g, ')')+ ws = JSON.parse(str)++ data.importData = []+ ws.forEach((value: any, index: number, ws: any) => {+ data.importData.push({+ supplier_name: ws[index][i18n.global.t('base.supplier.supplier_name')] ? ws[index][i18n.global.t('base.supplier.supplier_name')] + '' : '',+ city: ws[index][i18n.global.t('base.supplier.city')] ? ws[index][i18n.global.t('base.supplier.city')] + '' : '',+ address: ws[index][i18n.global.t('base.supplier.address')] ? ws[index][i18n.global.t('base.supplier.address')] + '' : '',+ manager: ws[index][i18n.global.t('base.supplier.manager')] ? ws[index][i18n.global.t('base.supplier.manager')] + '' : '',+ email: ws[index][i18n.global.t('base.supplier.email')] ? ws[index][i18n.global.t('base.supplier.email')] + '' : '',+ contact_tel: ws[index][i18n.global.t('base.supplier.contact_tel')] ? ws[index][i18n.global.t('base.supplier.contact_tel')] + '' : ''+ })+ })+ }+ }+ fileReader.readAsBinaryString(file)+ },++ exportTemplate: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.supplier'),+ mode: 'header',+ columnFilterMethod({ column }: any) {+ return !['checkbox', 'seq'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ deleteRow: (row: SupplierExcelVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (row) {+ const $table = xTable.value+ $table.remove(row)+ }+ }+ })+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/supplier/supplier.vue b/frontend/src/view/base/supplier/supplier.vuenew file mode 100644index 0000000..6ab00b3--- /dev/null+++ b/frontend/src/view/base/supplier/supplier.vue@@ -0,0 +1,296 @@+<!-- supplier Setting -->+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <!-- <v-window v-model="data.activeTab">+ <v-window-item> -->+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="12" sm="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn>+ <tooltip-btn icon="mdi-database-import-outline" :tooltip-text="$t('system.page.import')" @click="method.openDialogImport">+ </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="12" sm="4"></v-col>+ <v-col cols="12" sm="4"></v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.supplier_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.supplier.supplier_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="supplier_name" :title="$t('base.supplier.supplier_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.supplier.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.supplier.address')"></vxe-column>+ <vxe-column field="manager" :title="$t('base.supplier.manager')"></vxe-column>+ <vxe-column field="email" :title="$t('base.supplier.email')"></vxe-column>+ <vxe-column field="contact_tel" :title="$t('base.supplier.contact_tel')"></vxe-column>+ <vxe-column field="creator" :title="$t('base.supplier.creator')"></vxe-column>+ <vxe-column field="create_time" :title="$t('base.supplier.create_time')">+ <template #default="{ row, column }">+ <span>{{ formatDate(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="last_update_time" :title="$t('base.supplier.last_update_time')">+ <template #default="{ row, column }">+ <span>{{ formatDate(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ @click="method.editRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ <!-- </v-window-item>+ </v-window> -->+ </v-card-text>+ </v-card>+ </div>+ </div>+ <addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <importSupplierTable :show-dialog="data.showDialogImport" @close="method.closeDialogImport" @saveSuccess="method.saveSuccessImport" />+</template>++<script lang="tsx" setup>+import { computed, ref, reactive, onMounted, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { SupplierVO, DataProps } from '@/types/Base/Supplier'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import tooltipBtn from '@/components/tooltip-btn.vue'+import addOrUpdateDialog from './add-or-update-supplier.vue'+import { hookComponent } from '@/components/system'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import { SearchObject } from '@/types/System/Form'+import i18n from '@/languages/i18n'+import { getSupplierList, deleteSupplier } from '@/api/base/supplier'+import importSupplierTable from './import-supplier-table.vue'+import { formatDate } from '@/utils/format/formatSystem'+import customPager from '@/components/custom-pager.vue'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++const data = reactive({+ searchForm: {+ supplier_name: ''+ },+ tableData: [],+ // activeTab: null,+ showDialog: false,+ showDialogImport: false,+ dialogForm: {+ id: 0,+ supplier_name: '',+ city: '',+ address: '',+ manager: '',+ email: '',+ contact_tel: '',+ is_valid: true+ },+ tablePage: {+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ },+ timer: ref<any>(null)+})++const method = reactive({+ // Import Dialog+ openDialogImport: () => {+ data.showDialogImport = true+ },+ closeDialogImport: () => {+ data.showDialogImport = false+ },+ saveSuccessImport: () => {+ method.refresh()+ method.closeDialog()+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getData()+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ supplier_name: '',+ city: '',+ address: '',+ manager: '',+ email: '',+ contact_tel: '',+ is_valid: true+ }+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // after Add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Refresh data+ refresh: () => {+ method.getData()+ },+ editRow(row: SupplierVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: SupplierVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteSupplier(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.getData()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.supplier'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ getData: async () => {+ const { data: res } = await getSupplierList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ }+})+onMounted(() => {+ method.getData()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))+const tableHeight = computed(() => computedTableHeight({ hasTab: false }))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/base/userManagement/add-or-update-user.vue b/frontend/src/view/base/userManagement/add-or-update-user.vuenew file mode 100644index 0000000..5512d02--- /dev/null+++ b/frontend/src/view/base/userManagement/add-or-update-user.vue@@ -0,0 +1,191 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('router.sideBar.userManagement')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.user_num"+ :label="$t('base.userManagement.user_num')"+ :rules="data.rules.user_num"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.user_name"+ :label="$t('base.userManagement.user_name')"+ :rules="data.rules.user_name"+ variant="outlined"+ ></v-text-field>+ <v-select+ v-model="data.form.user_role"+ :items="data.combobox.user_role"+ :rules="data.rules.user_role"+ :label="$t('base.userManagement.user_role')"+ variant="outlined"+ clearable+ ></v-select>+ <v-select+ v-model="data.form.sex"+ :items="data.combobox.sex"+ item-title="label"+ item-value="value"+ :rules="data.rules.sex"+ :label="$t('base.userManagement.sex')"+ variant="outlined"+ clearable+ ></v-select>+ <v-text-field+ v-model="data.form.contact_tel"+ :label="$t('base.userManagement.contact_tel')"+ :rules="data.rules.contact_tel"+ variant="outlined"+ ></v-text-field>+ <v-switch+ v-model="data.form.is_valid"+ color="primary"+ :label="$t('base.userManagement.is_valid')"+ :rules="data.rules.is_valid"+ ></v-switch>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { UserVO } from '@/types/Base/UserManagement'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addUser, updateUser, getSelectItem } from '@/api/base/userManagement'+import { StringLength } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: UserVO+}>()++const isShow = computed(() => props.showDialog)++const dialogTitle = computed(() => {+ if (props.form.id && props.form.id > 0) {+ return 'update'+ }+ return 'add'+})++const data = reactive({+ form: ref<UserVO>({+ id: 0,+ user_num: '',+ user_name: '',+ contact_tel: '',+ is_valid: true+ }),+ rules: {+ user_num: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.userManagement.user_num') }!`,+ (val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)+ ],+ user_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.userManagement.user_name') }!`,+ (val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)+ ],+ user_role: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.userManagement.user_role') }!`],+ sex: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.userManagement.sex') }!`],+ contact_tel: [(val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 64)],+ is_valid: []+ },+ combobox: ref<{+ sex: {+ label: string+ value: string+ }[]+ user_role: string[]+ }>({+ sex: [],+ user_role: []+ })+})++const method = reactive({+ // Get the options required by the drop-down box+ getCombobox: async () => {+ // Static drop-down box+ const sexOptions = ['male', 'female']+ data.combobox.sex = []+ for (const sex of sexOptions) {+ data.combobox.sex.push({+ label: i18n.global.t(`system.combobox.sex.${ sex }`),+ value: sex+ })+ }+ // Dynamic drop-down box+ data.combobox.user_role = []+ const { data: res } = await getSelectItem()+ if (!res.isSuccess) {+ return+ }+ for (const item of res.data) {+ switch (item.code) {+ case 'user_role':+ data.combobox.user_role.push(item.name)+ break+ }+ }+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addUser(data.form) : await updateUser(data.form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.getCombobox()+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/userManagement/import-table.vue b/frontend/src/view/base/userManagement/import-table.vuenew file mode 100644index 0000000..0b46479--- /dev/null+++ b/frontend/src/view/base/userManagement/import-table.vue@@ -0,0 +1,231 @@+<!-- UserManagement Setting Import Dialog -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('system.page.import')}`"></v-toolbar>+ <v-card-text>+ <div class="mb-4">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.chooseFile')" size="x-small" @click="method.chooseFile"></tooltip-btn>+ <tooltip-btn+ icon="mdi-export-variant"+ :tooltip-text="$t('system.page.exportTemplate')"+ size="x-small"+ @click="method.exportTemplate"+ ></tooltip-btn>+ <input v-show="false" id="open" ref="uploadExcel" type="file" accept=".xls, .xlsx" @change="method.readExcel" />+ </div>+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.importData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRules"+ :export-config="{}"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="operate" width="60" :title="$t('system.page.operate')" :resizable="false">+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ <vxe-column field="user_num" :title="$t('base.userManagement.user_num')"></vxe-column>+ <vxe-column field="user_name" :title="$t('base.userManagement.user_name')"></vxe-column>+ <vxe-column field="contact_tel" :title="$t('base.userManagement.contact_tel')"></vxe-column>+ <vxe-column field="user_role" :title="$t('base.userManagement.user_role')"></vxe-column>+ <vxe-column field="sex" :title="$t('base.userManagement.sex')"></vxe-column>+ </vxe-table>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { VxeTablePropTypes } from 'vxe-table'+import * as XLSX from 'xlsx'+import i18n from '@/languages/i18n'+import { excelImport } from '@/api/base/userManagement'+import { hookComponent } from '@/components/system/index'+import { SYSTEM_HEIGHT, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { ImportVO } from '@/types/Base/UserManagement'+import { exportData } from '@/utils/exportTable'+import { formatString } from '@/utils/format/formatSystem'++const emit = defineEmits(['close', 'saveSuccess'])+const uploadExcel = ref()+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ importData: ref<Array<ImportVO>>([]),+ validRules: ref<VxeTablePropTypes.EditRules>({})+})++const method = reactive({+ initForm: () => {+ data.importData = []+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const isValid = method.valid()+ if (!isValid) {+ return+ }++ const $table = xTable.value+ // It must be use 'getTableData()' to get all datas with table because it will delete row sometimes.+ const importData = JSON.parse(JSON.stringify($table.getTableData().fullData))+ for (const item of importData) {+ let sex = 'male'+ if (['男', '女', 'Male', 'Female'].includes(item.sex)) {+ switch (item.sex) {+ case '男':+ case 'Male':+ sex = 'male'+ break+ case '女':+ case 'Female':+ sex = 'female'+ break+ }+ }+ item.sex = sex+ }+ const { data: res } = await excelImport(importData)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ },++ valid: () => {+ const $table = xTable.value+ const importData = $table.getTableData().fullData++ if (importData.length <= 0) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.tips.detailLengthIsZero') }`+ })+ return false+ }+ return true+ },++ chooseFile: async () => {+ uploadExcel.value.value = ''+ uploadExcel.value.click()+ },++ readExcel: async (evnt: any) => {+ const files = evnt.target.files+ if (files.length <= 0) {+ return false+ }++ const file = files[0]+ const fileReader = new FileReader()++ fileReader.onload = (ev: ProgressEvent<FileReader>) => {+ const fileData = ev?.target?.result+ if (fileData) {+ const workbook = XLSX.read(fileData, { type: 'binary' })+ const wsname = workbook.SheetNames[0]++ let ws = XLSX.utils.sheet_to_json(workbook.Sheets[wsname])+ let str = JSON.stringify(ws)+ str = str.replace(/(/g, '(')+ str = str.replace(/)/g, ')')+ ws = JSON.parse(str)++ data.importData = []+ ws.forEach((value: any, index: number, ws: any) => {+ data.importData.push({+ user_num: formatString(ws[index][i18n.global.t('base.userManagement.user_num')]),+ user_name: formatString(ws[index][i18n.global.t('base.userManagement.user_name')]),+ contact_tel: formatString(ws[index][i18n.global.t('base.userManagement.contact_tel')]),+ user_role: formatString(ws[index][i18n.global.t('base.userManagement.user_role')]),+ sex: formatString(ws[index][i18n.global.t('base.userManagement.sex')]),+ is_valid: true+ })+ })+ }+ }+ fileReader.readAsBinaryString(file)+ },++ exportTemplate: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.userManagement'),+ mode: 'header',+ columnFilterMethod({ column }: any) {+ return !['checkbox', 'seq'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ deleteRow: (row: ImportVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (row) {+ const $table = xTable.value+ $table.remove(row)+ }+ }+ })+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/userManagement/userManagement.vue b/frontend/src/view/base/userManagement/userManagement.vuenew file mode 100644index 0000000..88f1728--- /dev/null+++ b/frontend/src/view/base/userManagement/userManagement.vue@@ -0,0 +1,352 @@+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="12" sm="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn>+ <tooltip-btn icon="mdi-database-import-outline" :tooltip-text="$t('system.page.import')" @click="method.openDialogImport">+ </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn>+ <tooltip-btn icon="mdi-lock-reset" :tooltip-text="$t('base.userManagement.restPwd')" @click="method.restPwd"></tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.user_num"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.userManagement.user_num')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.user_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.userManagement.user_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.user_role"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.userManagement.user_role')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="user_num" :title="$t('base.userManagement.user_num')"></vxe-column>+ <vxe-column field="user_name" :title="$t('base.userManagement.user_name')"></vxe-column>+ <vxe-column field="user_role" :title="$t('base.userManagement.user_role')"></vxe-column>+ <vxe-column field="sex" :title="$t('base.userManagement.sex')">+ <template #default="{ row }">+ <span>{{ $t(`system.combobox.sex.${row.sex}`) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="contact_tel" :title="$t('base.userManagement.contact_tel')"></vxe-column>+ <vxe-column field="is_valid" :title="$t('base.userManagement.is_valid')">+ <template #default="{ row, column }">+ <span>{{ row[column.property] ? $t('system.combobox.yesOrNo.yes') : $t('system.combobox.yesOrNo.no') }}</span>+ </template>+ </vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ @click="method.editRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ <!-- <vxe-grid v-bind="data.gridOptions">+ <template #pager>+ <custom-pagerr+ v-model:current-page="data.tablePage.pageIndex"+ v-model:page-size="data.tablePage.pageSize"+ :layouts="['Sizes', 'PrevJump', 'PrevPage', 'Number', 'NextPage', 'NextJump', 'FullJump', 'Total']"+ :total="data.tablePage.total"+ @page-change="handlePageChange"+ >+ </custom-pagerr>+ </template>+ </vxe-grid> -->+ </div>+ </v-card-text>+ </v-card>+ </div>+ <!-- Add or modify data mode window -->+ <addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <import-table :show-dialog="data.showDialogImport" @close="method.closeDialogImport" @saveSuccess="method.saveSuccessImport" />+ </div>+</template>++<script lang="ts" setup>+import { computed, reactive, onMounted, ref, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { DataProps, UserVO } from '@/types/Base/UserManagement'+import { getUserList, deleteUser, resetPassword } from '@/api/base/userManagement'+import { hookComponent } from '@/components/system'+import addOrUpdateDialog from './add-or-update-user.vue'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import importTable from './import-table.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data: DataProps = reactive({+ showDialogImport: false,+ searchForm: {+ user_num: '',+ user_name: '',+ user_role: ''+ },+ timer: null,+ tableData: [],+ tablePage: {+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE+ },+ // Dialog info+ showDialog: false,+ dialogForm: {+ id: 0,+ user_num: '',+ user_name: '',+ contact_tel: '',+ auth_string: '',+ is_valid: true+ }+})++const method = reactive({+ // Import Dialog+ openDialogImport: () => {+ data.showDialogImport = true+ },+ closeDialogImport: () => {+ data.showDialogImport = false+ },+ saveSuccessImport: () => {+ method.refresh()+ method.closeDialogImport()+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getUserList()+ },+ // Find Data by Pagination+ getUserList: async () => {+ const { data: res } = await getUserList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ user_num: '',+ user_name: '',+ contact_tel: '',+ auth_string: '',+ is_valid: true+ }+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // after Add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Refresh data+ refresh: () => {+ method.getUserList()+ },+ editRow(row: UserVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: UserVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteUser(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ // When change paging+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.refresh()+ }),+ // Export table+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.userManagement'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ // Reset password+ restPwd: async () => {+ const checkRecord: UserVO[] = xTable.value.getCheckboxRecords(true)+ if (checkRecord.length > 0) {+ hookComponent.$dialog({+ content: i18n.global.t('base.userManagement.beforeResetPwd'),+ handleConfirm: async () => {+ const idList = checkRecord.map((item) => item.id)+ const { data: res } = await resetPassword(idList)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$dialog({+ content: `${ i18n.global.t('base.userManagement.afterResetPwd') } ${ res.data }`+ })+ }+ })+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.userManagement.checkboxIsNull')+ })+ }+ }+})++onMounted(async () => {+ await method.getUserList()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))++const tableHeight = computed(() => computedTableHeight({ hasTab: false }))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/base/userRoleSetting/add-or-update-user-role.vue b/frontend/src/view/base/userRoleSetting/add-or-update-user-role.vuenew file mode 100644index 0000000..3528b71--- /dev/null+++ b/frontend/src/view/base/userRoleSetting/add-or-update-user-role.vue@@ -0,0 +1,116 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('router.sideBar.userRoleSetting')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.role_name"+ :label="$t('base.userRoleSetting.role_name')"+ :rules="data.rules.role_name"+ variant="outlined"+ ></v-text-field>+ <v-switch+ v-model="data.form.is_valid"+ color="primary"+ :label="$t('base.userRoleSetting.is_valid')"+ :rules="data.rules.is_valid"+ ></v-switch>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { UserRoleVO } from '@/types/Base/UserRoleSetting'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addUserRole, updateUserRole } from '@/api/base/userRoleSetting'+import { StringLength } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: UserRoleVO+}>()++const isShow = computed(() => props.showDialog)++const dialogTitle = computed(() => {+ if (props.form.id && props.form.id > 0) {+ return 'update'+ }+ return 'add'+})++const data = reactive({+ form: ref<UserRoleVO>({+ id: 0,+ role_name: '',+ is_valid: true+ }),+ rules: {+ role_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.userRoleSetting.role_name') }!`,+ (val: string) => StringLength(val, 0, 32) === '' || StringLength(val, 0, 32)+ ],+ is_valid: []+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addUserRole(data.form) : await updateUserRole(data.form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/userRoleSetting/userRoleSetting.vue b/frontend/src/view/base/userRoleSetting/userRoleSetting.vuenew file mode 100644index 0000000..f692adf--- /dev/null+++ b/frontend/src/view/base/userRoleSetting/userRoleSetting.vue@@ -0,0 +1,234 @@+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="12" sm="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <!-- <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName1"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName2"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row> -->+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="role_name" :title="$t('base.userRoleSetting.role_name')"></vxe-column>+ <vxe-column field="is_valid" :title="$t('base.userRoleSetting.is_valid')">+ <template #default="{ row, column }">+ <span>{{ row[column.property] ? $t('system.combobox.yesOrNo.yes') : $t('system.combobox.yesOrNo.no') }}</span>+ </template>+ </vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ @click="method.editRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ </div>+ </v-card-text>+ </v-card>+ </div>+ <!-- Add or modify data mode window -->+ <addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ </div>+</template>++<script lang="ts" setup>+import { computed, reactive, onMounted, ref } from 'vue'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { DataProps, UserRoleVO } from '@/types/Base/UserRoleSetting'+import { getUserRoleAll, deleteUserRole } from '@/api/base/userRoleSetting'+import { hookComponent } from '@/components/system'+import addOrUpdateDialog from './add-or-update-user-role.vue'+import i18n from '@/languages/i18n'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++const data: DataProps = reactive({+ // searchForm: {+ // userName: '',+ // userName1: '',+ // userName2: ''+ // },+ tableData: [],+ // Dialog info+ showDialog: false,+ dialogForm: {+ id: 0,+ role_name: '',+ is_valid: true+ }+})++const method = reactive({+ sureSearch: () => {+ // console.log(data.searchForm)+ },+ // Find Data by Pagination+ getUserRoleList: async () => {+ const { data: res } = await getUserRoleAll()+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ role_name: '',+ is_valid: true+ }+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // after Add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Refresh data+ refresh: () => {+ method.getUserRoleList()+ },+ editRow(row: UserRoleVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: UserRoleVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteUserRole(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ // Export table+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.userRoleSetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ }+})++onMounted(async () => {+ await method.getUserRoleList()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))++const tableHeight = computed(() => computedTableHeight({ hasTab: false, hasPager: false }))+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/base/warehouseSetting/add-or-update-location.vue b/frontend/src/view/base/warehouseSetting/add-or-update-location.vuenew file mode 100644index 0000000..bf2ea05--- /dev/null+++ b/frontend/src/view/base/warehouseSetting/add-or-update-location.vue@@ -0,0 +1,361 @@+<!-- Location Setting Operate Dialog -->+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('base.warehouseSetting.locationSetting')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-select+ v-model="data.form.warehouse_id"+ :items="data.combobox.warehouse_name"+ item-title="label"+ item-value="value"+ :rules="data.rules.warehouse_name"+ :label="$t('base.warehouseSetting.warehouse_name')"+ variant="outlined"+ clearable+ @update:model-value="method.changeWarehouse"+ ></v-select>+ <v-select+ v-model="data.form.warehouse_area_id"+ :items="data.combobox.warehouse_area_name"+ item-title="label"+ item-value="value"+ :rules="data.rules.warehouse_area_name"+ :label="$t('base.warehouseSetting.area_name')"+ variant="outlined"+ clearable+ @update:model-value="method.changeWarehouseArea"+ ></v-select>+ <v-select+ v-model="data.form.warehouse_area_property"+ :items="data.combobox.area_property"+ item-title="label"+ item-value="value"+ :rules="data.rules.warehouse_area_property"+ :label="$t('base.warehouseSetting.area_property')"+ variant="outlined"+ disabled+ clearable+ ></v-select>+ <v-text-field+ v-model="data.form.location_name"+ :label="$t('base.warehouseSetting.location_name')"+ :rules="data.rules.location_name"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.location_length"+ :label="$t('base.warehouseSetting.location_length')"+ :rules="data.rules.location_length"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.location_width"+ :label="$t('base.warehouseSetting.location_width')"+ :rules="data.rules.location_width"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.location_heigth"+ :label="$t('base.warehouseSetting.location_heigth')"+ :rules="data.rules.location_heigth"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.location_volume"+ :label="$t('base.warehouseSetting.location_volume')"+ :rules="data.rules.location_volume"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.location_load"+ :label="$t('base.warehouseSetting.location_load')"+ :rules="data.rules.location_load"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.roadway_number"+ :label="$t('base.warehouseSetting.roadway_number')"+ :rules="data.rules.roadway_number"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.shelf_number"+ :label="$t('base.warehouseSetting.shelf_number')"+ :rules="data.rules.shelf_number"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.layer_number"+ :label="$t('base.warehouseSetting.layer_number')"+ :rules="data.rules.layer_number"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.tag_number"+ :label="$t('base.warehouseSetting.tag_number')"+ :rules="data.rules.tag_number"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-switch+ v-model="data.form.is_valid"+ color="primary"+ :label="$t('base.warehouseSetting.is_valid')"+ :rules="data.rules.is_valid"+ ></v-switch>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { hookComponent } from '@/components/system/index'+import { addGoodsLocation, updateGoodsLocation, getWarehouseSelect, getWarehouseAreaSelect } from '@/api/base/warehouseSetting'+import { GoodsLocationVO, AreaProperty } from '@/types/Base/Warehouse'+import i18n from '@/languages/i18n'+import { StringLength, IsDecimal } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: GoodsLocationVO+}>()++const isShow = computed(() => props.showDialog)++const dialogTitle = computed(() => {+ if (props.form.id && props.form.id > 0) {+ return 'update'+ }+ return 'add'+})++const data = reactive({+ form: ref<GoodsLocationVO>({+ id: 0,+ warehouse_name: '',+ warehouse_area_name: '',+ location_name: '',+ location_length: 0,+ location_width: 0,+ location_heigth: 0,+ location_volume: 0,+ location_load: 0,+ roadway_number: '',+ shelf_number: '',+ layer_number: '',+ tag_number: '',+ is_valid: true+ }),+ rules: {+ warehouse_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.warehouse_name') }!`,+ (val: string) => StringLength(val, 0, 32) === '' || StringLength(val, 0, 32)+ ],+ warehouse_area_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.area_name') }!`,+ (val: string) => StringLength(val, 0, 32) === '' || StringLength(val, 0, 32)+ ],+ warehouse_area_property: [],+ location_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.location_name') }!`,+ (val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)+ ],+ location_length: [(val: number) => IsDecimal(val, 'nonNegative', 5, 2) === '' || IsDecimal(val, 'nonNegative', 5, 2)],+ location_width: [(val: number) => IsDecimal(val, 'nonNegative', 5, 2) === '' || IsDecimal(val, 'nonNegative', 5, 2)],+ location_heigth: [(val: number) => IsDecimal(val, 'nonNegative', 5, 2) === '' || IsDecimal(val, 'nonNegative', 5, 2)],+ location_volume: [(val: number) => IsDecimal(val, 'nonNegative', 12, 2) === '' || IsDecimal(val, 'nonNegative', 12, 2)],+ location_load: [(val: number) => IsDecimal(val, 'nonNegative', 8, 2) === '' || IsDecimal(val, 'nonNegative', 8, 2)],+ roadway_number: [(val: string) => StringLength(val, 0, 10) === '' || StringLength(val, 0, 10)],+ shelf_number: [(val: string) => StringLength(val, 0, 10) === '' || StringLength(val, 0, 10)],+ layer_number: [(val: string) => StringLength(val, 0, 10) === '' || StringLength(val, 0, 10)],+ tag_number: [(val: string) => StringLength(val, 0, 10) === '' || StringLength(val, 0, 10)],+ is_valid: []+ },+ combobox: ref<{+ warehouse_name: {+ label: string+ value: number+ }[]+ warehouse_area_name: {+ label: string+ value: number+ meta: any+ }[]+ area_property: {+ label: string+ value: AreaProperty+ }[]+ }>({+ warehouse_name: [],+ warehouse_area_name: [],+ area_property: [+ {+ label: i18n.global.t('base.warehouseSetting.picking_area'),+ value: AreaProperty.picking_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.stocking_area'),+ value: AreaProperty.stocking_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.receiving_area'),+ value: AreaProperty.receiving_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.return_area'),+ value: AreaProperty.return_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.defective_area'),+ value: AreaProperty.defective_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.inventory_area'),+ value: AreaProperty.inventory_area+ }+ ]+ })+})++const method = reactive({+ changeWarehouse: (warehouseID: any) => {+ data.combobox.warehouse_area_name = []++ if (!warehouseID) {+ method.initWarehouseArea()+ return+ }++ // Find the ID corresponding value+ const warehouse = data.combobox.warehouse_name.find((item) => item.value === warehouseID)+ if (warehouse) {+ data.form.warehouse_name = warehouse.label+ data.form.warehouse_id = warehouseID++ // Clear messages of warehouse area when warehouse changed.+ method.initWarehouseArea()+ method.getWarehouseAreaSelect(warehouseID)+ }+ },+ changeWarehouseArea: (warehouseAreaID: any) => {+ if (!warehouseAreaID) {+ method.initWarehouseArea()+ return+ }++ // Find the ID corresponding value+ const warehouse = data.combobox.warehouse_area_name.find((item) => item.value === warehouseAreaID)+ if (warehouse) {+ data.form.warehouse_area_name = warehouse.label+ data.form.warehouse_area_id = warehouseAreaID+ data.form.warehouse_area_property = warehouse.meta+ }+ },+ // Clear messages of warehouse area when warehouse changed.+ initWarehouseArea() {+ delete data.form.warehouse_area_id+ data.form.warehouse_area_name = ''+ delete data.form.warehouse_area_property+ },+ getWarehouseSelect: async () => {+ data.combobox.warehouse_name = []+ const { data: res } = await getWarehouseSelect()+ if (!res.isSuccess) {+ return+ }+ for (const item of res.data) {+ data.combobox.warehouse_name.push({+ label: item.name,+ // WarehouseID is a numberic type+ value: Number(item.value)+ })+ }+ },+ // Get warehouse area select when warehouse changed.+ getWarehouseAreaSelect: async (warehouseID: number) => {+ data.combobox.warehouse_area_name = []+ const { data: res } = await getWarehouseAreaSelect(warehouseID)+ if (!res.isSuccess) {+ return+ }+ for (const item of res.data) {+ data.combobox.warehouse_area_name.push({+ label: item.area_name,+ // ID: WarehouseAreaID+ value: item.id,+ // Custom Property+ meta: item.area_property+ })+ }+ },+ closeDialog: () => {+ emit('close')+ },+ initForm: () => {+ data.form = props.form+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addGoodsLocation(data.form) : await updateGoodsLocation(data.form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ method.getWarehouseSelect()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/warehouseSetting/add-or-update-reservoir.vue b/frontend/src/view/base/warehouseSetting/add-or-update-reservoir.vuenew file mode 100644index 0000000..8635238--- /dev/null+++ b/frontend/src/view/base/warehouseSetting/add-or-update-reservoir.vue@@ -0,0 +1,213 @@+<!-- Reservoir Setting Operate Dialog -->+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('base.warehouseSetting.reservoirSetting')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-select+ v-model="data.form.warehouse_id"+ :items="data.combobox.warehouse_name"+ item-title="label"+ item-value="value"+ :rules="data.rules.warehouse_name"+ :label="$t('base.warehouseSetting.warehouse_name')"+ variant="outlined"+ clearable+ @update:model-value="method.changeWarehouse"+ ></v-select>+ <v-text-field+ v-model="data.form.area_name"+ :label="$t('base.warehouseSetting.area_name')"+ :rules="data.rules.area_name"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-select+ v-model="data.form.area_property"+ :items="data.combobox.area_property"+ item-title="label"+ item-value="value"+ :rules="data.rules.area_property"+ :label="$t('base.warehouseSetting.area_property')"+ variant="outlined"+ clearable+ ></v-select>+ <v-switch+ v-model="data.form.is_valid"+ color="primary"+ :label="$t('base.warehouseSetting.is_valid')"+ :rules="data.rules.is_valid"+ ></v-switch>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addWarehouseArea, updateWarehouseArea, getWarehouseSelect } from '@/api/base/warehouseSetting'+import { WarehouseAreaVO, AreaProperty } from '@/types/Base/Warehouse'+import { StringLength } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: WarehouseAreaVO+}>()++const isShow = computed(() => props.showDialog)++const dialogTitle = computed(() => {+ if (props.form.id && props.form.id > 0) {+ return 'update'+ }+ return 'add'+})++const data = reactive({+ form: ref<WarehouseAreaVO>({+ id: 0,+ warehouse_id: 0,+ parent_id: 0,+ warehouse_name: '',+ area_name: '',+ area_property: AreaProperty.picking_area,+ is_valid: true+ }),+ rules: {+ warehouse_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.warehouse_name') }!`+ ],+ area_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.area_name') }!`,+ (val: string) => StringLength(val, 0, 32) === '' || StringLength(val, 0, 32)+ ],+ area_property: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.area_property') }!`+ ],+ is_valid: []+ },+ combobox: ref<{+ warehouse_name: {+ label: string+ value: number+ }[]+ area_property: {+ label: string+ value: AreaProperty+ }[]+ }>({+ warehouse_name: [],+ area_property: [+ {+ label: i18n.global.t('base.warehouseSetting.picking_area'),+ value: AreaProperty.picking_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.stocking_area'),+ value: AreaProperty.stocking_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.receiving_area'),+ value: AreaProperty.receiving_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.return_area'),+ value: AreaProperty.return_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.defective_area'),+ value: AreaProperty.defective_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.inventory_area'),+ value: AreaProperty.inventory_area+ }+ ]+ })+})++const method = reactive({+ getCombobox: async () => {+ data.combobox.warehouse_name = []+ const { data: res } = await getWarehouseSelect()+ if (!res.isSuccess) {+ return+ }+ for (const item of res.data) {+ data.combobox.warehouse_name.push({+ label: item.name,+ // WarehouseID is a numberic type+ value: Number(item.value)+ })+ }+ },+ closeDialog: () => {+ emit('close')+ },+ initForm: () => {+ data.form = props.form+ },+ changeWarehouse: (warehouseID: any) => {+ // Find the ID corresponding value+ const warehouse = data.combobox.warehouse_name.find((item) => item.value === warehouseID)+ if (warehouse) {+ data.form.warehouse_name = warehouse.label+ data.form.warehouse_id = warehouseID+ }+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addWarehouseArea(data.form) : await updateWarehouseArea(data.form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ method.getCombobox()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/warehouseSetting/add-or-update-warehouse.vue b/frontend/src/view/base/warehouseSetting/add-or-update-warehouse.vuenew file mode 100644index 0000000..fa5c25b--- /dev/null+++ b/frontend/src/view/base/warehouseSetting/add-or-update-warehouse.vue@@ -0,0 +1,172 @@+<!-- Warehouse Setting Operate Dialog -->+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('router.sideBar.warehouseSetting')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.warehouse_name"+ :label="$t('base.warehouseSetting.warehouse_name')"+ :rules="data.rules.warehouse_name"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.city"+ :label="$t('base.warehouseSetting.city')"+ :rules="data.rules.city"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.address"+ :label="$t('base.warehouseSetting.address')"+ :rules="data.rules.address"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.contact_tel"+ :label="$t('base.warehouseSetting.contact_tel')"+ :rules="data.rules.contact_tel"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.email"+ :label="$t('base.warehouseSetting.email')"+ :rules="data.rules.email"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.manager"+ :label="$t('base.warehouseSetting.manager')"+ :rules="data.rules.manager"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-switch+ v-model="data.form.is_valid"+ color="primary"+ :label="$t('base.warehouseSetting.is_valid')"+ :rules="data.rules.is_valid"+ ></v-switch>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addWarehouse, updateWarehouse } from '@/api/base/warehouseSetting'+import { WarehouseVO } from '@/types/Base/Warehouse'+import { StringLength } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: WarehouseVO+}>()++const isShow = computed(() => props.showDialog)++const dialogTitle = computed(() => {+ if (props.form.id && props.form.id > 0) {+ return 'update'+ }+ return 'add'+})++const data = reactive({+ form: ref<WarehouseVO>({+ id: 0,+ warehouse_name: '',+ city: '',+ address: '',+ contact_tel: '',+ email: '',+ manager: '',+ is_valid: true+ }),+ rules: {+ warehouse_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.warehouse_name') }!`,+ (val: string) => StringLength(val, 0, 32) === '' || StringLength(val, 0, 32)+ ],+ city: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.city') }!`,+ (val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)+ ],+ address: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.address') }!`,+ (val: string) => StringLength(val, 0, 256) === '' || StringLength(val, 0, 256)+ ],+ contact_tel: [(val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)],+ email: [(val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)],+ manager: [(val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)],+ is_valid: []+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ initForm: () => {+ data.form = props.form+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addWarehouse(data.form) : await updateWarehouse(data.form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/warehouseSetting/import-table.vue b/frontend/src/view/base/warehouseSetting/import-table.vuenew file mode 100644index 0000000..ae67cdc--- /dev/null+++ b/frontend/src/view/base/warehouseSetting/import-table.vue@@ -0,0 +1,214 @@+<!-- Warehouse Setting Import Dialog -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('system.page.import')}`"></v-toolbar>+ <v-card-text>+ <div class="mb-4">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.chooseFile')" size="x-small" @click="method.chooseFile"></tooltip-btn>+ <tooltip-btn+ icon="mdi-export-variant"+ :tooltip-text="$t('system.page.exportTemplate')"+ size="x-small"+ @click="method.exportTemplate"+ ></tooltip-btn>+ <input v-show="false" id="open" ref="uploadExcel" type="file" accept=".xls, .xlsx" @change="method.readExcel" />+ </div>+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.importData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRules"+ :export-config="{}"+ align="center"+ >+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="operate" width="60" :title="$t('system.page.operate')" :resizable="false">+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ <vxe-column field="warehouse_name" :title="$t('base.warehouseSetting.warehouse_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.warehouseSetting.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.warehouseSetting.address')"></vxe-column>+ <vxe-column field="contact_tel" :title="$t('base.warehouseSetting.contact_tel')"></vxe-column>+ <vxe-column field="email" :title="$t('base.warehouseSetting.email')"></vxe-column>+ <vxe-column field="manager" :title="$t('base.warehouseSetting.manager')"></vxe-column>+ </vxe-table>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { VxeTablePropTypes } from 'vxe-table'+import * as XLSX from 'xlsx'+import i18n from '@/languages/i18n'+import { excelImport } from '@/api/base/warehouseSetting'+import { hookComponent } from '@/components/system/index'+import { SYSTEM_HEIGHT, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { WarehouseVO } from '@/types/Base/Warehouse'+import { exportData } from '@/utils/exportTable'+import { formatString } from '@/utils/format/formatSystem'++const emit = defineEmits(['close', 'saveSuccess'])+const uploadExcel = ref()+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ importData: ref<Array<WarehouseVO>>([]),+ validRules: ref<VxeTablePropTypes.EditRules>({})+})++const method = reactive({+ initForm: () => {+ data.importData = []+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const isValid = method.valid()+ if (!isValid) {+ return+ }++ const $table = xTable.value+ // It must be use 'getTableData()' to get all datas with table because it will delete row sometimes.+ const importData = $table.getTableData().fullData++ const { data: res } = await excelImport(importData)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ },++ valid: () => {+ const $table = xTable.value+ const importData = $table.getTableData().fullData++ if (importData.length <= 0) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.tips.detailLengthIsZero') }`+ })+ return false+ }+ return true+ },++ chooseFile: async () => {+ uploadExcel.value.value = ''+ uploadExcel.value.click()+ },++ readExcel: async (evnt: any) => {+ const files = evnt.target.files+ if (files.length <= 0) {+ return false+ }++ const file = files[0]+ const fileReader = new FileReader()++ fileReader.onload = (ev: ProgressEvent<FileReader>) => {+ const fileData = ev?.target?.result+ if (fileData) {+ const workbook = XLSX.read(fileData, { type: 'binary' })+ const wsname = workbook.SheetNames[0]++ let ws = XLSX.utils.sheet_to_json(workbook.Sheets[wsname])+ let str = JSON.stringify(ws)+ str = str.replace(/(/g, '(')+ str = str.replace(/)/g, ')')+ ws = JSON.parse(str)++ data.importData = []+ ws.forEach((value: any, index: number, ws: any) => {+ data.importData.push({+ warehouse_name: formatString(ws[index][i18n.global.t('base.warehouseSetting.warehouse_name')]),+ city: formatString(ws[index][i18n.global.t('base.warehouseSetting.city')]),+ address: formatString(ws[index][i18n.global.t('base.warehouseSetting.address')]),+ contact_tel: formatString(ws[index][i18n.global.t('base.warehouseSetting.contact_tel')]),+ email: formatString(ws[index][i18n.global.t('base.warehouseSetting.email')]),+ manager: formatString(ws[index][i18n.global.t('base.warehouseSetting.manager')])+ })+ })+ }+ }+ fileReader.readAsBinaryString(file)+ },++ exportTemplate: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.warehouseSetting'),+ mode: 'header',+ columnFilterMethod({ column }: any) {+ return !['checkbox', 'seq'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ deleteRow: (row: WarehouseVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (row) {+ const $table = xTable.value+ $table.remove(row)+ }+ }+ })+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/warehouseSetting/tab-location.vue b/frontend/src/view/base/warehouseSetting/tab-location.vuenew file mode 100644index 0000000..6f014fc--- /dev/null+++ b/frontend/src/view/base/warehouseSetting/tab-location.vue@@ -0,0 +1,290 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.warehouse_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.warehouseSetting.warehouse_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.warehouse_area_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.warehouseSetting.area_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTableGoodsLocation" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="warehouse_name" :title="$t('base.warehouseSetting.warehouse_name')"></vxe-column>+ <vxe-column field="warehouse_area_name" :title="$t('base.warehouseSetting.area_name')"></vxe-column>+ <vxe-column field="warehouse_area_property" :title="$t('base.warehouseSetting.area_property')">+ <template #default="{ row, column }">+ <span>{{ formatAreaProperty(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="location_name" :title="$t('base.warehouseSetting.location_name')"></vxe-column>+ <vxe-column width="150px" field="location_length" :title="$t('base.warehouseSetting.location_length')"></vxe-column>+ <vxe-column width="150px" field="location_width" :title="$t('base.warehouseSetting.location_width')"></vxe-column>+ <vxe-column width="150px" field="location_heigth" :title="$t('base.warehouseSetting.location_heigth')"></vxe-column>+ <vxe-column width="150px" field="location_volume" :title="$t('base.warehouseSetting.location_volume')"></vxe-column>+ <vxe-column width="150px" field="location_load" :title="$t('base.warehouseSetting.location_load')"></vxe-column>+ <vxe-column field="roadway_number" :title="$t('base.warehouseSetting.roadway_number')"></vxe-column>+ <vxe-column field="shelf_number" :title="$t('base.warehouseSetting.shelf_number')"></vxe-column>+ <vxe-column field="layer_number" :title="$t('base.warehouseSetting.layer_number')"></vxe-column>+ <vxe-column field="tag_number" :title="$t('base.warehouseSetting.tag_number')"></vxe-column>+ <vxe-column field="is_valid" :title="$t('base.warehouseSetting.is_valid')">+ <template #default="{ row, column }">+ <span>{{ formatIsValid(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn :flat="true" icon="mdi-pencil-outline" :tooltip-text="$t('system.page.edit')" @click="method.editRow(row)"></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ <add-or-update-dialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { GoodsLocationVO } from '@/types/Base/Warehouse'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { deleteGoodsLocation, getGoodsLocationList } from '@/api/base/warehouseSetting'+import tooltipBtn from '@/components/tooltip-btn.vue'+import addOrUpdateDialog from './add-or-update-location.vue'+import i18n from '@/languages/i18n'+import { formatIsValid } from '@/utils/format/formatSystem'+import { formatAreaProperty } from '@/utils/format/formatWarehouse'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { DEBOUNCE_TIME } from '@/constant/system'+import { SearchObject } from '@/types/System/Form'+import { exportData } from '@/utils/exportTable'++const xTableGoodsLocation = ref()++const data = reactive({+ showDialog: false,+ dialogForm: ref<GoodsLocationVO>({+ id: 0,+ warehouse_name: '',+ warehouse_area_name: '',+ location_name: '',+ location_length: 0,+ location_width: 0,+ location_heigth: 0,+ location_volume: 0,+ location_load: 0,+ roadway_number: '',+ shelf_number: '',+ layer_number: '',+ tag_number: '',+ is_valid: true+ }),+ searchForm: {+ warehouse_name: '',+ warehouse_area_name: ''+ },+ activeTab: null,+ tableData: ref<GoodsLocationVO[]>([]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ // Open a dialog to add+ add: () => {+ data.dialogForm = {+ id: 0,+ warehouse_name: '',+ warehouse_area_name: '',+ location_name: '',+ location_length: 0,+ location_width: 0,+ location_heigth: 0,+ location_volume: 0,+ location_load: 0,+ roadway_number: '',+ shelf_number: '',+ layer_number: '',+ tag_number: '',+ is_valid: true+ }+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Refresh data+ refresh: () => {+ method.getGoodsLocationList()+ },+ getGoodsLocationList: async () => {+ const { data: res } = await getGoodsLocationList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ editRow(row: GoodsLocationVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: GoodsLocationVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteGoodsLocation(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getGoodsLocationList()+ }),+ exportTable: () => {+ const $table = xTableGoodsLocation.value+ exportData({+ table: $table,+ filename: i18n.global.t('base.warehouseSetting.locationSetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getGoodsLocationList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getGoodsLocationList: method.getGoodsLocationList+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/base/warehouseSetting/tab-reservoir.vue b/frontend/src/view/base/warehouseSetting/tab-reservoir.vuenew file mode 100644index 0000000..55d90fe--- /dev/null+++ b/frontend/src/view/base/warehouseSetting/tab-reservoir.vue@@ -0,0 +1,265 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.warehouse_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.warehouseSetting.warehouse_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.area_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.warehouseSetting.area_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTableWarehouseArea" :data="data.tableData" :height="tableHeight" align="center">+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="warehouse_name" :title="$t('base.warehouseSetting.warehouse_name')"></vxe-column>+ <vxe-column field="area_name" :title="$t('base.warehouseSetting.area_name')"></vxe-column>+ <vxe-column field="area_property" :title="$t('base.warehouseSetting.area_property')">+ <template #default="{ row, column }">+ <span>{{ formatAreaProperty(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="is_valid" :title="$t('base.warehouseSetting.is_valid')">+ <template #default="{ row, column }">+ <span>{{ formatIsValid(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn :flat="true" icon="mdi-pencil-outline" :tooltip-text="$t('system.page.edit')" @click="method.editRow(row)"></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ <add-or-update-dialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { WarehouseAreaVO, AreaProperty } from '@/types/Base/Warehouse'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { deleteWarehouseArea, getWarehouseAreaList } from '@/api/base/warehouseSetting'+import tooltipBtn from '@/components/tooltip-btn.vue'+import addOrUpdateDialog from './add-or-update-reservoir.vue'+import i18n from '@/languages/i18n'+import { formatAreaProperty } from '@/utils/format/formatWarehouse'+import { formatIsValid } from '@/utils/format/formatSystem'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { DEBOUNCE_TIME } from '@/constant/system'+import { SearchObject } from '@/types/System/Form'+import { exportData } from '@/utils/exportTable'++const xTableWarehouseArea = ref()++const data = reactive({+ showDialog: false,+ dialogForm: ref<WarehouseAreaVO>({+ id: 0,+ parent_id: 0,+ warehouse_name: '',+ area_name: '',+ area_property: AreaProperty.picking_area,+ is_valid: true+ }),+ searchForm: {+ warehouse_name: '',+ area_name: ''+ },+ activeTab: null,+ tableData: ref<WarehouseAreaVO[]>([]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ // Open a dialog to add+ add: () => {+ data.dialogForm = {+ id: 0,+ parent_id: 0,+ warehouse_name: '',+ area_name: '',+ area_property: AreaProperty.picking_area,+ is_valid: true+ }+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Refresh data+ refresh: () => {+ method.getWarehouseAreaList()+ },+ getWarehouseAreaList: async () => {+ const { data: res } = await getWarehouseAreaList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ editRow(row: WarehouseAreaVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: WarehouseAreaVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteWarehouseArea(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getWarehouseAreaList()+ }),+ exportTable: () => {+ const $table = xTableWarehouseArea.value+ exportData({+ table: $table,+ filename: i18n.global.t('base.warehouseSetting.reservoirSetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getWarehouseAreaList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getWarehouseAreaList: method.getWarehouseAreaList+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/base/warehouseSetting/tab-warehouse.vue b/frontend/src/view/base/warehouseSetting/tab-warehouse.vuenew file mode 100644index 0000000..f0e2073--- /dev/null+++ b/frontend/src/view/base/warehouseSetting/tab-warehouse.vue@@ -0,0 +1,296 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-database-import-outline" :tooltip-text="$t('system.page.import')" @click="method.openDialogImport"> </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.warehouse_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.warehouseSetting.warehouse_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.city"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.warehouseSetting.city')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.manager"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.warehouseSetting.manager')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTableWarehouse" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="warehouse_name" :title="$t('base.warehouseSetting.warehouse_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.warehouseSetting.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.warehouseSetting.address')"></vxe-column>+ <vxe-column field="contact_tel" :title="$t('base.warehouseSetting.contact_tel')"></vxe-column>+ <vxe-column field="email" :title="$t('base.warehouseSetting.email')"></vxe-column>+ <vxe-column field="manager" :title="$t('base.warehouseSetting.manager')"></vxe-column>+ <vxe-column field="creator" :title="$t('base.warehouseSetting.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('base.warehouseSetting.create_time')"></vxe-column>+ <vxe-column field="is_valid" :title="$t('base.warehouseSetting.is_valid')">+ <template #default="{ row, column }">+ <span>{{ formatIsValid(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn :flat="true" icon="mdi-pencil-outline" :tooltip-text="$t('system.page.edit')" @click="method.editRow(row)"></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ <add-or-update-dialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <import-table :show-dialog="data.showDialogImport" @close="method.closeDialogImport" @saveSuccess="method.saveSuccessImport" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { WarehouseVO } from '@/types/Base/Warehouse'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { deleteWarehouse, getWarehouseList } from '@/api/base/warehouseSetting'+import tooltipBtn from '@/components/tooltip-btn.vue'+import addOrUpdateDialog from './add-or-update-warehouse.vue'+import i18n from '@/languages/i18n'+import { formatIsValid } from '@/utils/format/formatSystem'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { DEBOUNCE_TIME } from '@/constant/system'+import { SearchObject } from '@/types/System/Form'+import importTable from './import-table.vue'+import { exportData } from '@/utils/exportTable'++const xTableWarehouse = ref()++const data = reactive({+ showDialog: false,+ showDialogImport: false,++ dialogForm: {+ id: 0,+ warehouse_name: '',+ city: '',+ address: '',+ contact_tel: '',+ email: '',+ manager: '',+ is_valid: true+ },+ searchForm: {+ warehouse_name: '',+ city: '',+ manager: ''+ },+ activeTab: null,+ tableData: ref<WarehouseVO[]>([]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ // Open a dialog to add+ add: () => {+ data.dialogForm = {+ id: 0,+ warehouse_name: '',+ city: '',+ address: '',+ contact_tel: '',+ email: '',+ manager: '',+ is_valid: true+ }+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Import Dialog+ openDialogImport: () => {+ data.showDialogImport = true+ },+ closeDialogImport: () => {+ data.showDialogImport = false+ },+ saveSuccessImport: () => {+ method.refresh()+ method.closeDialogImport()+ },+ // Refresh data+ refresh: () => {+ method.getWarehouseList()+ },+ getWarehouseList: async () => {+ const { data: res } = await getWarehouseList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ editRow(row: WarehouseVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: WarehouseVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteWarehouse(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getWarehouseList()+ }),+ exportTable: () => {+ const $table = xTableWarehouse.value+ exportData({+ table: $table,+ filename: i18n.global.t('base.warehouseSetting.warehouseSetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getWarehouseList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getWarehouseList: method.getWarehouseList+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/base/warehouseSetting/warehouseSetting.vue b/frontend/src/view/base/warehouseSetting/warehouseSetting.vuenew file mode 100644index 0000000..ffbd1d3--- /dev/null+++ b/frontend/src/view/base/warehouseSetting/warehouseSetting.vue@@ -0,0 +1,110 @@+<!-- Warehouse Setting -->+<template>+ <div class="container">+ <div>+ <v-tabs v-model="data.activeTab" stacked @update:model-value="method.changeTabs">+ <v-tab v-for="(item, index) of tabsConfig" :key="index" :value="item.value">+ <v-icon>{{ item.icon }}</v-icon>+ <p class="tabItemTitle">{{ item.tabName }}</p>+ </v-tab>+ </v-tabs>++ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item value="tabWarehouse">+ <tab-warehouse ref="tabWarehouseRef" />+ </v-window-item>+ <v-window-item value="tabReservoir">+ <tab-reservoir ref="tabReservoirRef" />+ </v-window-item>+ <v-window-item value="tabLocation">+ <tab-location ref="tabLocationRef" />+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { ref, reactive, onMounted, watch, nextTick } from 'vue'+import i18n from '@/languages/i18n'+import tabWarehouse from './tab-warehouse.vue'+import tabReservoir from './tab-reservoir.vue'+import tabLocation from './tab-location.vue'++const tabWarehouseRef = ref()+const tabReservoirRef = ref()+const tabLocationRef = ref()++const tabsConfig = [+ {+ value: 'tabWarehouse',+ icon: 'mdi-warehouse',+ tabName: i18n.global.t('base.warehouseSetting.warehouseSetting')+ },+ {+ value: 'tabReservoir',+ icon: 'mdi-texture-box',+ tabName: i18n.global.t('base.warehouseSetting.reservoirSetting')+ },+ {+ value: 'tabLocation',+ icon: 'mdi-library-shelves ',+ tabName: i18n.global.t('base.warehouseSetting.locationSetting')+ }+]++const data = reactive({+ activeTab: '',+ isLoadWarehouseData: false,+ isLoadReservoirData: false,+ isLoadLocationData: false+})++const method = reactive({+ changeTabs: (e: any): void => {+ nextTick(() => {+ switch (e) {+ case 'tabWarehouse':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabWarehouseRef?.value?.getWarehouseList) {+ tabWarehouseRef.value.getWarehouseList()+ }+ break+ case 'tabReservoir':+ if (tabReservoirRef?.value?.getWarehouseAreaList) {+ tabReservoirRef.value.getWarehouseAreaList()+ }+ break+ case 'tabLocation':+ if (tabLocationRef?.value?.getGoodsLocationList) {+ tabLocationRef.value.getGoodsLocationList()+ }+ break+ }+ })+ }+})++onMounted(() => {})+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/add-or-update-shipment.vue b/frontend/src/view/deliveryManagement/deliveryManagement/add-or-update-shipment.vuenew file mode 100644index 0000000..c633cd4--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/add-or-update-shipment.vue@@ -0,0 +1,327 @@+<template>+ <v-dialog v-model="isShow" :width="'70%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('router.sideBar.deliveryManagement')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-select+ v-model="data.form.customer_name"+ :items="data.combobox.customer_name"+ item-title="label"+ item-value="label"+ :rules="data.rules.customer_name"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="outlined"+ clearable+ @update:model-value="method.customerNameChange"+ ></v-select>+ <v-row v-for="(item, index) of data.form.detailList" :key="index" style="margin-top: 5px">+ <!-- <v-select+ v-model="item.sku_id"+ :items="data.combobox.sku_code"+ item-title="label"+ item-value="value"+ :rules="data.rules.sku_id"+ :label="$t('wms.deliveryManagement.sku_code')"+ variant="outlined"+ clearable+ ></v-select> -->+ <v-col :cols="3">+ <v-text-field v-model="item.spu_name" :label="$t('wms.deliveryManagement.spu_name')" variant="outlined" readonly></v-text-field>+ </v-col>+ <v-col :cols="3">+ <v-text-field+ v-model="item.spu_code"+ :label="$t('wms.deliveryManagement.spu_code')"+ :rules="data.rules.spu_code"+ variant="outlined"+ readonly+ ></v-text-field>+ </v-col>+ <v-col :cols="3">+ <v-text-field v-model="item.sku_code" :label="$t('wms.deliveryManagement.sku_code')" variant="outlined" readonly></v-text-field>+ </v-col>+ <v-col :cols="2">+ <v-text-field+ v-model="item.qty"+ :rules="data.rules.qty"+ :label="$t('wms.deliveryManagement.detailQty')"+ variant="outlined"+ clearable+ ></v-text-field>+ </v-col>+ <v-col :cols="1">+ <div class="detailBtnContainer">+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.removeItem(index, item)"+ ></tooltip-btn>+ </div>+ </v-col>+ </v-row>+ <!-- <v-btn style="font-size: 20px; margin-bottom: 15px; margin-top: 10px; float: right" color="primary" :width="40" @click="method.AddDetail">+ ++ </v-btn> -->+ <v-btn+ style="font-size: 20px; margin-bottom: 15px; margin-top: 10px; float: right"+ color="primary"+ :width="40"+ @click="method.openSelect('target')"+ >+ ++ </v-btn>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ <skuSelect :show-dialog="data.showSkuDialogSelect" @close="method.closeDialogSelect('target')" @sureSelect="method.sureSelect" />+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch, nextTick } from 'vue'+import { DeliveryManagementVO, DeliveryManagementDetailListVO, addRequestVO } from '@/types/DeliveryManagement/DeliveryManagement'+import i18n from '@/languages/i18n'+import { errorColor } from '@/constant/style'+import { hookComponent } from '@/components/system/index'+import { addShipment } from '@/api/wms/deliveryManagement'+import { getSupplierAll } from '@/api/base/supplier'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { checkDetailRepeatGetBool } from '@/utils/dataVerification/page'+import skuSelect from '@/components/select/sku-select.vue'+import { CommodityDetailJoinMainVO } from '@/types/Base/CommodityManagement'+import { IsInteger } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: DeliveryManagementVO+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ curSelectType: '',+ showSkuDialogSelect: false,+ dialogTitle: '',+ form: ref<DeliveryManagementVO>({+ id: 0,+ detailList: []+ }),+ removeDetailList: ref<DeliveryManagementDetailListVO[]>([]),+ combobox: ref<{+ customer_name: {+ label: string+ value: number+ }[]+ }>({+ customer_name: []+ }),+ rules: {+ customer_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.customer_name') }!`+ ],+ spu_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.sku_code') }!`],+ qty: [+ (val: number) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.detailQty') }!`,+ (val: number) => IsInteger(val, 'greaterThanZero') === '' || IsInteger(val, 'greaterThanZero')+ ]+ }+})++const method = reactive({+ openSelect: (type: string) => {+ data.curSelectType = type++ if (type === 'target') {+ data.showSkuDialogSelect = true+ }+ },+ sureSelect: (selectRecords: CommodityDetailJoinMainVO[]) => {+ if (data.curSelectType === 'target') {+ for (const item of selectRecords) {+ const index = data.form.detailList.findIndex((fi) => fi.sku_id === item.sku_id)+ if (index === -1) {+ data.form.detailList.push({+ id: 0,+ sku_id: item.sku_id,+ spu_code: item.spu_code,+ spu_name: item.spu_name,+ sku_name: item.sku_name,+ sku_code: item.sku_code,+ qty: 0+ })+ }+ }+ }+ },+ closeDialogSelect: (type: string) => {+ if (type === 'target') {+ data.showSkuDialogSelect = false+ }+ },+ clearCommodity: (item: DeliveryManagementDetailListVO) => {+ item.sku_id = 0+ item.sku_code = ''+ item.spu_code = ''+ item.spu_name = ''+ },+ // When customers change+ customerNameChange: (val: string) => {+ if (!val) {+ data.form.customer_id = 0+ } else {+ data.form.customer_id = data.combobox.customer_name.filter((item) => item.label === val)[0].value+ }+ },+ // Add a new detail+ AddDetail: () => {+ data.form.detailList.push({ id: 0, qty: 0 })+ // Let the scroll bar go to the bottom, Improve user experience+ const carText = document.querySelector('.formCard')+ if (carText && carText.scrollHeight > carText.clientHeight) {+ nextTick(() => {+ // Set scroll bar to the bottom+ carText.scrollTop = carText.scrollHeight+ })+ }+ },+ // Get dialog type, add or update+ getDialogType: () => {+ // This is special because this document is not actually a table,+ // but the data associated with another table.+ // so directly use the details to determine whether it is a new document+ if (props.form.detailList.length > 0) {+ data.dialogTitle = 'update'+ } else {+ data.dialogTitle = 'add'+ }+ },+ // Get the options required by the drop-down box+ getCombobox: async () => {+ data.combobox.customer_name = []+ const { data: supplierRes } = await getSupplierAll()+ if (!supplierRes.isSuccess) {+ return+ }+ for (const item of supplierRes.data) {+ if (item.is_valid) {+ data.combobox.customer_name.push({+ label: item.supplier_name,+ value: item.id+ })+ }+ }+ },+ closeDialog: () => {+ emit('close')+ },+ // Details verification before document submission+ beforeSubmit: (): boolean => {+ let flag = true+ if (data.form.detailList.length === 0) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.detailLengthIsZero')+ })+ flag = false+ } else if (checkDetailRepeatGetBool(data.form.detailList, ['sku_id'])) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.detailHasItemRepeat')+ })+ flag = false+ }+ return flag+ },+ submit: async () => {+ const beforeSubmitFlag = method.beforeSubmit()+ if (!beforeSubmitFlag) {+ return+ }+ const { valid } = await formRef.value.validate()+ if (valid) {+ const reqList: addRequestVO[] = []+ for (const item of data.form.detailList) {+ reqList.push({+ customer_id: data.form.customer_id ? data.form.customer_id : 0,+ customer_name: data.form.customer_name ? data.form.customer_name : '',+ qty: item.qty,+ sku_id: item.sku_id ? item.sku_id : 0+ })+ }+ const { data: res } = await addShipment(reqList)+ // const { data: res } = data.dialogTitle === 'add'+ // : await updateRoleMenu({ ...data.form, detailList: [...data.form.detailList, ...data.removeDetailList] }) // Merge the deleted list and the original list+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ },+ // remove detail+ removeItem: (index: number, item: DeliveryManagementDetailListVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (item.id > 0) {+ item.id = -item.id+ data.removeDetailList.push(item) // Cache remove row+ }+ data.form.detailList.splice(index, 1) // Remove row in detailList+ }+ })+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.getDialogType()+ method.getCombobox()+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+// .v-form {+// div {+// margin-bottom: 7px;+// }+// }+.detailBtnContainer {+ height: 56px;+ display: flex;+ justify-content: center;+ align-items: center;+}+// .v-col {+// padding: 0 !important;+// }+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/confirm-order.vue b/frontend/src/view/deliveryManagement/deliveryManagement/confirm-order.vuenew file mode 100644index 0000000..8bbe40b--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/confirm-order.vue@@ -0,0 +1,254 @@+<template>+ <v-dialog v-model="isShow" :width="'70%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('wms.deliveryManagement.confirmOrder')}`"></v-toolbar>+ <v-card-text>+ <v-row>+ <v-col :cols="5">+ <vxe-table+ ref="xTable"+ keep-source+ :column-config="{ minWidth: '100px' }"+ :data="data.treeData"+ :height="'500px'"+ align="center"+ :cell-style="method.cellStyle"+ @cell-click="method.cellClick"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="40"></vxe-column>+ <vxe-column width="40">+ <template #default="{ row }">+ <div style="height: 100%; display: flex; align-items: center; justify-content: center">+ <vxe-checkbox v-model="row.confirm"></vxe-checkbox>+ </div>+ </template>+ </vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"> </vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"> </vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')">+ <template #default="{ row }">+ <span :style="data.validList.includes(row.sku_code) ? 'color: red' : ''">{{ row.sku_code }}</span>+ </template>+ </vxe-column>+ </vxe-table>+ <!-- <v-card :height="tableHeight"> -->+ <!-- <NavListVue+ :list-data="data.treeData"+ :title="data.navListOptions.title"+ :label-key="data.navListOptions.labelKey"+ :index-key="data.navListOptions.indexKey"+ :index-value="data.navListOptions.indexValue"+ @item-click="method.navListClick"+ /> -->+ <!-- </v-card> -->+ </v-col>+ <v-col :cols="7">+ <vxe-table+ ref="detailXTable"+ keep-source+ :column-config="{ minWidth: '100px' }"+ :data="data.tableData"+ :height="'500px'"+ align="center"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRules"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="warehouse_name" :title="$t('wms.stock.warehouse')"> </vxe-column>+ <vxe-column field="location_name" :title="$t('wms.stock.location_name')"> </vxe-column>+ <vxe-column field="goods_owner_name" :title="$t('base.ownerOfCargo.goods_owner_name')"> </vxe-column>+ <vxe-column field="qty_available" :title="$t('wms.deliveryManagement.qty_available')"></vxe-column>+ <vxe-column field="pick_qty" :title="$t('wms.deliveryManagement.detailQty')" :edit-render="{}">+ <template #edit="{ row }">+ <vxe-input v-model="row.pick_qty" type="text"></vxe-input>+ </template>+ </vxe-column>+ </vxe-table>+ </v-col>+ </v-row>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { ConfirmOrderVO, ConfirmOrderPickListVO } from '@/types/DeliveryManagement/DeliveryManagement'+import i18n from '@/languages/i18n'+import { getConfirmOrderInfoAndStock, confirmOrder } from '@/api/wms/deliveryManagement'+import { hookComponent } from '@/components/system/index'+import { isInteger } from '@/utils/dataVerification/tableRule'++const xTable = ref()+const detailXTable = ref()++const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ confirmOrderNo: string+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ navListOptions: {+ title: i18n.global.t('wms.deliveryManagement.orderDetail'),+ labelKey: 'sku_code',+ indexKey: 'sku_code',+ indexValue: ''+ },+ treeData: ref<ConfirmOrderVO[]>([]),+ tableData: ref<ConfirmOrderPickListVO[]>([]),+ // List of verification results for each commodity+ validList: ref<string[]>([]),+ validRules: ref<any>({+ pick_qty: [+ {+ validator: isInteger,+ validNumerical: 'nonNegative',+ trigger: 'change'+ }+ ]+ })+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ beforeSubmit: (): boolean => {+ // let flag = true+ data.validList = []+ const msgList: string[] = []+ let orderCount = 0+ if (data.treeData.filter((fl) => fl.confirm).length <= 0) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('wms.deliveryManagement.NoItemSelected')+ })+ return false+ }+ for (const item of data.treeData) {+ if (item.confirm) {+ let count = 0+ for (const dItem of item.pick_list) {+ count += Number(dItem.pick_qty)+ }+ orderCount += count+ if (count > item.qty) {+ data.validList.push(item.sku_code)+ msgList.push(`${ item.sku_code } ${ i18n.global.t('wms.deliveryManagement.quantityOverflow') } ${ item.qty }`)+ // flag = false+ }+ if (count === 0) {+ if (!data.validList.includes(item.sku_code)) {+ data.validList.push(item.sku_code)+ }+ msgList.push(`${ item.sku_code } ${ i18n.global.t('wms.deliveryManagement.detailQuantityIsZero') }!`)+ }+ }+ }+ // return flag+ if (msgList.length > 0) {+ hookComponent.$message({+ type: 'error',+ content: msgList.join(';\n')+ })+ return false+ }+ if (orderCount <= 0) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('wms.deliveryManagement.quantityIsZero')+ })+ return false+ }+ return true+ },+ submit: async () => {+ const $table = detailXTable.value+ const errMap = await $table.validate(true)+ if (errMap) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ return+ }+ if (method.beforeSubmit()) {+ // console.log(data.treeData)+ const { data: res } = await confirmOrder(data.treeData)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: i18n.global.t('wms.deliveryManagement.confirmSuccess')+ })+ emit('saveSuccess')+ }+ },+ getInfoByNo: async () => {+ const { data: res } = await getConfirmOrderInfoAndStock(props.confirmOrderNo)+ if (!res.isSuccess) {+ return+ }+ data.treeData = res.data+ data.tableData = []+ if (data.treeData.length > 0) {+ method.cellClick({ row: data.treeData[0] })+ }+ },+ cellClick: ({ row }: { row: ConfirmOrderVO }) => {+ data.navListOptions.indexValue = row.sku_code+ data.tableData = row.pick_list+ },+ // When clicking the left tree+ navListClick: (item: ConfirmOrderVO) => {+ data.navListOptions.indexValue = item.sku_code+ data.tableData = item.pick_list+ },+ cellStyle: ({ row }: { row: ConfirmOrderVO }) => {+ const style: any = { cursor: 'pointer' }+ if (row.sku_code === data.navListOptions.indexValue) {+ style.backgroundColor = '#e6dafd'+ }+ return style+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.getInfoByNo()+ }+ }+)+</script>++<style scoped lang="less">+.detailBtnContainer {+ height: 56px;+ display: flex;+ justify-content: center;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/deliveryManagement.vue b/frontend/src/view/deliveryManagement/deliveryManagement/deliveryManagement.vuenew file mode 100644index 0000000..ea018f7--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/deliveryManagement.vue@@ -0,0 +1,255 @@+<!-- Warehouse Setting -->+<template>+ <div class="container">+ <div>+ <v-tabs v-model="data.activeTab" stacked @update:model-value="method.changeTabs">+ <v-tab v-for="(item, index) of tabsConfig" :key="index" :value="item.value">+ <v-icon>{{ item.icon }}</v-icon>+ <p class="tabItemTitle">{{ item.tabName }}</p>+ </v-tab>+ </v-tabs>++ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item value="tabShipment">+ <tabShipment ref="tabShipmentRef" />+ </v-window-item>+ <v-window-item value="tabPreShipment">+ <tabPreShipment ref="tabPreShipmentRef" />+ </v-window-item>+ <v-window-item value="tabNewShipment">+ <tabNewShipment ref="tabNewShipmentRef" />+ </v-window-item>+ <v-window-item value="tabGoodsToBePicked">+ <tabGoodsToBePicked ref="tabGoodsToBePickedRef" />+ </v-window-item>+ <v-window-item value="tabPicked">+ <tabPicked ref="tabPickedRef" />+ </v-window-item>+ <v-window-item value="tabToBePackaged">+ <tabToBePackaged ref="tabToBePackagedRef" />+ </v-window-item>+ <v-window-item value="tabPackaged">+ <tabPackaged ref="tabPackagedRef" />+ </v-window-item>+ <v-window-item value="tabToBeWeighed">+ <tabToBeWeighed ref="tabToBeWeighedRef" />+ </v-window-item>+ <v-window-item value="tabWeighed">+ <tabWeighed ref="tabWeighedRef" />+ </v-window-item>+ <v-window-item value="tabToBeDelivered">+ <tabToBeDelivered ref="tabToBeDeliveredRef" />+ </v-window-item>+ <v-window-item value="tabDelivered">+ <tabDelivered ref="tabDeliveredRef" />+ </v-window-item>+ <v-window-item value="tabSignIn">+ <tabSignIn ref="tabSignInRef" />+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { ref, reactive, onMounted, nextTick } from 'vue'+import i18n from '@/languages/i18n'+import tabShipment from './tabShipment.vue'+import tabPreShipment from './tabPreShipment.vue'+import tabNewShipment from './tabNewShipment.vue'+import tabGoodsToBePicked from './tabGoodsToBePicked.vue'+import tabPicked from './tabPicked.vue'+import tabToBePackaged from './tabToBePackaged.vue'+import tabPackaged from './tabPackaged.vue'+import tabToBeWeighed from './tabToBeWeighed.vue'+import tabWeighed from './tabWeighed.vue'+import tabToBeDelivered from './tabToBeDelivered.vue'+import tabDelivered from './tabDelivered.vue'+import tabSignIn from './tabSignIn.vue'++const tabShipmentRef = ref()+const tabPreShipmentRef = ref()+const tabNewShipmentRef = ref()+const tabGoodsToBePickedRef = ref()+const tabPickedRef = ref()+const tabToBePackagedRef = ref()+const tabPackagedRef = ref()+const tabToBeWeighedRef = ref()+const tabWeighedRef = ref()+const tabToBeDeliveredRef = ref()+const tabDeliveredRef = ref()+const tabSignInRef = ref()++const tabsConfig = [+ {+ value: 'tabShipment',+ icon: 'mdi-clipboard-list',+ tabName: i18n.global.t('wms.deliveryManagement.shipment')+ },+ {+ value: 'tabPreShipment',+ icon: 'mdi-list-box-outline',+ tabName: i18n.global.t('wms.deliveryManagement.preShipment')+ },+ {+ value: 'tabNewShipment',+ icon: 'mdi-list-box',+ tabName: i18n.global.t('wms.deliveryManagement.newShipment')+ },+ {+ value: 'tabGoodsToBePicked',+ icon: 'mdi-dolly',+ tabName: i18n.global.t('wms.deliveryManagement.goodsToBePicked')+ },+ {+ value: 'tabPicked',+ icon: 'mdi-human-dolly',+ tabName: i18n.global.t('wms.deliveryManagement.picked')+ },+ {+ value: 'tabToBePackaged',+ icon: 'mdi-package-variant',+ tabName: i18n.global.t('wms.deliveryManagement.toBePackaged')+ },+ {+ value: 'tabPackaged',+ icon: 'mdi-package-variant-closed-check',+ tabName: i18n.global.t('wms.deliveryManagement.packaged')+ },+ {+ value: 'tabToBeWeighed',+ icon: 'mdi-basket-fill',+ tabName: i18n.global.t('wms.deliveryManagement.toBeWeighed')+ },+ {+ value: 'tabWeighed',+ icon: 'mdi-weight',+ tabName: i18n.global.t('wms.deliveryManagement.weighed')+ },+ {+ value: 'tabToBeDelivered',+ icon: 'mdi-send-outline',+ tabName: i18n.global.t('wms.deliveryManagement.toBeDelivered')+ },+ {+ value: 'tabDelivered',+ icon: 'mdi-send',+ tabName: i18n.global.t('wms.deliveryManagement.outOfWarehouse')+ },+ {+ value: 'tabSignIn',+ icon: 'mdi-check-circle',+ tabName: i18n.global.t('wms.deliveryManagement.signedIn')+ }+]++const data = reactive({+ activeTab: '',+ isLoadstockLocation: false,+ isLoadstock: false+})++const method = reactive({+ changeTabs: (e: any): void => {+ nextTick(() => {+ switch (e) {+ case 'tabShipment':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabShipmentRef?.value?.getShipment) {+ tabShipmentRef.value.getShipment()+ }+ break+ case 'tabPreShipment':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabPreShipmentRef?.value?.getPreShipment) {+ tabPreShipmentRef.value.getPreShipment()+ }+ break+ case 'tabNewShipment':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabNewShipmentRef?.value?.getNewShipment) {+ tabNewShipmentRef.value.getNewShipment()+ }+ break+ case 'tabGoodsToBePicked':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabGoodsToBePickedRef?.value?.getGoodsToBePicked) {+ tabGoodsToBePickedRef.value.getGoodsToBePicked()+ }+ break+ case 'tabToBePackaged':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabToBePackagedRef?.value?.getToBePackaged) {+ tabToBePackagedRef.value.getToBePackaged()+ }+ break+ case 'tabPackaged':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabPackagedRef?.value?.getPackaged) {+ tabPackagedRef.value.getPackaged()+ }+ break+ case 'tabToBeWeighed':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabToBeWeighedRef?.value?.getToBeWeighed) {+ tabToBeWeighedRef.value.getToBeWeighed()+ }+ break+ case 'tabWeighed':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabWeighedRef?.value?.getWeighed) {+ tabWeighedRef.value.getWeighed()+ }+ break+ case 'tabPicked':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabPickedRef?.value?.getPicked) {+ tabPickedRef.value.getPicked()+ }+ break+ case 'tabToBeDelivered':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabToBeDeliveredRef?.value?.getToBeDelivery) {+ tabToBeDeliveredRef.value.getToBeDelivery()+ }+ break+ case 'tabDelivered':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabDeliveredRef?.value?.getDelivery) {+ tabDeliveredRef.value.getDelivery()+ }+ break+ case 'tabSignIn':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabSignInRef?.value?.getSignIn) {+ tabSignInRef.value.getSignIn()+ }+ break+ }+ })+ }+})++onMounted(() => {})+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/package-confirm.vue b/frontend/src/view/deliveryManagement/deliveryManagement/package-confirm.vuenew file mode 100644index 0000000..4625c1d--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/package-confirm.vue@@ -0,0 +1,140 @@+<template>+ <v-dialog v-model="isShow" :width="'70%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="dialogTitle"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-row v-for="(item, index) of data.list" :key="index">+ <v-col :cols="3">+ <v-text-field v-model="item.spu_name" :label="$t('wms.deliveryManagement.spu_name')" variant="outlined" readonly></v-text-field>+ </v-col>+ <v-col :cols="3">+ <v-text-field v-model="item.spu_code" :label="$t('wms.deliveryManagement.spu_code')" variant="outlined" readonly></v-text-field>+ </v-col>+ <v-col :cols="isWeight ? 2 : 3">+ <v-text-field v-model="item.sku_code" :label="$t('wms.deliveryManagement.sku_code')" variant="outlined" readonly></v-text-field>+ </v-col>+ <v-col :cols="isWeight ? 2 : 3">+ <v-text-field+ v-model="item.qty"+ :rules="data.rules.qty"+ :label="isSignIn ? $t('wms.deliveryManagement.damagedQuantity') : $t('wms.deliveryManagement.detailQty')"+ variant="outlined"+ clearable+ ></v-text-field>+ </v-col>+ <v-col v-if="isWeight" :cols="2">+ <v-text-field+ v-model="item.weight"+ :rules="data.rules.weight"+ :label="$t('wms.deliveryManagement.detailWeight') + '(' + item.weight_unit + ')'"+ variant="outlined"+ clearable+ ></v-text-field>+ </v-col>+ </v-row>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { ref, reactive, computed, defineEmits, watch } from 'vue'+import { hookComponent } from '@/components/system/index'+import i18n from '@/languages/i18n'+import { IsInteger, IsDecimal } from '@/utils/dataVerification/formRule'+import { ConfirmItem } from '@/types/DeliveryManagement/DeliveryManagement'++const emit = defineEmits(['close', 'submit'])++const props = defineProps<{+ showDialog: boolean+ dataList: ConfirmItem[]+ isWeight: boolean+ isSignIn?: boolean+ dialogTitle: string+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ list: ref<ConfirmItem[]>([]),+ rules: {+ qty: [+ (val: number) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.detailQty') }!`,+ (val: number) => IsInteger(val, 'greaterThanZero') === '' || IsInteger(val, 'greaterThanZero')+ ],+ weight: [+ (val: number) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.detailQty') }!`,+ (val: number) => IsDecimal(val, 'nonNegative', 15, 3) === '' || IsDecimal(val, 'nonNegative', 15, 3)+ ]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: () => {+ if (props.isSignIn) {+ const verificationFailedList = data.list.filter(+ (item) => IsInteger(item.qty, 'nonNegative') !== ''+ || Number(item.qty) < 0+ || Number(item.qty) > item.maxQty+ )+ if (verificationFailedList.length > 0) {+ const errMsgStrList = verificationFailedList.map(+ (item) => `${ item.sku_code }: ${ i18n.global.t('wms.deliveryManagement.exceedingQuantity') }${ item.maxQty }`+ )+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('wms.deliveryManagement.invalidValue') }; ${ errMsgStrList.join('; ') }`+ })+ } else {+ hookComponent.$dialog({+ content: `${ i18n.global.t('wms.deliveryManagement.irreversible') }, ${ i18n.global.t('wms.deliveryManagement.confirmSignIn') }?`,+ handleConfirm: async () => {+ emit('submit', data.list)+ }+ })+ }+ } else {+ const verificationFailedList = data.list.filter(+ (item) => IsInteger(item.qty, 'greaterThanZero') !== ''+ || Number(item.qty) <= 0+ || Number(item.qty) > item.maxQty+ || (item.weight && IsDecimal(item.weight, 'nonNegative', 15, 3) !== '')+ )+ if (verificationFailedList.length > 0) {+ const errMsgStrList = verificationFailedList.map(+ (item) => `${ item.sku_code }: ${ i18n.global.t('wms.deliveryManagement.exceedingQuantity') }${ item.maxQty }`+ )+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('wms.deliveryManagement.invalidValue') }; ${ errMsgStrList.join('; ') }`+ })+ } else {+ emit('submit', data.list)+ }+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.list = props.dataList+ }+ }+)+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-detail.vue b/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-detail.vuenew file mode 100644index 0000000..e4e7e60--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-detail.vue@@ -0,0 +1,87 @@+<template>+ <v-dialog v-model="isShow" :width="'70%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('wms.deliveryManagement.ViewInventoryDetails')}`"></v-toolbar>+ <v-card-text>+ <vxe-table+ ref="detailXTable"+ keep-source+ :column-config="{ minWidth: '100px' }"+ :data="data.tableData"+ :height="'500px'"+ align="center"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column>+ <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column>+ <vxe-column field="goods_owner_name" :title="$t('base.ownerOfCargo.goods_owner_name')"></vxe-column>+ <vxe-column field="warehouse_name" :title="$t('wms.stockLocation.warehouse_name')"></vxe-column>+ <vxe-column field="warehouse_area_name" :title="$t('base.warehouseSetting.area_name')"></vxe-column>+ <vxe-column field="location_name" :title="$t('base.warehouseSetting.location_name')"></vxe-column>+ <!-- <vxe-column field="pick_qty" :title="$t('wms.deliveryManagement.unpicked_qty')"></vxe-column> -->+ <vxe-column field="picked_qty" :title="$t('wms.deliveryManagement.picked_qty')"></vxe-column>+ </vxe-table>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, defineEmits, watch } from 'vue'+import { hookComponent } from '@/components/system/index'+import { viewInventoryDetails } from '@/api/wms/deliveryManagement'+import i18n from '@/languages/i18n'++const emit = defineEmits(['close', 'submit'])++const props = defineProps<{+ showDialog: boolean+ id: number+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ tableData: []+})++const method = reactive({+ getTableData: async () => {+ const { data: res } = await viewInventoryDetails(props.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data+ },+ closeDialog: () => {+ emit('close')+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.getTableData()+ }+ }+)+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/shipmentFun.ts b/frontend/src/view/deliveryManagement/deliveryManagement/shipmentFun.tsnew file mode 100644index 0000000..19f98e6--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/shipmentFun.ts@@ -0,0 +1,23 @@+import i18n from '@/languages/i18n'++// Get the status display according to the key value+export function getShipmentState(state: number) {+ switch (state) {+ case 0:+ return i18n.global.t('wms.deliveryManagement.preShipment')+ case 1:+ return i18n.global.t('wms.deliveryManagement.newShipment')+ case 2:+ return i18n.global.t('wms.deliveryManagement.goodsToBePicked')+ case 3:+ return i18n.global.t('wms.deliveryManagement.picked')+ case 4:+ return i18n.global.t('wms.deliveryManagement.packaged')+ case 5:+ return i18n.global.t('wms.deliveryManagement.weighed')+ case 6:+ return i18n.global.t('wms.deliveryManagement.outOfWarehouse')+ case 7:+ return i18n.global.t('wms.deliveryManagement.signedIn')+ }+}\ No newline at end of filediff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabDelivered.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabDelivered.vuenew file mode 100644index 0000000..f6c9673--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabDelivered.vue@@ -0,0 +1,394 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <tooltip-btn icon="mdi-car-cog" :tooltip-text="$t('wms.deliveryManagement.setFreight')" @click="method.setFreight"> </tooltip-btn>+ <tooltip-btn icon="mdi-email-check" :tooltip-text="$t('wms.deliveryManagement.signIn')" @click="method.handleSignIn"></tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.spu_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.spu_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>+ <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column>+ <vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="package_no" :title="$t('wms.deliveryManagement.package_no')"></vxe-column>+ <vxe-column field="weighing_weight" :title="$t('wms.deliveryManagement.weighing_weight')">+ <template #default="{ row }">+ <span>{{ `${row.weighing_weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="weighing_no" :title="$t('wms.deliveryManagement.weighing_no')"></vxe-column>+ <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="140" :resizable="false" show-overflow>+ <template #default="{ row }">+ <div style="width: 100%; display: flex; justify-content: center">+ <tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn>+ <!-- <tooltip-btn+ :flat="true"+ icon="mdi-email-check"+ :tooltip-text="$t('wms.deliveryManagement.signIn')"+ @click="method.handleSignIn(row)"+ ></tooltip-btn> -->+ </div>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ <!-- <ToBeSignInConfirm+ :show-dialog="data.showDialog"+ :dialog-default-qty="data.dialogDefaultQty"+ @close="method.dialogClose"+ @submit="method.dialogSubmit"+ /> -->+ <SignInConfirm+ :dialog-title="$t('wms.deliveryManagement.signIn')"+ :show-dialog="data.showDialog"+ :is-weight="false"+ :is-sign-in="true"+ :data-list="data.confirmList"+ @close="method.dialogClose"+ @submit="method.dialogSubmit"+ />+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ <ToBeFreightfee :show-dialog="data.showSetFreight" @close="method.freightfeeClose" @submit="method.freightfeeSubmit" />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO, SetCarrierVO, ConfirmItem } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getDelivery, handleSignIn, setCarrier } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+// import ToBeSignInConfirm from './to-be-sign-in-confirm.vue'+import SignInConfirm from './package-confirm.vue'+import { GetUnit } from '@/constant/commodityManagement'+import ToBeFreightfee from './to-be-freightfee.vue'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { TablePage } from '@/types/System/Form'+import SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ showSetFreight: false,+ showDialog: false,+ dialogDefaultQty: 0,+ packageRow: ref<DeliveryManagementDetailVO>(),+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ }),+ confirmList: ref<ConfirmItem[]>([])+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ setFreight: () => {+ const $table = xTable.value+ if ($table.getCheckboxRecords().length > 0) {+ data.showSetFreight = true+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('base.userManagement.checkboxIsNull') }`+ })+ }+ },+ freightfeeClose: () => {+ data.showSetFreight = false+ },+ freightfeeSubmit: async (form: { carrier: string; freightfee_id: number; waybill_no: string }) => {+ const reqList: SetCarrierVO[] = []+ const $table = xTable.value+ for (const item of $table.getCheckboxRecords()) {+ reqList.push({+ id: item.id,+ dispatch_no: item.dispatch_no,+ dispatch_status: item.dispatch_status,+ freightfee_id: form.freightfee_id,+ carrier: form.carrier,+ waybill_no: form.waybill_no+ })+ }+ const { data: res } = await setCarrier(reqList)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.freightfeeClose()+ method.refresh()+ },+ dialogClose: () => {+ data.showDialog = false+ },+ // Callback after entering packaging value+ dialogSubmit: async (list: ConfirmItem[]) => {+ const SingInList = list.map((item) => ({+ id: item.id,+ dispatch_no: item.dispatch_no,+ dispatch_status: item.dispatch_status,+ damage_qty: item.qty+ }))++ const { data: res } = await handleSignIn(SingInList)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.dialogClose()+ method.refresh()+ // if (data.packageRow) {+ // const { data: res } = await handleSignIn([+ // {+ // id: data.packageRow.id,+ // dispatch_no: data.packageRow.dispatch_no,+ // dispatch_status: data.packageRow.dispatch_status,+ // damage_qty: qty+ // }+ // ])+ // if (!res.isSuccess) {+ // hookComponent.$message({+ // type: 'error',+ // content: res.errorMessage+ // })+ // return+ // }+ // hookComponent.$message({+ // type: 'success',+ // content: res.data+ // })+ // method.dialogClose()+ // method.refresh()+ // }+ },+ handleSignIn: async () => {+ const $table = xTable.value+ const checkTableList = $table.getCheckboxRecords()+ const confirmList: ConfirmItem[] = []+ if (checkTableList.length > 0) {+ // Processing the data required by the window+ for (const item of checkTableList) {+ confirmList.push({+ id: item.id,+ spu_name: item.spu_name,+ spu_code: item.spu_code,+ sku_code: item.sku_code,+ maxQty: item.picked_qty,+ qty: 0,+ dispatch_no: item.dispatch_no,+ dispatch_status: item.dispatch_status+ })+ }+ data.confirmList = confirmList+ data.showDialog = true+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('base.userManagement.checkboxIsNull') }`+ })+ }+ // data.packageRow = row+ // data.dialogDefaultQty = row.picked_qty ? row.picked_qty : 0+ // data.showDialog = true+ },+ // Refresh data+ refresh: () => {+ method.getDelivery()+ },+ getDelivery: async () => {+ const { data: res } = await getDelivery(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getDelivery()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.outOfWarehouse'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getDelivery()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getDelivery: method.getDelivery+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabGoodsToBePicked.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabGoodsToBePicked.vuenew file mode 100644index 0000000..2d16f62--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabGoodsToBePicked.vue@@ -0,0 +1,238 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.spu_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.spu_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <!-- <vxe-column type="checkbox" width="50"></vxe-column> -->+ <vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>+ <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column>+ <vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="unpicked_qty" :title="$t('wms.deliveryManagement.unpicked_qty')"></vxe-column>+ <vxe-column field="picked_qty" :title="$t('wms.deliveryManagement.picked_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="120" :resizable="false" show-overflow>+ <template #default="{ row }">+ <div style="width: 100%; display: flex; justify-content: center">+ <tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn>+ </div>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getGoodsToBePicked } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import { GetUnit } from '@/constant/commodityManagement'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { TablePage } from '@/types/System/Form'+import SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ // Refresh data+ refresh: () => {+ method.getGoodsToBePicked()+ },+ getGoodsToBePicked: async () => {+ const { data: res } = await getGoodsToBePicked(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getGoodsToBePicked()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.goodsToBePicked'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getGoodsToBePicked()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getGoodsToBePicked: method.getGoodsToBePicked+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabNewShipment.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabNewShipment.vuenew file mode 100644index 0000000..c010f37--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabNewShipment.vue@@ -0,0 +1,205 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <!-- <vxe-column type="checkbox" width="50"></vxe-column> -->+ <vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <!-- <vxe-column field="dispatch_status" :title="$t('wms.deliveryManagement.dispatch_status')"></vxe-column> -->+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.weight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', 2)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.volume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', 1)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>+ <!-- <vxe-column+ field="create_time"+ width="170px"+ :title="$t('wms.deliveryManagement.create_time')"++ ></vxe-column> -->+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getNewShipment } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import { GetUnit } from '@/constant/commodityManagement'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { TablePage } from '@/types/System/Form'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDialog: false,+ searchForm: {+ dispatch_no: '',+ customer_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ // Refresh data+ refresh: () => {+ method.getNewShipment()+ },+ getNewShipment: async () => {+ const { data: res } = await getNewShipment(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getNewShipment()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.newShipment'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getNewShipment()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getNewShipment: method.getNewShipment+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabPackaged.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabPackaged.vuenew file mode 100644index 0000000..e88a649--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabPackaged.vue@@ -0,0 +1,267 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.spu_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.spu_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <!-- <vxe-column type="checkbox" width="50"></vxe-column> -->+ <vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>+ <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column>+ <vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="unpackage_qty" :title="$t('wms.deliveryManagement.unpackage_qty')"></vxe-column>+ <vxe-column field="package_qty" :title="$t('wms.deliveryManagement.package_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="package_person" :title="$t('wms.deliveryManagement.package_person')"></vxe-column>+ <vxe-column field="package_time" width="170px" :title="$t('wms.deliveryManagement.package_time')"></vxe-column>+ <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="140" :resizable="false" show-overflow>+ <template #default="{ row }">+ <div style="width: 100%; display: flex; justify-content: center">+ <tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-arrow-u-left-top"+ :tooltip-text="$t('wms.deliveryManagement.backToThePreviousStep')"+ @click="method.backToThePreviousStep(row)"+ ></tooltip-btn>+ </div>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getPackaged, cancelOrderByDetail } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import { GetUnit } from '@/constant/commodityManagement'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { TablePage } from '@/types/System/Form'+import SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ // Back to the previous step+ backToThePreviousStep(row: DeliveryManagementDetailVO) {+ hookComponent.$dialog({+ content: `${ i18n.global.t('wms.deliveryManagement.confirmBack') }?`,+ handleConfirm: async () => {+ const { data: res } = await cancelOrderByDetail(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.refresh()+ }+ })+ },+ // Refresh data+ refresh: () => {+ method.getPackaged()+ },+ getPackaged: async () => {+ const { data: res } = await getPackaged(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getPackaged()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.packaged'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getPackaged()+ }+})++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getPackaged: method.getPackaged+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabPicked.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabPicked.vuenew file mode 100644index 0000000..e18810e--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabPicked.vue@@ -0,0 +1,238 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.spu_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.spu_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <!-- <vxe-column type="checkbox" width="50"></vxe-column> -->+ <vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>+ <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column>+ <vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="unpicked_qty" :title="$t('wms.deliveryManagement.unpicked_qty')"></vxe-column>+ <vxe-column field="picked_qty" :title="$t('wms.deliveryManagement.picked_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('weight', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="120" :resizable="false" show-overflow>+ <template #default="{ row }">+ <div style="width: 100%; display: flex; justify-content: center">+ <tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn>+ </div>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getPicked } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import { GetUnit } from '@/constant/commodityManagement'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { TablePage } from '@/types/System/Form'+import SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ // Refresh data+ refresh: () => {+ method.getPicked()+ },+ getPicked: async () => {+ const { data: res } = await getPicked(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getPicked()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.picked'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getPicked()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getPicked: method.getPicked+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabPreShipment.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabPreShipment.vuenew file mode 100644index 0000000..1035523--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabPreShipment.vue@@ -0,0 +1,208 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <!-- <vxe-column type="checkbox" width="50"></vxe-column> -->+ <vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <!-- <vxe-column field="dispatch_status" :title="$t('wms.deliveryManagement.dispatch_status')"></vxe-column> -->+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.weight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', 2)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.volume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', 1)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>+ <!-- <vxe-column+ field="create_time"+ width="170px"+ :title="$t('wms.deliveryManagement.create_time')"++ ></vxe-column> -->+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getPreShipment } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import { GetUnit } from '@/constant/commodityManagement'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { TablePage } from '@/types/System/Form'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDialog: false,+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ // Refresh data+ refresh: () => {+ method.getPreShipment()+ },+ getPreShipment: async () => {+ const { data: res } = await getPreShipment(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getPreShipment()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.preShipment'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getPreShipment()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getPreShipment: method.getPreShipment+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabShipment.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabShipment.vuenew file mode 100644index 0000000..ee6bd27--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabShipment.vue@@ -0,0 +1,424 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-select+ v-model="data.searchForm.dispatch_status"+ :items="data.combobox.dispatch_status"+ item-title="label"+ item-value="value"+ :label="$t('wms.deliveryManagement.dispatch_status')"+ variant="solo"+ density="comfortable"+ class="searchInput ml-5 mt-1"+ clearable+ hide-details+ ></v-select>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <!-- <vxe-column type="checkbox" width="50"></vxe-column> -->+ <vxe-column field="dispatch_no" width="120" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <vxe-column field="dispatch_status" :title="$t('wms.deliveryManagement.dispatch_status')">+ <template #default="{ row }">+ <span>{{ getShipmentState(row.dispatch_status) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.weight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', 2)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.volume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', 1)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>+ <!-- <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column> -->+ <vxe-column field="operate" :title="$t('system.page.operate')" width="240" :resizable="false" show-overflow>+ <template #default="{ row }">+ <div style="width: 100%; display: flex; justify-content: center">+ <tooltip-btn+ :disabled="row.dispatch_status !== 0 && row.dispatch_status !== 1"+ :flat="true"+ icon="mdi-clipboard-check-outline"+ :tooltip-text="$t('wms.deliveryManagement.confirmOrder')"+ @click="method.confirmOrder(row)"+ ></tooltip-btn>+ <tooltip-btn+ :disabled="row.dispatch_status !== 2"+ :flat="true"+ icon="mdi-cart-arrow-down"+ :tooltip-text="$t('wms.deliveryManagement.confirmPicking')"+ @click="method.confirmPicking(row)"+ ></tooltip-btn>+ <tooltip-btn+ :disabled="row.dispatch_status !== 2 && row.dispatch_status !== 3"+ :flat="true"+ icon="mdi-arrow-u-left-top"+ :tooltip-text="$t('wms.deliveryManagement.backToThePreviousStep')"+ @click="method.backToThePreviousStep(row)"+ ></tooltip-btn>+ <tooltip-btn+ :disabled="row.dispatch_status !== 0 && row.dispatch_status !== 1"+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </div>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ <!-- Add or modify data mode window -->+ <addOrUpdateShipment :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <!-- Confirm Order -->+ <ConfirmOrder+ :confirm-order-no="data.confirmOrderNo"+ :show-dialog="data.showConfirmOrder"+ @close="method.closeConfirmOrder"+ @save-success="method.confirmSuccess"+ />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { DeliveryManagementVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getShipment, delShipment, cancelOrderByDispatch, confirmPicking } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import addOrUpdateShipment from './add-or-update-shipment.vue'+import { getShipmentState } from './shipmentFun'+import ConfirmOrder from './confirm-order.vue'+import { GetUnit } from '@/constant/commodityManagement'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { TablePage } from '@/types/System/Form'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDialog: false,+ dialogForm: {+ id: 0,+ detailList: []+ },+ searchForm: ref<{+ dispatch_no: string+ customer_name: string+ dispatch_status?: string+ }>({+ dispatch_no: '',+ customer_name: ''+ }),+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ }),+ showConfirmOrder: false,+ confirmOrderNo: '',+ combobox: {+ dispatch_status: [+ {+ label: i18n.global.t('wms.deliveryManagement.preShipment'),+ value: '0'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.newShipment'),+ value: '1'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.goodsToBePicked'),+ value: '2'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.picked'),+ value: '3'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.packaged'),+ value: '4'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.weighed'),+ value: '5'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.outOfWarehouse'),+ value: '6'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.signedIn'),+ value: '7'+ }+ ]+ }+})++const method = reactive({+ // Confirm picking+ confirmPicking: async (row: DeliveryManagementVO) => {+ hookComponent.$dialog({+ content: `${ i18n.global.t('wms.deliveryManagement.confirmPicking') }?`,+ handleConfirm: async () => {+ if (row.dispatch_no) {+ const { data: res } = await confirmPicking(row.dispatch_no)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.refresh()+ }+ }+ })+ },+ // Back to the previous step+ backToThePreviousStep(row: DeliveryManagementVO) {+ hookComponent.$dialog({+ content: `${ i18n.global.t('wms.deliveryManagement.confirmBack') }?`,+ handleConfirm: async () => {+ const { data: res } = await cancelOrderByDispatch({+ dispatch_no: row.dispatch_no,+ dispatch_status: row.dispatch_status+ })+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.refresh()+ }+ })+ },+ // Close the order confirmation window+ closeConfirmOrder: () => {+ data.showConfirmOrder = false+ },+ // After confirming the shipment document+ confirmSuccess: () => {+ method.refresh()+ method.closeConfirmOrder()+ },+ // after Add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // Refresh dialog data+ clearDialogForm: () => {+ data.dialogForm = {+ id: 0,+ detailList: []+ }+ },+ add: () => {+ method.clearDialogForm()+ data.showDialog = true+ },+ confirmOrder: (row: DeliveryManagementVO) => {+ if (row.dispatch_status === undefined || ![0, 1].includes(row.dispatch_status)) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('wms.deliveryManagement.incorrectStatusMsg') }${ getShipmentState(0) }${ i18n.global.t(+ 'wms.deliveryManagement.or'+ ) }${ getShipmentState(1) }`+ })+ return+ }+ if (row.dispatch_no) {+ data.confirmOrderNo = row.dispatch_no+ data.showConfirmOrder = true+ }+ },+ deleteRow: (row: DeliveryManagementVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.dispatch_no) {+ const { data: res } = await delShipment(row.dispatch_no)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ // Refresh data+ refresh: () => {+ method.getShipment()+ },+ getShipment: async () => {+ const { data: res } = await getShipment(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getShipment()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.shipment'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm, ['dispatch_status'])+ method.getShipment()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getShipment: method.getShipment+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabSignIn.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabSignIn.vuenew file mode 100644index 0000000..1db30c6--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabSignIn.vue@@ -0,0 +1,252 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.spu_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.spu_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>+ <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column>+ <vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="weighing_weight" :title="$t('wms.deliveryManagement.weighing_weight')">+ <template #default="{ row }">+ <span>{{ `${row.weighing_weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="package_person" :title="$t('wms.deliveryManagement.package_person')"></vxe-column>+ <vxe-column field="weighing_person" :title="$t('wms.deliveryManagement.weighing_person')"></vxe-column>+ <vxe-column field="waybill_no" :title="$t('wms.deliveryManagement.waybill_no')"></vxe-column>+ <vxe-column field="carrier" :title="$t('wms.deliveryManagement.carrier')"></vxe-column>+ <vxe-column field="damagedQuantity" :title="$t('wms.deliveryManagement.damagedQuantity')">+ <template #default="{ row }">+ <span>{{ `${XEUtils.subtract(Number(row.qty), Number(row.sign_qty))}` }}</span>+ </template>+ </vxe-column>++ <vxe-column field="weighing_no" :title="$t('wms.deliveryManagement.weighing_no')"></vxe-column>+ <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="120" :resizable="false" show-overflow>+ <template #default="{ row }">+ <div style="width: 100%; display: flex; justify-content: center">+ <tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn>+ </div>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import XEUtils from 'xe-utils'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getSignIn } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import { GetUnit } from '@/constant/commodityManagement'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { TablePage } from '@/types/System/Form'+import SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ // Refresh data+ refresh: () => {+ method.getSignIn()+ },+ getSignIn: async () => {+ const { data: res } = await getSignIn(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getSignIn()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.signedIn'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getSignIn()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getSignIn: method.getSignIn+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeDelivered.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeDelivered.vuenew file mode 100644index 0000000..a4eec17--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeDelivered.vue@@ -0,0 +1,285 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <tooltip-btn icon="mdi-cube-send" :tooltip-text="$t('wms.deliveryManagement.delivery')" @click="method.handleDeliver"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.spu_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.spu_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>+ <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column>+ <vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="package_no" :title="$t('wms.deliveryManagement.package_no')"></vxe-column>+ <vxe-column field="weighing_weight" :title="$t('wms.deliveryManagement.weighing_weight')">+ <template #default="{ row }">+ <span>{{ `${row.weighing_weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="weighing_no" :title="$t('wms.deliveryManagement.weighing_no')"></vxe-column>+ <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="140" :resizable="false" show-overflow>+ <template #default="{ row }">+ <div style="width: 100%; display: flex; justify-content: center">+ <tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn>+ <!-- <tooltip-btn+ :flat="true"+ icon="mdi-cube-send"+ :tooltip-text="$t('wms.deliveryManagement.delivery')"+ @click="method.handleDeliver(row)"+ ></tooltip-btn> -->+ </div>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getToBeDelivery, handleDelivery } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import { GetUnit } from '@/constant/commodityManagement'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { TablePage } from '@/types/System/Form'+import SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ handleDeliver: async () => {+ const $table = xTable.value+ const checkTableList = $table.getCheckboxRecords()+ if (checkTableList.length > 0) {+ const deliveredList = checkTableList.map((row: DeliveryManagementDetailVO) => ({+ id: row.id,+ dispatch_no: row.dispatch_no,+ dispatch_status: row.dispatch_status,+ picked_qty: row.picked_qty+ }))+ hookComponent.$dialog({+ content: `${ i18n.global.t('wms.deliveryManagement.irreversible') }, ${ i18n.global.t('wms.deliveryManagement.confirmDelivery') }?`,+ handleConfirm: async () => {+ const { data: res } = await handleDelivery(deliveredList)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.refresh()+ }+ })+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('base.userManagement.checkboxIsNull') }`+ })+ }+ },+ // Refresh data+ refresh: () => {+ method.getToBeDelivery()+ },+ getToBeDelivery: async () => {+ const { data: res } = await getToBeDelivery(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getToBeDelivery()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.toBeDelivered'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getToBeDelivery()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getToBeDelivery: method.getToBeDelivery+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabToBePackaged.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBePackaged.vuenew file mode 100644index 0000000..0c1c8f8--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBePackaged.vue@@ -0,0 +1,322 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <tooltip-btn icon="mdi-package-down" :tooltip-text="$t('wms.deliveryManagement.package')" @click="method.handlePackage"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.spu_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.spu_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>+ <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column>+ <vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="unpackage_qty" :title="$t('wms.deliveryManagement.unpackage_qty')"></vxe-column>+ <vxe-column field="package_qty" :title="$t('wms.deliveryManagement.package_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>+ <!-- <vxe-column field="package_person" :title="$t('wms.deliveryManagement.package_person')"></vxe-column>+ <vxe-column field="package_time" width="170px" :title="$t('wms.deliveryManagement.package_time')"></vxe-column> -->+ <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="140" :resizable="false" show-overflow>+ <template #default="{ row }">+ <div style="width: 100%; display: flex; justify-content: center">+ <tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn>+ <!-- <tooltip-btn+ :flat="true"+ icon="mdi-package-down"+ :tooltip-text="$t('wms.deliveryManagement.package')"+ @click="method.handlePackage(row)"+ ></tooltip-btn> -->+ </div>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ <!-- <ToBePackageConfirm :show-dialog="data.showDialog" :max-qty="data.dialogMaxQty" @close="method.dialogClose" @submit="method.dialogSubmit" /> -->+ <PackageConfirm+ :dialog-title="$t('wms.deliveryManagement.package')"+ :show-dialog="data.showDialog"+ :is-weight="false"+ :data-list="data.confirmList"+ @close="method.dialogClose"+ @submit="method.dialogSubmit"+ />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO, ConfirmItem } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getToBePackaged, handlePackage } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+// import ToBePackageConfirm from './to-be-package-confirm.vue'+import PackageConfirm from './package-confirm.vue'+import { GetUnit } from '@/constant/commodityManagement'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { TablePage } from '@/types/System/Form'+import SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ showDialog: false,+ confirmList: ref<ConfirmItem[]>([]),+ dialogMaxQty: 0,+ packageRow: ref<DeliveryManagementDetailVO>(),+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ dialogClose: () => {+ data.showDialog = false+ },+ // Callback after entering packaging value+ dialogSubmit: async (list: ConfirmItem[]) => {+ const packList = list.map((item) => ({+ id: item.id,+ dispatch_no: item.dispatch_no,+ dispatch_status: item.dispatch_status,+ package_qty: item.qty,+ picked_qty: item.picked_qty+ }))+ const { data: res } = await handlePackage(packList)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.dialogClose()+ method.refresh()+ },+ // handlePackage: async (row: DeliveryManagementDetailVO) => {+ // data.packageRow = row+ // data.dialogMaxQty = row.unpackage_qty ? row.unpackage_qty : 0+ // data.showDialog = true+ // },+ handlePackage: async () => {+ const $table = xTable.value+ const checkTableList = $table.getCheckboxRecords()+ const confirmList: ConfirmItem[] = []+ if (checkTableList.length > 0) {+ // Processing the data required by the window+ for (const item of checkTableList) {+ confirmList.push({+ id: item.id,+ spu_name: item.spu_name,+ spu_code: item.spu_code,+ sku_code: item.sku_code,+ maxQty: item.unpackage_qty,+ qty: item.unpackage_qty,+ dispatch_no: item.dispatch_no,+ dispatch_status: item.dispatch_status,+ picked_qty: item.picked_qty+ })+ }+ data.confirmList = confirmList+ data.showDialog = true+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('base.userManagement.checkboxIsNull') }`+ })+ }+ },+ // Refresh data+ refresh: () => {+ method.getToBePackaged()+ },+ getToBePackaged: async () => {+ const { data: res } = await getToBePackaged(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getToBePackaged()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.toBePackaged'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getToBePackaged()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getToBePackaged: method.getToBePackaged+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeWeighed.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeWeighed.vuenew file mode 100644index 0000000..326c754--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeWeighed.vue@@ -0,0 +1,337 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <tooltip-btn icon="mdi-weight" :tooltip-text="$t('wms.deliveryManagement.weigh')" @click="method.handleWeigh"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.spu_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.spu_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <!-- <vxe-column field="weighing_no" :title="$t('wms.deliveryManagement.weighing_no')"></vxe-column> -->+ <vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>+ <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column>+ <vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="package_person" :title="$t('wms.deliveryManagement.package_person')"></vxe-column>+ <vxe-column field="package_no" :title="$t('wms.deliveryManagement.package_no')"></vxe-column>+ <!-- <vxe-column field="weighing_person" :title="$t('wms.deliveryManagement.weighing_person')"></vxe-column>+ <vxe-column field="weighing_weight" :title="$t('wms.deliveryManagement.weighing_weight')">+ <template #default="{ row }">+ <span>{{ `${row.weighing_weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column> -->+ <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="140" :resizable="false" show-overflow>+ <template #default="{ row }">+ <div style="width: 100%; display: flex; justify-content: center">+ <tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn>+ <!-- <tooltip-btn+ :flat="true"+ icon="mdi-weight"+ :tooltip-text="$t('wms.deliveryManagement.weigh')"+ @click="method.handleWeigh(row)"+ ></tooltip-btn> -->+ </div>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ <!-- <ToBeWeighedConfirm+ :show-dialog="data.showDialog"+ :default-weight="data.defaultWeight"+ :max-qty="data.dialogMaxQty"+ :weight-unit="data.dialogWeightUnit"+ @close="method.dialogClose"+ @submit="method.dialogSubmit"+ /> -->+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ <WeightConfirm+ :show-dialog="data.showDialog"+ :dialog-title="$t('wms.deliveryManagement.weigh')"+ :is-weight="true"+ :data-list="data.confirmList"+ @close="method.dialogClose"+ @submit="method.dialogSubmit"+ />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO, ConfirmItem } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getToBeWeighed, handleWeigh } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import { GetUnit } from '@/constant/commodityManagement'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { TablePage } from '@/types/System/Form'+import SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'+import WeightConfirm from './package-confirm.vue'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ showDialog: false,+ confirmList: ref<ConfirmItem[]>([]),+ dialogMaxQty: 0,+ dialogWeightUnit: '',+ defaultWeight: 0,+ weighedRow: ref<DeliveryManagementDetailVO>(),+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ dialogClose: () => {+ data.showDialog = false+ },+ // Callback after entering packaging value+ dialogSubmit: async (list: ConfirmItem[]) => {+ const packList = list.map((item) => ({+ id: item.id,+ dispatch_no: item.dispatch_no,+ dispatch_status: item.dispatch_status,+ weighing_qty: item.qty,+ weighing_weight: item.weight,+ picked_qty: item.picked_qty+ }))+ // if (data.weighedRow) {+ const { data: res } = await handleWeigh(packList)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.dialogClose()+ method.refresh()+ // }+ },+ handleWeigh: async () => {+ const $table = xTable.value+ const checkTableList = $table.getCheckboxRecords()+ const confirmList: ConfirmItem[] = []+ if (checkTableList.length > 0) {+ // Processing the data required by the window+ for (const item of checkTableList) {+ confirmList.push({+ id: item.id,+ spu_name: item.spu_name,+ spu_code: item.spu_code,+ sku_code: item.sku_code,+ maxQty: item.unweighing_qty,+ qty: item.unweighing_qty,+ weight: item.weight,+ weight_unit: GetUnit('weight', item.weight_unit),+ dispatch_no: item.dispatch_no,+ dispatch_status: item.dispatch_status,+ picked_qty: item.picked_qty+ })+ }+ data.confirmList = confirmList+ data.showDialog = true+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('base.userManagement.checkboxIsNull') }`+ })+ }+ // data.weighedRow = row+ // data.dialogWeightUnit = row.weight_unit !== undefined ? GetUnit('weight', row.weight_unit) : ''+ // data.dialogMaxQty = row.unweighing_qty ? row.unweighing_qty : 0+ // data.defaultWeight = row.weight ? row.weight : 0+ // data.showDialog = true+ },+ // Refresh data+ refresh: () => {+ method.getToBeWeighed()+ },+ getToBeWeighed: async () => {+ const { data: res } = await getToBeWeighed(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getToBeWeighed()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.toBeWeighed'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getToBeWeighed()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getToBeWeighed: method.getToBeWeighed+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabWeighed.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabWeighed.vuenew file mode 100644index 0000000..83b0574--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabWeighed.vue@@ -0,0 +1,272 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.spu_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.spu_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="weighing_no" :title="$t('wms.deliveryManagement.weighing_no')"></vxe-column>+ <vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>+ <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column>+ <vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="package_person" :title="$t('wms.deliveryManagement.package_person')"></vxe-column>+ <vxe-column field="package_no" :title="$t('wms.deliveryManagement.package_no')"></vxe-column>+ <vxe-column field="weighing_person" :title="$t('wms.deliveryManagement.weighing_person')"></vxe-column>+ <vxe-column field="weighing_weight" :title="$t('wms.deliveryManagement.weighing_weight')">+ <template #default="{ row }">+ <span>{{ `${row.weighing_weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="140" :resizable="false" show-overflow>+ <template #default="{ row }">+ <div style="width: 100%; display: flex; justify-content: center">+ <tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-arrow-u-left-top"+ :tooltip-text="$t('wms.deliveryManagement.backToThePreviousStep')"+ @click="method.backToThePreviousStep(row)"+ ></tooltip-btn>+ </div>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getWeighed, cancelOrderByDetail } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import { GetUnit } from '@/constant/commodityManagement'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { TablePage } from '@/types/System/Form'+import SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ showDialog: false,+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ // Back to the previous step+ backToThePreviousStep(row: DeliveryManagementDetailVO) {+ hookComponent.$dialog({+ content: `${ i18n.global.t('wms.deliveryManagement.confirmBack') }?`,+ handleConfirm: async () => {+ const { data: res } = await cancelOrderByDetail(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.refresh()+ }+ })+ },+ // Refresh data+ refresh: () => {+ method.getWeighed()+ },+ getWeighed: async () => {+ const { data: res } = await getWeighed(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getWeighed()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.weighed'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getWeighed()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getWeighed: method.getWeighed+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/to-be-freightfee.vue b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-freightfee.vuenew file mode 100644index 0000000..a0c6515--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-freightfee.vue@@ -0,0 +1,120 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('wms.deliveryManagement.setFreight')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.waybill_no"+ :rules="data.rules.waybill_no"+ :label="$t('wms.deliveryManagement.waybill_no')"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.carrier"+ :label="$t('wms.deliveryManagement.carrier')"+ variant="outlined"+ readonly+ clearable+ @click="method.openSelect()"+ @click:clear="method.valClearable"+ ></v-text-field>+ <v-text-field+ v-model="data.form.departure_city"+ :label="$t('wms.deliveryManagement.departure_city')"+ variant="outlined"+ readonly+ ></v-text-field>+ <v-text-field+ v-model="data.form.arrival_city"+ :label="$t('wms.deliveryManagement.arrival_city')"+ variant="outlined"+ readonly+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ <freight-select :show-dialog="data.dialogSelect" @close="method.closeDialogSelect()" @sureSelect="method.sureSelect" />+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, defineEmits, watch } from 'vue'+import { hookComponent } from '@/components/system/index'+import i18n from '@/languages/i18n'+import freightSelect from '@/components/select/freight-select.vue'+import { FreightVO } from '@/types/Base/Freight'+import { StringLength } from '@/utils/dataVerification/formRule'++const emit = defineEmits(['close', 'submit'])++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ dialogSelect: false,+ form: { carrier: '', freightfee_id: 0, departure_city: '', arrival_city: '', waybill_no: '' },+ combobox: {+ freightfee_id: []+ },+ rules: {+ waybill_no: [+ (val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)+ ]+ }+})++const method = reactive({+ openSelect: () => {+ data.dialogSelect = true+ },+ closeDialogSelect: () => {+ data.dialogSelect = false+ },+ sureSelect: (selectRecords: FreightVO[]) => {+ if (selectRecords.length > 0) {+ data.form.carrier = selectRecords[0].carrier+ data.form.freightfee_id = selectRecords[0].id ? selectRecords[0].id : 0+ data.form.departure_city = selectRecords[0].departure_city+ data.form.arrival_city = selectRecords[0].arrival_city+ }+ },+ valClearable: () => {+ data.form = { carrier: '', freightfee_id: 0, departure_city: '', arrival_city: '', waybill_no: data.form.waybill_no }+ },+ closeDialog: () => {+ emit('close')+ },+ submit: () => {+ if (data.form.carrier) {+ emit('submit', data.form)+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.checkText.mustSelect') }${ i18n.global.t('wms.deliveryManagement.carrier') }!`+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form = { carrier: '', freightfee_id: 0, departure_city: '', arrival_city: '', waybill_no: '' }+ }+ }+)+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/to-be-package-confirm.vue b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-package-confirm.vuenew file mode 100644index 0000000..8479202--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-package-confirm.vue@@ -0,0 +1,77 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('wms.deliveryManagement.package')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.qty"+ :rules="data.rules.qty"+ :label="$t('wms.deliveryManagement.detailQty')"+ variant="outlined"+ clearable+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, defineEmits, watch } from 'vue'+import { hookComponent } from '@/components/system/index'+import i18n from '@/languages/i18n'+import { IsInteger } from '@/utils/dataVerification/formRule'++const emit = defineEmits(['close', 'submit'])++const props = defineProps<{+ showDialog: boolean+ maxQty: number+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ form: { qty: 0 },+ rules: {+ qty: [+ (val: number) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.detailQty') }!`,+ (val: number) => IsInteger(val, 'greaterThanZero') === '' || IsInteger(val, 'greaterThanZero')+ ]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: () => {+ if (IsInteger(data.form.qty, 'greaterThanZero') === '' && Number(data.form.qty) > 0 && Number(data.form.qty) <= props.maxQty) {+ emit('submit', data.form.qty)+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('wms.deliveryManagement.validQtyMsgPackage') }${ props.maxQty }!`+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form.qty = props.maxQty+ }+ }+)+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/to-be-sign-in-confirm.vue b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-sign-in-confirm.vuenew file mode 100644index 0000000..00bd8d1--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-sign-in-confirm.vue@@ -0,0 +1,82 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('wms.deliveryManagement.signIn')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.qty"+ :rules="data.rules.qty"+ :label="$t('wms.deliveryManagement.damagedQuantity')"+ variant="outlined"+ clearable+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, defineEmits, watch } from 'vue'+import { hookComponent } from '@/components/system/index'+import i18n from '@/languages/i18n'+import { IsInteger } from '@/utils/dataVerification/formRule'++const emit = defineEmits(['close', 'submit'])++const props = defineProps<{+ showDialog: boolean+ dialogDefaultQty: number+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ form: { qty: 0 },+ rules: {+ qty: [+ (val: number) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.detailQty') }!`,+ (val: number) => IsInteger(val, 'nonNegative') === '' || IsInteger(val, 'nonNegative')+ ]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: () => {+ if (IsInteger(data.form.qty, 'nonNegative') === '' && Number(data.form.qty) >= 0 && Number(data.form.qty) <= props.dialogDefaultQty) {+ hookComponent.$dialog({+ content: `${ i18n.global.t('wms.deliveryManagement.irreversible') }, ${ i18n.global.t('wms.deliveryManagement.confirmSignIn') }?`,+ handleConfirm: async () => {+ emit('submit', data.form.qty)+ }+ })+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('wms.deliveryManagement.validQtyMsgSignIn') }${ props.dialogDefaultQty }!`+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form.qty = 0+ }+ }+)+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/to-be-weighed-confirm.vue b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-weighed-confirm.vuenew file mode 100644index 0000000..33f1a64--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-weighed-confirm.vue@@ -0,0 +1,98 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('wms.deliveryManagement.weigh')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.qty"+ style="margin-bottom: 5px"+ :rules="data.rules.qty"+ :label="$t('wms.deliveryManagement.detailQty')"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.weight"+ :label="$t('wms.deliveryManagement.detailWeight') + '(' + weightUnit + ')'"+ :rules="data.rules.weight"+ variant="outlined"+ clearable+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, defineEmits, watch } from 'vue'+import { hookComponent } from '@/components/system/index'+import i18n from '@/languages/i18n'+import { IsInteger, IsDecimal } from '@/utils/dataVerification/formRule'++const emit = defineEmits(['close', 'submit'])++const props = defineProps<{+ showDialog: boolean+ maxQty: number+ defaultWeight: number+ weightUnit: string+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ form: { qty: 0, weight: 0 },+ rules: {+ qty: [+ (val: number) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.detailQty') }!`,+ (val: number) => IsInteger(val, 'greaterThanZero') === '' || IsInteger(val, 'greaterThanZero')+ ],+ weight: [+ (val: number) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.detailQty') }!`,+ (val: number) => IsDecimal(val, 'nonNegative', 15, 3) === '' || IsDecimal(val, 'nonNegative', 15, 3)+ ]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: () => {+ if (+ IsInteger(data.form.qty, 'greaterThanZero') === ''+ && IsDecimal(data.form.weight, 'nonNegative', 15, 3) === ''+ && Number(data.form.qty) > 0+ && Number(data.form.qty) <= props.maxQty+ && Number(data.form.weight) > 0+ ) {+ emit('submit', { weighing_qty: data.form.qty, weighing_weight: data.form.weight })+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('wms.deliveryManagement.validQtyMsgPackage') }${ props.maxQty }!`+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form.qty = props.maxQty+ data.form.weight = props.defaultWeight+ }+ }+)+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/view/pageTemplate/PageTemplate.vue b/frontend/src/view/pageTemplate/PageTemplate.vuenew file mode 100644index 0000000..ed2dd70--- /dev/null+++ b/frontend/src/view/pageTemplate/PageTemplate.vue@@ -0,0 +1,245 @@+<template>+ <div class="container">+ <div>+ <!-- According to your own need to decide whether to the tab, if you don't need that you can delete <v-tabs> -->+ <v-tabs v-model="data.activeTab" stacked>+ <v-tab v-for="(item, index) of tabsConfig" :key="index" :value="item.value">+ <v-icon>{{ item.icon }}</v-icon>+ <p class="tabItemTitle">{{ item.tabName }}</p>+ </v-tab>+ </v-tabs>++ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <!-- If you have more than one tab, you should write more <v-window-item> and give it 'value' -->+ <v-window-item value="tabOne">+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <!--+ Don't delete v-col whether you don't need.+ If you only need one query, you should write:++ <v-col cols="4"></v-col>+ <v-col cols="4"></v-col>+ <v-col cols="4">Some Thing</v-col>+ -->+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.userName"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.userName1"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.userName2"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ @click="method.editRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, onMounted } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++/**+ * Table Model, this just a example+ * You should put it on the 'types' folder+ */+interface UserVO {+ id: number+ name: string+ role: string+ sex: string+ age: number+ address: string+}++const tabsConfig = [+ {+ value: 'tabOne',+ icon: 'mdi-phone',+ tabName: 'tabOne'+ }+]++const data = reactive({+ // TODO Adjust the search prop what you want+ searchForm: {+ userName: '',+ userName1: '',+ userName2: ''+ },+ activeTab: null,+ tableData: ref<UserVO[]>([+ { id: 10001, name: 'Test1', role: 'Develop', sex: 'Man', age: 28, address: 'test abc' },+ { id: 10002, name: 'Test2', role: 'Test', sex: 'Women', age: 22, address: 'Guangzhou' },+ { id: 10003, name: 'Test3', role: 'PM', sex: 'Man', age: 32, address: 'Shanghai' },+ { id: 10004, name: 'Test4', role: 'Designer', sex: 'Women', age: 24, address: 'Shanghai' }+ ]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE+ })+})++const method = reactive({+ editRow(row: any) {+ console.log(row)+ },+ deleteRow(row: any) {+ console.log(row)+ },+ sureSearch: () => {+ console.log(data.searchForm)+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ // TODO Get datas what you want+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ // TODO Write filename according to your file.+ filename: i18n.global.t('base.warehouseSetting.locationSetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ }+})++onMounted(() => {+ // TODO Get datas what you want+})++/**+ * computedCardHeight({ hasTab, hasOperate })+ * Must enter the params if you don't need tab or operate area+ * Defaultly, the 'hasTab' and 'hasOperate' are true+ */+const cardHeight = computed(() => computedCardHeight({}))++/**+ * computedTableHeight({ hasPager, hasTab, hasOperate })+ * Must enter the params if you don't need pager or tab or operate area+ * Defaultly, the 'hasPager' and 'hasTab' and 'hasOperate' are true+ */+const tableHeight = computed(() => computedTableHeight({}))+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseAdjust/add-or-update-adjust.vue b/frontend/src/view/warehouseWorking/warehouseAdjust/add-or-update-adjust.vuenew file mode 100644index 0000000..fe33591--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseAdjust/add-or-update-adjust.vue@@ -0,0 +1,282 @@+<!-- Warehouse Adjust Operate Dialog -->+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar class="" color="white" :title="`${$t('router.sideBar.warehouseAdjust')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-select+ v-model="data.form.job_type"+ :items="data.combobox.job_type"+ item-title="label"+ item-value="value"+ :rules="data.rules.job_type"+ :label="$t('wms.warehouseWorking.warehouseAdjust.job_type')"+ variant="outlined"+ clearable+ :disabled="isAssociatedJobType"+ @update:model-value="method.changeJobType"+ ></v-select>+ <v-text-field+ v-model="data.form.spu_code"+ :label="$t('base.commodityManagement.spu_code')"+ :rules="data.rules.spu_code"+ variant="outlined"+ readonly+ clearable+ :disabled="isAssociatedJobType"+ @click="method.openCommoditySelect"+ @click:clear="method.clearCommodity"+ ></v-text-field>+ <v-text-field+ v-model="data.form.spu_name"+ :label="$t('base.commodityManagement.spu_name')"+ :rules="data.rules.spu_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.sku_code"+ :label="$t('base.commodityManagement.sku_code')"+ :rules="data.rules.sku_code"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.warehouse_name"+ :label="$t('wms.warehouseWorking.warehouseAdjust.warehouse')"+ :rules="data.rules.warehouse_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.location_name"+ :label="$t('wms.warehouseWorking.warehouseAdjust.location_name')"+ :rules="data.rules.location_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.qty"+ :label="$t('wms.warehouseWorking.warehouseAdjust.qty')"+ :rules="data.rules.qty"+ variant="outlined"+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" :disabled="operateDisabled" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>++ <commodity-select+ :show-dialog="data.showCommodityDialogSelect"+ @close="method.closeCommodityDialogSelect"+ @sureSelect="method.sureSelectCommodity"+ />+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addStockAdjust } from '@/api/wms/warehouseAdjust'+import { WarehouseAdjustVO, AdjustJobType } from '@/types/WarehouseWorking/WarehouseAdjust'+import { removeObjectNull } from '@/utils/common'+import commoditySelect from '@/components/select/commodity-select.vue'+import { IsInteger } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])+const isUpdate = computed(() => props.form.id && props.form.id > 0)+const operateDisabled = computed(() => !!isUpdate.value)++const props = defineProps<{+ showDialog: boolean+ form: WarehouseAdjustVO+ // If 'associatedJobType' has value, the 'job_type' and 'sku' should be disabled.+ associatedJobType?: AdjustJobType+}>()++const isShow = computed(() => props.showDialog)+const isAssociatedJobType = computed(() => !!(props.associatedJobType && props.associatedJobType > 0))++const data = reactive({+ showCommodityDialogSelect: false,+ showLocationDialogSelect: false,++ form: ref<WarehouseAdjustVO>({+ id: 0,+ // job_type: AdjustJobType.UNKNOW,+ job_code: '',+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ qty: 0,+ is_update_stock: false,+ source_table_id: 0,+ spu_code: '',+ spu_name: '',+ sku_code: '',+ warehouse_name: '',+ location_name: '',+ creator: '',+ create_time: ''+ }),+ rules: {+ job_type: [],+ qty: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseAdjust.qty') }!`,+ (val: number) => IsInteger(val, 'greaterThanZero') === '' || IsInteger(val, 'greaterThanZero')+ ],+ warehouse_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseAdjust.warehouse') }!`+ ],+ location_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseAdjust.location_name') }!`+ ],+ spu_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_code') }!`],+ spu_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_name') }!`],+ sku_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_code') }!`],+ sku_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_name') }!`]+ },+ combobox: ref<{+ job_type: {+ label: string+ value: AdjustJobType+ }[]+ }>({+ job_type: [+ {+ label: i18n.global.t('wms.warehouseWorking.warehouseAdjust.warehouseTake'),+ value: AdjustJobType.TAKE+ },+ {+ label: i18n.global.t('wms.warehouseWorking.warehouseAdjust.processCombine'),+ value: AdjustJobType.PROCESS_COMBINE+ },+ {+ label: i18n.global.t('wms.warehouseWorking.warehouseAdjust.processSplit'),+ value: AdjustJobType.PROCESS_SPLIT+ },+ {+ label: i18n.global.t('wms.warehouseWorking.warehouseAdjust.warehouseMove'),+ value: AdjustJobType.MOVE+ }+ ]+ })+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },++ initForm: () => {+ data.form = props.form++ if (isAssociatedJobType.value) {+ data.form.job_type = props.associatedJobType+ }+ },++ changeJobType: (value: any) => {+ // Find the ID corresponding value+ const jobType = data.combobox.job_type.find((item) => item.value === value)+ if (jobType) {+ data.form.job_type = jobType.value+ }+ },++ openCommoditySelect: () => {+ // Open select modal after UI rendered.+ setTimeout(() => {+ data.showCommodityDialogSelect = true+ }, 100)+ },++ closeCommodityDialogSelect: () => {+ data.showCommodityDialogSelect = false+ },++ sureSelectCommodity: (selectRecords: any) => {+ try {+ data.form.sku_id = selectRecords[0].sku_id+ data.form.goods_owner_id = selectRecords[0].goods_owner_id+ data.form.goods_location_id = selectRecords[0].goods_location_id+ data.form.warehouse_name = selectRecords[0].warehouse+ data.form.location_name = selectRecords[0].location_name+ data.form.spu_code = selectRecords[0].spu_code+ data.form.spu_name = selectRecords[0].spu_name+ data.form.sku_code = selectRecords[0].sku_code+ } catch (error) {+ // console.error(error)+ }+ },++ clearCommodity: () => {+ data.form.sku_id = 0+ data.form.goods_location_id = 0+ data.form.warehouse_name = ''+ data.form.location_name = ''+ data.form.spu_code = ''+ data.form.spu_name = ''+ data.form.sku_code = ''+ },++ submit: async () => {+ const { valid } = await formRef.value.validate()++ const form = method.constructFormBody()++ if (valid) {+ const { data: res } = await addStockAdjust(form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ },++ constructFormBody: () => {+ let form = { ...data.form }+ form = removeObjectNull(form)++ return form+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseAdjust/warehouseAdjust.vue b/frontend/src/view/warehouseWorking/warehouseAdjust/warehouseAdjust.vuenew file mode 100644index 0000000..6497654--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseAdjust/warehouseAdjust.vue@@ -0,0 +1,365 @@+<!-- Warehouse Adjust -->+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn> -->+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.job_code"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.warehouseWorking.warehouseAdjust.job_code')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="job_code" width="150px" :title="$t('wms.warehouseWorking.warehouseAdjust.job_code')"></vxe-column>+ <vxe-column field="job_type" width="150px" :title="$t('wms.warehouseWorking.warehouseAdjust.job_type')">+ <template #default="{ row, column }">+ <span>{{ formatAdjustJobType(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="spu_code" width="150px" :title="$t('base.commodityManagement.spu_code')"></vxe-column>+ <vxe-column field="spu_name" width="150px" :title="$t('base.commodityManagement.spu_name')"></vxe-column>+ <vxe-column field="sku_code" width="150px" :title="$t('base.commodityManagement.sku_code')"></vxe-column>+ <vxe-column field="qty" width="150px" :title="$t('wms.warehouseWorking.warehouseAdjust.qty')"></vxe-column>+ <vxe-column field="warehouse_name" width="150px" :title="$t('wms.warehouseWorking.warehouseAdjust.warehouse')"></vxe-column>+ <vxe-column field="location_name" width="150px" :title="$t('wms.warehouseWorking.warehouseAdjust.location_name')"></vxe-column>+ <!-- <vxe-column field="handler" width="150px" :title="$t('wms.warehouseWorking.warehouseAdjust.handler')"></vxe-column>+ <vxe-column+ field="handle_time"+ width="170px"+ :title="$t('wms.warehouseWorking.warehouseAdjust.handle_time')"+ ></vxe-column> -->+ <vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseAdjust.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('wms.warehouseWorking.warehouseAdjust.create_time')"></vxe-column>+ <!-- <vxe-column field="operate" :title="$t('system.page.operate')" width="200" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-eye-outline"+ :tooltip-text="$t('system.page.view')"+ @click="method.viewRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-book-open-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseAdjust.confirmAdjust')"+ :disabled="method.confirmAdjustBtnDisabled(row)"+ @click="method.confirmAdjust(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ :disabled="method.confirmAdjustBtnDisabled(row)"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column> -->+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ <addOrUpdateDialog+ :show-dialog="data.showDialog"+ :form="data.dialogForm"+ :process-type="data.processType"+ @close="method.closeDialog"+ @saveSuccess="method.saveSuccess"+ />+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch, nextTick, onActivated } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { WarehouseAdjustVO } from '@/types/WarehouseWorking/WarehouseAdjust'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { deleteStockAdjust, getStockAdjustList, getStockAdjustOne, confirmStockAdjust } from '@/api/wms/warehouseAdjust'+import { PROCESS_JOB_COMBINE } from '@/constant/warehouseWorking'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import { SearchObject } from '@/types/System/Form'+import { formatAdjustJobType } from '@/utils/format/formatWarehouseWorking'+import tooltipBtn from '@/components/tooltip-btn.vue'+import addOrUpdateDialog from './add-or-update-adjust.vue'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++const data = reactive({+ showDialog: false,+ processType: PROCESS_JOB_COMBINE,+ timer: ref<any>(null),+ activeTab: null,+ searchForm: {+ job_code: ''+ },+ tableData: ref<WarehouseAdjustVO[]>([]),+ dialogForm: {+ id: 0,+ // job_type: AdjustJobType.TAKE,+ job_code: '',+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ qty: 0,+ is_update_stock: false,+ source_table_id: 0,+ spu_code: '',+ spu_name: '',+ sku_code: '',+ warehouse_name: '',+ location_name: ''+ },+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ })+})++const method = reactive({+ // Open a dialog to add+ add: () => {+ data.dialogForm = {+ id: 0,+ // job_type: AdjustJobType.TAKE,+ job_code: '',+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ qty: 0,+ is_update_stock: false,+ source_table_id: 0,+ spu_code: '',+ spu_name: '',+ sku_code: '',+ warehouse_name: '',+ location_name: ''+ }+ nextTick(() => {+ data.showDialog = true+ })+ },++ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },++ // Refresh data+ refresh: () => {+ method.getStockProcessList()+ },++ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },++ getStockProcessList: async () => {+ const { data: res } = await getStockAdjustList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ viewRow: async (row: WarehouseAdjustVO) => {+ await method.getOne(row.id)+ nextTick(() => {+ data.showDialog = true+ })+ },++ getOne: async (id: number) => {+ const { data: res } = await getStockAdjustOne(id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }++ data.dialogForm = res.data+ },++ deleteRow(row: WarehouseAdjustVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteStockAdjust(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }++ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },++ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.refresh()+ }),++ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.warehouseAdjust'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.refresh()+ },++ // The btn will become disabled when the 'process_status' is false+ // confirmAdjustBtnDisabled: (row: WarehouseAdjustVO) => row.is_update_stock === true,++ confirmAdjust: async (row: WarehouseAdjustVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('wms.warehouseWorking.warehouseAdjust.beforeConfirmAdjust'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await confirmStockAdjust(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('wms.warehouseWorking.warehouseAdjust.confirmAdjust') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ }+})++onActivated(() => {+ method.refresh()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))+const tableHeight = computed(() => computedTableHeight({ hasTab: false }))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseFreeze/add-or-update-freeze.vue b/frontend/src/view/warehouseWorking/warehouseFreeze/add-or-update-freeze.vuenew file mode 100644index 0000000..89c4060--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseFreeze/add-or-update-freeze.vue@@ -0,0 +1,237 @@+<!-- Warehouse Freeze Operate Dialog -->+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar class="" color="white" :title="`${$t('router.sideBar.warehouseFreeze')}(${jobTypeComp})`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.spu_code"+ :label="$t('base.commodityManagement.spu_code')"+ :rules="data.rules.spu_code"+ variant="outlined"+ readonly+ clearable+ @click="method.openCommoditySelect"+ @click:clear="method.clearCommodity"+ ></v-text-field>+ <v-text-field+ v-model="data.form.spu_name"+ :label="$t('base.commodityManagement.spu_name')"+ :rules="data.rules.spu_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.sku_code"+ :label="$t('base.commodityManagement.sku_code')"+ :rules="data.rules.sku_code"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.location_name"+ :label="$t('wms.warehouseWorking.warehouseFreeze.location_name')"+ :rules="data.rules.location_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.warehouse_name"+ :label="$t('wms.warehouseWorking.warehouseFreeze.warehouse')"+ :rules="data.rules.warehouse_name"+ variant="outlined"+ disabled+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" :disabled="operateDisabled" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>++ <commodity-select+ :show-dialog="data.showCommodityDialogSelect"+ :sql-title="commoditySqlTitle"+ @close="method.closeCommodityDialogSelect"+ @sureSelect="method.sureSelectCommodity"+ />+ <!-- <location-select :show-dialog="data.showLocationDialogSelect" @close="method.closeLocationDialogSelect" @sureSelect="method.sureSelectLocation" /> -->+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { FREEZE_JOB_FREEZE, FREEZE_JOB_UNFREEZE } from '@/constant/warehouseWorking'+import { hookComponent } from '@/components/system/index'+import { addStockFreeze } from '@/api/wms/warehouseFreeze'+import { WarehouseFreezeVO } from '@/types/WarehouseWorking/WarehouseFreeze'+import { removeObjectNull } from '@/utils/common'+import commoditySelect from '@/components/select/commodity-select.vue'+import i18n from '@/languages/i18n'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])+const isUpdate = computed(() => props.form.id && props.form.id > 0)+const operateDisabled = computed(() => !!isUpdate.value)++const props = defineProps<{+ showDialog: boolean+ form: WarehouseFreezeVO+ freezeType: boolean+}>()++const isShow = computed(() => props.showDialog)+const jobTypeComp = computed(() => (data.form.job_type === FREEZE_JOB_FREEZE+ ? i18n.global.t('wms.warehouseWorking.warehouseFreeze.freeze')+ : i18n.global.t('wms.warehouseWorking.warehouseFreeze.unfreeze')))++// Unfreeze should be filter freezed.+const commoditySqlTitle = computed(() => (data.form.job_type === FREEZE_JOB_UNFREEZE ? 'frozen' : ''))++const data = reactive({+ showCommodityDialogSelect: false,+ showLocationDialogSelect: false,++ form: ref<WarehouseFreezeVO>({+ id: 0,+ job_code: '',+ job_type: FREEZE_JOB_FREEZE,+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ handler: '',+ handle_time: '',+ last_update_time: '',+ tenant_id: 0,+ warehouse_name: '',+ location_name: '',+ spu_code: '',+ spu_name: '',+ sku_code: '',+ creator: '',+ create_time: ''+ }),+ rules: {+ warehouse_name: [],+ location_name: [],+ spu_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_code') }!`],+ spu_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_name') }!`],+ sku_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_code') }!`]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ initForm: () => {+ data.form = props.form+ data.form.job_type = props.freezeType+ },++ openCommoditySelect: () => {+ // Open select modal after UI rendered.+ setTimeout(() => {+ data.showCommodityDialogSelect = true+ }, 100)+ },++ closeCommodityDialogSelect: () => {+ data.showCommodityDialogSelect = false+ },++ openLocationSelect: () => {+ setTimeout(() => {+ data.showLocationDialogSelect = true+ }, 100)+ },++ closeLocationDialogSelect: () => {+ data.showLocationDialogSelect = false+ },++ sureSelectCommodity: (selectRecords: any) => {+ try {+ data.form.sku_id = selectRecords[0].sku_id+ data.form.spu_code = selectRecords[0].spu_code+ data.form.spu_name = selectRecords[0].spu_name+ data.form.sku_code = selectRecords[0].sku_code++ data.form.goods_owner_id = selectRecords[0].goods_owner_id+ data.form.goods_location_id = selectRecords[0].goods_location_id+ data.form.warehouse_name = selectRecords[0].warehouse_name+ data.form.location_name = selectRecords[0].location_name+ } catch (error) {+ console.error(error)+ }+ },++ clearCommodity: () => {+ data.form.sku_id = 0+ data.form.spu_code = ''+ data.form.spu_name = ''+ data.form.sku_code = ''+ },++ clearLocation: () => {+ data.form.goods_location_id = 0+ data.form.warehouse_name = ''+ data.form.location_name = ''+ },++ submit: async () => {+ const { valid } = await formRef.value.validate()++ const form = method.constructFormBody()++ if (valid) {+ const { data: res } = await addStockFreeze(form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ },++ constructFormBody: () => {+ let form = { ...data.form }+ form = removeObjectNull(form)++ return form+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseFreeze/warehouseFreeze.vue b/frontend/src/view/warehouseWorking/warehouseFreeze/warehouseFreeze.vuenew file mode 100644index 0000000..ccb6c28--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseFreeze/warehouseFreeze.vue@@ -0,0 +1,357 @@+<!-- Warehouse Freeze -->+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn+ icon="mdi-lock-open-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseFreeze.freeze')"+ @click="method.add(FREEZE_JOB_FREEZE)"+ ></tooltip-btn>+ <tooltip-btn+ icon="mdi-lock-open-variant-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseFreeze.unfreeze')"+ @click="method.add(FREEZE_JOB_UNFREEZE)"+ ></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.job_code"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.warehouseWorking.warehouseFreeze.job_code')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="job_code" width="150px" :title="$t('wms.warehouseWorking.warehouseFreeze.job_code')"></vxe-column>+ <vxe-column field="job_type" width="150px" :title="$t('wms.warehouseWorking.warehouseFreeze.job_type')">+ <template #default="{ row, column }">+ <span>{{ formatFreezeJobType(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="warehouse_name" width="150px" :title="$t('wms.warehouseWorking.warehouseFreeze.warehouse')"></vxe-column>+ <vxe-column field="location_name" width="150px" :title="$t('wms.warehouseWorking.warehouseFreeze.location_name')"></vxe-column>+ <vxe-column field="spu_code" width="150px" :title="$t('base.commodityManagement.spu_code')"></vxe-column>+ <vxe-column field="spu_name" width="150px" :title="$t('base.commodityManagement.spu_name')"></vxe-column>+ <vxe-column field="sku_code" width="150px" :title="$t('base.commodityManagement.sku_code')"></vxe-column>+ <vxe-column field="handler" width="150px" :title="$t('wms.warehouseWorking.warehouseFreeze.handler')"></vxe-column>+ <vxe-column field="handle_time" width="170px" :title="$t('wms.warehouseWorking.warehouseFreeze.handle_time')">+ <template #default="{ row, column }">+ <span>{{ formatDate(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <!-- <vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseFreeze.creator')"></vxe-column>+ <vxe-column+ field="create_time"+ width="170px"+ :title="$t('wms.warehouseWorking.warehouseFreeze.create_time')"+ ></vxe-column> -->+ <vxe-column field="operate" :title="$t('system.page.operate')" width="100" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-eye-outline"+ :tooltip-text="$t('system.page.view')"+ @click="method.viewRow(row)"+ ></tooltip-btn>+ <!-- <tooltip-btn+ :flat="true"+ icon="mdi-book-open-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseMove.confirmMove')"+ @click="method.confirmMove(row)"+ ></tooltip-btn> -->+ <!-- <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn> -->+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ <addOrUpdateDialog+ :show-dialog="data.showDialog"+ :form="data.dialogForm"+ :freeze-type="data.freezeType"+ @close="method.closeDialog"+ @saveSuccess="method.saveSuccess"+ />+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, onActivated, watch, nextTick } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { WarehouseFreezeVO } from '@/types/WarehouseWorking/WarehouseFreeze'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { FREEZE_JOB_FREEZE, FREEZE_JOB_UNFREEZE } from '@/constant/warehouseWorking'+import { hookComponent } from '@/components/system'+import { formatFreezeJobType } from '@/utils/format/formatWarehouseWorking'+import { getStockFreezeList, getStockFreezeOne } from '@/api/wms/warehouseFreeze'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import { SearchObject } from '@/types/System/Form'+import { formatDate } from '@/utils/format/formatSystem'+import tooltipBtn from '@/components/tooltip-btn.vue'+import addOrUpdateDialog from './add-or-update-freeze.vue'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++const data = reactive({+ showDialog: false,+ freezeType: FREEZE_JOB_FREEZE,+ timer: ref<any>(null),+ activeTab: null,+ searchForm: {+ job_code: ''+ },+ tableData: ref<WarehouseFreezeVO[]>([]),+ dialogForm: {+ id: 0,+ job_code: '',+ job_type: FREEZE_JOB_FREEZE,+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ handler: '',+ handle_time: '',+ last_update_time: '',+ tenant_id: 0,+ warehouse_name: '',+ location_name: '',+ spu_code: '',+ spu_name: '',+ sku_code: '',+ creator: '',+ create_time: ''+ },+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ })+})++const method = reactive({+ // Open a dialog to add+ add: (jobType: boolean) => {+ data.freezeType = jobType+ data.dialogForm = {+ id: 0,+ job_code: '',+ job_type: FREEZE_JOB_FREEZE,+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ handler: '',+ handle_time: '',+ last_update_time: '',+ tenant_id: 0,+ warehouse_name: '',+ location_name: '',+ spu_code: '',+ spu_name: '',+ sku_code: '',+ creator: '',+ create_time: ''+ }+ nextTick(() => {+ data.showDialog = true+ })+ },++ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },++ // Refresh data+ refresh: () => {+ method.getStockProcessList()+ },++ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },++ getStockProcessList: async () => {+ const { data: res } = await getStockFreezeList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ viewRow: async (row: WarehouseFreezeVO) => {+ await method.getOne(row.id)+ nextTick(() => {+ data.showDialog = true+ })+ },++ getOne: async (id: number) => {+ const { data: res } = await getStockFreezeOne(id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }++ data.dialogForm = res.data+ },++ // deleteRow(row: WarehouseFreezeVO) {+ // hookComponent.$dialog({+ // content: i18n.global.t('system.tips.beforeDeleteMessage'),+ // handleConfirm: async () => {+ // if (row.id) {+ // const { data: res } = await deleteStockFreeze(row.id)+ // if (!res.isSuccess) {+ // hookComponent.$message({+ // type: 'error',+ // content: res.errorMessage+ // })+ // return+ // }++ // hookComponent.$message({+ // type: 'success',+ // content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ // })+ // method.refresh()+ // }+ // }+ // })+ // },++ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.refresh()+ }),++ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.warehouseFreeze'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.refresh()+ }+})++onActivated(() => {+ method.refresh()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))+const tableHeight = computed(() => computedTableHeight({ hasTab: false }))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseMove/add-or-update-move.vue b/frontend/src/view/warehouseWorking/warehouseMove/add-or-update-move.vuenew file mode 100644index 0000000..e861716--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseMove/add-or-update-move.vue@@ -0,0 +1,311 @@+<!-- Warehouse Move Operate Dialog -->+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar class="" color="white" :title="`${$t('router.sideBar.warehouseMove')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.spu_code"+ :label="$t('base.commodityManagement.spu_code')"+ :rules="data.rules.spu_code"+ variant="outlined"+ readonly+ clearable+ @click="method.openCommoditySelect"+ @click:clear="method.clearCommodity"+ ></v-text-field>+ <v-text-field+ v-model="data.form.spu_name"+ :label="$t('base.commodityManagement.spu_name')"+ :rules="data.rules.spu_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.sku_code"+ :label="$t('base.commodityManagement.sku_code')"+ :rules="data.rules.sku_code"+ variant="outlined"+ disabled+ ></v-text-field>+ <!-- <v-text-field+ v-model="data.form.sku_name"+ :label="$t('base.commodityManagement.sku_name')"+ :rules="data.rules.sku_name"+ variant="outlined"+ disabled+ ></v-text-field> -->+ <v-text-field+ v-model="data.form.orig_goods_warehouse"+ :label="$t('wms.warehouseWorking.warehouseMove.orig_goods_warehouse')"+ :rules="data.rules.orig_goods_warehouse"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.orig_goods_location_name"+ :label="$t('wms.warehouseWorking.warehouseMove.orig_goods_location_name')"+ :rules="data.rules.orig_goods_location_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.dest_googs_warehouse"+ :label="$t('wms.warehouseWorking.warehouseMove.dest_googs_warehouse')"+ :rules="data.rules.dest_googs_warehouse"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.dest_googs_location_name"+ :label="$t('wms.warehouseWorking.warehouseMove.dest_googs_location_name')"+ :rules="data.rules.dest_googs_location_name"+ variant="outlined"+ readonly+ clearable+ @click="method.openLocationSelect"+ @click:clear="method.clearLocation"+ ></v-text-field>+ <v-text-field+ v-model="data.form.qty"+ :label="$t('wms.warehouseWorking.warehouseMove.qty')"+ :rules="data.rules.qty"+ variant="outlined"+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" :disabled="operateDisabled" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>++ <commodity-select+ :show-dialog="data.showCommodityDialogSelect"+ @close="method.closeCommodityDialogSelect"+ @sureSelect="method.sureSelectCommodity"+ />+ <location-select :show-dialog="data.showLocationDialogSelect" @close="method.closeLocationDialogSelect" @sureSelect="method.sureSelectLocation" />+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addStockMove } from '@/api/wms/warehouseMove'+import { WarehouseMoveVO, MoveStatus } from '@/types/WarehouseWorking/WarehouseMove'+import { removeObjectNull } from '@/utils/common'+import commoditySelect from '@/components/select/commodity-select.vue'+import locationSelect from '@/components/select/location-select.vue'+import { IsInteger } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])+const isUpdate = computed(() => props.form.id && props.form.id > 0)+const operateDisabled = computed(() => !!isUpdate.value)++const props = defineProps<{+ showDialog: boolean+ form: WarehouseMoveVO+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ showCommodityDialogSelect: false,+ showLocationDialogSelect: false,++ // Available Qty+ curAvailableQty: 0,++ form: ref<WarehouseMoveVO>({+ id: 0,+ job_code: '',+ move_status: MoveStatus.UNADJUST,+ sku_id: 0,+ orig_goods_location_id: 0,+ dest_googs_location_id: 0,+ qty: 0,+ goods_owner_id: 0,+ handler: '',+ handle_time: '',+ orig_goods_warehouse: '',+ orig_goods_location_name: '',+ dest_googs_warehouse: '',+ dest_googs_location_name: '',+ spu_code: '',+ spu_name: '',+ sku_code: '',+ sku_name: '',+ creator: '',+ create_time: ''+ }),+ rules: {+ qty: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseMove.qty') }!`,+ (val: number) => IsInteger(val, 'greaterThanZero') === '' || IsInteger(val, 'greaterThanZero'),+ (val: string) => method.validQty(val)+ ],+ orig_goods_warehouse: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseMove.orig_goods_warehouse') }!`+ ],+ orig_goods_location_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseMove.orig_goods_location_name') }!`+ ],+ dest_googs_warehouse: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseMove.dest_googs_warehouse') }!`+ ],+ dest_googs_location_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseMove.dest_googs_location_name') }!`+ ],+ spu_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_code') }!`],+ spu_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_name') }!`],+ sku_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_code') }!`],+ sku_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_name') }!`]+ }+})++const method = reactive({+ // The 'qty' can't more than 'qty_available'+ validQty: (value: string): boolean | string => {+ let inputQty = Number(value)+ if (Number.isNaN(inputQty)) {+ inputQty = 0+ }++ if (inputQty > data.curAvailableQty) {+ return `${ i18n.global.t('wms.warehouseWorking.warehouseProcessing.qtyMoreThanAvailable') }${ data.curAvailableQty }`+ }+ return true+ },+ closeDialog: () => {+ emit('close')+ },+ initForm: () => {+ data.form = props.form+ },++ openCommoditySelect: () => {+ // Open select modal after UI rendered.+ setTimeout(() => {+ data.showCommodityDialogSelect = true+ }, 100)+ },++ closeCommodityDialogSelect: () => {+ data.showCommodityDialogSelect = false+ },++ openLocationSelect: () => {+ setTimeout(() => {+ data.showLocationDialogSelect = true+ }, 100)+ },++ closeLocationDialogSelect: () => {+ data.showLocationDialogSelect = false+ },++ sureSelectCommodity: (selectRecords: any) => {+ try {+ data.form.sku_id = selectRecords[0].sku_id+ data.form.orig_goods_location_id = selectRecords[0].goods_location_id+ data.form.orig_goods_warehouse = selectRecords[0].warehouse_name+ data.form.orig_goods_location_name = selectRecords[0].location_name+ data.form.goods_owner_id = selectRecords[0].goods_owner_id+ data.form.spu_code = selectRecords[0].spu_code+ data.form.spu_name = selectRecords[0].spu_name+ data.form.sku_code = selectRecords[0].sku_code+ data.form.sku_name = selectRecords[0].sku_name++ data.curAvailableQty = selectRecords[0].qty_available+ } catch (error) {+ console.error(error)+ }+ },++ sureSelectLocation: (selectRecords: any) => {+ try {+ data.form.dest_googs_location_id = selectRecords[0].id+ data.form.dest_googs_warehouse = selectRecords[0].warehouse_name+ data.form.dest_googs_location_name = selectRecords[0].location_name+ } catch (error) {+ console.error(error)+ }+ },++ clearCommodity: () => {+ data.form.sku_id = 0+ data.form.orig_goods_location_id = 0+ data.form.orig_goods_warehouse = ''+ data.form.orig_goods_location_name = ''+ data.form.spu_code = ''+ data.form.spu_name = ''+ data.form.sku_code = ''+ data.form.sku_name = ''++ data.curAvailableQty = 0+ },++ clearLocation: () => {+ data.form.dest_googs_location_id = 0+ data.form.dest_googs_warehouse = ''+ data.form.dest_googs_location_name = ''+ },++ submit: async () => {+ const { valid } = await formRef.value.validate()++ const form = method.constructFormBody()++ if (valid) {+ const { data: res } = await addStockMove(form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ },++ constructFormBody: () => {+ let form = { ...data.form }+ form = removeObjectNull(form)++ return form+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseMove/warehouseMove.vue b/frontend/src/view/warehouseWorking/warehouseMove/warehouseMove.vuenew file mode 100644index 0000000..e041a49--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseMove/warehouseMove.vue@@ -0,0 +1,397 @@+<!-- Warehouse Move -->+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.job_code"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.warehouseWorking.warehouseMove.job_code')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="job_code" width="150px" :title="$t('wms.warehouseWorking.warehouseMove.job_code')"></vxe-column>+ <vxe-column field="move_status" width="150px" :title="$t('wms.warehouseWorking.warehouseMove.move_status')">+ <template #default="{ row, column }">+ <span>{{ formatMoveStatus(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="spu_code" width="150px" :title="$t('base.commodityManagement.spu_code')"></vxe-column>+ <vxe-column field="spu_name" width="150px" :title="$t('base.commodityManagement.spu_name')"></vxe-column>+ <vxe-column field="sku_code" width="150px" :title="$t('base.commodityManagement.sku_code')"></vxe-column>+ <vxe-column field="sku_name" width="150px" :title="$t('base.commodityManagement.sku_name')"></vxe-column>+ <vxe-column field="qty" width="150px" :title="$t('wms.warehouseWorking.warehouseMove.qty')"></vxe-column>+ <vxe-column+ field="orig_goods_warehouse"+ width="150px"+ :title="$t('wms.warehouseWorking.warehouseMove.orig_goods_warehouse')"+ ></vxe-column>+ <vxe-column+ field="orig_goods_location_name"+ width="150px"+ :title="$t('wms.warehouseWorking.warehouseMove.orig_goods_location_name')"+ ></vxe-column>+ <vxe-column+ field="dest_googs_warehouse"+ width="150px"+ :title="$t('wms.warehouseWorking.warehouseMove.dest_googs_warehouse')"+ ></vxe-column>+ <vxe-column+ field="dest_googs_location_name"+ width="150px"+ :title="$t('wms.warehouseWorking.warehouseMove.dest_googs_location_name')"+ ></vxe-column>+ <vxe-column field="handler" width="150px" :title="$t('wms.warehouseWorking.warehouseMove.handler')"></vxe-column>+ <vxe-column field="handle_time" width="170px" :title="$t('wms.warehouseWorking.warehouseMove.handle_time')">+ <template #default="{ row, column }">+ <span>{{ formatDate(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseMove.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('wms.warehouseWorking.warehouseMove.create_time')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="250" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-eye-outline"+ :tooltip-text="$t('system.page.view')"+ @click="method.viewRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-book-open-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseMove.confirmMove')"+ :disabled="method.confirmMoveBtnDisabled(row)"+ @click="method.confirmMove(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ :disabled="method.confirmMoveBtnDisabled(row)"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ <addOrUpdateDialog+ :show-dialog="data.showDialog"+ :form="data.dialogForm"+ :process-type="data.processType"+ @close="method.closeDialog"+ @saveSuccess="method.saveSuccess"+ />+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, onActivated, watch, nextTick } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { WarehouseMoveVO, MoveStatus } from '@/types/WarehouseWorking/WarehouseMove'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { deleteStockMove, getStockMoveList, getStockMoveOne, confirmMove } from '@/api/wms/warehouseMove'+import { PROCESS_JOB_COMBINE } from '@/constant/warehouseWorking'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import { SearchObject } from '@/types/System/Form'+import { formatMoveStatus } from '@/utils/format/formatWarehouseWorking'+import { formatDate } from '@/utils/format/formatSystem'+import tooltipBtn from '@/components/tooltip-btn.vue'+import addOrUpdateDialog from './add-or-update-move.vue'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++const data = reactive({+ showDialog: false,+ processType: PROCESS_JOB_COMBINE,+ timer: ref<any>(null),+ activeTab: null,+ searchForm: {+ job_code: ''+ },+ tableData: ref<WarehouseMoveVO[]>([]),+ dialogForm: {+ id: 0,+ job_code: '',+ move_status: MoveStatus.UNADJUST,+ sku_id: 0,+ orig_goods_location_id: 0,+ dest_googs_location_id: 0,+ qty: 0,+ goods_owner_id: 0,+ handler: '',+ handle_time: '',+ orig_goods_warehouse: '',+ orig_goods_location_name: '',+ dest_googs_warehouse: '',+ dest_googs_location_name: '',+ spu_code: '',+ spu_name: '',+ sku_code: '',+ sku_name: '',+ creator: '',+ create_time: ''+ },+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ })+})++const method = reactive({+ // Open a dialog to add+ add: () => {+ data.dialogForm = {+ id: 0,+ job_code: '',+ move_status: MoveStatus.UNADJUST,+ sku_id: 0,+ orig_goods_location_id: 0,+ dest_googs_location_id: 0,+ qty: 0,+ goods_owner_id: 0,+ handler: '',+ handle_time: '',+ orig_goods_warehouse: '',+ orig_goods_location_name: '',+ dest_googs_warehouse: '',+ dest_googs_location_name: '',+ spu_code: '',+ spu_name: '',+ sku_code: '',+ sku_name: '',+ creator: '',+ create_time: ''+ }+ nextTick(() => {+ data.showDialog = true+ })+ },++ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },++ // Refresh data+ refresh: () => {+ method.getStockProcessList()+ },++ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },++ getStockProcessList: async () => {+ const { data: res } = await getStockMoveList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ viewRow: async (row: WarehouseMoveVO) => {+ await method.getOne(row.id)+ nextTick(() => {+ data.showDialog = true+ })+ },++ getOne: async (id: number) => {+ const { data: res } = await getStockMoveOne(id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }++ data.dialogForm = res.data+ },++ deleteRow(row: WarehouseMoveVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteStockMove(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }++ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },++ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.refresh()+ }),++ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.warehouseMove'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.refresh()+ },++ // The btn will become disabled when the 'process_status' is false+ confirmMoveBtnDisabled: (row: WarehouseMoveVO) => row.move_status === MoveStatus.ADJUSTED,++ confirmMove: async (row: WarehouseMoveVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('wms.warehouseWorking.warehouseMove.beforeConfirmMove'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await confirmMove(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('wms.warehouseWorking.warehouseMove.confirmMove') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ }+})++onActivated(() => {+ method.refresh()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))+const tableHeight = computed(() => computedTableHeight({ hasTab: false }))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseProcessing/add-or-update-process.vue b/frontend/src/view/warehouseWorking/warehouseProcessing/add-or-update-process.vuenew file mode 100644index 0000000..734e47f--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseProcessing/add-or-update-process.vue@@ -0,0 +1,584 @@+<template>+ <v-dialog v-model="isShow" width="80%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="jobTypeComp"></v-toolbar>+ <v-card-text>+ <v-row>+ <!-- Source Table -->+ <v-col cols="6">+ <div class="dataTable">+ <div class="toolbar">+ <div class="toolbarTitle">+ <p style="color: #999">{{ $t('wms.warehouseWorking.warehouseProcessing.source') }}</p>+ </div>+ <tooltip-btn+ icon="mdi-plus"+ :tooltip-text="$t('system.page.add')"+ size="x-small"+ :disabled="operateDisabled"+ @click="method.openSelect('source')"+ ></tooltip-btn>+ </div>+ <vxe-table+ ref="xTableSource"+ :column-config="{ minWidth: '100px' }"+ :data="data.form.source_detail_list"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRulesSource"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="operate" width="50" :title="$t('system.page.operate')" :resizable="false">+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRowSource(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.warehouseWorking.warehouseProcessing.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.warehouseWorking.warehouseProcessing.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.warehouseWorking.warehouseProcessing.sku_code')"></vxe-column>+ <vxe-column+ field="qty"+ :title="$t('wms.warehouseWorking.warehouseProcessing.qty')"+ :edit-render="{ autofocus: '.vxe-input--inner' }"+ >+ <template #edit="{ row }">+ <vxe-input v-model="row.qty" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="unit" :title="$t('wms.warehouseWorking.warehouseProcessing.unit')"></vxe-column>+ </vxe-table>+ </div>+ </v-col>++ <!-- Target Table -->+ <v-col cols="6">+ <div class="dataTable">+ <div class="toolbar">+ <div class="toolbarTitle">+ <p style="color: #999">{{ $t('wms.warehouseWorking.warehouseProcessing.target') }}</p>+ </div>+ <tooltip-btn+ icon="mdi-plus"+ :tooltip-text="$t('system.page.add')"+ size="x-small"+ :disabled="operateDisabled"+ @click="method.openSelect('target')"+ ></tooltip-btn>+ </div>+ <vxe-table+ ref="xTableTarget"+ :column-config="{ minWidth: '100px' }"+ :data="data.form.target_detail_list"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRulesTarget"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="operate" width="50" :title="$t('system.page.operate')" :resizable="false">+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRowTarget(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.warehouseWorking.warehouseProcessing.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.warehouseWorking.warehouseProcessing.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.warehouseWorking.warehouseProcessing.sku_code')"></vxe-column>+ <vxe-column+ field="qty"+ :title="$t('wms.warehouseWorking.warehouseProcessing.qty')"+ :edit-render="{ autofocus: '.vxe-input--inner' }"+ >+ <template #edit="{ row }">+ <vxe-input v-model="row.qty" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="unit" width="60" :title="$t('wms.warehouseWorking.warehouseProcessing.unit')"></vxe-column>+ <vxe-column field="location_name" :title="$t('wms.warehouseWorking.warehouseProcessing.target_location')" :edit-render="{}">+ <template #edit="{ row }">+ <vxe-input v-model="row.location_name" readonly type="search" @search-click="method.openLocationSelect(row)"></vxe-input>+ </template>+ </vxe-column>+ </vxe-table>+ </div>+ </v-col>+ </v-row>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" :disabled="operateDisabled" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>++ <commodity-select :show-dialog="data.showCommodityDialogSelect" @close="method.closeDialogSelect('source')" @sureSelect="method.sureSelect" />+ <sku-select :show-dialog="data.showSkuDialogSelect" @close="method.closeDialogSelect('target')" @sureSelect="method.sureSelect" />+ <location-select :show-dialog="data.showLocationDialogSelect" @close="method.closeLocationDialogSelect" @sureSelect="method.sureSelectLocation" />+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { VxeTablePropTypes } from 'vxe-table'+import { WarehouseProcessingVO, WarehouseProcessingDetailVO } from '@/types/WarehouseWorking/WarehouseProcessing'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addStockProcess } from '@/api/wms/warehouseProcessing'+import { SYSTEM_HEIGHT, errorColor } from '@/constant/style'+import { removeObjectNull } from '@/utils/common'+import { PROCESS_JOB_COMBINE, PROCESS_JOB_SPLIT } from '@/constant/warehouseWorking'+import commoditySelect from '@/components/select/commodity-select.vue'+import locationSelect from '@/components/select/location-select.vue'+import skuSelect from '@/components/select/sku-select.vue'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { exportData } from '@/utils/exportTable'+import { isInteger } from '@/utils/dataVerification/tableRule'++const emit = defineEmits(['close', 'saveSuccess'])+const xTableSource = ref()+const xTableTarget = ref()++const props = defineProps<{+ showDialog: boolean+ form: WarehouseProcessingVO+ processType: boolean+}>()++const isShow = computed(() => props.showDialog)+const isUpdate = computed(() => props.form.id && props.form.id > 0)+const jobTypeComp = computed(() => (data.form.job_type === PROCESS_JOB_COMBINE+ ? i18n.global.t('wms.warehouseWorking.warehouseProcessing.process_combine')+ : i18n.global.t('wms.warehouseWorking.warehouseProcessing.process_split')))+const operateDisabled = computed(() => !!isUpdate.value)++const method = reactive({+ initForm: () => {+ data.form = props.form+ data.form.job_type = props.processType+ },++ closeDialog: () => {+ emit('close')+ },++ openSelect: (type: string) => {+ data.curSelectType = type++ if (type === 'source') {+ data.showCommodityDialogSelect = true+ } else if (type === 'target') {+ // Target should select the data with 'sku-select-modal'+ data.showSkuDialogSelect = true+ }+ },++ closeDialogSelect: (type: string) => {+ if (type === 'source') {+ data.showCommodityDialogSelect = false+ } else if (type === 'target') {+ // Target should select the data with 'sku-select-modal'+ data.showSkuDialogSelect = false+ }+ },++ sureSelect: (selectRecords: any) => {+ if (data.curSelectType === 'source') {+ method.insertSourceData(selectRecords)+ } else if (data.curSelectType === 'target') {+ method.insertTargetData(selectRecords)+ }+ },++ openLocationSelect: (row: WarehouseProcessingDetailVO) => {+ data.curSelectRow = row+ data.showLocationDialogSelect = true+ },++ closeLocationDialogSelect: () => {+ data.showLocationDialogSelect = false+ },++ sureSelectLocation: (selectRecords: any) => {+ if (selectRecords.length > 0) {+ const $table = xTableTarget.value+ const tableData = $table.getTableData().fullData+ tableData.forEach((row: WarehouseProcessingDetailVO) => {+ if (data.curSelectRow.sku_id === row.sku_id) {+ row.goods_location_id = selectRecords[0].id+ row.location_name = selectRecords[0].location_name+ }+ })+ // Tips: Must to reload!+ $table.reloadData(tableData)+ }+ },++ insertSourceData: (selectRecords: any) => {+ const $table = xTableSource.value+ const tableData = $table.getTableData().fullData++ // Combine: That can select more source commodity+ if (data.form.job_type === PROCESS_JOB_COMBINE) {+ for (const record of selectRecords) {+ const isRepeat = tableData.some((data: WarehouseProcessingDetailVO) => data.sku_id === record.sku_id)+ if (isRepeat) {+ continue+ }++ $table.insertAt(+ {+ id: 0,+ stock_process_id: 0,+ sku_id: record.sku_id,+ goods_owner_id: record.goods_owner_id,+ goods_location_id: record.goods_location_id,+ qty: record.qty_available || 0,+ tenant_id: 0,+ is_source: true,+ spu_code: record.spu_code,+ spu_name: record.spu_name,+ sku_code: record.sku_code,+ unit: record.unit,+ is_update_stock: false,+ qty_available: record.qty_available+ },+ -1+ )+ // })+ }+ } else if (data.form.job_type === PROCESS_JOB_SPLIT) {+ // Split: That just can select one source commodity.+ // It should remove all data before insert.+ $table.remove()+ $table.insertAt(+ {+ id: 0,+ stock_process_id: 0,+ sku_id: selectRecords[0].sku_id,+ goods_owner_id: selectRecords[0].goods_owner_id,+ goods_location_id: selectRecords[0].goods_location_id,+ qty: selectRecords[0].qty_available || 0,+ tenant_id: 0,+ is_source: true,+ spu_code: selectRecords[0].spu_code,+ spu_name: selectRecords[0].spu_name,+ sku_code: selectRecords[0].sku_code,+ unit: selectRecords[0].unit,+ is_update_stock: false,+ qty_available: selectRecords[0].qty_available+ },+ -1+ )+ }+ },++ insertTargetData: (selectRecords: any) => {+ const $table = xTableTarget.value+ const tableData = $table.getTableData().fullData++ // Combine: That just can select one target commodity+ if (data.form.job_type === PROCESS_JOB_COMBINE) {+ // It should remove all data before insert.+ $table.remove()+ $table.insertAt(+ {+ id: 0,+ stock_process_id: 0,+ sku_id: selectRecords[0].sku_id,+ goods_owner_id: 0,+ goods_location_id: 0,+ qty: 0,+ tenant_id: 0,+ is_source: false,+ spu_code: selectRecords[0].spu_code,+ spu_name: selectRecords[0].spu_name,+ sku_code: selectRecords[0].sku_code,+ unit: selectRecords[0].unit,+ is_update_stock: false+ },+ -1+ )+ } else if (data.form.job_type === PROCESS_JOB_SPLIT) {+ // Split: That can select more target commodity+ for (const record of selectRecords) {+ const isRepeat = tableData.some((data: WarehouseProcessingDetailVO) => data.sku_id === record.sku_id)+ if (isRepeat) {+ continue+ }+ $table.insertAt(+ {+ id: 0,+ stock_process_id: 0,+ sku_id: record.sku_id,+ goods_owner_id: 0,+ goods_location_id: 0,+ qty: 0,+ tenant_id: 0,+ is_source: false,+ spu_code: record.spu_code,+ spu_name: record.spu_name,+ sku_code: record.sku_code,+ unit: record.unit,+ is_update_stock: false+ },+ -1+ )+ }+ }+ },++ // Export table+ exportTable: (type: string) => {+ const $table = type === 'source' ? xTableSource.value : xTableTarget.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.commodityManagement'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ submit: async () => {+ const validSource = await method.validSourceTable()+ const validTarget = await method.validTargetTable()+ if (!validSource || !validTarget) {+ return+ }++ const form = method.constructFormBody()++ const { data: res } = await addStockProcess(form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ },++ constructFormBody: () => {+ const $tableSource = xTableSource.value+ const $tableTarget = xTableTarget.value++ const tableSourceRecords = $tableSource.getTableData().fullData+ const tableTargetRecords = $tableTarget.getTableData().fullData++ // Need combine source and target to server.+ let form = { ...data.form }+ form.detailList = [...tableSourceRecords, ...tableTargetRecords]+ form = removeObjectNull(form)++ delete form.source_detail_list+ delete form.target_detail_list++ return form+ },++ validSourceTable: async () => {+ const $table = xTableSource.value+ const tableData = $table.getTableData().fullData++ // 1.The table must have data.+ if (!tableData.length) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.detailLengthIsZero')+ })+ return false+ }++ // 2.The properties valid.+ const errMap = await $table.validate()+ if (errMap) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ return false+ }++ return true+ },++ validTargetTable: async () => {+ const $table = xTableTarget.value+ const tableData = $table.getTableData().fullData++ // 1.The table must have data.+ if (!tableData.length) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.detailLengthIsZero')+ })+ return false+ }++ // 2.The properties valid.+ const errMap = await $table.validate()+ if (errMap) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ return false+ }++ return true+ },++ // The 'qty' can't more than 'qty_available'+ validQty: ({ cellValue, row }: any) => {+ const qty = cellValue || 0+ const qtyAvailable = row.qty_available || 0++ if (qty > qtyAvailable) {+ return new Error(`${ i18n.global.t('wms.warehouseWorking.warehouseProcessing.qtyMoreThanAvailable') } ${ qtyAvailable }`)+ }+ },++ deleteRowSource: (row: WarehouseProcessingDetailVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (row) {+ const $table = xTableSource.value+ $table.remove(row)+ }+ }+ })+ },++ deleteRowTarget: (row: WarehouseProcessingDetailVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (row) {+ const $table = xTableTarget.value+ $table.remove(row)+ }+ }+ })+ }+})++const data = reactive({+ tableData: [],+ // 'source' | 'target'+ curSelectType: '',++ showCommodityDialogSelect: false,+ showSkuDialogSelect: false,+ showLocationDialogSelect: false,++ form: ref<WarehouseProcessingVO>({+ id: 0,+ job_code: '',+ job_type: PROCESS_JOB_COMBINE,+ process_status: false,+ processor: '',+ process_time: '',+ source_detail_list: [],+ target_detail_list: []+ }),+ curSelectRow: ref<WarehouseProcessingDetailVO>({+ id: 0,+ stock_process_id: 0,+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ qty: 0,+ is_source: true,+ spu_code: '',+ spu_name: '',+ sku_code: '',+ unit: '',+ is_update_stock: false+ }),+ validRulesSource: ref<any>({+ qty: [+ { required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseProcessing.qty') }` },+ {+ validator: method.validQty+ },+ {+ validator: isInteger,+ validNumerical: 'greaterThanZero',+ trigger: 'change'+ }+ ]+ }),+ validRulesTarget: ref<any>({+ qty: [+ { required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseProcessing.qty') }` },+ {+ validator: isInteger,+ validNumerical: 'greaterThanZero',+ trigger: 'change'+ }+ ],+ location_name: [+ {+ required: true,+ message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseProcessing.target_location') }`+ }+ ]+ })+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.mainForm {+ background-color: #f9f9f9;+ border-radius: 5px;+ padding: 20px;+ box-sizing: border-box;+ overflow: auto;+}++.toolbar {+ height: 40px;+ display: flex;+ justify-content: space-between;+}++.toolbarTitle {+ display: flex;+ // justify-content: center;+ // align-items: center;+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseProcessing/warehouseProcessing.vue b/frontend/src/view/warehouseWorking/warehouseProcessing/warehouseProcessing.vuenew file mode 100644index 0000000..94a87a1--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseProcessing/warehouseProcessing.vue@@ -0,0 +1,403 @@+<!-- Warehouse Processing -->+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn+ icon="mdi-arrow-split-vertical"+ :tooltip-text="$t('wms.warehouseWorking.warehouseProcessing.process_split')"+ @click="method.add(PROCESS_JOB_SPLIT)"+ ></tooltip-btn>+ <tooltip-btn+ icon="mdi-group"+ :tooltip-text="$t('wms.warehouseWorking.warehouseProcessing.process_combine')"+ @click="method.add(PROCESS_JOB_COMBINE)"+ ></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.job_code"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.warehouseWorking.warehouseProcessing.job_code')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="job_code" width="150px" :title="$t('wms.warehouseWorking.warehouseProcessing.job_code')"></vxe-column>+ <vxe-column field="job_type" :title="$t('wms.warehouseWorking.warehouseProcessing.job_type')">+ <template #default="{ row, column }">+ <span>{{ formatProcessJobType(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="adjust_status" :title="$t('wms.warehouseWorking.warehouseProcessing.adjust_status')">+ <template #default="{ row, column }">+ <span>{{ formatIsValid(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="processor" :title="$t('wms.warehouseWorking.warehouseProcessing.processor')"></vxe-column>+ <vxe-column field="process_time" width="170px" :title="$t('wms.warehouseWorking.warehouseProcessing.process_time')">+ <template #default="{ row, column }">+ <span>{{ formatDate(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseProcessing.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('wms.warehouseWorking.warehouseProcessing.create_time')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="250" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-eye-outline"+ :tooltip-text="$t('system.page.view')"+ @click="method.viewRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-book-check-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseProcessing.confirmProcess')"+ :disabled="method.confirmProcessBtnDisabled(row)"+ @click="method.confirmProcess(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-book-open-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseProcessing.confirmAdjust')"+ :disabled="method.confirmAdjustBtnDisabled(row)"+ @click="method.confirmAdjust(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ :disabled="method.confirmProcessBtnDisabled(row)"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ <addOrUpdateDialog+ :show-dialog="data.showDialog"+ :form="data.dialogForm"+ :process-type="data.processType"+ @close="method.closeDialog"+ @saveSuccess="method.saveSuccess"+ />+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, onActivated, watch, nextTick } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { WarehouseProcessingVO, WarehouseProcessingDetailVO } from '@/types/WarehouseWorking/WarehouseProcessing'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { deleteStockProcess, getStockProcessList, getStockProcessOne, confirmAdjustment, confirmProcess } from '@/api/wms/warehouseProcessing'+import { PROCESS_JOB_COMBINE, PROCESS_JOB_SPLIT } from '@/constant/warehouseWorking'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import { SearchObject } from '@/types/System/Form'+import { formatIsValid, formatDate } from '@/utils/format/formatSystem'+import { formatProcessJobType } from '@/utils/format/formatWarehouseWorking'+import tooltipBtn from '@/components/tooltip-btn.vue'+import addOrUpdateDialog from './add-or-update-process.vue'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++const data = reactive({+ showDialog: false,+ processType: PROCESS_JOB_COMBINE,+ timer: ref<any>(null),+ activeTab: null,+ searchForm: {+ job_code: ''+ },+ tableData: ref<WarehouseProcessingVO[]>([]),+ dialogForm: {+ id: 0,+ job_code: '',+ job_type: PROCESS_JOB_COMBINE,+ process_status: false,+ processor: '',+ process_time: '',+ source_detail_list: ref<any[]>([]),+ target_detail_list: ref<any[]>([]),+ creator: '',+ create_time: '',+ adjust_status: false+ },+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ })+})++const method = reactive({+ // Open a dialog to add+ add: (jobType: boolean) => {+ data.processType = jobType+ data.dialogForm = {+ id: 0,+ job_code: '',+ job_type: jobType,+ process_status: false,+ processor: '',+ process_time: '',+ source_detail_list: [],+ target_detail_list: [],+ creator: '',+ create_time: '',+ adjust_status: false+ }+ nextTick(() => {+ data.showDialog = true+ })+ },++ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },++ // Refresh data+ refresh: () => {+ method.getStockProcessList()+ },++ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },++ getStockProcessList: async () => {+ const { data: res } = await getStockProcessList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ viewRow: async (row: WarehouseProcessingVO) => {+ await method.getOne(row.id)+ nextTick(() => {+ data.showDialog = true+ })+ },++ getOne: async (id: number) => {+ const { data: res } = await getStockProcessOne(id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }++ data.dialogForm = res.data+ },++ deleteRow(row: WarehouseProcessingVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteStockProcess(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }++ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },++ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.refresh()+ }),++ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.warehouseProcessing'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.refresh()+ },++ // The btn will become disabled when the 'process_status' is false+ confirmProcessBtnDisabled: (row: WarehouseProcessingVO) => !!row.process_status,++ // The btn will become disabled when the 'process_status' is false+ // or the 'adjust_status' is true+ confirmAdjustBtnDisabled: (row: WarehouseProcessingVO) => !row.process_status || !!row.adjust_status,++ confirmProcess: async (row: WarehouseProcessingDetailVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('wms.warehouseWorking.warehouseProcessing.beforeConfirmProcess'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await confirmProcess(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('wms.warehouseWorking.warehouseProcessing.confirmProcess') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },++ confirmAdjust: async (row: WarehouseProcessingDetailVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('wms.warehouseWorking.warehouseProcessing.beforeConfirmAdjust'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await confirmAdjustment(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('wms.warehouseWorking.warehouseProcessing.confirmAdjust') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ }+})++onActivated(() => {+ method.refresh()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))+const tableHeight = computed(() => computedTableHeight({ hasTab: false }))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseTaking/add-or-update-taking.vue b/frontend/src/view/warehouseWorking/warehouseTaking/add-or-update-taking.vuenew file mode 100644index 0000000..47c073c--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseTaking/add-or-update-taking.vue@@ -0,0 +1,322 @@+<!-- Warehouse Taking Operate Dialog -->+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('router.sideBar.warehouseTaking')}`"></v-toolbar>+ <v-card-text>+ <div class="header">+ <div class="headerBtn">+ <tooltip-btn+ size="x-small"+ icon="mdi-home-plus-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseTaking.addFromStock')"+ @click="method.openCommoditySelect()"+ ></tooltip-btn>+ <tooltip-btn+ size="x-small"+ icon="mdi-store-plus-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseTaking.addFromCommodity')"+ :disabled="isFromStock"+ @click="method.openSkuSelect()"+ ></tooltip-btn>+ </div>+ <div class="headerTips">+ <v-tooltip :text="$t('wms.warehouseWorking.warehouseTaking.addTips')">+ <template #activator="{ props }">+ <v-btn v-bind="props" size="x-small" variant="text" icon="mdi-help-circle" color="blue-lighten-2"></v-btn>+ </template>+ </v-tooltip>+ </div>+ </div>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.spu_code"+ :label="$t('base.commodityManagement.spu_code')"+ :rules="data.rules.spu_code"+ variant="outlined"+ readonly+ clearable+ @click:clear="method.clearCommodity"+ ></v-text-field>+ <v-text-field+ v-model="data.form.spu_name"+ :label="$t('base.commodityManagement.spu_name')"+ :rules="data.rules.spu_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.sku_code"+ :label="$t('base.commodityManagement.sku_code')"+ :rules="data.rules.sku_code"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.warehouse_name"+ :label="$t('wms.warehouseWorking.warehouseTaking.warehouse')"+ :rules="data.rules.warehouse_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.location_name"+ :label="$t('wms.warehouseWorking.warehouseTaking.location_name')"+ :rules="data.rules.location_name"+ variant="outlined"+ :disabled="isFromStock"+ @click="method.openLocationSelect"+ @click:clear="method.clearLocation"+ ></v-text-field>+ <v-text-field+ v-model="data.form.book_qty"+ :label="$t('wms.warehouseWorking.warehouseTaking.book_qty')"+ :rules="data.rules.book_qty"+ variant="outlined"+ disabled+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" :disabled="operateDisabled" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>++ <commodity-select+ :show-dialog="data.showCommodityDialogSelect"+ @close="method.closeCommodityDialogSelect"+ @sureSelect="method.sureSelectCommodity"+ />+ <sku-select :show-dialog="data.showSkuDialogSelect" @close="method.closeDialogSelectSku" @sureSelect="method.sureSelectSku" />+ <location-select :show-dialog="data.showLocationDialogSelect" @close="method.closeDialogSelectLocation" @sureSelect="method.sureSelectLocation" />+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { hookComponent } from '@/components/system/index'+import { addStockTaking } from '@/api/wms/warehouseTaking'+import { WarehouseTakingVO } from '@/types/WarehouseWorking/WarehouseTaking'+import { removeObjectNull } from '@/utils/common'+import { TAKING_JOB_FINISH } from '@/constant/warehouseWorking'+import i18n from '@/languages/i18n'+import commoditySelect from '@/components/select/commodity-select.vue'+import tooltipBtn from '@/components/tooltip-btn.vue'+import locationSelect from '@/components/select/location-select.vue'+import skuSelect from '@/components/select/sku-select.vue'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])+const isUpdate = computed(() => props.form.id && props.form.id > 0)+const operateDisabled = computed(() => !!isUpdate.value)+const isFromStock = computed(() => data.curStockID > 0)++const props = defineProps<{+ showDialog: boolean+ form: WarehouseTakingVO+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ showCommodityDialogSelect: false,+ showLocationDialogSelect: false,+ showSkuDialogSelect: false,++ // There has value when choose from stock.+ curStockID: 0,++ form: ref<WarehouseTakingVO>({+ id: 0,+ job_code: '',+ job_status: TAKING_JOB_FINISH,+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ book_qty: 0,+ counted_qty: 0,+ difference_qty: 0,+ spu_code: '',+ spu_name: '',+ sku_code: '',+ warehouse_name: '',+ location_name: '',+ handler: '',+ handle_time: '',+ adjust_status: false,+ creator: '',+ create_time: ''+ }),+ rules: {+ job_type: [],+ book_qty: [],+ warehouse_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseTaking.warehouse') }!`+ ],+ location_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseTaking.location_name') }!`+ ],+ spu_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_code') }!`],+ spu_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_name') }!`],+ sku_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_code') }!`],+ sku_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_name') }!`]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },++ initForm: () => {+ data.form = props.form+ },++ openCommoditySelect: () => {+ data.showCommodityDialogSelect = true+ },++ closeCommodityDialogSelect: () => {+ data.showCommodityDialogSelect = false+ },++ sureSelectCommodity: (selectRecords: any) => {+ try {+ data.curStockID = selectRecords[0].id+ data.form.sku_id = selectRecords[0].sku_id+ data.form.goods_owner_id = selectRecords[0].goods_owner_id+ data.form.goods_location_id = selectRecords[0].goods_location_id+ data.form.warehouse_name = selectRecords[0].warehouse_name+ data.form.location_name = selectRecords[0].location_name+ data.form.spu_code = selectRecords[0].spu_code+ data.form.spu_name = selectRecords[0].spu_name+ data.form.sku_code = selectRecords[0].sku_code+ data.form.book_qty = selectRecords[0].qty_available+ } catch (error) {+ // console.error(error)+ }+ },++ clearCommodity: () => {+ data.curStockID = 0+ data.form.sku_id = 0+ data.form.goods_location_id = 0+ data.form.warehouse_name = ''+ data.form.location_name = ''+ data.form.spu_code = ''+ data.form.spu_name = ''+ data.form.sku_code = ''+ data.form.book_qty = 0+ },++ openSkuSelect: () => {+ data.showSkuDialogSelect = true+ },++ closeDialogSelectSku: () => {+ data.showSkuDialogSelect = false+ },++ sureSelectSku: (selectRecords: any) => {+ if (selectRecords.length > 0) {+ data.form.sku_id = selectRecords[0].sku_id+ data.form.goods_owner_id = selectRecords[0].goods_owner_id+ data.form.goods_location_id = selectRecords[0].goods_location_id+ // The book qty should zero when the data from commodity.+ data.form.book_qty = 0+ data.form.spu_code = selectRecords[0].spu_code+ data.form.spu_name = selectRecords[0].spu_name+ data.form.sku_code = selectRecords[0].sku_code+ }+ },++ openLocationSelect: () => {+ data.showLocationDialogSelect = true+ },++ closeDialogSelectLocation: () => {+ data.showLocationDialogSelect = false+ },++ sureSelectLocation: (selectRecords: any) => {+ if (selectRecords.length > 0) {+ data.form.goods_location_id = selectRecords[0].id+ data.form.warehouse_name = selectRecords[0].warehouse_name+ data.form.location_name = selectRecords[0].location_name+ }+ },++ clearLocation: () => {+ data.form.goods_location_id = 0+ data.form.warehouse_name = ''+ data.form.location_name = ''+ },++ submit: async () => {+ const { valid } = await formRef.value.validate()++ const form = method.constructFormBody()++ if (valid) {+ const { data: res } = await addStockTaking(form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ },++ constructFormBody: () => {+ let form = { ...data.form }+ form = removeObjectNull(form)++ return form+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}++.header {+ display: flex;+ margin-bottom: 15px;+ justify-content: space-between;+}++.headerBtn {+}+.headerTips {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseTaking/number-input.vue b/frontend/src/view/warehouseWorking/warehouseTaking/number-input.vuenew file mode 100644index 0000000..df3e01c--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseTaking/number-input.vue@@ -0,0 +1,142 @@+<!-- Warehouse Taking Number Input -->+<template>+ <v-dialog v-model="isShow" :width="'20%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('router.sideBar.warehouseTaking')}`"></v-toolbar>+ <v-card-text>+ <p class="mb-4" style="color: #999999">{{ $t('wms.warehouseWorking.warehouseTaking.book_qty') }}:{{ data.form.book_qty }}</p>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.counted_qty"+ :label="$t('wms.warehouseWorking.warehouseTaking.counted_qty')"+ :rules="data.rules.counted_qty"+ variant="outlined"+ clearable+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { hookComponent } from '@/components/system/index'+import { confirmStockTaking } from '@/api/wms/warehouseTaking'+import { WarehouseTakingVO } from '@/types/WarehouseWorking/WarehouseTaking'+import { removeObjectNull } from '@/utils/common'+import { TAKING_JOB_FINISH } from '@/constant/warehouseWorking'+import i18n from '@/languages/i18n'+import { IsInteger } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: WarehouseTakingVO+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ showCommodityDialogSelect: false,+ showLocationDialogSelect: false,++ form: ref<WarehouseTakingVO>({+ id: 0,+ job_code: '',+ job_status: TAKING_JOB_FINISH,+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ book_qty: 0,+ counted_qty: 0,+ difference_qty: 0,+ spu_code: '',+ spu_name: '',+ sku_code: '',+ warehouse_name: '',+ location_name: '',+ adjust_status: false,+ handler: '',+ handle_time: ''+ }),+ rules: {+ book_qty: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseTaking.book_qty') }!`+ ],+ counted_qty: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseTaking.counted_qty') }!`,+ (val: number) => IsInteger(val, 'nonNegative') === '' || IsInteger(val, 'nonNegative')+ ]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },++ initForm: () => {+ data.form = props.form+ },++ submit: async () => {+ const { valid } = await formRef.value.validate()++ const form = method.constructFormBody()++ if (valid) {+ const { data: res } = await confirmStockTaking(form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ },++ constructFormBody: () => {+ let form = { ...data.form }+ form = removeObjectNull(form)++ return form+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseTaking/warehouseTaking.vue b/frontend/src/view/warehouseWorking/warehouseTaking/warehouseTaking.vuenew file mode 100644index 0000000..1059ed0--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseTaking/warehouseTaking.vue@@ -0,0 +1,407 @@+<!-- Warehouse Taking -->+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.job_code"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.warehouseWorking.warehouseTaking.job_code')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="job_code" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.job_code')"></vxe-column>+ <vxe-column field="job_status" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.job_status')">+ <template #default="{ row, column }">+ <span>{{ formatTakingJobStatus(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="spu_code" width="150px" :title="$t('base.commodityManagement.spu_code')"></vxe-column>+ <vxe-column field="spu_name" width="150px" :title="$t('base.commodityManagement.spu_name')"></vxe-column>+ <vxe-column field="sku_code" width="150px" :title="$t('base.commodityManagement.sku_code')"></vxe-column>+ <vxe-column field="warehouse_name" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.warehouse')"></vxe-column>+ <vxe-column field="location_name" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.location_name')"></vxe-column>+ <vxe-column field="book_qty" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.book_qty')"></vxe-column>+ <vxe-column field="counted_qty" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.counted_qty')"></vxe-column>+ <vxe-column field="difference_qty" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.difference_qty')"></vxe-column>+ <vxe-column field="handler" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.handler')"></vxe-column>+ <vxe-column field="handle_time" width="170px" :title="$t('wms.warehouseWorking.warehouseTaking.handle_time')">+ <template #default="{ row, column }">+ <span>{{ formatDate(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseTaking.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('wms.warehouseWorking.warehouseTaking.create_time')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="250" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-eye-outline"+ :tooltip-text="$t('system.page.view')"+ @click="method.viewRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-book-check-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseTaking.confirmTaking')"+ :disabled="method.isConfirmTaking(row)"+ @click="method.confirmTaking(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-book-open-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseProcessing.confirmAdjust')"+ :disabled="method.confirmAdjustBtnDisabled(row)"+ @click="method.confirmAdjust(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ :disabled="method.isConfirmTaking(row)"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ <addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <number-input+ :show-dialog="data.showDialogNumberInput"+ :form="data.dialogForm"+ @close="method.closeDialogNumberInput"+ @saveSuccess="method.saveSuccessNumberInput"+ />+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, onActivated, watch, nextTick } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { WarehouseTakingVO } from '@/types/WarehouseWorking/WarehouseTaking'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { TAKING_JOB_FINISH, TAKING_JOB_UNFINISH } from '@/constant/warehouseWorking'+import { deleteStockTaking, getStockTakingList, getStockTakingOne, confirmAdjustment } from '@/api/wms/warehouseTaking'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import { SearchObject } from '@/types/System/Form'+import { formatTakingJobStatus } from '@/utils/format/formatWarehouseWorking'+import { formatDate } from '@/utils/format/formatSystem'+import tooltipBtn from '@/components/tooltip-btn.vue'+import addOrUpdateDialog from './add-or-update-taking.vue'+import numberInput from './number-input.vue'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++const data = reactive({+ showDialog: false,+ showDialogNumberInput: false,+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<WarehouseTakingVO[]>([]),+ dialogForm: ref<WarehouseTakingVO>({+ id: 0,+ job_code: '',+ job_status: TAKING_JOB_FINISH,+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ book_qty: 0,+ counted_qty: 0,+ difference_qty: 0,+ spu_code: '',+ spu_name: '',+ sku_code: '',+ warehouse_name: '',+ location_name: '',+ handler: '',+ handle_time: '',+ adjust_status: false,+ creator: '',+ create_time: ''+ }),+ searchForm: {+ job_code: ''+ },+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ })+})++const method = reactive({+ // Open a dialog to add+ add: () => {+ data.dialogForm = {+ id: 0,+ job_code: '',+ job_status: TAKING_JOB_FINISH,+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ book_qty: 0,+ counted_qty: 0,+ difference_qty: 0,+ spu_code: '',+ spu_name: '',+ sku_code: '',+ warehouse_name: '',+ location_name: '',+ handler: '',+ handle_time: '',+ adjust_status: false,+ creator: '',+ create_time: ''+ }+ nextTick(() => {+ data.showDialog = true+ })+ },++ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },++ // After confirm taking.+ saveSuccessNumberInput: () => {+ method.refresh()+ method.closeDialogNumberInput()+ },++ // Refresh data+ refresh: () => {+ method.getStockProcessList()+ },++ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },++ // Shut number input dialog+ closeDialogNumberInput: () => {+ data.showDialogNumberInput = false+ },++ getStockProcessList: async () => {+ const { data: res } = await getStockTakingList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ viewRow: async (row: WarehouseTakingVO) => {+ await method.getOne(row.id)+ nextTick(() => {+ data.showDialog = true+ })+ },++ getOne: async (id: number) => {+ const { data: res } = await getStockTakingOne(id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }++ data.dialogForm = res.data+ },++ deleteRow(row: WarehouseTakingVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteStockTaking(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }++ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },++ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.refresh()+ }),++ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.warehouseTaking'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.refresh()+ },++ // The btn will become disabled when the 'job_status' is false+ confirmAdjustBtnDisabled: (row: WarehouseTakingVO) => row.job_status === TAKING_JOB_UNFINISH || !!row.adjust_status,++ // The btn will become disabled when the 'job_status' is true+ isConfirmTaking: (row: WarehouseTakingVO) => row.job_status === TAKING_JOB_FINISH,++ confirmTaking: async (row: WarehouseTakingVO) => {+ data.dialogForm = row+ nextTick(() => {+ data.showDialogNumberInput = true+ })+ },++ confirmAdjust: async (row: WarehouseTakingVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('wms.warehouseWorking.warehouseTaking.beforeConfirmAdjust'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await confirmAdjustment(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('wms.warehouseWorking.warehouseTaking.confirmAdjust') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ }+})++onActivated(() => {+ method.refresh()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))+const tableHeight = computed(() => computedTableHeight({ hasTab: false }))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/wms/stockAsn/add-or-update-notice.vue b/frontend/src/view/wms/stockAsn/add-or-update-notice.vuenew file mode 100644index 0000000..98e7295--- /dev/null+++ b/frontend/src/view/wms/stockAsn/add-or-update-notice.vue@@ -0,0 +1,280 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('wms.stockAsn.tabNotice')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-select+ v-model="data.form.supplier_name"+ :items="data.combobox.supplier_name"+ item-title="label"+ item-value="label"+ :rules="data.rules.supplier_name"+ :label="$t('wms.stockAsnInfo.supplier_name')"+ variant="outlined"+ clearable+ @update:model-value="method.supplierNameChange"+ ></v-select>+ <v-select+ v-model="data.form.goods_owner_name"+ :items="data.combobox.goods_owner_name"+ item-title="label"+ item-value="label"+ :rules="data.rules.goods_owner_name"+ :label="$t('wms.stockAsnInfo.goods_owner_name')"+ variant="outlined"+ clearable+ @update:model-value="method.goodsOwnerNameChange"+ ></v-select>+ <v-text-field+ v-model="data.form.spu_code"+ :label="$t('wms.stockAsnInfo.spu_code')"+ :rules="data.rules.spu_code"+ variant="outlined"+ readonly+ clearable+ @click="method.openSelect('target')"+ @click:clear="method.clearCommodity"+ ></v-text-field>+ <v-text-field+ v-model="data.form.spu_name"+ :label="$t('wms.stockAsnInfo.spu_name')"+ :rules="data.rules.spu_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.sku_code"+ :label="$t('wms.stockAsnInfo.sku_code')"+ :rules="data.rules.sku_code"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.sku_name"+ :label="$t('wms.stockAsnInfo.sku_name')"+ :rules="data.rules.sku_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.asn_qty"+ :label="$t('wms.stockAsnInfo.asn_qty')"+ :rules="data.rules.asn_qty"+ variant="outlined"+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+ <sku-select :show-dialog="data.showSkuDialogSelect" @close="method.closeDialogSelect('target')" @sureSelect="method.sureSelect" />+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { StockAsnVO } from '@/types/WMS/StockAsn'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addAsn, updateAsn } from '@/api/wms/stockAsn'+import { getSupplierAll } from '@/api/base/supplier'+import { getOwnerOfCargoAll } from '@/api/base/ownerOfCargo'+import skuSelect from '@/components/select/sku-select.vue'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: StockAsnVO+}>()++const isShow = computed(() => props.showDialog)++const dialogTitle = computed(() => {+ if (props.form.id && props.form.id > 0) {+ return 'update'+ }+ return 'add'+})++const data = reactive({+ form: ref<StockAsnVO>({+ id: 0,+ asn_no: '',+ asn_status: 0,+ spu_id: 0,+ spu_code: '',+ spu_name: '',+ sku_id: 0,+ sku_code: '',+ sku_name: '',+ origin: '',+ length_unit: 0,+ volume_unit: 0,+ weight_unit: 0,+ asn_qty: 0,+ actual_qty: 0,+ sorted_qty: 0,+ shortage_qty: 0,+ more_qty: 0,+ damage_qty: 0,+ weight: 0,+ volume: 0,+ supplier_id: 0,+ supplier_name: '',+ goods_owner_id: 0,+ goods_owner_name: '',+ is_valid: true+ }),+ rules: {+ supplier_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.supplier_name') }!`],+ goods_owner_name: [],+ asn_qty: [],+ spu_code: [],+ spu_name: [],+ sku_code: [],+ sku_name: []+ },+ showSkuDialogSelect: false,+ curSelectType: '',+ combobox: ref<{+ supplier_name: {+ label: string+ value: number+ }[]+ goods_owner_name: {+ label: string+ value: number+ }[]+ }>({+ supplier_name: [],+ goods_owner_name: []+ })+})++const method = reactive({+ supplierNameChange: (val: string) => {+ if (!val) {+ data.form.supplier_id = 0+ } else {+ data.form.supplier_id = data.combobox.supplier_name.filter((item) => item.label === val)[0].value+ }+ },+ goodsOwnerNameChange: (val: string) => {+ if (!val) {+ data.form.goods_owner_id = 0+ } else {+ data.form.goods_owner_id = data.combobox.goods_owner_name.filter((item) => item.label === val)[0].value+ }+ },+ getCombobox: async () => {+ data.combobox.supplier_name = []+ data.combobox.goods_owner_name = []+ const { data: supplierRes } = await getSupplierAll()+ if (!supplierRes.isSuccess) {+ return+ }+ for (const item of supplierRes.data) {+ if (item.is_valid) {+ data.combobox.supplier_name.push({+ label: item.supplier_name,+ value: item.id+ })+ }+ }+ const { data: goodsOwnerRes } = await getOwnerOfCargoAll()+ if (!goodsOwnerRes.isSuccess) {+ return+ }+ for (const item of goodsOwnerRes.data) {+ if (item.is_valid) {+ data.combobox.goods_owner_name.push({+ label: item.goods_owner_name,+ value: item.id+ })+ }+ }+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addAsn(data.form) : await updateAsn(data.form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ },++ clearCommodity: () => {+ data.form.spu_id = 0+ data.form.spu_code = ''+ data.form.spu_name = ''+ data.form.spu_id = 0+ data.form.sku_code = ''+ data.form.sku_name = ''+ },+ openSelect: (type: string) => {+ data.curSelectType = type++ if (type === 'target') {+ data.showSkuDialogSelect = true+ }+ },+ closeDialogSelect: (type: string) => {+ if (type === 'target') {+ data.showSkuDialogSelect = false+ }+ },+ sureSelect: (selectRecords: any) => {+ if (data.curSelectType === 'target') {+ data.form.spu_id = selectRecords[0].spu_id+ data.form.spu_code = selectRecords[0].spu_code+ data.form.spu_name = selectRecords[0].spu_name+ data.form.sku_id = selectRecords[0].sku_id+ data.form.sku_code = selectRecords[0].sku_code+ data.form.sku_name = selectRecords[0].sku_name+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.getCombobox()+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/wms/stockAsn/sku-info.vue b/frontend/src/view/wms/stockAsn/sku-info.vuenew file mode 100644index 0000000..29d50b0--- /dev/null+++ b/frontend/src/view/wms/stockAsn/sku-info.vue@@ -0,0 +1,139 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <!-- <v-toolbar color="white" :title="`${$t('wms.stockAsn.tabNotice')}`"></v-toolbar> -->+ <v-card-text>+ <v-list-item two-line>+ <v-list-item-content>+ <v-list-item-title>{{ i18n.global.t('wms.skuInfo.spu_name') + ':' + data.tableData.spu_name }}</v-list-item-title>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.sku_code') + ':' + data.tableData.sku_code }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.sku_name') + ':' + data.tableData.sku_name }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.spu_description') + ':' + data.tableData.spu_description }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.category_name') + ':' + data.tableData.category_name }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.brand') + ':' + data.tableData.brand }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.origin') + ':' + data.tableData.origin }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.unit') + ':' + data.tableData.unit }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.cost') + ':' + data.tableData.cost }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.bar_code') + ':' + data.tableData.bar_code }}</v-list-item-subtitle>+ </v-list-item-content>+ </v-list-item>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { StockAsnVO, SkuInfoVo } from '@/types/WMS/StockAsn'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { getSkuInfo } from '@/api/wms/stockAsn'++const formRef = ref()+const emit = defineEmits(['close'])++const props = defineProps<{+ showDialog: boolean+ form: StockAsnVO+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ form: ref<StockAsnVO>({+ id: 0,+ asn_no: '',+ asn_status: 0,+ spu_id: 0,+ spu_code: '',+ spu_name: '',+ sku_id: 0,+ sku_code: '',+ sku_name: '',+ origin: '',+ length_unit: 0,+ volume_unit: 0,+ weight_unit: 0,+ asn_qty: 0,+ actual_qty: 0,+ sorted_qty: 0,+ shortage_qty: 0,+ more_qty: 0,+ damage_qty: 0,+ weight: 0,+ volume: 0,+ supplier_id: 0,+ supplier_name: '',+ goods_owner_id: 0,+ goods_owner_name: '',+ is_valid: true+ }),+ tableData: ref<SkuInfoVo>({+ spu_id: 0,+ spu_code: '',+ spu_name: '',+ category_id: 0,+ category_name: '',+ spu_description: '',+ bar_code: '',+ supplier_id: 0,+ supplier_name: '',+ brand: '',+ origin: '',+ length_unit: 0,+ volume_unit: 0,+ weight_unit: 0,+ sku_id: 0,+ sku_code: '',+ sku_name: '',+ weight: 0,+ lenght: 0,+ width: 0,+ height: 0,+ volume: 0,+ unit: '',+ cost: 0,+ price: 0+ })+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ getStockAsnList: async () => {+ const { data: res } = await getSkuInfo(data.form.sku_id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form = props.form+ method.getStockAsnList()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/wms/stockAsn/stockAsn.vue b/frontend/src/view/wms/stockAsn/stockAsn.vuenew file mode 100644index 0000000..dc2007b--- /dev/null+++ b/frontend/src/view/wms/stockAsn/stockAsn.vue@@ -0,0 +1,158 @@+<!-- Warehouse Setting -->+<template>+ <div class="container">+ <div>+ <v-tabs v-model="data.activeTab" stacked @update:model-value="method.changeTabs">+ <v-tab v-for="(item, index) of tabsConfig" :key="index" :value="item.value">+ <v-icon>{{ item.icon }}</v-icon>+ <p class="tabItemTitle">{{ item.tabName }}</p>+ </v-tab>+ </v-tabs>++ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item value="tabNotice">+ <tabNotice ref="tabNoticeRef" />+ </v-window-item>+ <v-window-item value="tabToDoArrival">+ <tabToDoArrival ref="tabToDoArrivalRef" />+ </v-window-item>+ <v-window-item value="tabToDoUnload">+ <tabToDoUnload ref="tabToDoUnloadRef" />+ </v-window-item>+ <v-window-item value="tabToDoSorting">+ <tabToDoSorting ref="tabToDoSortingRef" />+ </v-window-item>+ <v-window-item value="tabToDoGrounding">+ <tabToDoGrounding ref="tabToDoGroundingRef" />+ </v-window-item>+ <v-window-item value="tabReceiptDetails">+ <tabReceiptDetails ref="tabReceiptDetailsRef" />+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { ref, reactive, onMounted, watch, nextTick } from 'vue'+import i18n from '@/languages/i18n'+import tabNotice from './tabNotice.vue'+import tabToDoArrival from './tabToDoArrival.vue'+import tabToDoUnload from './tabToDoUnload.vue'+import tabToDoSorting from './tabToDoSorting.vue'+import tabToDoGrounding from './tabToDoGrounding.vue'+import tabReceiptDetails from './tabReceiptDetails.vue'++const tabNoticeRef = ref()+const tabToDoArrivalRef = ref()+const tabToDoUnloadRef = ref()+const tabToDoSortingRef = ref()+const tabToDoGroundingRef = ref()+const tabReceiptDetailsRef = ref()++const tabsConfig = [+ {+ value: 'tabNotice',+ icon: 'mdi-checkbox-blank-badge',+ tabName: i18n.global.t('wms.stockAsn.tabNotice')+ },+ {+ value: 'tabToDoArrival',+ icon: 'mdi-truck-cargo-container',+ tabName: i18n.global.t('wms.stockAsn.tabToDoArrival')+ },+ {+ value: 'tabToDoUnload',+ icon: 'mdi-truck-outline',+ tabName: i18n.global.t('wms.stockAsn.tabToDoUnload')+ },+ {+ value: 'tabToDoSorting',+ icon: 'mdi-dolly',+ tabName: i18n.global.t('wms.stockAsn.tabToDoSorting')+ },+ {+ value: 'tabToDoGrounding',+ icon: 'mdi-grid',+ tabName: i18n.global.t('wms.stockAsn.tabToDoGrounding')+ },+ {+ value: 'tabReceiptDetails',+ icon: 'mdi-file-cabinet',+ tabName: i18n.global.t('wms.stockAsn.tabReceiptDetails')+ }+]++const data = reactive({+ activeTab: '',+ isLoadNotice: false,+ isLoadToDoArrival: false,+ isLoadToDoUnload: false,+ isLoadToDoSorting: false,+ isLoadToDoGrounding: false,+ isLoadReceiptDetails: false+})++const method = reactive({+ changeTabs: (e: any): void => {+ nextTick(() => {+ switch (e) {+ case 'tabNotice':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabNoticeRef?.value?.getStockAsnList) {+ tabNoticeRef.value.getStockAsnList()+ }+ break+ case 'tabToDoArrival':+ if (tabToDoArrivalRef?.value?.getStockAsnList) {+ tabToDoArrivalRef.value.getStockAsnList()+ }+ break+ case 'tabToDoUnload':+ if (tabToDoUnloadRef?.value?.getStockAsnList) {+ tabToDoUnloadRef.value.getStockAsnList()+ }+ break+ case 'tabToDoSorting':+ if (tabToDoSortingRef?.value?.getStockAsnList) {+ tabToDoSortingRef.value.getStockAsnList()+ }+ break+ case 'tabToDoGrounding':+ if (tabToDoGroundingRef?.value?.getStockAsnList) {+ tabToDoGroundingRef.value.getStockAsnList()+ }+ break+ case 'tabReceiptDetails':+ if (tabReceiptDetailsRef?.value?.getStockAsnList) {+ tabReceiptDetailsRef.value.getStockAsnList()+ }+ break+ }+ })+ }+})++onMounted(() => {})+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/wms/stockAsn/tabNotice.vue b/frontend/src/view/wms/stockAsn/tabNotice.vuenew file mode 100644index 0000000..93c6ed8--- /dev/null+++ b/frontend/src/view/wms/stockAsn/tabNotice.vue@@ -0,0 +1,317 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.supplier_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.supplier_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.sku_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.sku_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTableStockLocation" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="asn_no" :title="$t('wms.stockAsnInfo.asn_no')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.stockAsnInfo.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.stockAsnInfo.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.stockAsnInfo.sku_code')">+ <template #default="{ row }">+ <div :class="'text-decoration-none'" @click="method.showSkuInfo(row)"> {{ row.sku_code }}</div>+ </template>+ </vxe-column>+ <vxe-column field="sku_name" :title="$t('wms.stockAsnInfo.sku_name')"></vxe-column>+ <vxe-column field="goods_owner_name" :title="$t('wms.stockAsnInfo.goods_owner_name')"></vxe-column>+ <vxe-column field="supplier_name" :title="$t('wms.stockAsnInfo.supplier_name')"></vxe-column>+ <vxe-column field="asn_qty" :title="$t('wms.stockAsnInfo.asn_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.stockAsnInfo.weight')"></vxe-column>+ <vxe-column field="volume" :title="$t('wms.stockAsnInfo.volume')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn :flat="true" icon="mdi-pencil-outline" :tooltip-text="$t('system.page.edit')" @click="method.editRow(row)"></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ <addOrUpdateNotice :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { StockAsnVO } from '@/types/WMS/StockAsn'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import { SearchObject } from '@/types/System/Form'+import { getStockAsnList, deleteAsn } from '@/api/wms/stockAsn'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import addOrUpdateNotice from './add-or-update-notice.vue'+import customPager from '@/components/custom-pager.vue'+import skuInfo from './sku-info.vue'+import { exportData } from '@/utils/exportTable'++const xTableStockLocation = ref()++const data = reactive({+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ supplier_name: '',+ sku_name: ''+ },+ dialogForm: ref<StockAsnVO>({+ id: 0,+ asn_no: '',+ asn_status: 0,+ spu_id: 0,+ spu_code: '',+ spu_name: '',+ sku_id: 0,+ sku_code: '',+ sku_name: '',+ origin: '',+ length_unit: 0,+ volume_unit: 0,+ weight_unit: 0,+ asn_qty: 0,+ actual_qty: 0,+ sorted_qty: 0,+ shortage_qty: 0,+ more_qty: 0,+ damage_qty: 0,+ weight: 0,+ volume: 0,+ supplier_id: 0,+ supplier_name: '',+ goods_owner_id: 0,+ goods_owner_name: '',+ is_valid: true+ }),+ activeTab: null,+ tableData: ref<StockAsnVO[]>([]),+ tablePage: reactive({+ total: 0,+ sqlTitle: 'asn_status:0',+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ closeDialogShowInfo: () => {+ data.showDialogShowInfo = false+ },+ showSkuInfo(row: StockAsnVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialogShowInfo = true+ },+ // Open a dialog to add+ add: () => {+ data.dialogForm = {+ id: 0,+ asn_no: '',+ asn_status: 0,+ spu_id: 0,+ spu_code: '',+ spu_name: '',+ sku_id: 0,+ sku_code: '',+ sku_name: '',+ origin: '',+ length_unit: 0,+ volume_unit: 0,+ weight_unit: 0,+ asn_qty: 0,+ actual_qty: 0,+ sorted_qty: 0,+ shortage_qty: 0,+ more_qty: 0,+ damage_qty: 0,+ weight: 0,+ volume: 0,+ supplier_id: 0,+ supplier_name: '',+ goods_owner_id: 0,+ goods_owner_name: '',+ is_valid: true+ }+ data.showDialog = true+ },+ editRow(row: StockAsnVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: StockAsnVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteAsn(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Refresh data+ refresh: () => {+ method.getStockAsnList()+ },+ getStockAsnList: async () => {+ const { data: res } = await getStockAsnList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getStockAsnList()+ }),+ exportTable: () => {+ const $table = xTableStockLocation.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.stockAsn.tabNotice'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getStockAsnList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getStockAsnList: method.getStockAsnList+})+watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/wms/stockAsn/tabReceiptDetails.vue b/frontend/src/view/wms/stockAsn/tabReceiptDetails.vuenew file mode 100644index 0000000..84cf1ac--- /dev/null+++ b/frontend/src/view/wms/stockAsn/tabReceiptDetails.vue@@ -0,0 +1,240 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.supplier_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.supplier_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.sku_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.sku_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTableStockLocation" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="asn_no" :title="$t('wms.stockAsnInfo.asn_no')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.stockAsnInfo.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.stockAsnInfo.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.stockAsnInfo.sku_code')">+ <template #default="{ row }">+ <div :class="'text-decoration-none'" @click="method.showSkuInfo(row)"> {{ row.sku_code }}</div>+ </template>+ </vxe-column>+ <vxe-column field="sku_name" :title="$t('wms.stockAsnInfo.sku_name')"></vxe-column>+ <vxe-column field="goods_owner_name" :title="$t('wms.stockAsnInfo.goods_owner_name')"></vxe-column>+ <vxe-column field="supplier_name" :title="$t('wms.stockAsnInfo.supplier_name')"></vxe-column>+ <vxe-column field="asn_qty" :title="$t('wms.stockAsnInfo.asn_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.stockAsnInfo.weight')"></vxe-column>+ <vxe-column field="volume" :title="$t('wms.stockAsnInfo.volume')"></vxe-column>+ <vxe-column field="actual_qty" :title="$t('wms.stockAsnInfo.actual_qty')"></vxe-column>+ <vxe-column field="sorted_qty" :title="$t('wms.stockAsnInfo.sorted_qty')"></vxe-column>+ <vxe-column field="shortage_qty" :title="$t('wms.stockAsnInfo.shortage_qty')"></vxe-column>+ <vxe-column field="more_qty" :title="$t('wms.stockAsnInfo.more_qty')"></vxe-column>+ <vxe-column field="damage_qty" :title="$t('wms.stockAsnInfo.damage_qty')"></vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ <skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { StockAsnVO } from '@/types/WMS/StockAsn'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import { SearchObject } from '@/types/System/Form'+import { getStockAsnList } from '@/api/wms/stockAsn'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import skuInfo from './sku-info.vue'+import { exportData } from '@/utils/exportTable'++const xTableStockLocation = ref()++const data = reactive({+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ supplier_name: '',+ sku_name: ''+ },+ activeTab: null,+ tableData: ref<StockAsnVO[]>([]),+ dialogForm: ref<StockAsnVO>({+ id: 0,+ asn_no: '',+ asn_status: 0,+ spu_id: 0,+ spu_code: '',+ spu_name: '',+ sku_id: 0,+ sku_code: '',+ sku_name: '',+ origin: '',+ length_unit: 0,+ volume_unit: 0,+ weight_unit: 0,+ asn_qty: 0,+ actual_qty: 0,+ sorted_qty: 0,+ shortage_qty: 0,+ more_qty: 0,+ damage_qty: 0,+ weight: 0,+ volume: 0,+ supplier_id: 0,+ supplier_name: '',+ goods_owner_id: 0,+ goods_owner_name: '',+ is_valid: true+ }),+ tablePage: reactive({+ total: 0,+ sqlTitle: 'asn_status:4',+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ closeDialogShowInfo: () => {+ data.showDialogShowInfo = false+ },+ showSkuInfo(row: StockAsnVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialogShowInfo = true+ },+ // Refresh data+ refresh: () => {+ method.getStockAsnList()+ },+ getStockAsnList: async () => {+ const { data: res } = await getStockAsnList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getStockAsnList()+ }),+ exportTable: () => {+ const $table = xTableStockLocation.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.stockAsn.tabReceiptDetails'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getStockAsnList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getStockAsnList: method.getStockAsnList+})+watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/wms/stockAsn/tabToDoArrival.vue b/frontend/src/view/wms/stockAsn/tabToDoArrival.vuenew file mode 100644index 0000000..a605d81--- /dev/null+++ b/frontend/src/view/wms/stockAsn/tabToDoArrival.vue@@ -0,0 +1,262 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.supplier_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.supplier_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.sku_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.sku_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTableStockLocation" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="asn_no" :title="$t('wms.stockAsnInfo.asn_no')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.stockAsnInfo.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.stockAsnInfo.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.stockAsnInfo.sku_code')">+ <template #default="{ row }">+ <div :class="'text-decoration-none'" @click="method.showSkuInfo(row)"> {{ row.sku_code }}</div>+ </template>+ </vxe-column>+ <vxe-column field="sku_name" :title="$t('wms.stockAsnInfo.sku_name')"></vxe-column>+ <vxe-column field="goods_owner_name" :title="$t('wms.stockAsnInfo.goods_owner_name')"></vxe-column>+ <vxe-column field="supplier_name" :title="$t('wms.stockAsnInfo.supplier_name')"></vxe-column>+ <vxe-column field="asn_qty" :title="$t('wms.stockAsnInfo.asn_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.stockAsnInfo.weight')"></vxe-column>+ <vxe-column field="volume" :title="$t('wms.stockAsnInfo.volume')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn :flat="true" icon="mdi-check" :tooltip-text="$t('system.page.confirm')" @click="method.editRow(row)"></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ <skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { StockAsnVO } from '@/types/WMS/StockAsn'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import { SearchObject } from '@/types/System/Form'+import { getStockAsnList, confirmAsn } from '@/api/wms/stockAsn'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import skuInfo from './sku-info.vue'+import { exportData } from '@/utils/exportTable'++const xTableStockLocation = ref()++const data = reactive({+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ supplier_name: '',+ sku_name: ''+ },+ activeTab: null,+ tableData: ref<StockAsnVO[]>([]),+ dialogForm: ref<StockAsnVO>({+ id: 0,+ asn_no: '',+ asn_status: 0,+ spu_id: 0,+ spu_code: '',+ spu_name: '',+ sku_id: 0,+ sku_code: '',+ sku_name: '',+ origin: '',+ length_unit: 0,+ volume_unit: 0,+ weight_unit: 0,+ asn_qty: 0,+ actual_qty: 0,+ sorted_qty: 0,+ shortage_qty: 0,+ more_qty: 0,+ damage_qty: 0,+ weight: 0,+ volume: 0,+ supplier_id: 0,+ supplier_name: '',+ goods_owner_id: 0,+ goods_owner_name: '',+ is_valid: true+ }),+ tablePage: reactive({+ total: 0,+ sqlTitle: 'asn_status:0',+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ closeDialogShowInfo: () => {+ data.showDialogShowInfo = false+ },+ showSkuInfo(row: StockAsnVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialogShowInfo = true+ },+ editRow(row: StockAsnVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeAsnConfirm'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await confirmAsn(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.confirm') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ // Refresh data+ refresh: () => {+ method.getStockAsnList()+ },+ getStockAsnList: async () => {+ const { data: res } = await getStockAsnList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getStockAsnList()+ }),+ exportTable: () => {+ const $table = xTableStockLocation.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.stockAsn.tabToDoArrival'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getStockAsnList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getStockAsnList: method.getStockAsnList+})+watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/wms/stockAsn/tabToDoGrounding.vue b/frontend/src/view/wms/stockAsn/tabToDoGrounding.vuenew file mode 100644index 0000000..6b4ab63--- /dev/null+++ b/frontend/src/view/wms/stockAsn/tabToDoGrounding.vue@@ -0,0 +1,286 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.supplier_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.supplier_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.sku_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.sku_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTableStockLocation" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="asn_no" :title="$t('wms.stockAsnInfo.asn_no')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.stockAsnInfo.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.stockAsnInfo.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.stockAsnInfo.sku_code')">+ <template #default="{ row }">+ <div :class="'text-decoration-none'" @click="method.showSkuInfo(row)"> {{ row.sku_code }}</div>+ </template>+ </vxe-column>+ <vxe-column field="sku_name" :title="$t('wms.stockAsnInfo.sku_name')"></vxe-column>+ <vxe-column field="goods_owner_name" :title="$t('wms.stockAsnInfo.goods_owner_name')"></vxe-column>+ <vxe-column field="supplier_name" :title="$t('wms.stockAsnInfo.supplier_name')"></vxe-column>+ <vxe-column field="asn_qty" :title="$t('wms.stockAsnInfo.asn_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.stockAsnInfo.weight')"></vxe-column>+ <vxe-column field="volume" :title="$t('wms.stockAsnInfo.volume')"></vxe-column>+ <vxe-column field="sorted_qty" :title="$t('wms.stockAsnInfo.sorted_qty')"></vxe-column>+ <vxe-column field="actual_qty" :title="$t('wms.stockAsnInfo.actual_qty')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn :flat="true" icon="mdi-pencil-outline" :tooltip-text="$t('system.page.edit')" @click="method.editRow(row)"></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ <updateGrounding :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { StockAsnVO } from '@/types/WMS/StockAsn'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import { SearchObject } from '@/types/System/Form'+import { getStockAsnList, sortedAsnCancel } from '@/api/wms/stockAsn'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import updateGrounding from './update-grounding.vue'+import customPager from '@/components/custom-pager.vue'+import skuInfo from './sku-info.vue'+import { exportData } from '@/utils/exportTable'++const xTableStockLocation = ref()++const data = reactive({+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ supplier_name: '',+ sku_name: ''+ },+ activeTab: null,+ dialogForm: ref<StockAsnVO>({+ id: 0,+ asn_no: '',+ asn_status: 0,+ spu_id: 0,+ spu_code: '',+ spu_name: '',+ sku_id: 0,+ sku_code: '',+ sku_name: '',+ origin: '',+ length_unit: 0,+ volume_unit: 0,+ weight_unit: 0,+ asn_qty: 0,+ actual_qty: 0,+ sorted_qty: 0,+ shortage_qty: 0,+ more_qty: 0,+ damage_qty: 0,+ weight: 0,+ volume: 0,+ supplier_id: 0,+ supplier_name: '',+ goods_owner_id: 0,+ goods_owner_name: '',+ is_valid: true+ }),+ tableData: ref<StockAsnVO[]>([]),+ tablePage: reactive({+ total: 0,+ sqlTitle: 'asn_status:3',+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ closeDialogShowInfo: () => {+ data.showDialogShowInfo = false+ },+ showSkuInfo(row: StockAsnVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialogShowInfo = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ editRow(row: StockAsnVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: StockAsnVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await sortedAsnCancel(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ // Refresh data+ refresh: () => {+ method.getStockAsnList()+ },+ getStockAsnList: async () => {+ const { data: res } = await getStockAsnList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getStockAsnList()+ }),+ exportTable: () => {+ const $table = xTableStockLocation.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.stockAsn.tabToDoGrounding'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getStockAsnList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getStockAsnList: method.getStockAsnList+})+watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/wms/stockAsn/tabToDoSorting.vue b/frontend/src/view/wms/stockAsn/tabToDoSorting.vuenew file mode 100644index 0000000..ee92a6e--- /dev/null+++ b/frontend/src/view/wms/stockAsn/tabToDoSorting.vue@@ -0,0 +1,308 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.supplier_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.supplier_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.sku_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.sku_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTableStockLocation" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="asn_no" :title="$t('wms.stockAsnInfo.asn_no')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.stockAsnInfo.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.stockAsnInfo.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.stockAsnInfo.sku_code')">+ <template #default="{ row }">+ <div :class="'text-decoration-none'" @click="method.showSkuInfo(row)"> {{ row.sku_code }}</div>+ </template>+ </vxe-column>+ <vxe-column field="sku_name" :title="$t('wms.stockAsnInfo.sku_name')"></vxe-column>+ <vxe-column field="goods_owner_name" :title="$t('wms.stockAsnInfo.goods_owner_name')"></vxe-column>+ <vxe-column field="supplier_name" :title="$t('wms.stockAsnInfo.supplier_name')"></vxe-column>+ <vxe-column field="asn_qty" :title="$t('wms.stockAsnInfo.asn_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.stockAsnInfo.weight')"></vxe-column>+ <vxe-column field="volume" :title="$t('wms.stockAsnInfo.volume')"></vxe-column>+ <vxe-column field="sorted_qty" :title="$t('wms.stockAsnInfo.sorted_qty')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="180" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn :flat="true" icon="mdi-pencil-outline" :tooltip-text="$t('system.page.edit')" @click="method.editRowEdit(row)"></tooltip-btn>+ <tooltip-btn :flat="true" icon="mdi-check" :tooltip-text="$t('system.page.confirm')" @click="method.editRow(row)"></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ <updateSorting :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { StockAsnVO } from '@/types/WMS/StockAsn'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import { SearchObject } from '@/types/System/Form'+import { getStockAsnList, sortedAsn, unloadAsnCancel } from '@/api/wms/stockAsn'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import updateSorting from './update-sorting.vue'+import customPager from '@/components/custom-pager.vue'+import skuInfo from './sku-info.vue'+import { exportData } from '@/utils/exportTable'++const xTableStockLocation = ref()++const data = reactive({+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ supplier_name: '',+ sku_name: ''+ },+ activeTab: null,+ dialogForm: ref<StockAsnVO>({+ id: 0,+ asn_no: '',+ asn_status: 0,+ spu_id: 0,+ spu_code: '',+ spu_name: '',+ sku_id: 0,+ sku_code: '',+ sku_name: '',+ origin: '',+ length_unit: 0,+ volume_unit: 0,+ weight_unit: 0,+ asn_qty: 0,+ actual_qty: 0,+ sorted_qty: 0,+ shortage_qty: 0,+ more_qty: 0,+ damage_qty: 0,+ weight: 0,+ volume: 0,+ supplier_id: 0,+ supplier_name: '',+ goods_owner_id: 0,+ goods_owner_name: '',+ is_valid: true+ }),+ tableData: ref<StockAsnVO[]>([]),+ tablePage: reactive({+ total: 0,+ sqlTitle: 'asn_status:2',+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ closeDialogShowInfo: () => {+ data.showDialogShowInfo = false+ },+ showSkuInfo(row: StockAsnVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialogShowInfo = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ editRowEdit(row: StockAsnVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ editRow(row: StockAsnVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeAsnSorted'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await sortedAsn(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.confirm') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ deleteRow(row: StockAsnVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await unloadAsnCancel(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ // Refresh data+ refresh: () => {+ method.getStockAsnList()+ },+ getStockAsnList: async () => {+ const { data: res } = await getStockAsnList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getStockAsnList()+ }),+ exportTable: () => {+ const $table = xTableStockLocation.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.stockAsn.tabToDoSorting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getStockAsnList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getStockAsnList: method.getStockAsnList+})+watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/wms/stockAsn/tabToDoUnload.vue b/frontend/src/view/wms/stockAsn/tabToDoUnload.vuenew file mode 100644index 0000000..35c3db4--- /dev/null+++ b/frontend/src/view/wms/stockAsn/tabToDoUnload.vue@@ -0,0 +1,291 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.supplier_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.supplier_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.sku_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.sku_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTableStockLocation" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="asn_no" :title="$t('wms.stockAsnInfo.asn_no')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.stockAsnInfo.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.stockAsnInfo.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.stockAsnInfo.sku_code')">+ <template #default="{ row }">+ <div :class="'text-decoration-none'" @click="method.showSkuInfo(row)"> {{ row.sku_code }}</div>+ </template>+ </vxe-column>+ <vxe-column field="sku_name" :title="$t('wms.stockAsnInfo.sku_name')"></vxe-column>+ <vxe-column field="goods_owner_name" :title="$t('wms.stockAsnInfo.goods_owner_name')"></vxe-column>+ <vxe-column field="supplier_name" :title="$t('wms.stockAsnInfo.supplier_name')"></vxe-column>+ <vxe-column field="asn_qty" :title="$t('wms.stockAsnInfo.asn_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.stockAsnInfo.weight')"></vxe-column>+ <vxe-column field="volume" :title="$t('wms.stockAsnInfo.volume')"></vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn :flat="true" icon="mdi-check" :tooltip-text="$t('system.page.confirm')" @click="method.editRow(row)"></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ <skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { StockAsnVO } from '@/types/WMS/StockAsn'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import { SearchObject } from '@/types/System/Form'+import { getStockAsnList, unloadAsn, confirmAsnCancel } from '@/api/wms/stockAsn'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import skuInfo from './sku-info.vue'+import { exportData } from '@/utils/exportTable'++const xTableStockLocation = ref()++const data = reactive({+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ supplier_name: '',+ sku_name: ''+ },+ activeTab: null,+ tableData: ref<StockAsnVO[]>([]),+ dialogForm: ref<StockAsnVO>({+ id: 0,+ asn_no: '',+ asn_status: 0,+ spu_id: 0,+ spu_code: '',+ spu_name: '',+ sku_id: 0,+ sku_code: '',+ sku_name: '',+ origin: '',+ length_unit: 0,+ volume_unit: 0,+ weight_unit: 0,+ asn_qty: 0,+ actual_qty: 0,+ sorted_qty: 0,+ shortage_qty: 0,+ more_qty: 0,+ damage_qty: 0,+ weight: 0,+ volume: 0,+ supplier_id: 0,+ supplier_name: '',+ goods_owner_id: 0,+ goods_owner_name: '',+ is_valid: true+ }),+ tablePage: reactive({+ total: 0,+ sqlTitle: 'asn_status:1',+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ closeDialogShowInfo: () => {+ data.showDialogShowInfo = false+ },+ showSkuInfo(row: StockAsnVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialogShowInfo = true+ },+ editRow(row: StockAsnVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeAsnUnload'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await unloadAsn(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.confirm') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ deleteRow(row: StockAsnVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await confirmAsnCancel(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ // Refresh data+ refresh: () => {+ method.getStockAsnList()+ },+ getStockAsnList: async () => {+ const { data: res } = await getStockAsnList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getStockAsnList()+ }),+ exportTable: () => {+ const $table = xTableStockLocation.value+ $table.exportData({+ table: $table,+ filename: i18n.global.t('wms.stockAsn.tabToDoUnload'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getStockAsnList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getStockAsnList: method.getStockAsnList+})+watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/wms/stockAsn/update-grounding.vue b/frontend/src/view/wms/stockAsn/update-grounding.vuenew file mode 100644index 0000000..da89fb6--- /dev/null+++ b/frontend/src/view/wms/stockAsn/update-grounding.vue@@ -0,0 +1,170 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('wms.stockAsn.tabNotice')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.formPutaway.location_name"+ :label="$t('base.warehouseSetting.location_name')"+ :rules="data.rules.location_name"+ variant="outlined"+ readonly+ clearable+ @click="method.openSelect('target')"+ @click:clear="method.clearCommodity"+ ></v-text-field>+ <v-text-field+ v-model="data.formPutaway.putaway_qty"+ :label="$t('wms.stockAsnInfo.actual_qty')"+ :rules="data.rules.putaway_qty"+ variant="outlined"+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+ <locationSelect :show-dialog="data.showSkuDialogSelect" @close="method.closeDialogSelect('target')" @sureSelect="method.sureSelect" />+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { StockAsnVO, PutawayVo } from '@/types/WMS/StockAsn'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { putawayAsn } from '@/api/wms/stockAsn'+import locationSelect from '@/components/select/location-select.vue'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: StockAsnVO+}>()++const isShow = computed(() => props.showDialog)++const dialogTitle = computed(() => 'update')++const data = reactive({+ form: ref<StockAsnVO>({+ id: 0,+ asn_no: '',+ asn_status: 0,+ spu_id: 0,+ spu_code: '',+ spu_name: '',+ sku_id: 0,+ sku_code: '',+ sku_name: '',+ origin: '',+ length_unit: 0,+ volume_unit: 0,+ weight_unit: 0,+ asn_qty: 0,+ actual_qty: 0,+ sorted_qty: 0,+ shortage_qty: 0,+ more_qty: 0,+ damage_qty: 0,+ weight: 0,+ volume: 0,+ supplier_id: 0,+ supplier_name: '',+ goods_owner_id: 0,+ goods_owner_name: '',+ is_valid: true+ }),+ formPutaway: ref<PutawayVo>({+ asn_id: 0,+ location_name: '',+ goods_location_id: 0,+ putaway_qty: 0+ }),+ rules: {+ putaway_qty: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.actual_qty') }!`],+ location_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.location_name') }!`+ ]+ },+ showSkuDialogSelect: false,+ curSelectType: ''+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ data.formPutaway.asn_id = data.form.id+ const { data: res } = await putawayAsn(data.formPutaway)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ },++ clearCommodity: () => {+ data.formPutaway.goods_location_id = 0+ data.formPutaway.location_name = ''+ },+ openSelect: (type: string) => {+ data.curSelectType = type++ if (type === 'target') {+ data.showSkuDialogSelect = true+ }+ },+ closeDialogSelect: (type: string) => {+ if (type === 'target') {+ data.showSkuDialogSelect = false+ }+ },+ sureSelect: (selectRecords: any) => {+ if (data.curSelectType === 'target') {+ data.formPutaway.goods_location_id = selectRecords[0].id+ data.formPutaway.location_name = selectRecords[0].location_name+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/wms/stockAsn/update-sorting.vue b/frontend/src/view/wms/stockAsn/update-sorting.vuenew file mode 100644index 0000000..a150a66--- /dev/null+++ b/frontend/src/view/wms/stockAsn/update-sorting.vue@@ -0,0 +1,129 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('wms.stockAsn.tabNotice')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.sorted_qty"+ :label="$t('wms.stockAsnInfo.sorted_qty')"+ :rules="data.rules.sorted_qty"+ variant="outlined"+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { StockAsnVO, SortingVo } from '@/types/WMS/StockAsn'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { sortingAsn } from '@/api/wms/stockAsn'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: StockAsnVO+}>()++const isShow = computed(() => props.showDialog)++const dialogTitle = computed(() => 'update')++const data = reactive({+ form: ref<StockAsnVO>({+ id: 0,+ asn_no: '',+ asn_status: 0,+ spu_id: 0,+ spu_code: '',+ spu_name: '',+ sku_id: 0,+ sku_code: '',+ sku_name: '',+ origin: '',+ length_unit: 0,+ volume_unit: 0,+ weight_unit: 0,+ asn_qty: 0,+ actual_qty: 0,+ sorted_qty: 0,+ shortage_qty: 0,+ more_qty: 0,+ damage_qty: 0,+ weight: 0,+ volume: 0,+ supplier_id: 0,+ supplier_name: '',+ goods_owner_id: 0,+ goods_owner_name: '',+ is_valid: true+ }),+ formSorting: ref<SortingVo>({+ asn_id: 0,+ sorted_qty: 0+ }),+ rules: {+ sorted_qty: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.sorted_qty') }!`]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ data.formSorting.asn_id = data.form.id+ data.formSorting.sorted_qty = data.form.sorted_qty+ const { data: res } = await sortingAsn(data.formSorting)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/wms/stockManagement/sku-info.vue b/frontend/src/view/wms/stockManagement/sku-info.vuenew file mode 100644index 0000000..abaa0a8--- /dev/null+++ b/frontend/src/view/wms/stockManagement/sku-info.vue@@ -0,0 +1,112 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <!-- <v-toolbar color="white" :title="`${$t('wms.stockAsn.tabNotice')}`"></v-toolbar> -->+ <v-card-text>+ <v-list-item two-line>+ <v-list-item-content>+ <v-list-item-title>{{ i18n.global.t('wms.skuInfo.spu_name') + ':' + data.tableData.spu_name }}</v-list-item-title>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.sku_code') + ':' + data.tableData.sku_code }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.sku_name') + ':' + data.tableData.sku_name }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.spu_description') + ':' + data.tableData.spu_description }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.category_name') + ':' + data.tableData.category_name }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.brand') + ':' + data.tableData.brand }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.origin') + ':' + data.tableData.origin }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.unit') + ':' + data.tableData.unit }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.cost') + ':' + data.tableData.cost }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.bar_code') + ':' + data.tableData.bar_code }}</v-list-item-subtitle>+ </v-list-item-content>+ </v-list-item>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { SkuInfoVo } from '@/types/WMS/StockAsn'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { getSkuInfo } from '@/api/wms/stockAsn'++const formRef = ref()+const emit = defineEmits(['close'])++const props = defineProps<{+ showDialog: boolean+ sku_id: number+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ id: 0,+ tableData: ref<SkuInfoVo>({+ spu_id: 0,+ spu_code: '',+ spu_name: '',+ category_id: 0,+ category_name: '',+ spu_description: '',+ bar_code: '',+ supplier_id: 0,+ supplier_name: '',+ brand: '',+ origin: '',+ length_unit: 0,+ volume_unit: 0,+ weight_unit: 0,+ sku_id: 0,+ sku_code: '',+ sku_name: '',+ weight: 0,+ lenght: 0,+ width: 0,+ height: 0,+ volume: 0,+ unit: '',+ cost: 0,+ price: 0+ })+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ getStockAsnList: async () => {+ const { data: res } = await getSkuInfo(data.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.id = props.sku_id+ method.getStockAsnList()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/wms/stockManagement/stockManagement.vue b/frontend/src/view/wms/stockManagement/stockManagement.vuenew file mode 100644index 0000000..150d85c--- /dev/null+++ b/frontend/src/view/wms/stockManagement/stockManagement.vue@@ -0,0 +1,94 @@+<!-- Warehouse Setting -->+<template>+ <div class="container">+ <div>+ <v-tabs v-model="data.activeTab" stacked @update:model-value="method.changeTabs">+ <v-tab v-for="(item, index) of tabsConfig" :key="index" :value="item.value">+ <v-icon>{{ item.icon }}</v-icon>+ <p class="tabItemTitle">{{ item.tabName }}</p>+ </v-tab>+ </v-tabs>++ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item value="tabStockLocation">+ <tabStockLocation ref="tabStockLocationRef" />+ </v-window-item>+ <v-window-item value="tabStock">+ <tabStock ref="tabStockRef" />+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { ref, reactive, onMounted, watch, nextTick } from 'vue'+import i18n from '@/languages/i18n'+import tabStockLocation from './tabStockLocation.vue'+import tabStock from './tabStock.vue'++const tabStockLocationRef = ref()+const tabStockRef = ref()++const tabsConfig = [+ {+ value: 'tabStockLocation',+ icon: 'mdi-database',+ tabName: i18n.global.t('wms.stockManagement.stockLocation')+ },+ {+ value: 'tabStock',+ icon: 'mdi-warehouse',+ tabName: i18n.global.t('wms.stockManagement.stock')+ }+]++const data = reactive({+ activeTab: '',+ isLoadstockLocation: false,+ isLoadstock: false+})++const method = reactive({+ changeTabs: (e: any): void => {+ nextTick(() => {+ switch (e) {+ case 'tabStockLocation':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabStockLocationRef?.value?.getStockLocationList) {+ tabStockLocationRef.value.getStockLocationList()+ }+ break+ case 'tabStock':+ if (tabStockRef?.value?.getStockList) {+ tabStockRef.value.getStockList()+ }+ break+ }+ })+ }+})++onMounted(() => { })+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/wms/stockManagement/tabStock.vue b/frontend/src/view/wms/stockManagement/tabStock.vuenew file mode 100644index 0000000..aef93a5--- /dev/null+++ b/frontend/src/view/wms/stockManagement/tabStock.vue@@ -0,0 +1,215 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.spu_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockList.spu_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTableWarehouse" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.stockList.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.stockList.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.stockList.sku_code')">+ <template #default="{ row }">+ <div :class="'text-decoration-none'" @click="method.showSkuInfo(row)"> {{ row.sku_code }}</div>+ </template>+ </vxe-column>+ <vxe-column field="qty" :title="$t('wms.stockList.qty')"></vxe-column>+ <vxe-column field="qty_available" :title="$t('wms.stockList.qty_available')"></vxe-column>+ <vxe-column field="qty_locked" :title="$t('wms.stockList.qty_locked')"></vxe-column>+ <vxe-column field="qty_frozen" :title="$t('wms.stockList.qty_frozen')"></vxe-column>+ <vxe-column field="qty_asn" :title="$t('wms.stockList.qty_asn')"></vxe-column>+ <vxe-column field="qty_to_unload" :title="$t('wms.stockList.qty_to_unload')"></vxe-column>+ <vxe-column field="qty_to_sort" :title="$t('wms.stockList.qty_to_sort')"></vxe-column>+ <vxe-column field="qty_sorted" :title="$t('wms.stockList.qty_sorted')"></vxe-column>+ <vxe-column field="shortage_qty" :title="$t('wms.stockList.shortage_qty')"></vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ <skuInfo :show-dialog="data.showDialogShowInfo" :sku_id="data.sku_id" @close="method.closeDialogShowInfo" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents, VxeTablePropTypes } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { StockVO } from '@/types/WMS/StockManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import { SearchObject } from '@/types/System/Form'+import { getStockList } from '@/api/wms/stockManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import skuInfo from './sku-info.vue'+import { exportData } from '@/utils/exportTable'++const xTableWarehouse = ref()++const data = reactive({+ sku_id: 0,+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ spu_name: ''+ },+ activeTab: null,+ tableData: ref<StockVO[]>([]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ closeDialogShowInfo: () => {+ data.showDialogShowInfo = false+ },+ showSkuInfo(row: StockVO) {+ data.sku_id = row.sku_id+ data.showDialogShowInfo = true+ },+ sumNum: (list: any[], field: string) => {+ let count = 0+ list.forEach((item) => {+ count += Number(item[field])+ })+ return count+ },+ // footerMethod:ref<VxeTablePropTypes.FooterMethod>({ columns, data }) => {+ // columns.map((column, columnIndex) => {+ // if (columnIndex === 0) {+ // return '合计'+ // }+ // if (['qty', 'qty_available'].includes(column.field)) {+ // return method.sumNum(data, column.field)+ // }+ // return null+ // })+ // },+ // Refresh data+ refresh: () => {+ method.getStockList()+ },+ getStockList: async () => {+ const { data: res } = await getStockList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getStockList()+ }),+ exportTable: () => {+ const $table = xTableWarehouse.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.stockManagement.stock'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getStockList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getStockList: method.getStockList+})+watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/wms/stockManagement/tabStockLocation.vue b/frontend/src/view/wms/stockManagement/tabStockLocation.vuenew file mode 100644index 0000000..7ae3408--- /dev/null+++ b/frontend/src/view/wms/stockManagement/tabStockLocation.vue@@ -0,0 +1,195 @@+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.location_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockLocation.location_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTableStockLocation" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="warehouse_name" :title="$t('wms.stockLocation.warehouse_name')"></vxe-column>+ <vxe-column field="location_name" :title="$t('wms.stockLocation.location_name')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.stockLocation.spu_code')">+ <template #default="{ row }">+ <div :class="'text-decoration-none'" @click="method.showSkuInfo(row)"> {{ row.sku_code }}</div>+ </template>+ </vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.stockLocation.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.stockLocation.sku_code')"></vxe-column>+ <vxe-column field="sku_name" :title="$t('wms.stockLocation.sku_name')"></vxe-column>+ <vxe-column field="qty" :title="$t('wms.stockLocation.qty')"></vxe-column>+ <vxe-column field="qty_available" :title="$t('wms.stockLocation.qty_available')"></vxe-column>+ <vxe-column field="qty_locked" :title="$t('wms.stockLocation.qty_locked')"></vxe-column>+ <vxe-column field="qty_frozen" :title="$t('wms.stockLocation.qty_frozen')"></vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ <skuInfo :show-dialog="data.showDialogShowInfo" :sku_id="data.sku_id" @close="method.closeDialogShowInfo" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { StockLocationVO } from '@/types/WMS/StockManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import { SearchObject } from '@/types/System/Form'+import { getStockLocationList } from '@/api/wms/stockManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import skuInfo from './sku-info.vue'+import { exportData } from '@/utils/exportTable'++const xTableStockLocation = ref()++const data = reactive({+ sku_id: 0,+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ location_name: ''+ },+ activeTab: null,+ tableData: ref<StockLocationVO[]>([]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ closeDialogShowInfo: () => {+ data.showDialogShowInfo = false+ },+ showSkuInfo(row: StockLocationVO) {+ data.sku_id = row.sku_id+ data.showDialogShowInfo = true+ },+ // Refresh data+ refresh: () => {+ method.getStockLocationList()+ },+ getStockLocationList: async () => {+ const { data: res } = await getStockLocationList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getStockLocationList()+ }),+ exportTable: () => {+ const $table = xTableStockLocation.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.stockManagement.stockLocation'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getStockLocationList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getStockLocationList: method.getStockLocationList+})+watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/vite-env.d.ts b/frontend/src/vite-env.d.tsnew file mode 100644index 0000000..11f02fe--- /dev/null+++ b/frontend/src/vite-env.d.ts@@ -0,0 +1 @@+/// <reference types="vite/client" />diff --git a/frontend/tsconfig.json b/frontend/tsconfig.jsonnew file mode 100644index 0000000..2a99648--- /dev/null+++ b/frontend/tsconfig.json@@ -0,0 +1,24 @@+{+ "compilerOptions": {+ "target": "ESNext",+ "useDefineForClassFields": true,+ "module": "ESNext",+ "moduleResolution": "Node",+ "strict": true,+ "jsx": "preserve",+ "resolveJsonModule": true,+ "isolatedModules": true,+ "esModuleInterop": true,+ "lib": ["ESNext", "DOM"],+ "skipLibCheck": true,+ "noEmit": true,+ // 加入以下配置项+ "baseUrl": ".", // 用于设置解析非相对模块名称的基本目录,相对模块不会受到baseUrl的影响+ "paths": {+ // 用于设置模块名到基于baseUrl的路径映射+ "@/*": ["src/*"]+ }+ },+ "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue", "src/api/sys/login.tsn.tssrc/api/sys/login.tslogisrc/api/sys/login.tssys/src/api/sys/login.tsapi/sys/login.ts"],+ "references": [{ "path": "./tsconfig.node.json" }]+}diff --git a/frontend/tsconfig.node.json b/frontend/tsconfig.node.jsonnew file mode 100644index 0000000..9d31e2a--- /dev/null+++ b/frontend/tsconfig.node.json@@ -0,0 +1,9 @@+{+ "compilerOptions": {+ "composite": true,+ "module": "ESNext",+ "moduleResolution": "Node",+ "allowSyntheticDefaultImports": true+ },+ "include": ["vite.config.ts"]+}diff --git a/frontend/vite.config.ts b/frontend/vite.config.tsnew file mode 100644index 0000000..4a96d92--- /dev/null+++ b/frontend/vite.config.ts@@ -0,0 +1,26 @@+import { defineConfig } from 'vite'+import vue from '@vitejs/plugin-vue'+import { resolve } from 'path'++// https://vitejs.dev/config/+export default defineConfig({+ plugins: [+ vue()+ ],+ resolve: {+ alias: {+ // 配置别名指向src目录+ '@': resolve(__dirname, 'src'),+ 'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js'+ },+ // 使用别名的文件后缀+ extensions: ['.js', '.json', '.ts']+ },+ css: {+ preprocessorOptions: {+ less: {+ javascriptEnabled: true+ }+ }+ }+})diff --git a/frontend/yarn.lock b/frontend/yarn.locknew file mode 100644index 0000000..faccf6c--- /dev/null+++ b/frontend/yarn.lock@@ -0,0 +1,3262 @@+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.+# yarn lockfile v1+++"@antfu/install-pkg@^0.1.1":+ version "0.1.1"+ resolved "https://registry.npmjs.org/@antfu/install-pkg/-/install-pkg-0.1.1.tgz#157bb04f0de8100b9e4c01734db1a6c77e98bbb5"+ integrity sha512-LyB/8+bSfa0DFGC06zpCEfs89/XoWZwws5ygEa5D+Xsm3OfI+aXQ86VgVG7Acyef+rSZ5HE7J8rrxzrQeM3PjQ==+ dependencies:+ execa "^5.1.1"+ find-up "^5.0.0"++"@antfu/utils@^0.5.2":+ version "0.5.2"+ resolved "https://registry.npmjs.org/@antfu/utils/-/utils-0.5.2.tgz#8c2d931ff927be0ebe740169874a3d4004ab414b"+ integrity sha512-CQkeV+oJxUazwjlHD0/3ZD08QWKuGQkhnrKo3e6ly5pd48VUpXbb77q0xMU4+vc2CkJnDS02Eq/M9ugyX20XZA==++"@antfu/utils@^0.7.2":+ version "0.7.2"+ resolved "https://registry.npmjs.org/@antfu/utils/-/utils-0.7.2.tgz#3bb6f37a6b188056fe9e2f363b6aa735ed65d7ca"+ integrity sha512-vy9fM3pIxZmX07dL+VX1aZe7ynZ+YyB0jY+jE6r3hOK6GNY2t6W8rzpFC4tgpbXUYABkFQwgJq2XYXlxbXAI0g==++"@babel/code-frame@^7.0.0":+ version "7.18.6"+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"+ integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==+ dependencies:+ "@babel/highlight" "^7.18.6"++"@babel/helper-validator-identifier@^7.18.6":+ version "7.19.1"+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"+ integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==++"@babel/highlight@^7.18.6":+ version "7.18.6"+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"+ integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==+ dependencies:+ "@babel/helper-validator-identifier" "^7.18.6"+ chalk "^2.0.0"+ js-tokens "^4.0.0"++"@babel/parser@^7.16.4":+ version "7.20.5"+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8"+ integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.4.tgz#4b31b9e3da2e4c12a8170bd682f713c775f68ab1"+ integrity sha512-VPuTzXFm/m2fcGfN6CiwZTlLzxrKsWbPkG7ArRFpuxyaHUm/XFHQPD4xNwZT6uUmpIHhnSjcaCmcla8COzmZ5Q==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.16.4.tgz#057d3e8b0ee41ff59386c33ba6dcf20f4bedd1f7"+ integrity sha512-rZzb7r22m20S1S7ufIc6DC6W659yxoOrl7sKP1nCYhuvUlnCFHVSbATG4keGUtV8rDz11sRRDbWkvQZpzPaHiw==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.16.4.tgz#62ccab8ac1d3e6ef1df3fa2e1974bc2b8528d74a"+ integrity sha512-MW+B2O++BkcOfMWmuHXB15/l1i7wXhJFqbJhp82IBOais8RBEQv2vQz/jHrDEHaY2X0QY7Wfw86SBL2PbVOr0g==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.4.tgz#c19a6489d626c36fc611c85ccd8a3333c1f2a930"+ integrity sha512-a28X1O//aOfxwJVZVs7ZfM8Tyih2Za4nKJrBwW5Wm4yKsnwBy9aiS/xwpxiiTRttw3EaTg4Srerhcm6z0bu9Wg==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.16.4.tgz#b726bbc84a1e277f6ec2509d10b8ee03f242b776"+ integrity sha512-e3doCr6Ecfwd7VzlaQqEPrnbvvPjE9uoTpxG5pyLzr2rI2NMjDHmvY1E5EO81O/e9TUOLLkXA5m6T8lfjK9yAA==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.4.tgz#364568e6ca2901297f247de0681c9b14bbe658c8"+ integrity sha512-Oup3G/QxBgvvqnXWrBed7xxkFNwAwJVHZcklWyQt7YCAL5bfUkaa6FVWnR78rNQiM8MqqLiT6ZTZSdUFuVIg1w==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.4.tgz#44701ba4a5497ba64eec0a6c9e221d8f46a25e72"+ integrity sha512-vAP+eYOxlN/Bpo/TZmzEQapNS8W1njECrqkTpNgvXskkkJC2AwOXwZWai/Kc2vEFZUXQttx6UJbj9grqjD/+9Q==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.16.4.tgz#b58fb418ec9ac714d8dbb38c787ff2441eb1d9db"+ integrity sha512-2zXoBhv4r5pZiyjBKrOdFP4CXOChxXiYD50LRUU+65DkdS5niPFHbboKZd/c81l0ezpw7AQnHeoCy5hFrzzs4g==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.16.4.tgz#b37f15ecddb53eeea466e5960e31a58f33e0e87e"+ integrity sha512-A47ZmtpIPyERxkSvIv+zLd6kNIOtJH03XA0Hy7jaceRDdQaQVGSDt4mZqpWqJYgDk9rg96aglbF6kCRvPGDSUA==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.16.4.tgz#117e32a9680b5deac184ebee122f8575369fad1b"+ integrity sha512-uxdSrpe9wFhz4yBwt2kl2TxS/NWEINYBUFIxQtaEVtglm1eECvsj1vEKI0KX2k2wCe17zDdQ3v+jVxfwVfvvjw==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.16.4.tgz#dd504fb83c280752d4b485d9acb3cf391cb7bf5b"+ integrity sha512-peDrrUuxbZ9Jw+DwLCh/9xmZAk0p0K1iY5d2IcwmnN+B87xw7kujOkig6ZRcZqgrXgeRGurRHn0ENMAjjD5DEg==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.4.tgz#9ab77e31cf3be1e35572afff94b51df8149d15bd"+ integrity sha512-sD9EEUoGtVhFjjsauWjflZklTNr57KdQ6xfloO4yH1u7vNQlOfAlhEzbyBKfgbJlW7rwXYBdl5/NcZ+Mg2XhQA==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.4.tgz#69d56c2a960808bee1c7b9b84a115220ec9ce05c"+ integrity sha512-X1HSqHUX9D+d0l6/nIh4ZZJ94eQky8d8z6yxAptpZE3FxCWYWvTDd9X9ST84MGZEJx04VYUD/AGgciddwO0b8g==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.4.tgz#9fc23583f4a1508a8d352bd376340e42217e8a90"+ integrity sha512-97ANpzyNp0GTXCt6SRdIx1ngwncpkV/z453ZuxbnBROCJ5p/55UjhbaG23UdHj88fGWLKPFtMoU4CBacz4j9FA==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.16.4.tgz#4cae1f70ac2943f076dd130c3c80d28f57bf75d1"+ integrity sha512-pUvPQLPmbEeJRPjP0DYTC1vjHyhrnCklQmCGYbipkep+oyfTn7GTBJXoPodR7ZS5upmEyc8lzAkn2o29wD786A==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.16.4.tgz#fdf494de07cda23a2dc4b71ff1e0848e4ee6539c"+ integrity sha512-N55Q0mJs3Sl8+utPRPBrL6NLYZKBCLLx0bme/+RbjvMforTGGzFvsRl4xLTZMUBFC1poDzBEPTEu5nxizQ9Nlw==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.4.tgz#b59ecb49087119c575c0f64d7e66001d52799e24"+ integrity sha512-LHSJLit8jCObEQNYkgsDYBh2JrJT53oJO2HVdkSYLa6+zuLJh0lAr06brXIkljrlI+N7NNW1IAXGn/6IZPi3YQ==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.4.tgz#c51e36db875948b7b11d08bafa355605a1aa289c"+ integrity sha512-nLgdc6tWEhcCFg/WVFaUxHcPK3AP/bh+KEwKtl69Ay5IBqUwKDaq/6Xk0E+fh/FGjnLwqFSsarsbPHeKM8t8Sw==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.16.4.tgz#0b50e941cd44f069e9f2573321aec984244ec228"+ integrity sha512-08SluG24GjPO3tXKk95/85n9kpyZtXCVwURR2i4myhrOfi3jspClV0xQQ0W0PYWHioJj+LejFMt41q+PG3mlAQ==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.16.4.tgz#d1c93b20f17355ab2221cd18e13ae2f1b68013e3"+ integrity sha512-yYiRDQcqLYQSvNQcBKN7XogbrSvBE45FEQdH8fuXPl7cngzkCvpsG2H9Uey39IjQ6gqqc+Q4VXYHsQcKW0OMjQ==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.16.4.tgz#df5910e76660e0acbbdceb8d4ae6bf1efeade6ae"+ integrity sha512-5rabnGIqexekYkh9zXG5waotq8mrdlRoBqAktjx2W3kb0zsI83mdCwrcAeKYirnUaTGztR5TxXcXmQrEzny83w==++"@esbuild/[email protected]":+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.4.tgz#6ec594468610c176933da1387c609558371d37e0"+ integrity sha512-sN/I8FMPtmtT2Yw+Dly8Ur5vQ5a/RmC8hW7jO9PtPSQUPkowxWpcUZnqOggU7VwyT3Xkj6vcXWd3V/qTXwultQ==++"@fast-csv/[email protected]":+ version "4.3.5"+ resolved "https://registry.npmmirror.com/@fast-csv/format/-/format-4.3.5.tgz#90d83d1b47b6aaf67be70d6118f84f3e12ee1ff3"+ integrity sha512-8iRn6QF3I8Ak78lNAa+Gdl5MJJBM5vRHivFtMRUWINdevNo00K7OXxS2PshawLKTejVwieIlPmK5YlLu6w4u8A==+ dependencies:+ "@types/node" "^14.0.1"+ lodash.escaperegexp "^4.1.2"+ lodash.isboolean "^3.0.3"+ lodash.isequal "^4.5.0"+ lodash.isfunction "^3.0.9"+ lodash.isnil "^4.0.0"++"@fast-csv/[email protected]":+ version "4.3.6"+ resolved "https://registry.npmmirror.com/@fast-csv/parse/-/parse-4.3.6.tgz#ee47d0640ca0291034c7aa94039a744cfb019264"+ integrity sha512-uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA==+ dependencies:+ "@types/node" "^14.0.1"+ lodash.escaperegexp "^4.1.2"+ lodash.groupby "^4.6.0"+ lodash.isfunction "^3.0.9"+ lodash.isnil "^4.0.0"+ lodash.isundefined "^3.0.1"+ lodash.uniq "^4.5.0"++"@iconify/types@^2.0.0":+ version "2.0.0"+ resolved "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz#ab0e9ea681d6c8a1214f30cd741fe3a20cc57f57"+ integrity sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==++"@iconify/utils@^2.0.3":+ version "2.0.3"+ resolved "https://registry.npmjs.org/@iconify/utils/-/utils-2.0.3.tgz#87a6524348197d229b04bcc1db8ffebf31f3d09d"+ integrity sha512-kLpJ95/ZeT1+vIstjdeFnyfiEmmTJuekGb5SVykfKjLSJjmftTCzm7sxxzNHsd8i5mpKPl7Rws9sLGR3juKJ+g==+ dependencies:+ "@antfu/install-pkg" "^0.1.1"+ "@antfu/utils" "^0.5.2"+ "@iconify/types" "^2.0.0"+ debug "^4.3.4"+ kolorist "^1.6.0"+ local-pkg "^0.4.2"++"@intlify/[email protected]":+ version "9.2.2"+ resolved "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.2.2.tgz#5353369b05cc9fe35cab95fe20afeb8a4481f939"+ integrity sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==+ dependencies:+ "@intlify/devtools-if" "9.2.2"+ "@intlify/message-compiler" "9.2.2"+ "@intlify/shared" "9.2.2"+ "@intlify/vue-devtools" "9.2.2"++"@intlify/[email protected]":+ version "9.2.2"+ resolved "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.2.2.tgz#b13d9ac4b4e2fe6d2e7daa556517a8061fe8bd39"+ integrity sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==+ dependencies:+ "@intlify/shared" "9.2.2"++"@intlify/[email protected]":+ version "9.2.2"+ resolved "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.2.tgz#e42ab6939b8ae5b3d21faf6a44045667a18bba1c"+ integrity sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==+ dependencies:+ "@intlify/shared" "9.2.2"+ source-map "0.6.1"++"@intlify/[email protected]":+ version "9.2.2"+ resolved "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.2.tgz#5011be9ca2b4ab86f8660739286e2707f9abb4a5"+ integrity sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==++"@intlify/[email protected]":+ version "9.2.2"+ resolved "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz#b95701556daf7ebb3a2d45aa3ae9e6415aed8317"+ integrity sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==+ dependencies:+ "@intlify/core-base" "9.2.2"+ "@intlify/shared" "9.2.2"++"@jridgewell/sourcemap-codec@^1.4.13":+ version "1.4.14"+ resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"+ integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==++"@mdi/font@^7.1.96":+ version "7.1.96"+ resolved "https://registry.npmjs.org/@mdi/font/-/font-7.1.96.tgz#211ca4acfa31964278e5085de595e8c73967d400"+ integrity sha512-Imag6npmfkBDi2Ze2jiZVAPTDIKLxhz2Sx82xJ2zctyAU5LYJejLI5ChnDwiD9bMkQfVuzEsI98Q8toHyC+HCg==++"@nodelib/[email protected]":+ version "2.1.5"+ resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"+ integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==+ dependencies:+ "@nodelib/fs.stat" "2.0.5"+ run-parallel "^1.1.9"++"@nodelib/[email protected]", "@nodelib/fs.stat@^2.0.2":+ version "2.0.5"+ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"+ integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==++"@nodelib/fs.walk@^1.2.3":+ version "1.2.8"+ resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"+ integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==+ dependencies:+ "@nodelib/fs.scandir" "2.1.5"+ fastq "^1.6.0"++"@rollup/pluginutils@^5.0.2":+ version "5.0.2"+ resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz#012b8f53c71e4f6f9cb317e311df1404f56e7a33"+ integrity sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==+ dependencies:+ "@types/estree" "^1.0.0"+ estree-walker "^2.0.2"+ picomatch "^2.3.1"++"@types/estree@^1.0.0":+ version "1.0.0"+ resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"+ integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==++"@types/json-schema@^7.0.9":+ version "7.0.11"+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"+ integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==++"@types/json5@^0.0.29":+ version "0.0.29"+ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"+ integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==++"@types/node@^14.0.1":+ version "14.18.36"+ resolved "https://registry.npmmirror.com/@types/node/-/node-14.18.36.tgz#c414052cb9d43fab67d679d5f3c641be911f5835"+ integrity sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==++"@types/node@^18.11.13":+ version "18.11.13"+ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.13.tgz#dff34f226ec1ac0432ae3b136ec5552bd3b9c0fe"+ integrity sha512-IASpMGVcWpUsx5xBOrxMj7Bl8lqfuTY7FKAnPmu5cHkfQVWF8GulWS1jbRqA934qZL35xh5xN/+Xe/i26Bod4w==++"@types/semver@^7.3.12":+ version "7.3.13"+ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"+ integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==++"@typescript-eslint/eslint-plugin@^5.46.0":+ version "5.46.0"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.46.0.tgz#9a96a713b9616c783501a3c1774c9e2b40217ad0"+ integrity sha512-QrZqaIOzJAjv0sfjY4EjbXUi3ZOFpKfzntx22gPGr9pmFcTjcFw/1sS1LJhEubfAGwuLjNrPV0rH+D1/XZFy7Q==+ dependencies:+ "@typescript-eslint/scope-manager" "5.46.0"+ "@typescript-eslint/type-utils" "5.46.0"+ "@typescript-eslint/utils" "5.46.0"+ debug "^4.3.4"+ ignore "^5.2.0"+ natural-compare-lite "^1.4.0"+ regexpp "^3.2.0"+ semver "^7.3.7"+ tsutils "^3.21.0"++"@typescript-eslint/parser@^5.46.0":+ version "5.46.0"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.46.0.tgz#002d8e67122947922a62547acfed3347cbf2c0b6"+ integrity sha512-joNO6zMGUZg+C73vwrKXCd8usnsmOYmgW/w5ZW0pG0RGvqeznjtGDk61EqqTpNrFLUYBW2RSBFrxdAZMqA4OZA==+ dependencies:+ "@typescript-eslint/scope-manager" "5.46.0"+ "@typescript-eslint/types" "5.46.0"+ "@typescript-eslint/typescript-estree" "5.46.0"+ debug "^4.3.4"++"@typescript-eslint/[email protected]":+ version "5.46.0"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.46.0.tgz#60790b14d0c687dd633b22b8121374764f76ce0d"+ integrity sha512-7wWBq9d/GbPiIM6SqPK9tfynNxVbfpihoY5cSFMer19OYUA3l4powA2uv0AV2eAZV6KoAh6lkzxv4PoxOLh1oA==+ dependencies:+ "@typescript-eslint/types" "5.46.0"+ "@typescript-eslint/visitor-keys" "5.46.0"++"@typescript-eslint/[email protected]":+ version "5.46.0"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.46.0.tgz#3a4507b3b437e2fd9e95c3e5eea5ae16f79d64b3"+ integrity sha512-dwv4nimVIAsVS2dTA0MekkWaRnoYNXY26dKz8AN5W3cBFYwYGFQEqm/cG+TOoooKlncJS4RTbFKgcFY/pOiBCg==+ dependencies:+ "@typescript-eslint/typescript-estree" "5.46.0"+ "@typescript-eslint/utils" "5.46.0"+ debug "^4.3.4"+ tsutils "^3.21.0"++"@typescript-eslint/[email protected]":+ version "5.46.0"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.46.0.tgz#f4d76622a996b88153bbd829ea9ccb9f7a5d28bc"+ integrity sha512-wHWgQHFB+qh6bu0IAPAJCdeCdI0wwzZnnWThlmHNY01XJ9Z97oKqKOzWYpR2I83QmshhQJl6LDM9TqMiMwJBTw==++"@typescript-eslint/[email protected]":+ version "5.46.0"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.46.0.tgz#a6c2b84b9351f78209a1d1f2d99ca553f7fa29a5"+ integrity sha512-kDLNn/tQP+Yp8Ro2dUpyyVV0Ksn2rmpPpB0/3MO874RNmXtypMwSeazjEN/Q6CTp8D7ExXAAekPEcCEB/vtJkw==+ dependencies:+ "@typescript-eslint/types" "5.46.0"+ "@typescript-eslint/visitor-keys" "5.46.0"+ debug "^4.3.4"+ globby "^11.1.0"+ is-glob "^4.0.3"+ semver "^7.3.7"+ tsutils "^3.21.0"++"@typescript-eslint/[email protected]":+ version "5.46.0"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.46.0.tgz#600cd873ba471b7d8b0b9f35de34cf852c6fcb31"+ integrity sha512-4O+Ps1CRDw+D+R40JYh5GlKLQERXRKW5yIQoNDpmXPJ+C7kaPF9R7GWl+PxGgXjB3PQCqsaaZUpZ9dG4U6DO7g==+ dependencies:+ "@types/json-schema" "^7.0.9"+ "@types/semver" "^7.3.12"+ "@typescript-eslint/scope-manager" "5.46.0"+ "@typescript-eslint/types" "5.46.0"+ "@typescript-eslint/typescript-estree" "5.46.0"+ eslint-scope "^5.1.1"+ eslint-utils "^3.0.0"+ semver "^7.3.7"++"@typescript-eslint/[email protected]":+ version "5.46.0"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.0.tgz#36d87248ae20c61ef72404bcd61f14aa2563915f"+ integrity sha512-E13gBoIXmaNhwjipuvQg1ByqSAu/GbEpP/qzFihugJ+MomtoJtFAJG/+2DRPByf57B863m0/q7Zt16V9ohhANw==+ dependencies:+ "@typescript-eslint/types" "5.46.0"+ eslint-visitor-keys "^3.3.0"++"@vitejs/plugin-vue@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-4.0.0.tgz#93815beffd23db46288c787352a8ea31a0c03e5e"+ integrity sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==++"@volar/[email protected]":+ version "1.0.13"+ resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.0.13.tgz#b846c2afe730121525984ecc2dc473ce4565b68b"+ integrity sha512-aJhRiNjKFgLLB3nRJOfAeyle4StnEQgOKa0UpJU+k5EZd3QdiMfQmekXjxYeQj7NOZNQU7zCBEIvQ3gy15I7tA==+ dependencies:+ "@volar/source-map" "1.0.13"+ "@vue/reactivity" "^3.2.45"+ muggle-string "^0.1.0"++"@volar/[email protected]":+ version "1.0.13"+ resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.0.13.tgz#ede133b7bc39c9eb13a0c19204ac0a283845a104"+ integrity sha512-dU0plR9BS+bLs7u4chWay+VEIFTrLF15rG2634lGcu7o+z01bRO1U2cegZuIPy46SNkN3ONErLHwS09NBM+Ucg==+ dependencies:+ muggle-string "^0.1.0"++"@volar/[email protected]":+ version "1.0.13"+ resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.0.13.tgz#d70a1a1f240967035476b669bad508966897265f"+ integrity sha512-CfJ4higRZrLDAHVGY84gZ444ZUcA3ktPqVMW0fM3mgHDbzYViB3/tsvXOtZk76D3HK2ap6n4cDwBSv3cY4xqlg==+ dependencies:+ "@volar/language-core" "1.0.13"++"@volar/[email protected]":+ version "1.0.13"+ resolved "https://registry.yarnpkg.com/@volar/vue-language-core/-/vue-language-core-1.0.13.tgz#1ee3bff979f307471942b97bcdb3bbadecce5ae8"+ integrity sha512-DRUg7yk4w2+5XFk8LS1dbXEM0na2uAddOj3KWHROPQmn78pfgXEH3r0NGDCnxElWJX5Y16iameisOjtOhevxog==+ dependencies:+ "@volar/language-core" "1.0.13"+ "@volar/source-map" "1.0.13"+ "@vue/compiler-dom" "^3.2.45"+ "@vue/compiler-sfc" "^3.2.45"+ "@vue/reactivity" "^3.2.45"+ "@vue/shared" "^3.2.45"+ minimatch "^5.1.0"+ vue-template-compiler "^2.7.14"++"@volar/[email protected]":+ version "1.0.13"+ resolved "https://registry.yarnpkg.com/@volar/vue-typescript/-/vue-typescript-1.0.13.tgz#6b23c24e3029f2301ae9927143b888f05c6f0082"+ integrity sha512-iEdkF5l6G10fv/G5hs7WcvtT48AT6y/Pm7pvafnB6SxPhm2uHQ+130x3zeWLMaUel5t6h5LBw2pFsF5Bh85QAQ==+ dependencies:+ "@volar/typescript" "1.0.13"+ "@volar/vue-language-core" "1.0.13"++"@vue/[email protected]":+ version "3.2.45"+ resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.45.tgz#d9311207d96f6ebd5f4660be129fb99f01ddb41b"+ integrity sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==+ dependencies:+ "@babel/parser" "^7.16.4"+ "@vue/shared" "3.2.45"+ estree-walker "^2.0.2"+ source-map "^0.6.1"++"@vue/[email protected]", "@vue/compiler-dom@^3.2.45":+ version "3.2.45"+ resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz#c43cc15e50da62ecc16a42f2622d25dc5fd97dce"+ integrity sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==+ dependencies:+ "@vue/compiler-core" "3.2.45"+ "@vue/shared" "3.2.45"++"@vue/[email protected]", "@vue/compiler-sfc@^3.2.45":+ version "3.2.45"+ resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz#7f7989cc04ec9e7c55acd406827a2c4e96872c70"+ integrity sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==+ dependencies:+ "@babel/parser" "^7.16.4"+ "@vue/compiler-core" "3.2.45"+ "@vue/compiler-dom" "3.2.45"+ "@vue/compiler-ssr" "3.2.45"+ "@vue/reactivity-transform" "3.2.45"+ "@vue/shared" "3.2.45"+ estree-walker "^2.0.2"+ magic-string "^0.25.7"+ postcss "^8.1.10"+ source-map "^0.6.1"++"@vue/[email protected]":+ version "3.2.45"+ resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz#bd20604b6e64ea15344d5b6278c4141191c983b2"+ integrity sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==+ dependencies:+ "@vue/compiler-dom" "3.2.45"+ "@vue/shared" "3.2.45"++"@vue/devtools-api@^6.0.0-beta.11", "@vue/devtools-api@^6.2.1", "@vue/devtools-api@^6.4.5":+ version "6.4.5"+ resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.4.5.tgz#d54e844c1adbb1e677c81c665ecef1a2b4bb8380"+ integrity sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==++"@vue/[email protected]":+ version "3.2.45"+ resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz#07ac83b8138550c83dfb50db43cde1e0e5e8124d"+ integrity sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==+ dependencies:+ "@babel/parser" "^7.16.4"+ "@vue/compiler-core" "3.2.45"+ "@vue/shared" "3.2.45"+ estree-walker "^2.0.2"+ magic-string "^0.25.7"++"@vue/[email protected]", "@vue/reactivity@^3.2.45":+ version "3.2.45"+ resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.45.tgz#412a45b574de601be5a4a5d9a8cbd4dee4662ff0"+ integrity sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==+ dependencies:+ "@vue/shared" "3.2.45"++"@vue/[email protected]":+ version "3.2.45"+ resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.45.tgz#7ad7ef9b2519d41062a30c6fa001ec43ac549c7f"+ integrity sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==+ dependencies:+ "@vue/reactivity" "3.2.45"+ "@vue/shared" "3.2.45"++"@vue/[email protected]":+ version "3.2.45"+ resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz#1a2ef6ee2ad876206fbbe2a884554bba2d0faf59"+ integrity sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==+ dependencies:+ "@vue/runtime-core" "3.2.45"+ "@vue/shared" "3.2.45"+ csstype "^2.6.8"++"@vue/[email protected]":+ version "3.2.45"+ resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.45.tgz#ca9306a0c12b0530a1a250e44f4a0abac6b81f3f"+ integrity sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==+ dependencies:+ "@vue/compiler-ssr" "3.2.45"+ "@vue/shared" "3.2.45"++"@vue/[email protected]", "@vue/shared@^3.2.45":+ version "3.2.45"+ resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.45.tgz#a3fffa7489eafff38d984e23d0236e230c818bc2"+ integrity sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==++acorn-jsx@^5.2.0, acorn-jsx@^5.3.1, acorn-jsx@^5.3.2:+ version "5.3.2"+ resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"+ integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==++acorn@^7.1.1, acorn@^7.4.0:+ version "7.4.1"+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"+ integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==++acorn@^8.8.0, acorn@^8.8.1:+ version "8.8.1"+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"+ integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==++adler-32@~1.3.0:+ version "1.3.1"+ resolved "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz#1dbf0b36dda0012189a32b3679061932df1821e2"+ integrity sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==++ajv@^6.10.0, ajv@^6.10.2:+ version "6.12.6"+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"+ integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==+ dependencies:+ fast-deep-equal "^3.1.1"+ fast-json-stable-stringify "^2.0.0"+ json-schema-traverse "^0.4.1"+ uri-js "^4.2.2"++ansi-escapes@^4.2.1:+ version "4.3.2"+ resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"+ integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==+ dependencies:+ type-fest "^0.21.3"++ansi-regex@^4.1.0:+ version "4.1.1"+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"+ integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==++ansi-regex@^5.0.1:+ version "5.0.1"+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"+ integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==++ansi-styles@^3.2.0, ansi-styles@^3.2.1:+ version "3.2.1"+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"+ integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==+ dependencies:+ color-convert "^1.9.0"++ansi-styles@^4.1.0:+ version "4.3.0"+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"+ integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==+ dependencies:+ color-convert "^2.0.1"++anymatch@~3.1.2:+ version "3.1.3"+ resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"+ integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==+ dependencies:+ normalize-path "^3.0.0"+ picomatch "^2.0.4"++archiver-utils@^2.1.0:+ version "2.1.0"+ resolved "https://registry.npmmirror.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2"+ integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==+ dependencies:+ glob "^7.1.4"+ graceful-fs "^4.2.0"+ lazystream "^1.0.0"+ lodash.defaults "^4.2.0"+ lodash.difference "^4.5.0"+ lodash.flatten "^4.4.0"+ lodash.isplainobject "^4.0.6"+ lodash.union "^4.6.0"+ normalize-path "^3.0.0"+ readable-stream "^2.0.0"++archiver@^5.0.0:+ version "5.3.1"+ resolved "https://registry.npmmirror.com/archiver/-/archiver-5.3.1.tgz#21e92811d6f09ecfce649fbefefe8c79e57cbbb6"+ integrity sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==+ dependencies:+ archiver-utils "^2.1.0"+ async "^3.2.3"+ buffer-crc32 "^0.2.1"+ readable-stream "^3.6.0"+ readdir-glob "^1.0.0"+ tar-stream "^2.2.0"+ zip-stream "^4.1.0"++argparse@^1.0.7:+ version "1.0.10"+ resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"+ integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==+ dependencies:+ sprintf-js "~1.0.2"++array-includes@^3.1.4:+ version "3.1.6"+ resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"+ integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==+ dependencies:+ call-bind "^1.0.2"+ define-properties "^1.1.4"+ es-abstract "^1.20.4"+ get-intrinsic "^1.1.3"+ is-string "^1.0.7"++array-union@^2.1.0:+ version "2.1.0"+ resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"+ integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==++array.prototype.flat@^1.2.5:+ version "1.3.1"+ resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"+ integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==+ dependencies:+ call-bind "^1.0.2"+ define-properties "^1.1.4"+ es-abstract "^1.20.4"+ es-shim-unscopables "^1.0.0"++astral-regex@^1.0.0:+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"+ integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==++async@^3.2.3:+ version "3.2.4"+ resolved "https://registry.npmmirror.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"+ integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==++asynckit@^0.4.0:+ version "0.4.0"+ resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"+ integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==++axios@^1.2.1:+ version "1.2.1"+ resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.1.tgz#44cf04a3c9f0c2252ebd85975361c026cb9f864a"+ integrity sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==+ dependencies:+ follow-redirects "^1.15.0"+ form-data "^4.0.0"+ proxy-from-env "^1.1.0"++balanced-match@^1.0.0:+ version "1.0.2"+ resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"+ integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==++base64-js@^1.3.1:+ version "1.5.1"+ resolved "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"+ integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==++big-integer@^1.6.17:+ version "1.6.51"+ resolved "https://registry.npmmirror.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686"+ integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==++binary-extensions@^2.0.0:+ version "2.2.0"+ resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"+ integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==++binary@~0.3.0:+ version "0.3.0"+ resolved "https://registry.npmmirror.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79"+ integrity sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==+ dependencies:+ buffers "~0.1.1"+ chainsaw "~0.1.0"++bl@^4.0.3:+ version "4.1.0"+ resolved "https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"+ integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==+ dependencies:+ buffer "^5.5.0"+ inherits "^2.0.4"+ readable-stream "^3.4.0"++bluebird@~3.4.1:+ version "3.4.7"+ resolved "https://registry.npmmirror.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"+ integrity sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==++brace-expansion@^1.1.7:+ version "1.1.11"+ resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"+ integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==+ dependencies:+ balanced-match "^1.0.0"+ concat-map "0.0.1"++brace-expansion@^2.0.1:+ version "2.0.1"+ resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"+ integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==+ dependencies:+ balanced-match "^1.0.0"++braces@^3.0.2, braces@~3.0.2:+ version "3.0.2"+ resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"+ integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==+ dependencies:+ fill-range "^7.0.1"++buffer-crc32@^0.2.1, buffer-crc32@^0.2.13:+ version "0.2.13"+ resolved "https://registry.npmmirror.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"+ integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==++buffer-indexof-polyfill@~1.0.0:+ version "1.0.2"+ resolved "https://registry.npmmirror.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz#d2732135c5999c64b277fcf9b1abe3498254729c"+ integrity sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==++buffer@^5.5.0:+ version "5.7.1"+ resolved "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"+ integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==+ dependencies:+ base64-js "^1.3.1"+ ieee754 "^1.1.13"++buffers@~0.1.1:+ version "0.1.1"+ resolved "https://registry.npmmirror.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"+ integrity sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==++call-bind@^1.0.0, call-bind@^1.0.2:+ version "1.0.2"+ resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"+ integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==+ dependencies:+ function-bind "^1.1.1"+ get-intrinsic "^1.0.2"++callsites@^3.0.0:+ version "3.1.0"+ resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"+ integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==++cfb@~1.2.1:+ version "1.2.2"+ resolved "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz#94e687628c700e5155436dac05f74e08df23bc44"+ integrity sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==+ dependencies:+ adler-32 "~1.3.0"+ crc-32 "~1.2.0"++chainsaw@~0.1.0:+ version "0.1.0"+ resolved "https://registry.npmmirror.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98"+ integrity sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==+ dependencies:+ traverse ">=0.3.0 <0.4"++chalk@^2.0.0:+ version "2.4.2"+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"+ integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==+ dependencies:+ ansi-styles "^3.2.1"+ escape-string-regexp "^1.0.5"+ supports-color "^5.3.0"++chalk@^4.0.0, chalk@^4.1.0:+ version "4.1.2"+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"+ integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==+ dependencies:+ ansi-styles "^4.1.0"+ supports-color "^7.1.0"++chardet@^0.7.0:+ version "0.7.0"+ resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"+ integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==++chokidar@^3.5.3:+ version "3.5.3"+ resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"+ integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==+ dependencies:+ anymatch "~3.1.2"+ braces "~3.0.2"+ glob-parent "~5.1.2"+ is-binary-path "~2.1.0"+ is-glob "~4.0.1"+ normalize-path "~3.0.0"+ readdirp "~3.6.0"+ optionalDependencies:+ fsevents "~2.3.2"++cli-cursor@^3.1.0:+ version "3.1.0"+ resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"+ integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==+ dependencies:+ restore-cursor "^3.1.0"++cli-width@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"+ integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==++codepage@~1.15.0:+ version "1.15.0"+ resolved "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz#2e00519024b39424ec66eeb3ec07227e692618ab"+ integrity sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==++color-convert@^1.9.0:+ version "1.9.3"+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"+ integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==+ dependencies:+ color-name "1.1.3"++color-convert@^2.0.1:+ version "2.0.1"+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"+ integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==+ dependencies:+ color-name "~1.1.4"++ version "1.1.3"+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"+ integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==++color-name@~1.1.4:+ version "1.1.4"+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"+ integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==++combined-stream@^1.0.8:+ version "1.0.8"+ resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"+ integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==+ dependencies:+ delayed-stream "~1.0.0"++compress-commons@^4.1.0:+ version "4.1.1"+ resolved "https://registry.npmmirror.com/compress-commons/-/compress-commons-4.1.1.tgz#df2a09a7ed17447642bad10a85cc9a19e5c42a7d"+ integrity sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==+ dependencies:+ buffer-crc32 "^0.2.13"+ crc32-stream "^4.0.2"+ normalize-path "^3.0.0"+ readable-stream "^3.6.0"++ version "0.0.1"+ resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"+ integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==++confusing-browser-globals@^1.0.10:+ version "1.0.11"+ resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"+ integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==++copy-anything@^2.0.1:+ version "2.0.6"+ resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.6.tgz#092454ea9584a7b7ad5573062b2a87f5900fc480"+ integrity sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==+ dependencies:+ is-what "^3.14.1"++core-util-is@~1.0.0:+ version "1.0.3"+ resolved "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"+ integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==++crc-32@^1.2.0, crc-32@~1.2.0, crc-32@~1.2.1:+ version "1.2.2"+ resolved "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff"+ integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==++crc32-stream@^4.0.2:+ version "4.0.2"+ resolved "https://registry.npmmirror.com/crc32-stream/-/crc32-stream-4.0.2.tgz#c922ad22b38395abe9d3870f02fa8134ed709007"+ integrity sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==+ dependencies:+ crc-32 "^1.2.0"+ readable-stream "^3.4.0"++cross-spawn@^7.0.2, cross-spawn@^7.0.3:+ version "7.0.3"+ resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"+ integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==+ dependencies:+ path-key "^3.1.0"+ shebang-command "^2.0.0"+ which "^2.0.1"++csstype@^2.6.8:+ version "2.6.21"+ resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e"+ integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==++dayjs@^1.8.34:+ version "1.11.7"+ resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"+ integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==++de-indent@^1.0.2:+ version "1.0.2"+ resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"+ integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==++debug@^2.6.9:+ version "2.6.9"+ resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"+ integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==+ dependencies:+ ms "2.0.0"++debug@^3.2.6, debug@^3.2.7:+ version "3.2.7"+ resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"+ integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==+ dependencies:+ ms "^2.1.1"++debug@^4.0.1, debug@^4.1.1, debug@^4.3.4:+ version "4.3.4"+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"+ integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==+ dependencies:+ ms "2.1.2"++deep-is@^0.1.3:+ version "0.1.4"+ resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"+ integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==++deepmerge@^4.2.2:+ version "4.2.2"+ resolved "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"+ integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==++define-properties@^1.1.3, define-properties@^1.1.4:+ version "1.1.4"+ resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"+ integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==+ dependencies:+ has-property-descriptors "^1.0.0"+ object-keys "^1.1.1"++delayed-stream@~1.0.0:+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"+ integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==++dir-glob@^3.0.1:+ version "3.0.1"+ resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"+ integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==+ dependencies:+ path-type "^4.0.0"++doctrine@^2.1.0:+ version "2.1.0"+ resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"+ integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==+ dependencies:+ esutils "^2.0.2"++doctrine@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"+ integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==+ dependencies:+ esutils "^2.0.2"++duplexer2@~0.1.4:+ version "0.1.4"+ resolved "https://registry.npmmirror.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"+ integrity sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==+ dependencies:+ readable-stream "^2.0.2"++emoji-regex@^7.0.1:+ version "7.0.3"+ resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"+ integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==++emoji-regex@^8.0.0:+ version "8.0.0"+ resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"+ integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==++end-of-stream@^1.4.1:+ version "1.4.4"+ resolved "https://registry.npmmirror.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"+ integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==+ dependencies:+ once "^1.4.0"++errno@^0.1.1:+ version "0.1.8"+ resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"+ integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==+ dependencies:+ prr "~1.0.1"++es-abstract@^1.19.0, es-abstract@^1.20.4:+ version "1.20.5"+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.5.tgz#e6dc99177be37cacda5988e692c3fa8b218e95d2"+ integrity sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==+ dependencies:+ call-bind "^1.0.2"+ es-to-primitive "^1.2.1"+ function-bind "^1.1.1"+ function.prototype.name "^1.1.5"+ get-intrinsic "^1.1.3"+ get-symbol-description "^1.0.0"+ gopd "^1.0.1"+ has "^1.0.3"+ has-property-descriptors "^1.0.0"+ has-symbols "^1.0.3"+ internal-slot "^1.0.3"+ is-callable "^1.2.7"+ is-negative-zero "^2.0.2"+ is-regex "^1.1.4"+ is-shared-array-buffer "^1.0.2"+ is-string "^1.0.7"+ is-weakref "^1.0.2"+ object-inspect "^1.12.2"+ object-keys "^1.1.1"+ object.assign "^4.1.4"+ regexp.prototype.flags "^1.4.3"+ safe-regex-test "^1.0.0"+ string.prototype.trimend "^1.0.6"+ string.prototype.trimstart "^1.0.6"+ unbox-primitive "^1.0.2"++es-shim-unscopables@^1.0.0:+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"+ integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==+ dependencies:+ has "^1.0.3"++es-to-primitive@^1.2.1:+ version "1.2.1"+ resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"+ integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==+ dependencies:+ is-callable "^1.1.4"+ is-date-object "^1.0.1"+ is-symbol "^1.0.2"++esbuild@^0.16.3:+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.16.4.tgz#06c86298d233386f5e41bcc14d36086daf3f40bd"+ integrity sha512-qQrPMQpPTWf8jHugLWHoGqZjApyx3OEm76dlTXobHwh/EBbavbRdjXdYi/GWr43GyN0sfpap14GPkb05NH3ROA==+ optionalDependencies:+ "@esbuild/android-arm" "0.16.4"+ "@esbuild/android-arm64" "0.16.4"+ "@esbuild/android-x64" "0.16.4"+ "@esbuild/darwin-arm64" "0.16.4"+ "@esbuild/darwin-x64" "0.16.4"+ "@esbuild/freebsd-arm64" "0.16.4"+ "@esbuild/freebsd-x64" "0.16.4"+ "@esbuild/linux-arm" "0.16.4"+ "@esbuild/linux-arm64" "0.16.4"+ "@esbuild/linux-ia32" "0.16.4"+ "@esbuild/linux-loong64" "0.16.4"+ "@esbuild/linux-mips64el" "0.16.4"+ "@esbuild/linux-ppc64" "0.16.4"+ "@esbuild/linux-riscv64" "0.16.4"+ "@esbuild/linux-s390x" "0.16.4"+ "@esbuild/linux-x64" "0.16.4"+ "@esbuild/netbsd-x64" "0.16.4"+ "@esbuild/openbsd-x64" "0.16.4"+ "@esbuild/sunos-x64" "0.16.4"+ "@esbuild/win32-arm64" "0.16.4"+ "@esbuild/win32-ia32" "0.16.4"+ "@esbuild/win32-x64" "0.16.4"++escape-string-regexp@^1.0.5:+ version "1.0.5"+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"+ integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==++escape-string-regexp@^5.0.0:+ version "5.0.0"+ resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"+ integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==++ version "14.2.1"+ resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz#8a2eb38455dc5a312550193b319cdaeef042cd1e"+ integrity sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==+ dependencies:+ confusing-browser-globals "^1.0.10"+ object.assign "^4.1.2"+ object.entries "^1.1.2"++eslint-import-resolver-node@^0.3.6:+ version "0.3.6"+ resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"+ integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==+ dependencies:+ debug "^3.2.7"+ resolve "^1.20.0"++eslint-module-utils@^2.7.3:+ version "2.7.4"+ resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974"+ integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==+ dependencies:+ debug "^3.2.7"++eslint-plugin-import@^2.26.0:+ version "2.26.0"+ resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"+ integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==+ dependencies:+ array-includes "^3.1.4"+ array.prototype.flat "^1.2.5"+ debug "^2.6.9"+ doctrine "^2.1.0"+ eslint-import-resolver-node "^0.3.6"+ eslint-module-utils "^2.7.3"+ has "^1.0.3"+ is-core-module "^2.8.1"+ is-glob "^4.0.3"+ minimatch "^3.1.2"+ object.values "^1.1.5"+ resolve "^1.22.0"+ tsconfig-paths "^3.14.1"++ version "7.20.0"+ resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.20.0.tgz#98c21885a6bfdf0713c3a92957a5afeaaeed9253"+ integrity sha512-oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw==+ dependencies:+ eslint-utils "^2.1.0"+ natural-compare "^1.4.0"+ semver "^6.3.0"+ vue-eslint-parser "^7.10.0"++eslint-scope@^5.1.0, eslint-scope@^5.1.1:+ version "5.1.1"+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"+ integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==+ dependencies:+ esrecurse "^4.3.0"+ estraverse "^4.1.1"++eslint-scope@^7.1.1:+ version "7.1.1"+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"+ integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==+ dependencies:+ esrecurse "^4.3.0"+ estraverse "^5.2.0"++eslint-utils@^2.0.0, eslint-utils@^2.1.0:+ version "2.1.0"+ resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"+ integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==+ dependencies:+ eslint-visitor-keys "^1.1.0"++eslint-utils@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"+ integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==+ dependencies:+ eslint-visitor-keys "^2.0.0"++eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.2.0, eslint-visitor-keys@^1.3.0:+ version "1.3.0"+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"+ integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==++eslint-visitor-keys@^2.0.0:+ version "2.1.0"+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"+ integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==++eslint-visitor-keys@^3.3.0:+ version "3.3.0"+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"+ integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==++ version "7.2.0"+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.2.0.tgz#d41b2e47804b30dbabb093a967fb283d560082e6"+ integrity sha512-B3BtEyaDKC5MlfDa2Ha8/D6DsS4fju95zs0hjS3HdGazw+LNayai38A25qMppK37wWGWNYSPOR6oYzlz5MHsRQ==+ dependencies:+ "@babel/code-frame" "^7.0.0"+ ajv "^6.10.0"+ chalk "^4.0.0"+ cross-spawn "^7.0.2"+ debug "^4.0.1"+ doctrine "^3.0.0"+ eslint-scope "^5.1.0"+ eslint-utils "^2.0.0"+ eslint-visitor-keys "^1.2.0"+ espree "^7.1.0"+ esquery "^1.2.0"+ esutils "^2.0.2"+ file-entry-cache "^5.0.1"+ functional-red-black-tree "^1.0.1"+ glob-parent "^5.0.0"+ globals "^12.1.0"+ ignore "^4.0.6"+ import-fresh "^3.0.0"+ imurmurhash "^0.1.4"+ inquirer "^7.0.0"+ is-glob "^4.0.0"+ js-yaml "^3.13.1"+ json-stable-stringify-without-jsonify "^1.0.1"+ levn "^0.4.1"+ lodash "^4.17.14"+ minimatch "^3.0.4"+ natural-compare "^1.4.0"+ optionator "^0.9.1"+ progress "^2.0.0"+ regexpp "^3.1.0"+ semver "^7.2.1"+ strip-ansi "^6.0.0"+ strip-json-comments "^3.1.0"+ table "^5.2.3"+ text-table "^0.2.0"+ v8-compile-cache "^2.0.3"++espree@^6.2.1:+ version "6.2.1"+ resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"+ integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==+ dependencies:+ acorn "^7.1.1"+ acorn-jsx "^5.2.0"+ eslint-visitor-keys "^1.1.0"++espree@^7.1.0:+ version "7.3.1"+ resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"+ integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==+ dependencies:+ acorn "^7.4.0"+ acorn-jsx "^5.3.1"+ eslint-visitor-keys "^1.3.0"++espree@^9.3.1:+ version "9.4.1"+ resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd"+ integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==+ dependencies:+ acorn "^8.8.0"+ acorn-jsx "^5.3.2"+ eslint-visitor-keys "^3.3.0"++esprima@^4.0.0:+ version "4.0.1"+ resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"+ integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==++esquery@^1.2.0, esquery@^1.4.0:+ version "1.4.0"+ resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"+ integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==+ dependencies:+ estraverse "^5.1.0"++esrecurse@^4.3.0:+ version "4.3.0"+ resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"+ integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==+ dependencies:+ estraverse "^5.2.0"++estraverse@^4.1.1:+ version "4.3.0"+ resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"+ integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==++estraverse@^5.1.0, estraverse@^5.2.0:+ version "5.3.0"+ resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"+ integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==++estree-walker@^2.0.2:+ version "2.0.2"+ resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"+ integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==++esutils@^2.0.2:+ version "2.0.3"+ resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"+ integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==++exceljs@^4.3.0:+ version "4.3.0"+ resolved "https://registry.npmmirror.com/exceljs/-/exceljs-4.3.0.tgz#939bc0d4c59c200acadb7051be34d25c109853c4"+ integrity sha512-hTAeo5b5TPvf8Z02I2sKIT4kSfCnOO2bCxYX8ABqODCdAjppI3gI9VYiGCQQYVcBaBSKlFDMKlAQRqC+kV9O8w==+ dependencies:+ archiver "^5.0.0"+ dayjs "^1.8.34"+ fast-csv "^4.3.1"+ jszip "^3.5.0"+ readable-stream "^3.6.0"+ saxes "^5.0.1"+ tmp "^0.2.0"+ unzipper "^0.10.11"+ uuid "^8.3.0"++execa@^5.1.1:+ version "5.1.1"+ resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"+ integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==+ dependencies:+ cross-spawn "^7.0.3"+ get-stream "^6.0.0"+ human-signals "^2.1.0"+ is-stream "^2.0.0"+ merge-stream "^2.0.0"+ npm-run-path "^4.0.1"+ onetime "^5.1.2"+ signal-exit "^3.0.3"+ strip-final-newline "^2.0.0"++external-editor@^3.0.3:+ version "3.1.0"+ resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"+ integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==+ dependencies:+ chardet "^0.7.0"+ iconv-lite "^0.4.24"+ tmp "^0.0.33"++fast-csv@^4.3.1:+ version "4.3.6"+ resolved "https://registry.npmmirror.com/fast-csv/-/fast-csv-4.3.6.tgz#70349bdd8fe4d66b1130d8c91820b64a21bc4a63"+ integrity sha512-2RNSpuwwsJGP0frGsOmTb9oUF+VkFSM4SyLTDgwf2ciHWTarN0lQTC+F2f/t5J9QjW+c65VFIAAu85GsvMIusw==+ dependencies:+ "@fast-csv/format" "4.3.5"+ "@fast-csv/parse" "4.3.6"++fast-deep-equal@^3.1.1:+ version "3.1.3"+ resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"+ integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==++fast-glob@^3.2.12, fast-glob@^3.2.9:+ version "3.2.12"+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"+ integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==+ dependencies:+ "@nodelib/fs.stat" "^2.0.2"+ "@nodelib/fs.walk" "^1.2.3"+ glob-parent "^5.1.2"+ merge2 "^1.3.0"+ micromatch "^4.0.4"++fast-json-stable-stringify@^2.0.0:+ version "2.1.0"+ resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"+ integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==++fast-levenshtein@^2.0.6:+ version "2.0.6"+ resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"+ integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==++fastq@^1.6.0:+ version "1.14.0"+ resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.14.0.tgz#107f69d7295b11e0fccc264e1fc6389f623731ce"+ integrity sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==+ dependencies:+ reusify "^1.0.4"++figures@^3.0.0:+ version "3.2.0"+ resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"+ integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==+ dependencies:+ escape-string-regexp "^1.0.5"++file-entry-cache@^5.0.1:+ version "5.0.1"+ resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"+ integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==+ dependencies:+ flat-cache "^2.0.1"++fill-range@^7.0.1:+ version "7.0.1"+ resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"+ integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==+ dependencies:+ to-regex-range "^5.0.1"++find-up@^5.0.0:+ version "5.0.0"+ resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"+ integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==+ dependencies:+ locate-path "^6.0.0"+ path-exists "^4.0.0"++flat-cache@^2.0.1:+ version "2.0.1"+ resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"+ integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==+ dependencies:+ flatted "^2.0.0"+ rimraf "2.6.3"+ write "1.0.3"++flatted@^2.0.0:+ version "2.0.2"+ resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"+ integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==++flatted@^3.0.5:+ version "3.2.7"+ resolved "https://registry.npmmirror.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"+ integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==++follow-redirects@^1.15.0:+ version "1.15.2"+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"+ integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==++form-data@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"+ integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==+ dependencies:+ asynckit "^0.4.0"+ combined-stream "^1.0.8"+ mime-types "^2.1.12"++frac@~1.1.2:+ version "1.1.2"+ resolved "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b"+ integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==++fs-constants@^1.0.0:+ version "1.0.0"+ resolved "https://registry.npmmirror.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"+ integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==++fs.realpath@^1.0.0:+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"+ integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==++fsevents@~2.3.2:+ version "2.3.2"+ resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"+ integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==++fstream@^1.0.12:+ version "1.0.12"+ resolved "https://registry.npmmirror.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"+ integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==+ dependencies:+ graceful-fs "^4.1.2"+ inherits "~2.0.0"+ mkdirp ">=0.5 0"+ rimraf "2"++function-bind@^1.1.1:+ version "1.1.1"+ resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"+ integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==++function.prototype.name@^1.1.5:+ version "1.1.5"+ resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"+ integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==+ dependencies:+ call-bind "^1.0.2"+ define-properties "^1.1.3"+ es-abstract "^1.19.0"+ functions-have-names "^1.2.2"++functional-red-black-tree@^1.0.1:+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"+ integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==++functions-have-names@^1.2.2:+ version "1.2.3"+ resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"+ integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==++get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3:+ version "1.1.3"+ resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"+ integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==+ dependencies:+ function-bind "^1.1.1"+ has "^1.0.3"+ has-symbols "^1.0.3"++get-stream@^6.0.0:+ version "6.0.1"+ resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"+ integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==++get-symbol-description@^1.0.0:+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"+ integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==+ dependencies:+ call-bind "^1.0.2"+ get-intrinsic "^1.1.1"++glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.2:+ version "5.1.2"+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"+ integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==+ dependencies:+ is-glob "^4.0.1"++glob@^7.1.3, glob@^7.1.4:+ version "7.2.3"+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"+ integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==+ dependencies:+ fs.realpath "^1.0.0"+ inflight "^1.0.4"+ inherits "2"+ minimatch "^3.1.1"+ once "^1.3.0"+ path-is-absolute "^1.0.0"++globals@^12.1.0:+ version "12.4.0"+ resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"+ integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==+ dependencies:+ type-fest "^0.8.1"++globby@^11.1.0:+ version "11.1.0"+ resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"+ integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==+ dependencies:+ array-union "^2.1.0"+ dir-glob "^3.0.1"+ fast-glob "^3.2.9"+ ignore "^5.2.0"+ merge2 "^1.4.1"+ slash "^3.0.0"++gopd@^1.0.1:+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"+ integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==+ dependencies:+ get-intrinsic "^1.1.3"++graceful-fs@^4.1.2, graceful-fs@^4.2.0, graceful-fs@^4.2.2:+ version "4.2.10"+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"+ integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==++has-bigints@^1.0.1, has-bigints@^1.0.2:+ version "1.0.2"+ resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"+ integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==++has-flag@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"+ integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==++has-flag@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"+ integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==++has-property-descriptors@^1.0.0:+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"+ integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==+ dependencies:+ get-intrinsic "^1.1.1"++has-symbols@^1.0.2, has-symbols@^1.0.3:+ version "1.0.3"+ resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"+ integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==++has-tostringtag@^1.0.0:+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"+ integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==+ dependencies:+ has-symbols "^1.0.2"++has@^1.0.3:+ version "1.0.3"+ resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"+ integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==+ dependencies:+ function-bind "^1.1.1"++he@^1.2.0:+ version "1.2.0"+ resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"+ integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==++human-signals@^2.1.0:+ version "2.1.0"+ resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"+ integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==++iconv-lite@^0.4.24:+ version "0.4.24"+ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"+ integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==+ dependencies:+ safer-buffer ">= 2.1.2 < 3"++iconv-lite@^0.6.3:+ version "0.6.3"+ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"+ integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==+ dependencies:+ safer-buffer ">= 2.1.2 < 3.0.0"++ieee754@^1.1.13:+ version "1.2.1"+ resolved "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"+ integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==++ignore@^4.0.6:+ version "4.0.6"+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"+ integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==++ignore@^5.2.0:+ version "5.2.1"+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.1.tgz#c2b1f76cb999ede1502f3a226a9310fdfe88d46c"+ integrity sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==++image-size@~0.5.0:+ version "0.5.5"+ resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"+ integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==++immediate@~3.0.5:+ version "3.0.6"+ resolved "https://registry.npmmirror.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"+ integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==++import-fresh@^3.0.0:+ version "3.3.0"+ resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"+ integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==+ dependencies:+ parent-module "^1.0.0"+ resolve-from "^4.0.0"++imurmurhash@^0.1.4:+ version "0.1.4"+ resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"+ integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==++inflight@^1.0.4:+ version "1.0.6"+ resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"+ integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==+ dependencies:+ once "^1.3.0"+ wrappy "1"++inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.3:+ version "2.0.4"+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"+ integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==++inquirer@^7.0.0:+ version "7.3.3"+ resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"+ integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==+ dependencies:+ ansi-escapes "^4.2.1"+ chalk "^4.1.0"+ cli-cursor "^3.1.0"+ cli-width "^3.0.0"+ external-editor "^3.0.3"+ figures "^3.0.0"+ lodash "^4.17.19"+ mute-stream "0.0.8"+ run-async "^2.4.0"+ rxjs "^6.6.0"+ string-width "^4.1.0"+ strip-ansi "^6.0.0"+ through "^2.3.6"++internal-slot@^1.0.3:+ version "1.0.3"+ resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"+ integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==+ dependencies:+ get-intrinsic "^1.1.0"+ has "^1.0.3"+ side-channel "^1.0.4"++is-bigint@^1.0.1:+ version "1.0.4"+ resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"+ integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==+ dependencies:+ has-bigints "^1.0.1"++is-binary-path@~2.1.0:+ version "2.1.0"+ resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"+ integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==+ dependencies:+ binary-extensions "^2.0.0"++is-boolean-object@^1.1.0:+ version "1.1.2"+ resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"+ integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==+ dependencies:+ call-bind "^1.0.2"+ has-tostringtag "^1.0.0"++is-callable@^1.1.4, is-callable@^1.2.7:+ version "1.2.7"+ resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"+ integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==++is-core-module@^2.8.1, is-core-module@^2.9.0:+ version "2.11.0"+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"+ integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==+ dependencies:+ has "^1.0.3"++is-date-object@^1.0.1:+ version "1.0.5"+ resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"+ integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==+ dependencies:+ has-tostringtag "^1.0.0"++is-extglob@^2.1.1:+ version "2.1.1"+ resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"+ integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==++is-fullwidth-code-point@^2.0.0:+ version "2.0.0"+ resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"+ integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==++is-fullwidth-code-point@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"+ integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==++is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:+ version "4.0.3"+ resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"+ integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==+ dependencies:+ is-extglob "^2.1.1"++is-negative-zero@^2.0.2:+ version "2.0.2"+ resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"+ integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==++is-number-object@^1.0.4:+ version "1.0.7"+ resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"+ integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==+ dependencies:+ has-tostringtag "^1.0.0"++is-number@^7.0.0:+ version "7.0.0"+ resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"+ integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==++is-regex@^1.1.4:+ version "1.1.4"+ resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"+ integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==+ dependencies:+ call-bind "^1.0.2"+ has-tostringtag "^1.0.0"++is-shared-array-buffer@^1.0.2:+ version "1.0.2"+ resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"+ integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==+ dependencies:+ call-bind "^1.0.2"++is-stream@^2.0.0:+ version "2.0.1"+ resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"+ integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==++is-string@^1.0.5, is-string@^1.0.7:+ version "1.0.7"+ resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"+ integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==+ dependencies:+ has-tostringtag "^1.0.0"++is-symbol@^1.0.2, is-symbol@^1.0.3:+ version "1.0.4"+ resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"+ integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==+ dependencies:+ has-symbols "^1.0.2"++is-weakref@^1.0.2:+ version "1.0.2"+ resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"+ integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==+ dependencies:+ call-bind "^1.0.2"++is-what@^3.14.1:+ version "3.14.1"+ resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1"+ integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==++isarray@~1.0.0:+ version "1.0.0"+ resolved "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"+ integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==++isexe@^2.0.0:+ version "2.0.0"+ resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"+ integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==++js-tokens@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"+ integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==++js-yaml@^3.13.1:+ version "3.14.1"+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"+ integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==+ dependencies:+ argparse "^1.0.7"+ esprima "^4.0.0"++json-schema-traverse@^0.4.1:+ version "0.4.1"+ resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"+ integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==++json-stable-stringify-without-jsonify@^1.0.1:+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"+ integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==++json5@^1.0.1:+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"+ integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==+ dependencies:+ minimist "^1.2.0"++jsonc-parser@^3.2.0:+ version "3.2.0"+ resolved "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"+ integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==++jszip@^3.5.0:+ version "3.10.1"+ resolved "https://registry.npmmirror.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2"+ integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==+ dependencies:+ lie "~3.3.0"+ pako "~1.0.2"+ readable-stream "~2.3.6"+ setimmediate "^1.0.5"++klona@^2.0.4:+ version "2.0.5"+ resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"+ integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==++kolorist@^1.6.0:+ version "1.6.0"+ resolved "https://registry.npmjs.org/kolorist/-/kolorist-1.6.0.tgz#f43ac794305b30032a5bedcae7799d0f91d2ff36"+ integrity sha512-dLkz37Ab97HWMx9KTes3Tbi3D1ln9fCAy2zr2YVExJasDRPGRaKcoE4fycWNtnCAJfjFqe0cnY+f8KT2JePEXQ==++lazystream@^1.0.0:+ version "1.0.1"+ resolved "https://registry.npmmirror.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638"+ integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==+ dependencies:+ readable-stream "^2.0.5"++less-loader@^11.1.0:+ version "11.1.0"+ resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-11.1.0.tgz#a452384259bdf8e4f6d5fdcc39543609e6313f82"+ integrity sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==+ dependencies:+ klona "^2.0.4"++less@^4.1.3:+ version "4.1.3"+ resolved "https://registry.yarnpkg.com/less/-/less-4.1.3.tgz#175be9ddcbf9b250173e0a00b4d6920a5b770246"+ integrity sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==+ dependencies:+ copy-anything "^2.0.1"+ parse-node-version "^1.0.1"+ tslib "^2.3.0"+ optionalDependencies:+ errno "^0.1.1"+ graceful-fs "^4.1.2"+ image-size "~0.5.0"+ make-dir "^2.1.0"+ mime "^1.4.1"+ needle "^3.1.0"+ source-map "~0.6.0"++levn@^0.4.1:+ version "0.4.1"+ resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"+ integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==+ dependencies:+ prelude-ls "^1.2.1"+ type-check "~0.4.0"++lie@~3.3.0:+ version "3.3.0"+ resolved "https://registry.npmmirror.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"+ integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==+ dependencies:+ immediate "~3.0.5"++listenercount@~1.0.1:+ version "1.0.1"+ resolved "https://registry.npmmirror.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937"+ integrity sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==++local-pkg@^0.4.2:+ version "0.4.2"+ resolved "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.2.tgz#13107310b77e74a0e513147a131a2ba288176c2f"+ integrity sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==++locate-path@^6.0.0:+ version "6.0.0"+ resolved "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"+ integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==+ dependencies:+ p-locate "^5.0.0"++lodash.defaults@^4.2.0:+ version "4.2.0"+ resolved "https://registry.npmmirror.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"+ integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==++lodash.difference@^4.5.0:+ version "4.5.0"+ resolved "https://registry.npmmirror.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"+ integrity sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==++lodash.escaperegexp@^4.1.2:+ version "4.1.2"+ resolved "https://registry.npmmirror.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"+ integrity sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==++lodash.flatten@^4.4.0:+ version "4.4.0"+ resolved "https://registry.npmmirror.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"+ integrity sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==++lodash.groupby@^4.6.0:+ version "4.6.0"+ resolved "https://registry.npmmirror.com/lodash.groupby/-/lodash.groupby-4.6.0.tgz#0b08a1dcf68397c397855c3239783832df7403d1"+ integrity sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw==++lodash.isboolean@^3.0.3:+ version "3.0.3"+ resolved "https://registry.npmmirror.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"+ integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==++lodash.isequal@^4.5.0:+ version "4.5.0"+ resolved "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"+ integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==++lodash.isfunction@^3.0.9:+ version "3.0.9"+ resolved "https://registry.npmmirror.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"+ integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==++lodash.isnil@^4.0.0:+ version "4.0.0"+ resolved "https://registry.npmmirror.com/lodash.isnil/-/lodash.isnil-4.0.0.tgz#49e28cd559013458c814c5479d3c663a21bfaa6c"+ integrity sha512-up2Mzq3545mwVnMhTDMdfoG1OurpA/s5t88JmQX809eH3C8491iu2sfKhTfhQtKY78oPNhiaHJUpT/dUDAAtng==++lodash.isplainobject@^4.0.6:+ version "4.0.6"+ resolved "https://registry.npmmirror.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"+ integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==++lodash.isundefined@^3.0.1:+ version "3.0.1"+ resolved "https://registry.npmmirror.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48"+ integrity sha512-MXB1is3s899/cD8jheYYE2V9qTHwKvt+npCwpD+1Sxm3Q3cECXCiYHjeHWXNwr6Q0SOBPrYUDxendrO6goVTEA==++lodash.union@^4.6.0:+ version "4.6.0"+ resolved "https://registry.npmmirror.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"+ integrity sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==++lodash.uniq@^4.5.0:+ version "4.5.0"+ resolved "https://registry.npmmirror.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"+ integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==++lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21:+ version "4.17.21"+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"+ integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==++lottie-web@^5.10.1:+ version "5.10.1"+ resolved "https://registry.npmmirror.com/lottie-web/-/lottie-web-5.10.1.tgz#fde8e6be374afc3906f78b4152ada9be44ce3ccf"+ integrity sha512-u17bVNf/vA3oK9Wkyb1Vpo83WUIEQwaT0GeEN0qcvaExizyJ/RjmcbjSDj0CnwQCtpGqTgYhqprCC7cTWuXMNw==++lru-cache@^6.0.0:+ version "6.0.0"+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"+ integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==+ dependencies:+ yallist "^4.0.0"++magic-string@^0.25.7:+ version "0.25.9"+ resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"+ integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==+ dependencies:+ sourcemap-codec "^1.4.8"++magic-string@^0.27.0:+ version "0.27.0"+ resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3"+ integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==+ dependencies:+ "@jridgewell/sourcemap-codec" "^1.4.13"++make-dir@^2.1.0:+ version "2.1.0"+ resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"+ integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==+ dependencies:+ pify "^4.0.1"+ semver "^5.6.0"++material-design-icons-iconfont@^6.7.0:+ version "6.7.0"+ resolved "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-6.7.0.tgz#55cf0f3d7e4c76e032855b7e810b6e30535eff3c"+ integrity sha512-lSj71DgVv20kO0kGbs42icDzbRot61gEDBLQACzkUuznRQBUYmbxzEkGU6dNBb5fRWHMaScYlAXX96HQ4/cJWA==++merge-stream@^2.0.0:+ version "2.0.0"+ resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"+ integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==++merge2@^1.3.0, merge2@^1.4.1:+ version "1.4.1"+ resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"+ integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==++micromatch@^4.0.4:+ version "4.0.5"+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"+ integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==+ dependencies:+ braces "^3.0.2"+ picomatch "^2.3.1"++ version "1.52.0"+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"+ integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==++mime-types@^2.1.12:+ version "2.1.35"+ resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"+ integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==+ dependencies:+ mime-db "1.52.0"++mime@^1.4.1:+ version "1.6.0"+ resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"+ integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==++mimic-fn@^2.1.0:+ version "2.1.0"+ resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"+ integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==++minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:+ version "3.1.2"+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"+ integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==+ dependencies:+ brace-expansion "^1.1.7"++minimatch@^5.1.0, minimatch@^5.1.1:+ version "5.1.1"+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.1.tgz#6c9dffcf9927ff2a31e74b5af11adf8b9604b022"+ integrity sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g==+ dependencies:+ brace-expansion "^2.0.1"++minimist@^1.2.0, minimist@^1.2.6:+ version "1.2.7"+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"+ integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==++mitt@^3.0.0:+ version "3.0.0"+ resolved "https://registry.npmmirror.com/mitt/-/mitt-3.0.0.tgz#69ef9bd5c80ff6f57473e8d89326d01c414be0bd"+ integrity sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==++"mkdirp@>=0.5 0", mkdirp@^0.5.1:+ version "0.5.6"+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"+ integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==+ dependencies:+ minimist "^1.2.6"++mlly@^1.0.0:+ version "1.0.0"+ resolved "https://registry.npmjs.org/mlly/-/mlly-1.0.0.tgz#d38ca6e33ab89b60654f71ef08931d51e83d3569"+ integrity sha512-QL108Hwt+u9bXdWgOI0dhzZfACovn5Aen4Xvc8Jasd9ouRH4NjnrXEiyP3nVvJo91zPlYjVRckta0Nt2zfoR6g==+ dependencies:+ acorn "^8.8.1"+ pathe "^1.0.0"+ pkg-types "^1.0.0"+ ufo "^1.0.0"++ version "2.0.0"+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"+ integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==++ version "2.1.2"+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"+ integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==++ms@^2.1.1:+ version "2.1.3"+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"+ integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==++muggle-string@^0.1.0:+ version "0.1.0"+ resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.1.0.tgz#1fda8a281c8b27bb8b70466dbc9f27586a8baa6c"+ integrity sha512-Tr1knR3d2mKvvWthlk7202rywKbiOm4rVFLsfAaSIhJ6dt9o47W4S+JMtWhd/PW9Wrdew2/S2fSvhz3E2gkfEg==++ version "0.0.8"+ resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"+ integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==++nanoid@^3.3.4:+ version "3.3.4"+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"+ integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==++natural-compare-lite@^1.4.0:+ version "1.4.0"+ resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"+ integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==++natural-compare@^1.4.0:+ version "1.4.0"+ resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"+ integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==++needle@^3.1.0:+ version "3.2.0"+ resolved "https://registry.yarnpkg.com/needle/-/needle-3.2.0.tgz#07d240ebcabfd65c76c03afae7f6defe6469df44"+ integrity sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==+ dependencies:+ debug "^3.2.6"+ iconv-lite "^0.6.3"+ sax "^1.2.4"++normalize-path@^3.0.0, normalize-path@~3.0.0:+ version "3.0.0"+ resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"+ integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==++npm-run-path@^4.0.1:+ version "4.0.1"+ resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"+ integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==+ dependencies:+ path-key "^3.0.0"++object-inspect@^1.12.2, object-inspect@^1.9.0:+ version "1.12.2"+ resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"+ integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==++object-keys@^1.1.1:+ version "1.1.1"+ resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"+ integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==++object.assign@^4.1.2, object.assign@^4.1.4:+ version "4.1.4"+ resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"+ integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==+ dependencies:+ call-bind "^1.0.2"+ define-properties "^1.1.4"+ has-symbols "^1.0.3"+ object-keys "^1.1.1"++object.entries@^1.1.2:+ version "1.1.6"+ resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23"+ integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==+ dependencies:+ call-bind "^1.0.2"+ define-properties "^1.1.4"+ es-abstract "^1.20.4"++object.values@^1.1.5:+ version "1.1.6"+ resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"+ integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==+ dependencies:+ call-bind "^1.0.2"+ define-properties "^1.1.4"+ es-abstract "^1.20.4"++once@^1.3.0, once@^1.4.0:+ version "1.4.0"+ resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"+ integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==+ dependencies:+ wrappy "1"++onetime@^5.1.0, onetime@^5.1.2:+ version "5.1.2"+ resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"+ integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==+ dependencies:+ mimic-fn "^2.1.0"++optionator@^0.9.1:+ version "0.9.1"+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"+ integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==+ dependencies:+ deep-is "^0.1.3"+ fast-levenshtein "^2.0.6"+ levn "^0.4.1"+ prelude-ls "^1.2.1"+ type-check "^0.4.0"+ word-wrap "^1.2.3"++os-tmpdir@~1.0.2:+ version "1.0.2"+ resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"+ integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==++p-limit@^3.0.2:+ version "3.1.0"+ resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"+ integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==+ dependencies:+ yocto-queue "^0.1.0"++p-locate@^5.0.0:+ version "5.0.0"+ resolved "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"+ integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==+ dependencies:+ p-limit "^3.0.2"++pako@~1.0.2:+ version "1.0.11"+ resolved "https://registry.npmmirror.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"+ integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==++parent-module@^1.0.0:+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"+ integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==+ dependencies:+ callsites "^3.0.0"++parse-node-version@^1.0.1:+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"+ integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==++path-exists@^4.0.0:+ version "4.0.0"+ resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"+ integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==++path-is-absolute@^1.0.0:+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"+ integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==++path-key@^3.0.0, path-key@^3.1.0:+ version "3.1.1"+ resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"+ integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==++path-parse@^1.0.7:+ version "1.0.7"+ resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"+ integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==++path-type@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"+ integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==++pathe@^1.0.0:+ version "1.0.0"+ resolved "https://registry.npmjs.org/pathe/-/pathe-1.0.0.tgz#135fc11464fc57c84ef93d5c5ed21247e24571df"+ integrity sha512-nPdMG0Pd09HuSsr7QOKUXO2Jr9eqaDiZvDwdyIhNG5SHYujkQHYKDfGQkulBxvbDHz8oHLsTgKN86LSwYzSHAg==++picocolors@^1.0.0:+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"+ integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==++picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:+ version "2.3.1"+ resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"+ integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==++pify@^4.0.1:+ version "4.0.1"+ resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"+ integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==++pkg-types@^1.0.0, pkg-types@^1.0.1:+ version "1.0.1"+ resolved "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.1.tgz#25234407f9dc63409af45ced9407625ff446a761"+ integrity sha512-jHv9HB+Ho7dj6ItwppRDDl0iZRYBD0jsakHXtFgoLr+cHSF6xC+QL54sJmWxyGxOLYSHm0afhXhXcQDQqH9z8g==+ dependencies:+ jsonc-parser "^3.2.0"+ mlly "^1.0.0"+ pathe "^1.0.0"++postcss@^8.1.10, postcss@^8.4.19:+ version "8.4.20"+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.20.tgz#64c52f509644cecad8567e949f4081d98349dc56"+ integrity sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==+ dependencies:+ nanoid "^3.3.4"+ picocolors "^1.0.0"+ source-map-js "^1.0.2"++prelude-ls@^1.2.1:+ version "1.2.1"+ resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"+ integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==++process-nextick-args@~2.0.0:+ version "2.0.1"+ resolved "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"+ integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==++progress@^2.0.0:+ version "2.0.3"+ resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"+ integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==++proxy-from-env@^1.1.0:+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"+ integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==++prr@~1.0.1:+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"+ integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==++punycode@^2.1.0:+ version "2.1.1"+ resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"+ integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==++queue-microtask@^1.2.2:+ version "1.2.3"+ resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"+ integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==++readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@~2.3.6:+ version "2.3.7"+ resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"+ integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==+ dependencies:+ core-util-is "~1.0.0"+ inherits "~2.0.3"+ isarray "~1.0.0"+ process-nextick-args "~2.0.0"+ safe-buffer "~5.1.1"+ string_decoder "~1.1.1"+ util-deprecate "~1.0.1"++readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:+ version "3.6.0"+ resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"+ integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==+ dependencies:+ inherits "^2.0.3"+ string_decoder "^1.1.1"+ util-deprecate "^1.0.1"++readdir-glob@^1.0.0:+ version "1.1.2"+ resolved "https://registry.npmmirror.com/readdir-glob/-/readdir-glob-1.1.2.tgz#b185789b8e6a43491635b6953295c5c5e3fd224c"+ integrity sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA==+ dependencies:+ minimatch "^5.1.0"++readdirp@~3.6.0:+ version "3.6.0"+ resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"+ integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==+ dependencies:+ picomatch "^2.2.1"++regexp.prototype.flags@^1.4.3:+ version "1.4.3"+ resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"+ integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==+ dependencies:+ call-bind "^1.0.2"+ define-properties "^1.1.3"+ functions-have-names "^1.2.2"++regexpp@^3.1.0, regexpp@^3.2.0:+ version "3.2.0"+ resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"+ integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==++resolve-from@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"+ integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==++resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1:+ version "1.22.1"+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"+ integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==+ dependencies:+ is-core-module "^2.9.0"+ path-parse "^1.0.7"+ supports-preserve-symlinks-flag "^1.0.0"++restore-cursor@^3.1.0:+ version "3.1.0"+ resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"+ integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==+ dependencies:+ onetime "^5.1.0"+ signal-exit "^3.0.2"++reusify@^1.0.4:+ version "1.0.4"+ resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"+ integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==++rimraf@2:+ version "2.7.1"+ resolved "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"+ integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==+ dependencies:+ glob "^7.1.3"++ version "2.6.3"+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"+ integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==+ dependencies:+ glob "^7.1.3"++rimraf@^3.0.0:+ version "3.0.2"+ resolved "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"+ integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==+ dependencies:+ glob "^7.1.3"++rollup@^3.7.0:+ version "3.7.3"+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.7.3.tgz#d440adff5f89099fd1f552e4e4333045e3bc71d4"+ integrity sha512-7e68MQbAWCX6mI4/0lG1WHd+NdNAlVamg0Zkd+8LZ/oXojligdGnCNyHlzXqXCZObyjs5FRc3AH0b17iJESGIQ==+ optionalDependencies:+ fsevents "~2.3.2"++run-async@^2.4.0:+ version "2.4.1"+ resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"+ integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==++run-parallel@^1.1.9:+ version "1.2.0"+ resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"+ integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==+ dependencies:+ queue-microtask "^1.2.2"++rxjs@^6.6.0:+ version "6.6.7"+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"+ integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==+ dependencies:+ tslib "^1.9.0"++safe-buffer@~5.1.0, safe-buffer@~5.1.1:+ version "5.1.2"+ resolved "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"+ integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==++safe-buffer@~5.2.0:+ version "5.2.1"+ resolved "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"+ integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==++safe-regex-test@^1.0.0:+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"+ integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==+ dependencies:+ call-bind "^1.0.2"+ get-intrinsic "^1.1.3"+ is-regex "^1.1.4"++"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":+ version "2.1.2"+ resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"+ integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==++sax@^1.2.4:+ version "1.2.4"+ resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"+ integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==++saxes@^5.0.1:+ version "5.0.1"+ resolved "https://registry.npmmirror.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"+ integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==+ dependencies:+ xmlchars "^2.2.0"++scule@^1.0.0:+ version "1.0.0"+ resolved "https://registry.npmjs.org/scule/-/scule-1.0.0.tgz#895e6f4ba887e78d8b9b4111e23ae84fef82376d"+ integrity sha512-4AsO/FrViE/iDNEPaAQlb77tf0csuq27EsVpy6ett584EcRTp6pTDLoGWVxCD77y5iU5FauOvhsI4o1APwPoSQ==++semver@^5.6.0:+ version "5.7.1"+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"+ integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==++semver@^6.3.0:+ version "6.3.0"+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"+ integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==++semver@^7.2.1, semver@^7.3.6, semver@^7.3.7:+ version "7.3.8"+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"+ integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==+ dependencies:+ lru-cache "^6.0.0"++setimmediate@^1.0.5, setimmediate@~1.0.4:+ version "1.0.5"+ resolved "https://registry.npmmirror.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"+ integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==++shebang-command@^2.0.0:+ version "2.0.0"+ resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"+ integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==+ dependencies:+ shebang-regex "^3.0.0"++shebang-regex@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"+ integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==++side-channel@^1.0.4:+ version "1.0.4"+ resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"+ integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==+ dependencies:+ call-bind "^1.0.0"+ get-intrinsic "^1.0.2"+ object-inspect "^1.9.0"++signal-exit@^3.0.2, signal-exit@^3.0.3:+ version "3.0.7"+ resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"+ integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==++slash@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"+ integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==++slice-ansi@^2.1.0:+ version "2.1.0"+ resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"+ integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==+ dependencies:+ ansi-styles "^3.2.0"+ astral-regex "^1.0.0"+ is-fullwidth-code-point "^2.0.0"++source-map-js@^1.0.2:+ version "1.0.2"+ resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"+ integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==+[email protected], source-map@^0.6.1, source-map@~0.6.0:+ version "0.6.1"+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"+ integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==++sourcemap-codec@^1.4.8:+ version "1.4.8"+ resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"+ integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==++sprintf-js@~1.0.2:+ version "1.0.3"+ resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"+ integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==++ssf@~0.11.2:+ version "0.11.2"+ resolved "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz#0b99698b237548d088fc43cdf2b70c1a7512c06c"+ integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==+ dependencies:+ frac "~1.1.2"++string-width@^3.0.0:+ version "3.1.0"+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"+ integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==+ dependencies:+ emoji-regex "^7.0.1"+ is-fullwidth-code-point "^2.0.0"+ strip-ansi "^5.1.0"++string-width@^4.1.0:+ version "4.2.3"+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"+ integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==+ dependencies:+ emoji-regex "^8.0.0"+ is-fullwidth-code-point "^3.0.0"+ strip-ansi "^6.0.1"++string.prototype.trimend@^1.0.6:+ version "1.0.6"+ resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"+ integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==+ dependencies:+ call-bind "^1.0.2"+ define-properties "^1.1.4"+ es-abstract "^1.20.4"++string.prototype.trimstart@^1.0.6:+ version "1.0.6"+ resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"+ integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==+ dependencies:+ call-bind "^1.0.2"+ define-properties "^1.1.4"+ es-abstract "^1.20.4"++string_decoder@^1.1.1:+ version "1.3.0"+ resolved "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"+ integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==+ dependencies:+ safe-buffer "~5.2.0"++string_decoder@~1.1.1:+ version "1.1.1"+ resolved "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"+ integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==+ dependencies:+ safe-buffer "~5.1.0"++strip-ansi@^5.1.0:+ version "5.2.0"+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"+ integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==+ dependencies:+ ansi-regex "^4.1.0"++strip-ansi@^6.0.0, strip-ansi@^6.0.1:+ version "6.0.1"+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"+ integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==+ dependencies:+ ansi-regex "^5.0.1"++strip-bom@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"+ integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==++strip-final-newline@^2.0.0:+ version "2.0.0"+ resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"+ integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==++strip-json-comments@^3.1.0:+ version "3.1.1"+ resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"+ integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==++strip-literal@^1.0.0:+ version "1.0.0"+ resolved "https://registry.npmjs.org/strip-literal/-/strip-literal-1.0.0.tgz#0a484ed5a978cd9d2becf3cf8f4f2cb5ab0e1e74"+ integrity sha512-5o4LsH1lzBzO9UFH63AJ2ad2/S2AVx6NtjOcaz+VTT2h1RiRvbipW72z8M/lxEhcPHDBQwpDrnTF7sXy/7OwCQ==+ dependencies:+ acorn "^8.8.1"++supports-color@^5.3.0:+ version "5.5.0"+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"+ integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==+ dependencies:+ has-flag "^3.0.0"++supports-color@^7.1.0:+ version "7.2.0"+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"+ integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==+ dependencies:+ has-flag "^4.0.0"++supports-preserve-symlinks-flag@^1.0.0:+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"+ integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==++table@^5.2.3:+ version "5.4.6"+ resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"+ integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==+ dependencies:+ ajv "^6.10.2"+ lodash "^4.17.14"+ slice-ansi "^2.1.0"+ string-width "^3.0.0"++tar-stream@^2.2.0:+ version "2.2.0"+ resolved "https://registry.npmmirror.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"+ integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==+ dependencies:+ bl "^4.0.3"+ end-of-stream "^1.4.1"+ fs-constants "^1.0.0"+ inherits "^2.0.3"+ readable-stream "^3.1.1"++text-table@^0.2.0:+ version "0.2.0"+ resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"+ integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==++through@^2.3.6:+ version "2.3.8"+ resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"+ integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==++tmp@^0.0.33:+ version "0.0.33"+ resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"+ integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==+ dependencies:+ os-tmpdir "~1.0.2"++tmp@^0.2.0:+ version "0.2.1"+ resolved "https://registry.npmmirror.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"+ integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==+ dependencies:+ rimraf "^3.0.0"++to-regex-range@^5.0.1:+ version "5.0.1"+ resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"+ integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==+ dependencies:+ is-number "^7.0.0"++"traverse@>=0.3.0 <0.4":+ version "0.3.9"+ resolved "https://registry.npmmirror.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"+ integrity sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==++ts-md5@^1.3.1:+ version "1.3.1"+ resolved "https://registry.npmmirror.com/ts-md5/-/ts-md5-1.3.1.tgz#f5b860c0d5241dd9bb4e909dd73991166403f511"+ integrity sha512-DiwiXfwvcTeZ5wCE0z+2A9EseZsztaiZtGrtSaY5JOD7ekPnR/GoIVD5gXZAlK9Na9Kvpo9Waz5rW64WKAWApg==++tsconfig-paths@^3.14.1:+ version "3.14.1"+ resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"+ integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==+ dependencies:+ "@types/json5" "^0.0.29"+ json5 "^1.0.1"+ minimist "^1.2.6"+ strip-bom "^3.0.0"++tslib@^1.8.1, tslib@^1.9.0:+ version "1.14.1"+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"+ integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==++tslib@^2.3.0:+ version "2.4.1"+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"+ integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==++tsutils@^3.21.0:+ version "3.21.0"+ resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"+ integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==+ dependencies:+ tslib "^1.8.1"++type-check@^0.4.0, type-check@~0.4.0:+ version "0.4.0"+ resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"+ integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==+ dependencies:+ prelude-ls "^1.2.1"++type-fest@^0.21.3:+ version "0.21.3"+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"+ integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==++type-fest@^0.8.1:+ version "0.8.1"+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"+ integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==++typescript@^4.9.3:+ version "4.9.4"+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78"+ integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==++ufo@^1.0.0:+ version "1.0.1"+ resolved "https://registry.npmjs.org/ufo/-/ufo-1.0.1.tgz#64ed43b530706bda2e4892f911f568cf4cf67d29"+ integrity sha512-boAm74ubXHY7KJQZLlXrtMz52qFvpsbOxDcZOnw/Wf+LS4Mmyu7JxmzD4tDLtUQtmZECypJ0FrCz4QIe6dvKRA==++unbox-primitive@^1.0.2:+ version "1.0.2"+ resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"+ integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==+ dependencies:+ call-bind "^1.0.2"+ has-bigints "^1.0.2"+ has-symbols "^1.0.3"+ which-boxed-primitive "^1.0.2"++unimport@^1.0.2:+ version "1.0.2"+ resolved "https://registry.npmjs.org/unimport/-/unimport-1.0.2.tgz#3d250dea0a441010f7e710c2031d6e334c7705ef"+ integrity sha512-DcYkDwl1XMZNmyEKUFzVzHAul0FZcj9m0OM/WRfaAtg6Gw1waYlypYJl6qAg31k57TnNPwGDCAxYPodYC5qomQ==+ dependencies:+ "@rollup/pluginutils" "^5.0.2"+ escape-string-regexp "^5.0.0"+ fast-glob "^3.2.12"+ local-pkg "^0.4.2"+ magic-string "^0.27.0"+ mlly "^1.0.0"+ pathe "^1.0.0"+ pkg-types "^1.0.1"+ scule "^1.0.0"+ strip-literal "^1.0.0"+ unplugin "^1.0.1"++unplugin-auto-import@^0.12.1:+ version "0.12.1"+ resolved "https://registry.npmjs.org/unplugin-auto-import/-/unplugin-auto-import-0.12.1.tgz#eea943ff85e4230110a302451e7df1e584ecd480"+ integrity sha512-J/3ZORq5YGKG+8D5vLLOgqaHNK77izlVN07mQ752yRLqBNDbJiwPRSnUwwYqH5N6rDay1SqnJCHaUdbJ9QMI2w==+ dependencies:+ "@antfu/utils" "^0.7.2"+ "@rollup/pluginutils" "^5.0.2"+ local-pkg "^0.4.2"+ magic-string "^0.27.0"+ unimport "^1.0.2"+ unplugin "^1.0.1"++unplugin-icons@^0.14.15:+ version "0.14.15"+ resolved "https://registry.npmjs.org/unplugin-icons/-/unplugin-icons-0.14.15.tgz#535605e25a34c6613888dca2094caf6ce2a5907c"+ integrity sha512-J6YBA+fUzVM2IZPXCK3Pnk36jYVwQ6lkjRgOnZaXNIxpMDsmwDqrE1AGJ0zUbfuEoOa90OBGc0OPfN1r+qlSIQ==+ dependencies:+ "@antfu/install-pkg" "^0.1.1"+ "@antfu/utils" "^0.7.2"+ "@iconify/utils" "^2.0.3"+ debug "^4.3.4"+ kolorist "^1.6.0"+ local-pkg "^0.4.2"+ unplugin "^1.0.1"++unplugin-vue-components@^0.22.12:+ version "0.22.12"+ resolved "https://registry.npmjs.org/unplugin-vue-components/-/unplugin-vue-components-0.22.12.tgz#39013f77be72d32df9d6ca1599e592a484015612"+ integrity sha512-FxyzsuBvMCYPIk+8cgscGBQ345tvwVu+qY5IhE++eorkyvA4Z1TiD/HCiim+Kbqozl10i4K+z+NCa2WO2jexRA==+ dependencies:+ "@antfu/utils" "^0.7.2"+ "@rollup/pluginutils" "^5.0.2"+ chokidar "^3.5.3"+ debug "^4.3.4"+ fast-glob "^3.2.12"+ local-pkg "^0.4.2"+ magic-string "^0.27.0"+ minimatch "^5.1.1"+ resolve "^1.22.1"+ unplugin "^1.0.1"++unplugin@^1.0.1:+ version "1.0.1"+ resolved "https://registry.npmjs.org/unplugin/-/unplugin-1.0.1.tgz#83b528b981cdcea1cad422a12cd02e695195ef3f"+ integrity sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==+ dependencies:+ acorn "^8.8.1"+ chokidar "^3.5.3"+ webpack-sources "^3.2.3"+ webpack-virtual-modules "^0.5.0"++unzipper@^0.10.11:+ version "0.10.11"+ resolved "https://registry.npmmirror.com/unzipper/-/unzipper-0.10.11.tgz#0b4991446472cbdb92ee7403909f26c2419c782e"+ integrity sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==+ dependencies:+ big-integer "^1.6.17"+ binary "~0.3.0"+ bluebird "~3.4.1"+ buffer-indexof-polyfill "~1.0.0"+ duplexer2 "~0.1.4"+ fstream "^1.0.12"+ graceful-fs "^4.2.2"+ listenercount "~1.0.1"+ readable-stream "~2.3.6"+ setimmediate "~1.0.4"++uri-js@^4.2.2:+ version "4.4.1"+ resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"+ integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==+ dependencies:+ punycode "^2.1.0"++util-deprecate@^1.0.1, util-deprecate@~1.0.1:+ version "1.0.2"+ resolved "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"+ integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==++uuid@^8.3.0:+ version "8.3.2"+ resolved "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"+ integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==++v8-compile-cache@^2.0.3:+ version "2.3.0"+ resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"+ integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==++vite@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/vite/-/vite-4.0.0.tgz#b81b88349a06b2faaa53ae14cf96c942548e3454"+ integrity sha512-ynad+4kYs8Jcnn8J7SacS9vAbk7eMy0xWg6E7bAhS1s79TK+D7tVFGXVZ55S7RNLRROU1rxoKlvZ/qjaB41DGA==+ dependencies:+ esbuild "^0.16.3"+ postcss "^8.4.19"+ resolve "^1.22.1"+ rollup "^3.7.0"+ optionalDependencies:+ fsevents "~2.3.2"++vue-eslint-parser@^7.10.0:+ version "7.11.0"+ resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz#214b5dea961007fcffb2ee65b8912307628d0daf"+ integrity sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==+ dependencies:+ debug "^4.1.1"+ eslint-scope "^5.1.1"+ eslint-visitor-keys "^1.1.0"+ espree "^6.2.1"+ esquery "^1.4.0"+ lodash "^4.17.21"+ semver "^6.3.0"++vue-eslint-parser@^9.1.0:+ version "9.1.0"+ resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz#0e121d1bb29bd10763c83e3cc583ee03434a9dd5"+ integrity sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==+ dependencies:+ debug "^4.3.4"+ eslint-scope "^7.1.1"+ eslint-visitor-keys "^3.3.0"+ espree "^9.3.1"+ esquery "^1.4.0"+ lodash "^4.17.21"+ semver "^7.3.6"++vue-i18n@^9.2.2:+ version "9.2.2"+ resolved "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.2.2.tgz#aeb49d9424923c77e0d6441e3f21dafcecd0e666"+ integrity sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==+ dependencies:+ "@intlify/core-base" "9.2.2"+ "@intlify/shared" "9.2.2"+ "@intlify/vue-devtools" "9.2.2"+ "@vue/devtools-api" "^6.2.1"++vue-router@^4.1.6:+ version "4.1.6"+ resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.1.6.tgz#b70303737e12b4814578d21d68d21618469375a1"+ integrity sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==+ dependencies:+ "@vue/devtools-api" "^6.4.5"++vue-template-compiler@^2.7.14:+ version "2.7.14"+ resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz#4545b7dfb88090744c1577ae5ac3f964e61634b1"+ integrity sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==+ dependencies:+ de-indent "^1.0.2"+ he "^1.2.0"++vue-tsc@^1.0.11:+ version "1.0.13"+ resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.0.13.tgz#92541c9399552f9d8ae35baaa92657ba822a9a26"+ integrity sha512-DORISA3Fu9595xbg5HQqUj4XZVvkyRkcZFJCkCt1CeN7tIMgVRQ8ow07AKcbuHoEkqg7OI4qLu1wyC/VH3o5Ug==+ dependencies:+ "@volar/vue-language-core" "1.0.13"+ "@volar/vue-typescript" "1.0.13"++vue@^3.2.45:+ version "3.2.45"+ resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.45.tgz#94a116784447eb7dbd892167784619fef379b3c8"+ integrity sha512-9Nx/Mg2b2xWlXykmCwiTUCWHbWIj53bnkizBxKai1g61f2Xit700A1ljowpTIM11e3uipOeiPcSqnmBg6gyiaA==+ dependencies:+ "@vue/compiler-dom" "3.2.45"+ "@vue/compiler-sfc" "3.2.45"+ "@vue/runtime-dom" "3.2.45"+ "@vue/server-renderer" "3.2.45"+ "@vue/shared" "3.2.45"++vuetify@^3.0.4:+ version "3.0.4"+ resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-3.0.4.tgz#1d5b7ffe8edd673cf4053dd73fbbc097fd075180"+ integrity sha512-znJjQbOeVhPqtI7y50wepiq/jMWXhAXEl43FUIgrppWNWDDoL00NiGQiJMEkc5/GTTq1gxkpg4QlCUaHXAMpBg==++vuex-persist@^3.1.3:+ version "3.1.3"+ resolved "https://registry.npmmirror.com/vuex-persist/-/vuex-persist-3.1.3.tgz#518c722a2ca3026bcee5732f99d24f75cee0f3b6"+ integrity sha512-QWOpP4SxmJDC5Y1+0+Yl/F4n7z27syd1St/oP+IYCGe0X0GFio0Zan6kngZFufdIhJm+5dFGDo3VG5kdkCGeRQ==+ dependencies:+ deepmerge "^4.2.2"+ flatted "^3.0.5"++vuex@^4.0.2:+ version "4.1.0"+ resolved "https://registry.yarnpkg.com/vuex/-/vuex-4.1.0.tgz#aa1b3ea5c7385812b074c86faeeec2217872e36c"+ integrity sha512-hmV6UerDrPcgbSy9ORAtNXDr9M4wlNP4pEFKye4ujJF8oqgFFuxDCdOLS3eNoRTtq5O3hoBDh9Doj1bQMYHRbQ==+ dependencies:+ "@vue/devtools-api" "^6.0.0-beta.11"++vxe-table-plugin-export-xlsx@^3.0.4:+ version "3.0.4"+ resolved "https://registry.npmmirror.com/vxe-table-plugin-export-xlsx/-/vxe-table-plugin-export-xlsx-3.0.4.tgz#35faabc0791b4e9aa516b78ea3fd45e67314afe4"+ integrity sha512-Og/NbXRIb+BS6sJ48oDNVrZnlkcpaCd/zS8JBAZjHLgioWr1Xoob6FEpaeXBebGPPgTumZNUrrBO57JhhYAerA==++vxe-table@^4.3.7:+ version "4.3.7"+ resolved "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.3.7.tgz#138c402b1681f077f9fd93c7dafa1cc974ac3af4"+ integrity sha512-v+d7eEQ5uqtVTQCts4xkW0S15LZcIuEukYHGXI53SdoUj2gLFggPYAxQr1y659CM/ESRWPz9LNVHpd97KkjGHw==++webpack-sources@^3.2.3:+ version "3.2.3"+ resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"+ integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==++webpack-virtual-modules@^0.5.0:+ version "0.5.0"+ resolved "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz#362f14738a56dae107937ab98ea7062e8bdd3b6c"+ integrity sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==++which-boxed-primitive@^1.0.2:+ version "1.0.2"+ resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"+ integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==+ dependencies:+ is-bigint "^1.0.1"+ is-boolean-object "^1.1.0"+ is-number-object "^1.0.4"+ is-string "^1.0.5"+ is-symbol "^1.0.3"++which@^2.0.1:+ version "2.0.2"+ resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"+ integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==+ dependencies:+ isexe "^2.0.0"++wmf@~1.0.1:+ version "1.0.2"+ resolved "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz#7d19d621071a08c2bdc6b7e688a9c435298cc2da"+ integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==++word-wrap@^1.2.3:+ version "1.2.3"+ resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"+ integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==++word@~0.3.0:+ version "0.3.0"+ resolved "https://registry.npmmirror.com/word/-/word-0.3.0.tgz#8542157e4f8e849f4a363a288992d47612db9961"+ integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==++wrappy@1:+ version "1.0.2"+ resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"+ integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==++ version "1.0.3"+ resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"+ integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==+ dependencies:+ mkdirp "^0.5.1"++xe-utils@^3.5.7:+ version "3.5.7"+ resolved "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.7.tgz#2c885852dfadd5c8beeffdc1f884f8ceb962c669"+ integrity sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew==++xlsx@^0.18.5:+ version "0.18.5"+ resolved "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz#16711b9113c848076b8a177022799ad356eba7d0"+ integrity sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==+ dependencies:+ adler-32 "~1.3.0"+ cfb "~1.2.1"+ codepage "~1.15.0"+ crc-32 "~1.2.1"+ ssf "~0.11.2"+ wmf "~1.0.1"+ word "~0.3.0"++xmlchars@^2.2.0:+ version "2.2.0"+ resolved "https://registry.npmmirror.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"+ integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==++yallist@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"+ integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==++yocto-queue@^0.1.0:+ version "0.1.0"+ resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"+ integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==++zip-stream@^4.1.0:+ version "4.1.0"+ resolved "https://registry.npmmirror.com/zip-stream/-/zip-stream-4.1.0.tgz#51dd326571544e36aa3f756430b313576dc8fc79"+ integrity sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==+ dependencies:+ archiver-utils "^2.1.0"+ compress-commons "^4.1.0"+ readable-stream "^3.6.0"diff --git a/image0.png b/image0.pngnew file mode 100644index 0000000..daf9d09Binary files /dev/null and b/image0.png differdiff --git a/image1.png b/image1.pngnew file mode 100644index 0000000..71ed7b5Binary files /dev/null and b/image1.png differdiff --git a/image2.png b/image2.pngnew file mode 100644index 0000000..e512174Binary files /dev/null and b/image2.png differdiff --git a/logo.png b/logo.pngnew file mode 100644index 0000000..9476e3cBinary files /dev/null and b/logo.png differ