diff --git a/BasicData/Tnb.BasicData.Entitys/Const/DicTypeKey.cs b/BasicData/Tnb.BasicData.Entitys/Const/DicTypeKey.cs deleted file mode 100644 index 19b9aabb..00000000 --- a/BasicData/Tnb.BasicData.Entitys/Const/DicTypeKey.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Tnb.BasicData.Entitys.Const -{ - public static class DicTypeKey - { - /// - /// 计量单位 - /// - public const string MeasurementUnit = "MeasurementUnit"; - } -} \ No newline at end of file diff --git a/BasicData/Tnb.BasicData.Entitys/Consts/DictConst.cs b/BasicData/Tnb.BasicData.Entitys/Consts/DictConst.cs new file mode 100644 index 00000000..5d4f3bb9 --- /dev/null +++ b/BasicData/Tnb.BasicData.Entitys/Consts/DictConst.cs @@ -0,0 +1,40 @@ +namespace Tnb.BasicData.Entitys; + +public static class DictConst +{ + #region BasicData + /// + /// 计量单位 + /// + public const string MeasurementUnit = "MeasurementUnit"; + + #endregion + + #region ProductionMgr + /// + /// 生产任务状态TypeId + /// + public const string PrdTaskStatusTypeId = "25572555259157"; + /// + /// 工单状态 已下发字典Id + /// + public const string IssueId = "25019232867093"; + /// + /// 任务单状态-待开工编码 + /// + public const string ToBeStartedEnCode = "ToBeStarted"; + + #endregion + + #region WarehouseMgr + + #endregion + + #region QcMgr + + #endregion + + #region EqpMgr + + #endregion +} \ No newline at end of file diff --git a/BasicData/Tnb.BasicData.Entitys/Consts/ModuleConst.cs b/BasicData/Tnb.BasicData.Entitys/Consts/ModuleConst.cs new file mode 100644 index 00000000..20eb49d8 --- /dev/null +++ b/BasicData/Tnb.BasicData.Entitys/Consts/ModuleConst.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tnb.BasicData; + +public class ModuleConst +{ + public const string Tag = "BasicData"; + public const string Area = "basic"; +} diff --git a/BasicData/Tnb.BasicData/EbomService.cs b/BasicData/Tnb.BasicData/EbomService.cs index fc3cc7e2..58dc8dc2 100644 --- a/BasicData/Tnb.BasicData/EbomService.cs +++ b/BasicData/Tnb.BasicData/EbomService.cs @@ -6,15 +6,16 @@ using Microsoft.AspNetCore.Mvc; using SqlSugar; using Tnb.BasicData.Entitys.Entity; using Tnb.BasicData.Entitys.Dto; -using Tnb.BasicData.Entitys.Const; +using Tnb.BasicData.Entitys; +using JNPF.Common.Const; namespace Tnb.BasicData { /// /// 物料清单 /// - [ApiDescriptionSettings(Tag = "BasicData", Name = "Ebom", Order = 701)] - [Route("api/basic/[controller]")] + [ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 1102)] + [Route("api/[area]/[controller]/[action]")] public class EbomService : IDynamicApiController, ITransient { private readonly ISqlSugarRepository _repository; @@ -34,11 +35,11 @@ namespace Tnb.BasicData /// /// 获取物料清单树. /// - [HttpPost("[action]")] + [HttpPost] public async Task GetTree(EbomTreeQueryInput queryInput) { var db = _repository.AsSugarClient(); - var dic = await _dictionaryDataService.GetDicByKey(DicTypeKey.MeasurementUnit); + var dic = await _dictionaryDataService.GetDicByKey(DictConst.MeasurementUnit); // var momDbLink = await _repository.AsSugarClient().Queryable().FirstAsync(x => x.FullName == DbName.TNBMON); // if (momDbLink != null) @@ -108,7 +109,7 @@ namespace Tnb.BasicData } - [HttpPost("[action]")] + [HttpPost] public async Task> GetEbomVersionAndRouteName(string materialId) { var db = _repository.AsSugarClient(); diff --git a/BasicData/Tnb.BasicData/MaterialService.cs b/BasicData/Tnb.BasicData/MaterialService.cs index 6a2bf5b9..89f6027a 100644 --- a/BasicData/Tnb.BasicData/MaterialService.cs +++ b/BasicData/Tnb.BasicData/MaterialService.cs @@ -7,15 +7,14 @@ using Microsoft.AspNetCore.Mvc; using SqlSugar; using Tnb.BasicData.Entitys; using Tnb.BasicData.Entitys.Entity; -using Tnb.BasicData.Entitys.Const; namespace Tnb.BasicData { /// /// 物料档案 /// - [ApiDescriptionSettings(Tag = "BasicData", Name = "Material", Order = 700)] - [Route("api/basic/[controller]")] + [ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 1102)] + [Route("api/[area]/[controller]/[action]")] public class MaterialService : IDynamicApiController, ITransient { private readonly ISqlSugarRepository _repository; @@ -30,11 +29,11 @@ namespace Tnb.BasicData _dictionaryDataService = dictionaryDataService; } - [HttpPost("[action]")] + [HttpPost] public async Task> GetEbomVersionAndRouteName(string materialId) { var db = _repository.AsSugarClient(); - var dic = await _dictionaryDataService.GetDicByKey(DicTypeKey.MeasurementUnit); + var dic = await _dictionaryDataService.GetDicByKey(DictConst.MeasurementUnit); // var momDbLink = await _repository.AsSugarClient().Queryable().FirstAsync(x => x.FullName == DbName.TNBMON); // if (momDbLink != null) // { @@ -58,12 +57,12 @@ namespace Tnb.BasicData }; } - [HttpPost("[action]")] + [HttpPost] public async Task> GetMaterialUnits(string materialId) { var db = _repository.AsSugarClient(); - var type = await db.Queryable().Where(x => x.EnCode == DicTypeKey.MeasurementUnit) + var type = await db.Queryable().Where(x => x.EnCode == DictConst.MeasurementUnit) .SingleAsync(); string typeId = type?.Id; var queryable1 = db.Queryable() diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Consts/DictionaryConstants.cs b/ProductionMgr/Tnb.ProductionMgr.Entitys/Consts/DictionaryConstants.cs index 30d11308..91518851 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entitys/Consts/DictionaryConstants.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entitys/Consts/DictionaryConstants.cs @@ -6,22 +6,6 @@ using System.Threading.Tasks; namespace Tnb.ProductionMgr.Entitys.Consts { - public class DictionaryConstants - { - /// - /// 生产任务状态TypeId - /// - public const string PrdTaskStatusTypeId = "25572555259157"; - /// - /// 工单状态 已下发字典Id - /// - public const string IssueId = "25019232867093"; - /// - /// 任务单状态-待开工编码 - /// - public const string ToBeStartedEnCode = "ToBeStarted"; - - } /// /// 工单状态 /// diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Consts/ModuleConst.cs b/ProductionMgr/Tnb.ProductionMgr.Entitys/Consts/ModuleConst.cs new file mode 100644 index 00000000..409f2184 --- /dev/null +++ b/ProductionMgr/Tnb.ProductionMgr.Entitys/Consts/ModuleConst.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tnb.ProductionMgr; + +public class ModuleConst +{ + public const string Tag = "ProductionManager"; + public const string Area = "production"; +} diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Tnb.ProductionMgr.Entitys.csproj b/ProductionMgr/Tnb.ProductionMgr.Entitys/Tnb.ProductionMgr.Entitys.csproj index a13ba3ff..24542167 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entitys/Tnb.ProductionMgr.Entitys.csproj +++ b/ProductionMgr/Tnb.ProductionMgr.Entitys/Tnb.ProductionMgr.Entitys.csproj @@ -9,6 +9,7 @@ + diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs index 003baf58..d2515302 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs @@ -8,17 +8,19 @@ using JNPF.Systems.Interfaces.System; using Mapster; using Microsoft.AspNetCore.Mvc; using SqlSugar; -using Tnb.ProductionMgr.Entitys.Consts; -using Tnb.ProductionMgr.Entitys.Dto; +using Tnb.BasicData.Entitys; +using Tnb.ProductionMgr.Entitys; +using Tnb.ProductionMgr.Entitys.Dto.PrdManage; +using Tnb.ProductionMgr.Entitys.Dto.WorkOrder; using Tnb.ProductionMgr.Entitys.Entity; using Tnb.ProductionMgr.Interfaces; -namespace Tnb.ProductionPlanMgr +namespace Tnb.ProductionMgr { /// /// 生产计划管理 /// - [ApiDescriptionSettings(Tag = "ProductionMgr", Area = "production", Order = 700)] + [ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 700)] [Route("api/[area]/[controller]/[action]")] public class PrdMoService : IPrdMoService, IDynamicApiController, ITransient { @@ -125,7 +127,7 @@ namespace Tnb.ProductionPlanMgr [HttpGet("{eqpId}")] public async Task PrdTaskSort(string eqpId) { - var taskStatusDic = await _dictionaryDataService.GetDicByTypeId(DictionaryConstants.PrdTaskStatusTypeId); + var taskStatusDic = await _dictionaryDataService.GetDicByTypeId(DictConst.PrdTaskStatusTypeId); var list = await _repository.AsSugarClient().Queryable() .Where(it => it.eqp_id == eqpId) .OrderBy(o => o.estimated_start_date) @@ -153,7 +155,7 @@ namespace Tnb.ProductionPlanMgr { var list = await _repository.AsSugarClient().Queryable().Where(it => it.id == taskId).ToListAsync(); var data = list.Adapt>(); - var dic = await _dictionaryDataService.GetDicByTypeId(DictionaryConstants.PrdTaskStatusTypeId); + var dic = await _dictionaryDataService.GetDicByTypeId(DictConst.PrdTaskStatusTypeId); _repository.AsSugarClient().ThenMapper(data, x => x.statusName = dic.ContainsKey(x.status) ? dic[x.status].ToString() : ""); return data; } @@ -185,7 +187,7 @@ namespace Tnb.ProductionPlanMgr } var row = await db.Updateable() - .SetColumns(it => new PrdMo { mo_status = DictionaryConstants.IssueId }) + .SetColumns(it => new PrdMo { mo_status = DictConst.IssueId }) .Where(it => input.WorkOrderIds.Contains(it.id)) .ExecuteCommandAsync(); return (row > 0); @@ -432,7 +434,7 @@ namespace Tnb.ProductionPlanMgr } var db = _repository.AsSugarClient(); var row = await db.Updateable() - .SetColumns(it => new PrdTask { status = DictionaryConstants.ToBeStartedEnCode }) + .SetColumns(it => new PrdTask { status = DictConst.ToBeStartedEnCode }) .Where(it => input.TaskIds.Contains(it.id)) .ExecuteCommandAsync(); return (row > 0);