Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordD.cs
#	EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemD.cs
#	EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemH.cs
This commit is contained in:
2023-05-17 17:34:30 +08:00
132 changed files with 26859 additions and 1061 deletions

View File

@@ -8,14 +8,14 @@ using Tnb.EquipMgr.Entities.Dto;
namespace Tnb.EquipMgr.Interfaces
{
public interface IToolMoldProductService
public interface IToolMoldMaterialService
{
/// <summary>
/// 根据模具id获取设备集合
/// 根据模具id获取物料集合
/// </summary>
/// <param name="mold"></param>
/// <returns></returns>
public Task<List<ProductListOutput>> GetProductLists(ToolMoldInput ToolMoldInput);
public Task<List<MaterialListOutput>> GetMaterialLists(ToolMoldInput ToolMoldInput);
/// <summary>
/// 增加模具产品绑定
/// </summary>
@@ -37,14 +37,14 @@ namespace Tnb.EquipMgr.Interfaces
/// <param name="mold"></param>
/// <param name="productids"></param>
/// <returns></returns>
public Task<dynamic> SaveProductGroup(ToolMoldInput ToolMoldInput);
public Task<dynamic> SaveMaterialGroup(ToolMoldInput ToolMoldInput);
/// <summary>
/// 取消产品同组
/// </summary>
/// <param name="mold"></param>
/// <param name="productids"></param>
/// <returns></returns>
public Task<dynamic> CancelProductGroup(ToolMoldInput ToolMoldInput);
public Task<dynamic> CancelMaterialGroup(ToolMoldInput ToolMoldInput);
/// <summary>
/// 根据产品id获取模具集合
@@ -59,6 +59,6 @@ namespace Tnb.EquipMgr.Interfaces
/// <param name="productid"></param>
/// <returns></returns>
public Task<dynamic> DetachProductData(ToolMoldInput ToolMoldInput);
public Task<dynamic> DetachMaterialData(ToolMoldInput ToolMoldInput);
}
}