油漆

2024-06-06 13:19:24 +08:00 · 2024-06-06 13:19:24 +08:00 · 127c428a9e
commit 127c428a9e
parent c93711290e
919 changed files with 93 additions and 86 deletions
--- a/.vs/2024-05-31/v17/.wsuo
+++ b/.vs/2024-05-31/v17/.wsuo
--- a/.vs/ProjectEvaluation/zradmin.metadata.v7.bin
+++ b/.vs/ProjectEvaluation/zradmin.metadata.v7.bin
--- a/.vs/ProjectEvaluation/zradmin.projects.v7.bin
+++ b/.vs/ProjectEvaluation/zradmin.projects.v7.bin
--- a/.vs/VSWorkspaceState.json
+++ b/.vs/VSWorkspaceState.json
@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "SelectedNode": "\\ZRAdmin.sln",
+  "PreviewInSolutionExplorer": false
+}
--- a/.vs/ZRAdmin/DesignTimeBuild/.dtbcache.v2
+++ b/.vs/ZRAdmin/DesignTimeBuild/.dtbcache.v2
--- a/.vs/ZRAdmin/FileContentIndex/480484bf-f61b-4326-bc08-1dba32c12887.vsidx
+++ b/.vs/ZRAdmin/FileContentIndex/480484bf-f61b-4326-bc08-1dba32c12887.vsidx
--- a/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142515.xlsx
+++ b/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142515.xlsx
--- a/.vs/ZRAdmin/v17/.futdcache.v2
+++ b/.vs/ZRAdmin/v17/.futdcache.v2
--- a/.vs/ZRAdmin/v17/.suo
+++ b/.vs/ZRAdmin/v17/.suo
--- a/.vs/ZRAdmin/v17/fileList.bin
+++ b/.vs/ZRAdmin/v17/fileList.bin
--- a/server/.dockerignore
+++ b/server/.dockerignore
--- a/server/.gitattributes
+++ b/server/.gitattributes
--- a/server/.gitignore
+++ b/server/.gitignore
--- a/server/Infrastructure/App/App.cs
+++ b/server/Infrastructure/App/App.cs
--- a/server/Infrastructure/AppSettings.cs
+++ b/server/Infrastructure/AppSettings.cs
--- a/server/Infrastructure/Attribute/AppServiceAttribute.cs
+++ b/server/Infrastructure/Attribute/AppServiceAttribute.cs
--- a/server/Infrastructure/Attribute/LogAttribute.cs
+++ b/server/Infrastructure/Attribute/LogAttribute.cs
--- a/server/Infrastructure/Constant/HttpStatus.cs
+++ b/server/Infrastructure/Constant/HttpStatus.cs
--- a/server/Infrastructure/Constant/HubsConstant.cs
+++ b/server/Infrastructure/Constant/HubsConstant.cs
--- a/server/Infrastructure/CustomException/CustomException.cs
+++ b/server/Infrastructure/CustomException/CustomException.cs
--- a/server/Infrastructure/CustomException/ResultCode.cs
+++ b/server/Infrastructure/CustomException/ResultCode.cs
--- a/server/Infrastructure/Enums/BusinessType.cs
+++ b/server/Infrastructure/Enums/BusinessType.cs
--- a/server/Infrastructure/Enums/StoreType.cs
+++ b/server/Infrastructure/Enums/StoreType.cs
--- a/server/Infrastructure/Extensions/Extension.Convert.cs
+++ b/server/Infrastructure/Extensions/Extension.Convert.cs
--- a/server/Infrastructure/Extensions/Extension.Enum.cs
+++ b/server/Infrastructure/Extensions/Extension.Enum.cs
--- a/server/Infrastructure/Extensions/Extension.Exception.cs
+++ b/server/Infrastructure/Extensions/Extension.Exception.cs
--- a/server/Infrastructure/Extensions/Extension.Linq.cs
+++ b/server/Infrastructure/Extensions/Extension.Linq.cs
--- a/server/Infrastructure/Extensions/Extension.Validate.cs
+++ b/server/Infrastructure/Extensions/Extension.Validate.cs
--- a/server/Infrastructure/Extensions/StringExtension.cs
+++ b/server/Infrastructure/Extensions/StringExtension.cs
--- a/server/Infrastructure/GlobalConstant.cs
+++ b/server/Infrastructure/GlobalConstant.cs
--- a/server/Infrastructure/Helper/AssemblyUtils.cs
+++ b/server/Infrastructure/Helper/AssemblyUtils.cs
--- a/server/Infrastructure/Helper/ComputerHelper.cs
+++ b/server/Infrastructure/Helper/ComputerHelper.cs
--- a/server/Infrastructure/Helper/DateTimeHelper.cs
+++ b/server/Infrastructure/Helper/DateTimeHelper.cs
--- a/server/Infrastructure/Helper/FileUtil.cs
+++ b/server/Infrastructure/Helper/FileUtil.cs
--- a/server/Infrastructure/Helper/HttpHelper.cs
+++ b/server/Infrastructure/Helper/HttpHelper.cs
--- a/server/Infrastructure/Helper/ShellHelper.cs
+++ b/server/Infrastructure/Helper/ShellHelper.cs
--- a/server/Infrastructure/Helper/XmlCommentHelper.cs
+++ b/server/Infrastructure/Helper/XmlCommentHelper.cs
--- a/server/Infrastructure/Infrastructure.csproj
+++ b/server/Infrastructure/Infrastructure.csproj
--- a/server/Infrastructure/InternalApp.cs
+++ b/server/Infrastructure/InternalApp.cs
--- a/server/Infrastructure/JsonConverterUtil.cs
+++ b/server/Infrastructure/JsonConverterUtil.cs
--- a/server/Infrastructure/Model/ApiResult.cs
+++ b/server/Infrastructure/Model/ApiResult.cs
--- a/server/Infrastructure/Model/SendEmailDto.cs
+++ b/server/Infrastructure/Model/SendEmailDto.cs
--- a/server/Infrastructure/OptionsSetting.cs
+++ b/server/Infrastructure/OptionsSetting.cs
--- a/server/LICENSE
+++ b/server/LICENSE
--- a/server/README.en.md
+++ b/server/README.en.md
--- a/server/README.md
+++ b/server/README.md
--- a/server/ZR.Admin.WebApi/.config/dotnet-tools.json
+++ b/server/ZR.Admin.WebApi/.config/dotnet-tools.json
--- a/server/ZR.Admin.WebApi/.gitignore
+++ b/server/ZR.Admin.WebApi/.gitignore
--- a/server/ZR.Admin.WebApi/AutoMapperProfile/AutoMapperProfile.cs
+++ b/server/ZR.Admin.WebApi/AutoMapperProfile/AutoMapperProfile.cs
--- a/server/ZR.Admin.WebApi/Controllers/BaseController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/BaseController.cs
--- a/server/ZR.Admin.WebApi/Controllers/CommonController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/CommonController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/ArticleCategoryController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/ArticleCategoryController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/ArticleController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/ArticleController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/SysFileController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/SysFileController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/SysPostController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/SysPostController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/SysUserController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/SysUserController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/SysUserRoleController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/SysUserRoleController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/TasksController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/TasksController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/monitor/MonitorController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/monitor/MonitorController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs
--- a/server/ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs
--- a/server/ZR.Admin.WebApi/Controllers/WxOpenController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/WxOpenController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/md/MdBOMController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/md/MdBOMController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/md/MdDeviceController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/md/MdDeviceController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/md/MdTechnologicalProrouteController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/md/MdTechnologicalProrouteController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/md/MdUnitController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/md/MdUnitController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/md/MdWorklineController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/md/MdWorklineController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/md/MdWorkshopController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/md/MdWorkshopController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/md/MdWorkstationController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/md/MdWorkstationController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/mm/MmAgvLocationController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/mm/MmAgvLocationController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/mm/MmFinishedwarehouseController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/mm/MmFinishedwarehouseController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/op/OperationController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/op/OperationController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/op/quality/QualityStatisticsController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/op/quality/QualityStatisticsController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanV2Controller.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanV2Controller.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/pro/WmPackingrecordController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/pro/WmPackingrecordController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/qc/FQC/CRUD/QcQualityStatisticsFirstController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/qc/FQC/CRUD/QcQualityStatisticsFirstController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/qc/FQC/FirstFQCController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/qc/FQC/FirstFQCController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/qc/FQC/QCStatisticsController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/qc/FQC/QCStatisticsController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/qc/QcRoughController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/qc/QcRoughController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/qc/QcinspectionItemController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/qc/QcinspectionItemController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/wms/WMExitwarehouseController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/wms/WMExitwarehouseController.cs
--- a/server/ZR.Admin.WebApi/Controllers/mes/wms/WMentryWarehousing_productController.cs
+++ b/server/ZR.Admin.WebApi/Controllers/mes/wms/WMentryWarehousing_productController.cs
--- a/Show More
+++ b/Show More