diff --git a/BasicData/Tnb.BasicData.Entitys/Dto/BasEbom/EbomListOutput.cs b/BasicData/Tnb.BasicData.Entitys/Dto/BasEbom/EbomListOutput.cs
new file mode 100644
index 00000000..9bdc1445
--- /dev/null
+++ b/BasicData/Tnb.BasicData.Entitys/Dto/BasEbom/EbomListOutput.cs
@@ -0,0 +1,30 @@
+namespace Tnb.BasicData.Entities.Dto
+{
+ ///
+ /// 物料清单列表输出类
+ ///
+ public class EbomListOutput
+ {
+ public string id { get; set; }
+ ///
+ /// 物料编码-物料名称
+ ///
+ public string material_id { get; set; }
+ ///
+ /// 物料id
+ ///
+ public string material_id_id { get; set; }
+ public string status { get; set; }
+ public string descrip { get; set; }
+ public string unit_id { get; set; }
+ public string version { get; set; }
+ ///
+ /// 工艺路线名称
+ ///
+ public string route_id { get; set; }
+ ///
+ /// 工艺路线id
+ ///
+ public string route_id_id { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/BasicData/Tnb.BasicData.Entitys/Dto/BasMbom/MbomListOutput.cs b/BasicData/Tnb.BasicData.Entitys/Dto/BasMbom/MbomListOutput.cs
new file mode 100644
index 00000000..3c4f1a44
--- /dev/null
+++ b/BasicData/Tnb.BasicData.Entitys/Dto/BasMbom/MbomListOutput.cs
@@ -0,0 +1,18 @@
+namespace Tnb.BasicData.Entities.Dto
+{
+ public class MbomListOutput
+ {
+ public string id { get; set; }
+ public string ebom_id { get; set; }
+ public string num { get; set; }
+ public string unit_id { get; set; }
+ public string version { get; set; }
+ public string start_time { get; set; }
+ public string end_time { get; set; }
+ public string material_id { get; set; }
+ public string material_id_id { get; set; }
+ public string route_id { get; set; }
+ public string route_id_id { get; set; }
+ public string is_first { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasEbomH.cs b/BasicData/Tnb.BasicData.Entitys/Entity/BasEbomH.cs
index 3064d18c..8ec9980c 100644
--- a/BasicData/Tnb.BasicData.Entitys/Entity/BasEbomH.cs
+++ b/BasicData/Tnb.BasicData.Entitys/Entity/BasEbomH.cs
@@ -117,6 +117,14 @@ namespace Tnb.BasicData.Entities
///
[SugarColumn(ColumnName="modify_id")]
public string modify_id {get;set;}
+
+ ///
+ /// Desc:仅用于关联表字段查询用不存储数据
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ [SugarColumn(ColumnName="query_info")]
+ public string query_info {get;set;}
}
}
\ No newline at end of file
diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/BasMbom.cs b/BasicData/Tnb.BasicData.Entitys/Entity/BasMbom.cs
index 6ff5a46b..40f91302 100644
--- a/BasicData/Tnb.BasicData.Entitys/Entity/BasMbom.cs
+++ b/BasicData/Tnb.BasicData.Entitys/Entity/BasMbom.cs
@@ -125,5 +125,12 @@ namespace Tnb.BasicData.Entities
///
public string modify_id {get;set;}
+ ///
+ /// Desc:仅用于关联表字段查询用不存储数据
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ [SugarColumn(ColumnName="query_info")]
+ public string query_info {get;set;}
}
}
\ No newline at end of file
diff --git a/BasicData/Tnb.BasicData.Entitys/Tnb.BasicData.Entitys.csproj b/BasicData/Tnb.BasicData.Entitys/Tnb.BasicData.Entitys.csproj
index e910aaa2..e161f1b4 100644
--- a/BasicData/Tnb.BasicData.Entitys/Tnb.BasicData.Entitys.csproj
+++ b/BasicData/Tnb.BasicData.Entitys/Tnb.BasicData.Entitys.csproj
@@ -9,6 +9,7 @@
+
diff --git a/BasicData/Tnb.BasicData.Interfaces/Tnb.BasicData.Interfaces.csproj b/BasicData/Tnb.BasicData.Interfaces/Tnb.BasicData.Interfaces.csproj
index bc331b03..312602bf 100644
--- a/BasicData/Tnb.BasicData.Interfaces/Tnb.BasicData.Interfaces.csproj
+++ b/BasicData/Tnb.BasicData.Interfaces/Tnb.BasicData.Interfaces.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/BasicData/Tnb.BasicData/BasEbomService.cs b/BasicData/Tnb.BasicData/BasEbomService.cs
index b91dd36a..46e63b58 100644
--- a/BasicData/Tnb.BasicData/BasEbomService.cs
+++ b/BasicData/Tnb.BasicData/BasEbomService.cs
@@ -1,11 +1,17 @@
using JNPF.Common.Core.Manager;
+using JNPF.Common.Filter;
+using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
+using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Interfaces.System;
+using JNPF.VisualDev;
+using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.BasicData.Entities;
using Tnb.BasicData.Entities.Dto;
+using Tnb.BasicData.Entitys.Dto.BasProcess;
using Tnb.BasicData.Interfaces;
namespace Tnb.BasicData
@@ -15,11 +21,14 @@ namespace Tnb.BasicData
///
[ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 1102)]
[Route("api/[area]/[controller]/[action]")]
- public class BasEbomService : IBasEbomService,IDynamicApiController, ITransient
+ [OverideVisualDev(ModelId)]
+ public class BasEbomService : IBasEbomService,IOverideVisualDevService,IDynamicApiController, ITransient
{
+ public const string ModelId = "25487105536805";
private readonly ISqlSugarRepository _repository;
private readonly DataBaseManager _dbManager;
private readonly IDictionaryDataService _dictionaryDataService;
+ public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public BasEbomService(
ISqlSugarRepository repository,DataBaseManager dbManager,IDictionaryDataService dictionaryDataService)
@@ -27,6 +36,40 @@ namespace Tnb.BasicData
_repository = repository;
_dbManager = dbManager;
_dictionaryDataService = dictionaryDataService;
+ OverideFuncs.GetListAsync = GetList;
+ }
+
+
+ ///
+ /// 物料清单列表
+ ///
+ ///
+ ///
+ public async Task GetList(VisualDevModelListQueryInput input)
+ {
+ var db = _repository.AsSugarClient();
+ Dictionary queryJson = string.IsNullOrEmpty(input.queryJson) ? null : input.queryJson.ToObject>();
+ string materialInfo = queryJson?["query_info"]?.ToString();
+ var list = await db.Queryable((a, b, c) => new object[]
+ {
+ JoinType.Left, a.material_id == b.id,
+ JoinType.Left, a.route_id == c.id,
+ })
+ .WhereIF(!string.IsNullOrEmpty(materialInfo),(a,b,c)=>b.code.Contains(materialInfo) || b.name.Contains(materialInfo))
+ .Select((a, b, c) => new EbomListOutput
+ {
+ id = a.id,
+ material_id = b.code + "-" + b.name,
+ material_id_id = b.id,
+ status = SqlFunc.IIF(a.status == "0", "禁用", "启用"),
+ descrip = a.descrip,
+ version = a.version,
+ route_id = c.name,
+ route_id_id = c.id,
+
+ }).ToPagedListAsync(input.currentPage, input.pageSize);
+
+ return PageResult.SqlSugarPageResult(list);
}
///
diff --git a/BasicData/Tnb.BasicData/BasMbomService.cs b/BasicData/Tnb.BasicData/BasMbomService.cs
index f606f40a..1fd5b097 100644
--- a/BasicData/Tnb.BasicData/BasMbomService.cs
+++ b/BasicData/Tnb.BasicData/BasMbomService.cs
@@ -1,9 +1,11 @@
using JNPF.Common.Core.Manager;
+using JNPF.Common.Filter;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev;
+using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.BasicData.Entities;
@@ -18,7 +20,7 @@ namespace Tnb.BasicData
[ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 1102)]
[Route("api/[area]/[controller]/[action]")]
[OverideVisualDev(ModelId)]
- public class BasMbomService : IBasMbomService,IDynamicApiController, ITransient
+ public class BasMbomService : IBasMbomService,IOverideVisualDevService,IDynamicApiController, ITransient
{
public const string ModelId = "25574817510421";
private readonly ISqlSugarRepository _repository;
@@ -37,7 +39,42 @@ namespace Tnb.BasicData
_dbManager = dbManager;
_userManager = userManager;
_dictionaryDataService = dictionaryDataService;
- OverideFuncs.GetAsync = GetInfo;
+ // OverideFuncs.GetAsync = GetInfo;
+ OverideFuncs.GetListAsync = GetList;
+ }
+
+ ///
+ /// 生产bom列表
+ ///
+ ///
+ ///
+ public async Task GetList(VisualDevModelListQueryInput input)
+ {
+ var db = _repository.AsSugarClient();
+ Dictionary queryJson = string.IsNullOrEmpty(input.queryJson) ? null : input.queryJson.ToObject>();
+ string materialInfo = queryJson?["query_info"]?.ToString();
+ var list = await db.Queryable((a, b, c,d) => new object[]
+ {
+ JoinType.Left, a.material_id == b.id,
+ JoinType.Left, a.ebom_id == c.id,
+ JoinType.Left, a.route_id == d.id,
+ })
+ .WhereIF(!string.IsNullOrEmpty(materialInfo),(a,b,c,d)=>b.code.Contains(materialInfo) || b.name.Contains(materialInfo))
+ .Select((a, b, c,d) => new MbomListOutput
+ {
+ id = a.id,
+ material_id = b.code + "-" + b.name,
+ material_id_id = b.id,
+ version = a.version,
+ ebom_id = c.version,
+ route_id = d.name,
+ route_id_id = c.id,
+ start_time = a.start_time.Value.ToString("yyyy-MM-dd"),
+ end_time = a.start_time.Value.ToString("yyyy-MM-dd"),
+ is_first = SqlFunc.IIF(a.is_first==0 , "否","是"),
+ }).ToPagedListAsync(input.currentPage, input.pageSize);
+
+ return PageResult.SqlSugarPageResult(list);
}
///
@@ -136,6 +173,7 @@ namespace Tnb.BasicData
preparation_time = process.preparation_time,
station = process.station,
byproduct_status = process.byproduct_status,
+ production_method = process.production_method,
});
@@ -225,35 +263,42 @@ namespace Tnb.BasicData
});
- foreach (var input in process.inputs)
+ if (process.inputs != null)
{
- string inputId = SnowflakeIdHelper.NextId();
- inputs.Add(new BasMbomInput()
+ foreach (var input in process.inputs)
{
- id = inputId,
- mbom_id = mbomSaveDataInput.id,
- mbom_process_id = mbomProcessId,
- process_id = process.process_id,
- material_id = input.material_id,
- num = input.num,
- org_id = orgId,
- });
+ string inputId = SnowflakeIdHelper.NextId();
+ inputs.Add(new BasMbomInput()
+ {
+ id = inputId,
+ mbom_id = mbomSaveDataInput.id,
+ mbom_process_id = mbomProcessId,
+ process_id = process.process_id,
+ material_id = input.material_id,
+ num = input.num,
+ org_id = orgId,
+ });
+ }
+ }
+
+ if (process.outputs != null)
+ {
+ foreach (var output in process.outputs)
+ {
+ string outputId = SnowflakeIdHelper.NextId();
+ outputs.Add(new BasMbomOutput()
+ {
+ id = outputId,
+ mbom_id = mbomSaveDataInput.id,
+ mbom_process_id = mbomProcessId,
+ process_id = process.process_id,
+ material_id = output.material_id,
+ num = output.num,
+ org_id = orgId,
+ });
+ }
}
- foreach (var output in process.outputs)
- {
- string outputId = SnowflakeIdHelper.NextId();
- outputs.Add(new BasMbomOutput()
- {
- id = outputId,
- mbom_id = mbomSaveDataInput.id,
- mbom_process_id = mbomProcessId,
- process_id = process.process_id,
- material_id = output.material_id,
- num = output.num,
- org_id = orgId,
- });
- }
}
await _repository.AsSugarClient().Deleteable().Where(x=>x.mbom_id==mbomSaveDataInput.id).ExecuteCommandAsync();
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Consts/ModuleConsts.cs b/EquipMgr/Tnb.EquipMgr.Entities/Consts/ModuleConsts.cs
index 7b6efd37..9b9f5f7a 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Consts/ModuleConsts.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Consts/ModuleConsts.cs
@@ -1,9 +1,8 @@
-namespace Tnb.EquipMgr.Entities.Consts
-{
- public class ModuleConsts
- {
- public const string Tag = "EquimentManager";
- public const string Area = "equiment";
+namespace Tnb.EquipMgr;
+
+public class ModuleConsts
+{
+ public const string Tag = "EquipMgr";
+ public const string Area = "equip";
- }
}
\ No newline at end of file
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Tnb.EquipMgr.Entities.csproj b/EquipMgr/Tnb.EquipMgr.Entities/Tnb.EquipMgr.Entities.csproj
index 4e4e987f..e910aaa2 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Tnb.EquipMgr.Entities.csproj
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Tnb.EquipMgr.Entities.csproj
@@ -1,4 +1,5 @@
+
net6.0
diff --git a/EquipMgr/Tnb.EquipMgr.Interfaces/Tnb.EquipMgr.Interfaces.csproj b/EquipMgr/Tnb.EquipMgr.Interfaces/Tnb.EquipMgr.Interfaces.csproj
index 3bce5366..8bbf5496 100644
--- a/EquipMgr/Tnb.EquipMgr.Interfaces/Tnb.EquipMgr.Interfaces.csproj
+++ b/EquipMgr/Tnb.EquipMgr.Interfaces/Tnb.EquipMgr.Interfaces.csproj
@@ -1,4 +1,5 @@
+
net6.0
diff --git a/EquipMgr/Tnb.EquipMgr/EquipmentService.cs b/EquipMgr/Tnb.EquipMgr/EquipmentService.cs
index db5b3b74..2f8880d1 100644
--- a/EquipMgr/Tnb.EquipMgr/EquipmentService.cs
+++ b/EquipMgr/Tnb.EquipMgr/EquipmentService.cs
@@ -9,7 +9,6 @@ using Mapster;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.EquipMgr.Entities;
-using Tnb.EquipMgr.Entities.Consts;
using Tnb.EquipMgr.Entities.Dto;
using Tnb.EquipMgr.Interfaces;
diff --git a/EquipMgr/Tnb.EquipMgr/Tnb.EquipMgr.csproj b/EquipMgr/Tnb.EquipMgr/Tnb.EquipMgr.csproj
index 9135ec11..03958fba 100644
--- a/EquipMgr/Tnb.EquipMgr/Tnb.EquipMgr.csproj
+++ b/EquipMgr/Tnb.EquipMgr/Tnb.EquipMgr.csproj
@@ -1,4 +1,5 @@
+
net6.0
diff --git a/QcMgr/Tnb.QcMgr.Entities/Consts/ModuleConsts.cs b/QcMgr/Tnb.QcMgr.Entities/Consts/ModuleConsts.cs
new file mode 100644
index 00000000..ac78688a
--- /dev/null
+++ b/QcMgr/Tnb.QcMgr.Entities/Consts/ModuleConsts.cs
@@ -0,0 +1,8 @@
+namespace Tnb.QcMgr;
+
+public class ModuleConsts
+{
+ public const string Tag = "QcMgr";
+ public const string Area = "qc";
+
+}
\ No newline at end of file
diff --git a/QcMgr/Tnb.QcMgr.Entities/Tnb.QcMgr.Entities.csproj b/QcMgr/Tnb.QcMgr.Entities/Tnb.QcMgr.Entities.csproj
index 4e4e987f..e910aaa2 100644
--- a/QcMgr/Tnb.QcMgr.Entities/Tnb.QcMgr.Entities.csproj
+++ b/QcMgr/Tnb.QcMgr.Entities/Tnb.QcMgr.Entities.csproj
@@ -1,4 +1,5 @@
+
net6.0
diff --git a/QcMgr/Tnb.QcMgr.Interfaces/Tnb.QcMgr.Interfaces.csproj b/QcMgr/Tnb.QcMgr.Interfaces/Tnb.QcMgr.Interfaces.csproj
index c85520db..4bb868dc 100644
--- a/QcMgr/Tnb.QcMgr.Interfaces/Tnb.QcMgr.Interfaces.csproj
+++ b/QcMgr/Tnb.QcMgr.Interfaces/Tnb.QcMgr.Interfaces.csproj
@@ -1,4 +1,5 @@
+
net6.0
diff --git a/QcMgr/Tnb.QcMgr/Tnb.QcMgr.csproj b/QcMgr/Tnb.QcMgr/Tnb.QcMgr.csproj
index 045dea48..4c21cfe1 100644
--- a/QcMgr/Tnb.QcMgr/Tnb.QcMgr.csproj
+++ b/QcMgr/Tnb.QcMgr/Tnb.QcMgr.csproj
@@ -1,4 +1,5 @@
+
net6.0
diff --git a/Tnb.Server.sln b/Tnb.Server.sln
index fdb96217..c40b262a 100644
--- a/Tnb.Server.sln
+++ b/Tnb.Server.sln
@@ -119,7 +119,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.EquipMgr.Interfaces", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.BasicData", "BasicData\Tnb.BasicData\Tnb.BasicData.csproj", "{58343F2F-E846-4CBD-8BA5-50EE3088E89D}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.BasicData.Entitys", "BasicData\Tnb.BasicData.Entitys\Tnb.BasicData.Entitys.csproj", "{99F91D4C-7030-4D25-B08C-8B509C3A7462}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.BasicData.Entities", "BasicData\Tnb.BasicData.Entitys\Tnb.BasicData.Entities.csproj", "{99F91D4C-7030-4D25-B08C-8B509C3A7462}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.BasicData.Interfaces", "BasicData\Tnb.BasicData.Interfaces\Tnb.BasicData.Interfaces.csproj", "{3F1EB6A2-BDC3-4F86-896E-786EAEE91D0B}"
EndProject
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs
new file mode 100644
index 00000000..4847bae1
--- /dev/null
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs
@@ -0,0 +1,8 @@
+namespace Tnb.WarehouseMgr;
+
+public class ModuleConsts
+{
+ public const string Tag = "WarehouseMgr";
+ public const string Area = "wms";
+
+}
\ No newline at end of file
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Tnb.WarehouseMgr.Entities.csproj b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Tnb.WarehouseMgr.Entities.csproj
index 4e4e987f..e910aaa2 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Tnb.WarehouseMgr.Entities.csproj
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Tnb.WarehouseMgr.Entities.csproj
@@ -1,4 +1,5 @@
+
net6.0
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/Tnb.WarehouseMgr.Interfaces.csproj b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/Tnb.WarehouseMgr.Interfaces.csproj
index 0bc8ac89..6a1e6e38 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/Tnb.WarehouseMgr.Interfaces.csproj
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/Tnb.WarehouseMgr.Interfaces.csproj
@@ -1,4 +1,5 @@
+
net6.0
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj b/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj
index 73911578..49198cc8 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj
+++ b/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj
@@ -1,4 +1,5 @@
+
net6.0
diff --git a/apihost/Tnb.API.Entry/Tnb.API.Entry.csproj b/apihost/Tnb.API.Entry/Tnb.API.Entry.csproj
index d3a9130e..211629f1 100644
--- a/apihost/Tnb.API.Entry/Tnb.API.Entry.csproj
+++ b/apihost/Tnb.API.Entry/Tnb.API.Entry.csproj
@@ -45,7 +45,6 @@
-
diff --git a/common/Tnb.SqlSugar/Tnb.SqlSugar.csproj b/common/Tnb.SqlSugar/Tnb.SqlSugar.csproj
index 4c355b20..e71e8896 100644
--- a/common/Tnb.SqlSugar/Tnb.SqlSugar.csproj
+++ b/common/Tnb.SqlSugar/Tnb.SqlSugar.csproj
@@ -10,6 +10,7 @@
TNB 数据库访问器 SqlSugar 插件
enable
$(NoWarn);CS1591;
+ False