Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

仓库-GP12查询条件，描述，PDA入库出库功能调整

Browse Source
This commit is contained in:
赵正易
2024-05-06 16:04:11 +08:00
parent 09880cbc5f
commit 1d5326e885
6 changed files with 84 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ZR.Service/mes/wms/WmFgentryInspectService.cs
View File

@@ -84,12 +84,18 @@ namespace ZR.Service.mes.wms
/// <returns></returns>
public PagedInfo<WmFgentryInspect_parentDto> GetList_first(WmFgentryInspectQueryDto parm)
{
bool useTime = false;
if (string.IsNullOrEmpty(parm.Workorder) && string.IsNullOrEmpty(parm.Packcode) && string.IsNullOrEmpty(parm.Partnumber))
{
useTime = true;
}
var predicate = Expressionable.Create<WmFgentryInspect>()
.AndIF(!string.IsNullOrEmpty(parm.Workorder), it => it.Workorder.Contains(parm.Workorder))
.AndIF(!string.IsNullOrEmpty(parm.Packcode), it => it.Packcode.Contains(parm.Packcode))
.AndIF(!string.IsNullOrEmpty(parm.Partnumber), it => it.Partnumber.Contains(parm.Partnumber))
.AndIF(parm.starttime != null && parm.starttime > new DateTime(1999, 1, 1), it => it.CreatedTime > parm.starttime)
.AndIF(parm.endtime != null && parm.endtime > new DateTime(1999, 1, 1), it => it.CreatedTime < parm.endtime)
// XXX 调整搜索逻辑，当搜索工单号零件号或标签时，屏蔽时间的判定
.AndIF(useTime && parm.starttime > new DateTime(1999, 1, 1), it => it.CreatedTime > parm.starttime)
.AndIF(useTime && parm.endtime > new DateTime(1999, 1, 1), it => it.CreatedTime < parm.endtime)
;
@@ -117,18 +123,28 @@ namespace ZR.Service.mes.wms
ProductDescription =w.ProductDescription,
Specifications=w.Specifications,
PreviousNumber = w.PreviousNumber,
Colour = w.Colour
Colour = w.Colour,
Status = w.Status
})
.ToList();
foreach (var inspect in inspects)
{
inspect.Result_good = Queryable().Where(it => it.Workorder == inspect.Workorder).Where(it => it.Result == 1).Count();
inspect.Result_bad = Queryable().Where(it => it.Workorder == inspect.Workorder).Where(it => it.Result == 2).Count();
inspect.Result_null = Queryable().Where(it => it.Workorder == inspect.Workorder).Where(it => it.Result == 0 || it.Result == null).Count();
// 描述来源调整为物料清单
WmMaterial material = Context.Queryable<WmMaterial>()
.Where(it => it.Partnumber == inspect.Partnumber)
.First();
if (material == null)
{
inspect.ProductDescription = "此零件号不在物料清单内！";
}
else
{
inspect.ProductDescription = !string.IsNullOrEmpty(material.Description) ? material.Description : material.ProductName;
}
}