diff --git a/BasicData/Tnb.BasicData.Entitys/Dto/ParentMaterial/EbomTreeOutput.cs b/BasicData/Tnb.BasicData.Entitys/Dto/BasEbom/EbomTreeOutput.cs
similarity index 98%
rename from BasicData/Tnb.BasicData.Entitys/Dto/ParentMaterial/EbomTreeOutput.cs
rename to BasicData/Tnb.BasicData.Entitys/Dto/BasEbom/EbomTreeOutput.cs
index 6f681b9b..e6062a07 100644
--- a/BasicData/Tnb.BasicData.Entitys/Dto/ParentMaterial/EbomTreeOutput.cs
+++ b/BasicData/Tnb.BasicData.Entitys/Dto/BasEbom/EbomTreeOutput.cs
@@ -1,4 +1,4 @@
-namespace Tnb.BasicData.Entitys.Dto
+namespace Tnb.BasicData.Entities.Dto
{
public class EbomTreeOutput
{
diff --git a/BasicData/Tnb.BasicData.Entitys/Dto/ParentMaterial/EbomTreeQueryInput.cs b/BasicData/Tnb.BasicData.Entitys/Dto/BasEbom/EbomTreeQueryInput.cs
similarity index 89%
rename from BasicData/Tnb.BasicData.Entitys/Dto/ParentMaterial/EbomTreeQueryInput.cs
rename to BasicData/Tnb.BasicData.Entitys/Dto/BasEbom/EbomTreeQueryInput.cs
index 9c4dfea5..4d8a7550 100644
--- a/BasicData/Tnb.BasicData.Entitys/Dto/ParentMaterial/EbomTreeQueryInput.cs
+++ b/BasicData/Tnb.BasicData.Entitys/Dto/BasEbom/EbomTreeQueryInput.cs
@@ -1,4 +1,4 @@
-namespace Tnb.BasicData.Entitys.Dto
+namespace Tnb.BasicData.Entities.Dto
{
public class EbomTreeQueryInput
{
diff --git a/BasicData/Tnb.BasicData.Entitys/Dto/ProcessManage/RouteLineTreeOutput.cs b/BasicData/Tnb.BasicData.Entitys/Dto/ProcessManage/RouteLineTreeOutput.cs
index d3279972..aab0daec 100644
--- a/BasicData/Tnb.BasicData.Entitys/Dto/ProcessManage/RouteLineTreeOutput.cs
+++ b/BasicData/Tnb.BasicData.Entitys/Dto/ProcessManage/RouteLineTreeOutput.cs
@@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Security;
-namespace Tnb.BasicData.Entitys.Dto.ProcessManage
+namespace Tnb.BasicData.Entities.Dto
{
///
/// 工艺路线模版左侧树输出参数
diff --git a/BasicData/Tnb.BasicData.Entitys/Mapper/Mapper.cs b/BasicData/Tnb.BasicData.Entitys/Mapper/Mapper.cs
index fdb102c4..12c508bc 100644
--- a/BasicData/Tnb.BasicData.Entitys/Mapper/Mapper.cs
+++ b/BasicData/Tnb.BasicData.Entitys/Mapper/Mapper.cs
@@ -1,6 +1,6 @@
using Mapster;
using SqlSugar;
-using Tnb.BasicData.Entitys.Dto.ProcessManage;
+using Tnb.BasicData.Entities.Dto;
namespace Tnb.BasicData.Entities
{
diff --git a/BasicData/Tnb.BasicData.Interfaces/IBasEbomService.cs b/BasicData/Tnb.BasicData.Interfaces/IBasEbomService.cs
new file mode 100644
index 00000000..b51afb7d
--- /dev/null
+++ b/BasicData/Tnb.BasicData.Interfaces/IBasEbomService.cs
@@ -0,0 +1,9 @@
+using Tnb.BasicData.Entities.Dto;
+
+namespace Tnb.BasicData.Interfaces
+{
+ public interface IBasEbomService
+ {
+ public Task GetTree(EbomTreeQueryInput queryInput);
+ }
+}
\ No newline at end of file
diff --git a/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs b/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs
new file mode 100644
index 00000000..3fce3259
--- /dev/null
+++ b/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs
@@ -0,0 +1,7 @@
+namespace Tnb.BasicData.Interfaces
+{
+ public interface IBasMaterialService
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/BasicData/Tnb.BasicData.Interfaces/IBasMbomService.cs b/BasicData/Tnb.BasicData.Interfaces/IBasMbomService.cs
new file mode 100644
index 00000000..97007bfc
--- /dev/null
+++ b/BasicData/Tnb.BasicData.Interfaces/IBasMbomService.cs
@@ -0,0 +1,7 @@
+namespace Tnb.BasicData.Interfaces
+{
+ public interface IBasMbomService
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/BasicData/Tnb.BasicData.Interfaces/IBasRouteService.cs b/BasicData/Tnb.BasicData.Interfaces/IBasRouteService.cs
new file mode 100644
index 00000000..e986bd82
--- /dev/null
+++ b/BasicData/Tnb.BasicData.Interfaces/IBasRouteService.cs
@@ -0,0 +1,17 @@
+namespace Tnb.BasicData.Interfaces
+{
+ public interface IBasRouteService
+ {
+ ///
+ /// 发布工艺路线
+ ///
+ /// 工艺路线id id
+ public Task Publish(Dictionary parameters);
+
+ ///
+ /// 复制工艺路线
+ ///
+ /// 工艺路线id id
+ public Task Copy(Dictionary parameters);
+ }
+}
\ No newline at end of file
diff --git a/BasicData/Tnb.BasicData/EbomService.cs b/BasicData/Tnb.BasicData/BasEbomService.cs
similarity index 97%
rename from BasicData/Tnb.BasicData/EbomService.cs
rename to BasicData/Tnb.BasicData/BasEbomService.cs
index 2f53f42e..b91dd36a 100644
--- a/BasicData/Tnb.BasicData/EbomService.cs
+++ b/BasicData/Tnb.BasicData/BasEbomService.cs
@@ -4,8 +4,9 @@ using JNPF.DynamicApiController;
using JNPF.Systems.Interfaces.System;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
-using Tnb.BasicData.Entitys.Dto;
using Tnb.BasicData.Entities;
+using Tnb.BasicData.Entities.Dto;
+using Tnb.BasicData.Interfaces;
namespace Tnb.BasicData
{
@@ -14,13 +15,13 @@ namespace Tnb.BasicData
///
[ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 1102)]
[Route("api/[area]/[controller]/[action]")]
- public class EbomService : IDynamicApiController, ITransient
+ public class BasEbomService : IBasEbomService,IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository _repository;
private readonly DataBaseManager _dbManager;
private readonly IDictionaryDataService _dictionaryDataService;
- public EbomService(
+ public BasEbomService(
ISqlSugarRepository repository,DataBaseManager dbManager,IDictionaryDataService dictionaryDataService)
{
_repository = repository;
diff --git a/BasicData/Tnb.BasicData/MaterialService.cs b/BasicData/Tnb.BasicData/BasMaterialService.cs
similarity index 95%
rename from BasicData/Tnb.BasicData/MaterialService.cs
rename to BasicData/Tnb.BasicData/BasMaterialService.cs
index 75d49113..f855644e 100644
--- a/BasicData/Tnb.BasicData/MaterialService.cs
+++ b/BasicData/Tnb.BasicData/BasMaterialService.cs
@@ -5,6 +5,7 @@ using JNPF.Systems.Interfaces.System;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.BasicData.Entities;
+using Tnb.BasicData.Interfaces;
namespace Tnb.BasicData
{
@@ -13,13 +14,13 @@ namespace Tnb.BasicData
///
[ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 1102)]
[Route("api/[area]/[controller]/[action]")]
- public class MaterialService : IDynamicApiController, ITransient
+ public class BasMaterialService : IBasMaterialService,IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository _repository;
private readonly DataBaseManager _dbManager;
private readonly IDictionaryDataService _dictionaryDataService;
- public MaterialService(
+ public BasMaterialService(
ISqlSugarRepository repository,DataBaseManager dbManager,IDictionaryDataService dictionaryDataService)
{
_repository = repository;
diff --git a/BasicData/Tnb.BasicData/MbomService.cs b/BasicData/Tnb.BasicData/BasMbomService.cs
similarity index 86%
rename from BasicData/Tnb.BasicData/MbomService.cs
rename to BasicData/Tnb.BasicData/BasMbomService.cs
index ac0fcabd..30b65047 100644
--- a/BasicData/Tnb.BasicData/MbomService.cs
+++ b/BasicData/Tnb.BasicData/BasMbomService.cs
@@ -5,6 +5,7 @@ using JNPF.Systems.Interfaces.System;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.BasicData.Entities;
+using Tnb.BasicData.Interfaces;
namespace Tnb.BasicData
{
@@ -13,13 +14,13 @@ namespace Tnb.BasicData
///
[ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 1102)]
[Route("api/[area]/[controller]/[action]")]
- public class MbomService : IDynamicApiController, ITransient
+ public class BasMbomService : IBasMbomService,IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository _repository;
private readonly DataBaseManager _dbManager;
private readonly IDictionaryDataService _dictionaryDataService;
- public MbomService(
+ public BasMbomService(
ISqlSugarRepository repository,DataBaseManager dbManager,IDictionaryDataService dictionaryDataService)
{
_repository = repository;
diff --git a/BasicData/Tnb.BasicData/RouteService.cs b/BasicData/Tnb.BasicData/BasRouteService.cs
similarity index 92%
rename from BasicData/Tnb.BasicData/RouteService.cs
rename to BasicData/Tnb.BasicData/BasRouteService.cs
index 382c43de..1a1f37fb 100644
--- a/BasicData/Tnb.BasicData/RouteService.cs
+++ b/BasicData/Tnb.BasicData/BasRouteService.cs
@@ -5,6 +5,7 @@ using JNPF.DynamicApiController;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.BasicData.Entities;
+using Tnb.BasicData.Interfaces;
namespace Tnb.BasicData
{
@@ -13,18 +14,16 @@ namespace Tnb.BasicData
///
[ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 701)]
[Route("api/[area]/[controller]/[action]")]
- public class RouteService : IDynamicApiController, ITransient
+ public class BasRouteService : IBasRouteService,IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository _repository;
- private readonly UserManager _userManager;
- public RouteService(
+ public BasRouteService(
UserManager userManager,
ISqlSugarRepository repository)
{
_repository = repository;
- _userManager = userManager;
}
///