5
This commit is contained in:
parent
6252fea981
commit
c12c5426d8
@ -222,7 +222,7 @@ namespace DOAN.Admin.WebApi.Controllers
|
||||
|
||||
//TODO 获取物料
|
||||
[HttpPost("get_material")]
|
||||
public IActionResult GetMaterialInfo([FromBody] BaseMaterialListQueryDto3 query)
|
||||
public IActionResult GetMaterialInfo([FromBody] BaseMaterialListQueryDto5 query)
|
||||
{
|
||||
if (query == null)
|
||||
{
|
||||
|
||||
@ -27,7 +27,7 @@ namespace DOAN.Model.MES.base_.Dto
|
||||
|
||||
public DateTime[] TimeRange { get; set; }
|
||||
}
|
||||
public class BaseMaterialListQueryDto3
|
||||
public class BaseMaterialListQueryDto5
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
|
||||
@ -36,7 +36,7 @@ namespace DOAN.Service.MES.product.IService
|
||||
|
||||
public PagedInfo<ProWorkorder> WorkOrderExport(DateTime exportTime, PagerInfo pager);
|
||||
|
||||
List<BaseMaterialList> GetMaterialInfo(BaseMaterialListQueryDto3 parm);
|
||||
List<BaseMaterialList> GetMaterialInfo(BaseMaterialListQueryDto5 parm);
|
||||
List<BaseCustom> GetCustomInfo(BaseCustomQueryDto2 parm);
|
||||
|
||||
}
|
||||
|
||||
@ -557,7 +557,7 @@ namespace DOAN.Service.MES.product
|
||||
/// </summary>
|
||||
/// <param name="query"></param>
|
||||
/// <returns></returns>
|
||||
public List<BaseMaterialList> GetMaterialInfo(BaseMaterialListQueryDto3 parm)
|
||||
public List<BaseMaterialList> GetMaterialInfo(BaseMaterialListQueryDto5 parm)
|
||||
{
|
||||
var predicate = Expressionable.Create<BaseMaterialList>()
|
||||
.AndIF(!string.IsNullOrEmpty(parm.Name_or_Code), it => it.Name.Contains(parm.Name_or_Code))
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user