RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整搜索

Browse Source
This commit is contained in:
qianhao.xu 2024-11-04 14:56:09 +08:00
parent c223465ea0
commit 7041c9d71e
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOAN.Admin.WebApi/Controllers/MES/quality/IPQC/QcDefectCollectionController.cs
View File

@ -140,8 +140,8 @@ namespace DOAN.WebApi.Controllers.MES.quality.IPQC
}
//TODO 获取所有供应商
[HttpGet("get_add_supplier")]
public IActionResult GetAddSupplier(string supplierCode)
[HttpGet("get_all_supplier")]
public IActionResult GetAllSupplier(string supplierCode)
{
var response = _QcDefectCollectionService.GetAllSuppliers(supplierCode);

14
DOAN.Model/MES/quality/IPQC/Dto/QcDefectCollectionDto.cs
View File

@ -103,5 +103,19 @@ namespace DOAN.Model.MES.quality.IPQC.Dto
public string LineCode { get; set; }
//public int? Tqm { get; set; }
public string SupplierCode { get; set; }
/// <summary>
/// 产品编码
/// </summary>
public string ProductCode { get; set; }
/// <summary>
/// 产品名称
/// </summary>
public string ProductName { get; set; }
}
}

2
DOAN.Service/MES/quality/IPQC/QcDefectCollectionService.cs
View File

@ -203,7 +203,7 @@ namespace DOAN.Service.MES.quality.IPQC
{
return Context.Queryable<BaseSupplier>()
.WhereIF(string.IsNullOrEmpty(supplier_str),it=>it.SupplierNo.Contains(supplier_str))
.Where(it=>it.Status == 1).ToList();
.Where(it=>it.Status == 1).Take(40).ToList();
}
}

4
DOAN.Service/MES/quality/IQC/QcReportService.cs
View File

@ -29,7 +29,11 @@ namespace DOAN.Service.MES.quality.IQC
var predicate = Expressionable.Create<QcDefectCollection>()
.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode.Contains(parm.MaterialCode))
.AndIF(!string.IsNullOrEmpty(parm.MaterialName), it => it.MaterialName.Contains(parm.MaterialName))
.AndIF(!string.IsNullOrEmpty(parm.ProductCode), it => it.ProductCode.Contains(parm.ProductCode))
.AndIF(!string.IsNullOrEmpty(parm.ProductName), it => it.ProductName.Contains(parm.ProductName))
.AndIF(!string.IsNullOrEmpty(parm.LineCode), it => it.LineCode.Contains(parm.LineCode))
.AndIF(!string.IsNullOrEmpty(parm.SupplierCode), it => it.SupplierCode.Contains(parm.SupplierCode))
.AndIF(parm.DateTime != null && parm.DateTime > DateTime.MinValue.AddYears(1), it => it.DateTime == parm.DateTime)
.And(it => it.Tqm == 1||it.Tqm==2)
;