diff --git a/RIZO.Admin.WebApi/Controllers/Business/QualityDefectReasonController.cs b/RIZO.Admin.WebApi/Controllers/Mes/MasterData/QualityDefectReasonController.cs
similarity index 94%
rename from RIZO.Admin.WebApi/Controllers/Business/QualityDefectReasonController.cs
rename to RIZO.Admin.WebApi/Controllers/Mes/MasterData/QualityDefectReasonController.cs
index 32b1e7a..2e70265 100644
--- a/RIZO.Admin.WebApi/Controllers/Business/QualityDefectReasonController.cs
+++ b/RIZO.Admin.WebApi/Controllers/Mes/MasterData/QualityDefectReasonController.cs
@@ -1,15 +1,15 @@
using Microsoft.AspNetCore.Mvc;
-using RIZO.Model.Business.Dto;
-using RIZO.Model.Business;
-using RIZO.Service.Business.IBusinessService;
+using RIZO.Model.Mes.MasterData;
+using RIZO.Model.Mes.Dto.MasterData;
+using RIZO.Service.Mes.IMesService.MasterData;
//创建时间:2025-11-10
-namespace RIZO.Admin.WebApi.Controllers.Business
+namespace RIZO.Admin.WebApi.Controllers.Mes.MasterData
{
///
/// 质量不良原因字典表
///
- [Route("business/QualityDefectReason")]
+ [Route("mes/QualityDefectReason")]
public class QualityDefectReasonController : BaseController
{
///
diff --git a/RIZO.Admin.WebApi/Controllers/Business/MaterialInfoController.cs b/RIZO.Admin.WebApi/Controllers/Mes/Material/MaterialInfoController.cs
similarity index 93%
rename from RIZO.Admin.WebApi/Controllers/Business/MaterialInfoController.cs
rename to RIZO.Admin.WebApi/Controllers/Mes/Material/MaterialInfoController.cs
index e8030cb..d3684c9 100644
--- a/RIZO.Admin.WebApi/Controllers/Business/MaterialInfoController.cs
+++ b/RIZO.Admin.WebApi/Controllers/Mes/Material/MaterialInfoController.cs
@@ -1,16 +1,16 @@
using Microsoft.AspNetCore.Mvc;
-using RIZO.Model.Business.Dto;
-using RIZO.Model.Business;
-using RIZO.Service.Business.IBusinessService;
+using RIZO.Model.Mes.Material;
+using RIZO.Model.Mes.Dto.Material;
+using RIZO.Service.Mes.IMesService.Material;
//创建时间:2025-11-05
-namespace RIZO.Admin.WebApi.Controllers.Business
+namespace RIZO.Admin.WebApi.Controllers.Mes.Material
{
///
/// 物料表
///
[AllowAnonymous] //先跳过验证
- [Route("business/MaterialInfo")]
+ [Route("mes/MaterialInfo")]
public class MaterialInfoController : BaseController
{
///
diff --git a/RIZO.Admin.WebApi/Controllers/Business/OperationInfoController.cs b/RIZO.Admin.WebApi/Controllers/Mes/Process/OperationInfoController.cs
similarity index 95%
rename from RIZO.Admin.WebApi/Controllers/Business/OperationInfoController.cs
rename to RIZO.Admin.WebApi/Controllers/Mes/Process/OperationInfoController.cs
index bc2e770..af3c88d 100644
--- a/RIZO.Admin.WebApi/Controllers/Business/OperationInfoController.cs
+++ b/RIZO.Admin.WebApi/Controllers/Mes/Process/OperationInfoController.cs
@@ -1,16 +1,17 @@
using Microsoft.AspNetCore.Mvc;
using RIZO.Model;
-using RIZO.Model.Business;
-using RIZO.Model.Business.Dto;
-using RIZO.Service.Business.IBusinessService;
+using RIZO.Model.Mes.Dto.Process;
+using RIZO.Model.Mes.Process;
+using RIZO.Service.Mes.IMesService.Process;
+
//创建时间:2025-11-04
-namespace RIZO.Admin.WebApi.Controllers.Business
+namespace RIZO.Admin.WebApi.Controllers.Mes.Process
{
///
/// 工序表
///
- [Route("business/OperationInfo")]
+ [Route("mes/OperationInfo")]
[AllowAnonymous]
public class OperationInfoController : BaseController
{
diff --git a/RIZO.Admin.WebApi/Controllers/Business/ProcessInfoController.cs b/RIZO.Admin.WebApi/Controllers/Mes/Process/ProcessInfoController.cs
similarity index 95%
rename from RIZO.Admin.WebApi/Controllers/Business/ProcessInfoController.cs
rename to RIZO.Admin.WebApi/Controllers/Mes/Process/ProcessInfoController.cs
index 5cad5d9..d5f02c2 100644
--- a/RIZO.Admin.WebApi/Controllers/Business/ProcessInfoController.cs
+++ b/RIZO.Admin.WebApi/Controllers/Mes/Process/ProcessInfoController.cs
@@ -1,20 +1,22 @@
using Aliyun.OSS;
using Microsoft.AspNetCore.Mvc;
using RIZO.Model;
-using RIZO.Model.Business;
-using RIZO.Model.Business.Dto;
+using RIZO.Model.Mes;
using RIZO.Model.Content.Dto;
-using RIZO.Model.Dto;
-using RIZO.Service.Business;
-using RIZO.Service.Business.IBusinessService;
+using RIZO.Model.Mes.Dto;
+using RIZO.Model.Mes.Dto.Process;
+using RIZO.Service.Mes;
+using RIZO.Service.Mes.IMesService.Process;
+using RIZO.Model.Mes.Process;
+
//创建时间:2025-11-04
-namespace RIZO.Admin.WebApi.Controllers.Business
+namespace RIZO.Admin.WebApi.Controllers.Mes.Process
{
///
/// 工艺表
///
- [Route("business/ProcessInfo")]
+ [Route("mes/ProcessInfo")]
[AllowAnonymous]
public class ProcessInfoController : BaseController
{
diff --git a/RIZO.Admin.WebApi/Program.cs b/RIZO.Admin.WebApi/Program.cs
index 1ca0107..9b05863 100644
--- a/RIZO.Admin.WebApi/Program.cs
+++ b/RIZO.Admin.WebApi/Program.cs
@@ -15,7 +15,7 @@ using RIZO.ServiceCore.SqlSugar;
using RIZO.Mall;
-using RIZO.Service.Business;
+using RIZO.Service.Mes;
//using SQLitePCL;
var builder = WebApplication.CreateBuilder(args);
diff --git a/RIZO.Model/Business/Dto/QualityDefectReasonDto.cs b/RIZO.Model/Mes/Dto/MasterData/QualityDefectReasonDto.cs
similarity index 96%
rename from RIZO.Model/Business/Dto/QualityDefectReasonDto.cs
rename to RIZO.Model/Mes/Dto/MasterData/QualityDefectReasonDto.cs
index 2380c19..267d613 100644
--- a/RIZO.Model/Business/Dto/QualityDefectReasonDto.cs
+++ b/RIZO.Model/Mes/Dto/MasterData/QualityDefectReasonDto.cs
@@ -1,5 +1,4 @@
-
-namespace RIZO.Model.Business.Dto
+namespace RIZO.Model.Mes.Dto.MasterData
{
///
/// 质量不良原因字典表查询对象
diff --git a/RIZO.Model/Business/Dto/MaterialInfoDto.cs b/RIZO.Model/Mes/Dto/Material/MaterialInfoDto.cs
similarity index 97%
rename from RIZO.Model/Business/Dto/MaterialInfoDto.cs
rename to RIZO.Model/Mes/Dto/Material/MaterialInfoDto.cs
index 889295b..3262a13 100644
--- a/RIZO.Model/Business/Dto/MaterialInfoDto.cs
+++ b/RIZO.Model/Mes/Dto/Material/MaterialInfoDto.cs
@@ -1,5 +1,4 @@
-
-namespace RIZO.Model.Business.Dto
+namespace RIZO.Model.Mes.Dto.Material
{
///
/// 物料表查询对象
diff --git a/RIZO.Model/Business/Dto/OperationInfoDto.cs b/RIZO.Model/Mes/Dto/Process/OperationInfoDto.cs
similarity index 95%
rename from RIZO.Model/Business/Dto/OperationInfoDto.cs
rename to RIZO.Model/Mes/Dto/Process/OperationInfoDto.cs
index bf53da7..346b48d 100644
--- a/RIZO.Model/Business/Dto/OperationInfoDto.cs
+++ b/RIZO.Model/Mes/Dto/Process/OperationInfoDto.cs
@@ -1,5 +1,4 @@
-
-namespace RIZO.Model.Business.Dto
+namespace RIZO.Model.Mes.Dto.Process
{
///
/// 工序表查询对象
diff --git a/RIZO.Model/Business/Dto/ProcessInfoDto.cs b/RIZO.Model/Mes/Dto/Process/ProcessInfoDto.cs
similarity index 97%
rename from RIZO.Model/Business/Dto/ProcessInfoDto.cs
rename to RIZO.Model/Mes/Dto/Process/ProcessInfoDto.cs
index 6668d5c..8fad508 100644
--- a/RIZO.Model/Business/Dto/ProcessInfoDto.cs
+++ b/RIZO.Model/Mes/Dto/Process/ProcessInfoDto.cs
@@ -1,5 +1,4 @@
-
-namespace RIZO.Model.Business.Dto
+namespace RIZO.Model.Mes.Dto.Process
{
///
/// 工艺表查询对象
diff --git a/RIZO.Model/Business/Dto/ProcessInfoImport.cs b/RIZO.Model/Mes/Dto/Process/ProcessInfoImport.cs
similarity index 96%
rename from RIZO.Model/Business/Dto/ProcessInfoImport.cs
rename to RIZO.Model/Mes/Dto/Process/ProcessInfoImport.cs
index 2fbd428..7e71378 100644
--- a/RIZO.Model/Business/Dto/ProcessInfoImport.cs
+++ b/RIZO.Model/Mes/Dto/Process/ProcessInfoImport.cs
@@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using MiniExcelLib.Core.Attributes;
-namespace RIZO.Model.Business.Dto
+namespace RIZO.Model.Mes.Dto.Process
{
public class ProcessInfoImport
{
diff --git a/RIZO.Model/Business/QualityDefectReason.cs b/RIZO.Model/Mes/MasterData/QualityDefectReason.cs
similarity index 98%
rename from RIZO.Model/Business/QualityDefectReason.cs
rename to RIZO.Model/Mes/MasterData/QualityDefectReason.cs
index f5f7e0b..10fdce9 100644
--- a/RIZO.Model/Business/QualityDefectReason.cs
+++ b/RIZO.Model/Mes/MasterData/QualityDefectReason.cs
@@ -1,5 +1,4 @@
-
-namespace RIZO.Model.Business
+namespace RIZO.Model.Mes.MasterData
{
///
/// 质量不良原因字典表
diff --git a/RIZO.Model/Business/MaterialInfo.cs b/RIZO.Model/Mes/Material/MaterialInfo.cs
similarity index 98%
rename from RIZO.Model/Business/MaterialInfo.cs
rename to RIZO.Model/Mes/Material/MaterialInfo.cs
index 980f3a0..8092de6 100644
--- a/RIZO.Model/Business/MaterialInfo.cs
+++ b/RIZO.Model/Mes/Material/MaterialInfo.cs
@@ -1,5 +1,4 @@
-
-namespace RIZO.Model.Business
+namespace RIZO.Model.Mes.Material
{
///
/// 物料表
diff --git a/RIZO.Model/Business/MaterialTypeDict.cs b/RIZO.Model/Mes/Material/MaterialTypeDict.cs
similarity index 90%
rename from RIZO.Model/Business/MaterialTypeDict.cs
rename to RIZO.Model/Mes/Material/MaterialTypeDict.cs
index 1854673..65f39c6 100644
--- a/RIZO.Model/Business/MaterialTypeDict.cs
+++ b/RIZO.Model/Mes/Material/MaterialTypeDict.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RIZO.Model.Business
+namespace RIZO.Model.Mes.Material
{
public class MaterialTypeDict
{
diff --git a/RIZO.Model/Business/OperationInfo.cs b/RIZO.Model/Mes/Process/OperationInfo.cs
similarity index 98%
rename from RIZO.Model/Business/OperationInfo.cs
rename to RIZO.Model/Mes/Process/OperationInfo.cs
index 3bb0b27..df6871a 100644
--- a/RIZO.Model/Business/OperationInfo.cs
+++ b/RIZO.Model/Mes/Process/OperationInfo.cs
@@ -1,5 +1,4 @@
-
-namespace RIZO.Model.Business
+namespace RIZO.Model.Mes.Process
{
///
/// 工序表
diff --git a/RIZO.Model/Business/ProcessInfo.cs b/RIZO.Model/Mes/Process/ProcessInfo.cs
similarity index 97%
rename from RIZO.Model/Business/ProcessInfo.cs
rename to RIZO.Model/Mes/Process/ProcessInfo.cs
index 81338f3..c3d9398 100644
--- a/RIZO.Model/Business/ProcessInfo.cs
+++ b/RIZO.Model/Mes/Process/ProcessInfo.cs
@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RIZO.Model.Business
+namespace RIZO.Model.Mes.Process
{
[SugarTable("process_info")] // 表名与数据库一致
public class ProcessInfo
diff --git a/RIZO.Service/Business/IBusinessService/IQualityDefectReasonService.cs b/RIZO.Service/Mes/IMesService/MasterData/IQualityDefectReasonService.cs
similarity index 79%
rename from RIZO.Service/Business/IBusinessService/IQualityDefectReasonService.cs
rename to RIZO.Service/Mes/IMesService/MasterData/IQualityDefectReasonService.cs
index 0d1028a..7f81b29 100644
--- a/RIZO.Service/Business/IBusinessService/IQualityDefectReasonService.cs
+++ b/RIZO.Service/Mes/IMesService/MasterData/IQualityDefectReasonService.cs
@@ -1,7 +1,7 @@
-using RIZO.Model.Business.Dto;
-using RIZO.Model.Business;
+using RIZO.Model.Mes.Dto.MasterData;
+using RIZO.Model.Mes.MasterData;
-namespace RIZO.Service.Business.IBusinessService
+namespace RIZO.Service.Mes.IMesService.MasterData
{
///
/// 质量不良原因字典表service接口
diff --git a/RIZO.Service/Business/IBusinessService/IMaterialInfoService.cs b/RIZO.Service/Mes/IMesService/Material/IMaterialInfoService.cs
similarity index 76%
rename from RIZO.Service/Business/IBusinessService/IMaterialInfoService.cs
rename to RIZO.Service/Mes/IMesService/Material/IMaterialInfoService.cs
index ed7f09c..8f25eef 100644
--- a/RIZO.Service/Business/IBusinessService/IMaterialInfoService.cs
+++ b/RIZO.Service/Mes/IMesService/Material/IMaterialInfoService.cs
@@ -1,7 +1,7 @@
-using RIZO.Model.Business.Dto;
-using RIZO.Model.Business;
+using RIZO.Model.Mes.Dto.Material;
+using RIZO.Model.Mes.Material;
-namespace RIZO.Service.Business.IBusinessService
+namespace RIZO.Service.Mes.IMesService.Material
{
///
/// 物料表service接口
diff --git a/RIZO.Service/Business/IBusinessService/IOperationInfoService.cs b/RIZO.Service/Mes/IMesService/Process/IOperationInfoService.cs
similarity index 81%
rename from RIZO.Service/Business/IBusinessService/IOperationInfoService.cs
rename to RIZO.Service/Mes/IMesService/Process/IOperationInfoService.cs
index 0f08bf0..173b9de 100644
--- a/RIZO.Service/Business/IBusinessService/IOperationInfoService.cs
+++ b/RIZO.Service/Mes/IMesService/Process/IOperationInfoService.cs
@@ -1,7 +1,7 @@
-using RIZO.Model.Business.Dto;
-using RIZO.Model.Business;
+using RIZO.Model.Mes.Dto.Process;
+using RIZO.Model.Mes.Process;
-namespace RIZO.Service.Business.IBusinessService
+namespace RIZO.Service.Mes.IMesService.Process
{
///
/// 工序表service接口
diff --git a/RIZO.Service/Business/IBusinessService/IProcessInfoService.cs b/RIZO.Service/Mes/IMesService/Process/IProcessInfoService.cs
similarity index 85%
rename from RIZO.Service/Business/IBusinessService/IProcessInfoService.cs
rename to RIZO.Service/Mes/IMesService/Process/IProcessInfoService.cs
index 46f8068..4735031 100644
--- a/RIZO.Service/Business/IBusinessService/IProcessInfoService.cs
+++ b/RIZO.Service/Mes/IMesService/Process/IProcessInfoService.cs
@@ -1,8 +1,8 @@
-using RIZO.Model.Business.Dto;
-using RIZO.Model.Business;
using Infrastructure.Model;
+using RIZO.Model.Mes.Dto.Process;
+using RIZO.Model.Mes.Process;
-namespace RIZO.Service.Business.IBusinessService
+namespace RIZO.Service.Mes.IMesService.Process
{
///
/// 工艺表service接口
diff --git a/RIZO.Service/Business/QualityDefectReasonService.cs b/RIZO.Service/Mes/MasterData/QualityDefectReasonService.cs
similarity index 94%
rename from RIZO.Service/Business/QualityDefectReasonService.cs
rename to RIZO.Service/Mes/MasterData/QualityDefectReasonService.cs
index 10fcf6c..6188612 100644
--- a/RIZO.Service/Business/QualityDefectReasonService.cs
+++ b/RIZO.Service/Mes/MasterData/QualityDefectReasonService.cs
@@ -1,11 +1,11 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
-using RIZO.Model.Business.Dto;
-using RIZO.Model.Business;
using RIZO.Repository;
-using RIZO.Service.Business.IBusinessService;
+using RIZO.Model.Mes.MasterData;
+using RIZO.Model.Mes.Dto.MasterData;
+using RIZO.Service.Mes.IMesService.MasterData;
-namespace RIZO.Service.Business
+namespace RIZO.Service.Mes.MasterData
{
///
/// 质量不良原因字典表Service业务层处理
diff --git a/RIZO.Service/Business/MaterialInfoService.cs b/RIZO.Service/Mes/Material/MaterialInfoService.cs
similarity index 93%
rename from RIZO.Service/Business/MaterialInfoService.cs
rename to RIZO.Service/Mes/Material/MaterialInfoService.cs
index b423597..7095b79 100644
--- a/RIZO.Service/Business/MaterialInfoService.cs
+++ b/RIZO.Service/Mes/Material/MaterialInfoService.cs
@@ -1,11 +1,11 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
-using RIZO.Model.Business.Dto;
-using RIZO.Model.Business;
using RIZO.Repository;
-using RIZO.Service.Business.IBusinessService;
+using RIZO.Model.Mes.Material;
+using RIZO.Model.Mes.Dto.Material;
+using RIZO.Service.Mes.IMesService.Material;
-namespace RIZO.Service.Business
+namespace RIZO.Service.Mes.Material
{
///
/// 物料表Service业务层处理
diff --git a/RIZO.Service/Business/OperationInfoService.cs b/RIZO.Service/Mes/Process/OperationInfoService.cs
similarity index 94%
rename from RIZO.Service/Business/OperationInfoService.cs
rename to RIZO.Service/Mes/Process/OperationInfoService.cs
index a3c4506..b7affca 100644
--- a/RIZO.Service/Business/OperationInfoService.cs
+++ b/RIZO.Service/Mes/Process/OperationInfoService.cs
@@ -1,13 +1,13 @@
using Aliyun.OSS;
using Infrastructure.Attribute;
using Infrastructure.Extensions;
-using RIZO.Model.Business;
-using RIZO.Model.Business.Dto;
+using RIZO.Model.Mes.Dto.Process;
+using RIZO.Model.Mes.Process;
using RIZO.Repository;
-using RIZO.Service.Business.IBusinessService;
+using RIZO.Service.Mes.IMesService.Process;
using System;
-namespace RIZO.Service.Business
+namespace RIZO.Service.Mes.Process
{
///
/// 工序表Service业务层处理
diff --git a/RIZO.Service/Business/ProcessInfoService.cs b/RIZO.Service/Mes/Process/ProcessInfoService.cs
similarity index 98%
rename from RIZO.Service/Business/ProcessInfoService.cs
rename to RIZO.Service/Mes/Process/ProcessInfoService.cs
index f86030d..c2fff9d 100644
--- a/RIZO.Service/Business/ProcessInfoService.cs
+++ b/RIZO.Service/Mes/Process/ProcessInfoService.cs
@@ -3,17 +3,17 @@ using Infrastructure.Extensions;
using Infrastructure.Model;
using Microsoft.AspNetCore.Http;
using MiniExcelLibs;
-using RIZO.Model.Business;
-using RIZO.Model.Business.Dto;
using RIZO.Model.System;
using RIZO.Repository;
-using RIZO.Service.Business.IBusinessService;
using static MiniExcelLib.Core.MiniExcel;
using System.Collections.Generic;
using System.IO;
using Microsoft.AspNetCore.Http;
+using RIZO.Model.Mes.Process;
+using RIZO.Model.Mes.Dto.Process;
+using RIZO.Service.Mes.IMesService.Process;
-namespace RIZO.Service.Business
+namespace RIZO.Service.Mes.Process
{
///
/// 工艺表Service业务层处理