wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

物料增加信息 工艺路线弹窗增加过滤

Browse Source
This commit is contained in:
周科达
2023-05-08 17:42:07 +08:00
parent c9e0e2691b
commit b4ad3d26e2
8 changed files with 177 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
BasicData/Tnb.BasicData/BasMaterialService.cs
View File

@@ -43,6 +43,7 @@ namespace Tnb.BasicData
BasMaterial basMaterial = await _repository.GetByIdAsync(id);
List<BasMaterialUnit> materialUnits = await _repository.AsSugarClient().Queryable<BasMaterialUnit>().Where(x => x.material_id == id).ToListAsync();
List<BasMaterialIntoFactorySpecifications> materialIntoFactorySpecifications = await _repository.AsSugarClient().Queryable<BasMaterialIntoFactorySpecifications>().Where(x => x.material_id == id).ToListAsync();
string newId = SnowflakeIdHelper.NextId();
basMaterial.id = newId;
@@ -57,15 +58,22 @@ namespace Tnb.BasicData
basMaterialUnit.id = SnowflakeIdHelper.NextId();
basMaterialUnit.material_id = newId;
}
foreach (BasMaterialIntoFactorySpecifications basMaterialIntoFactorySpecification in materialIntoFactorySpecifications)
{
basMaterialIntoFactorySpecification.id = SnowflakeIdHelper.NextId();
basMaterialIntoFactorySpecification.material_id = newId;
}
await _repository.AsSugarClient().Insertable<BasMaterialUnit>(materialUnits).ExecuteCommandAsync();
await _repository.AsSugarClient().Insertable<BasMaterialIntoFactorySpecifications>(materialIntoFactorySpecifications).ExecuteCommandAsync();
});
return result.IsSuccess ? "复制成功" : result.ErrorMessage;
}
/// <summary>
/// 获取物料清单所有自己物料信息
/// 获取物料清单所有子集物料信息
/// </summary>
/// <param name="queryInput"></param>
/// <returns></returns>

2
BasicData/Tnb.BasicData/BasProcessService.cs
View File

@@ -51,7 +51,7 @@ namespace Tnb.BasicData
_runService = runService;
_visualDevService = visualDevService;
OverideFuncs.CreateAsync = Create;
OverideFuncs.GetListAsync = GetList;
// OverideFuncs.GetListAsync = GetList;
}
/// <summary>

27
BasicData/Tnb.BasicData/BasRouteService.cs
View File

@@ -1,4 +1,5 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Filter;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
@@ -6,6 +7,7 @@ using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.BasicData.Entities;
using Tnb.BasicData.Interfaces;
using Tnb.BasicData.Entities.Dto;
namespace Tnb.BasicData
{
@@ -72,5 +74,30 @@ namespace Tnb.BasicData
return result.IsSuccess ? "复制成功" : result.ErrorMessage;
}
/// <summary>
/// 获取有效的已发布的工艺路线
/// </summary>
/// <param name="parameters"></param>
[HttpPost]
public async Task<dynamic> GetValidRouteList([FromBody]PageInputBase pageInputBase)
{
var db = _repository.AsSugarClient();
var result = await db.Queryable<BasRouteH>()
.Where(x => x.status == "1" && ((x.start_time != null && x.start_time.Value <= DateTime.Now && x.end_time != null && x.end_time.Value>=DateTime.Now)
|| (x.start_time==null && x.end_time>=DateTime.Now)
|| (x.end_time==null && x.start_time<=DateTime.Now)
|| (x.start_time == null && x.end_time == null)
))
.Select(x=>new VaildRouteOutput()
{
id = x.id,
code = x.code,
name = x.name,
start_time = x.start_time,
end_time = x.end_time,
}).ToPagedListAsync(pageInputBase.currentPage, pageInputBase.pageSize);
return PageResult<VaildRouteOutput>.SqlSugarPageResult(result);
}
}
}