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

物料清单添加Type 1-成品 2-毛坯

Browse Source
This commit is contained in:
赵正易
2024-05-24 10:47:22 +08:00
parent be0e699bec
commit 6f2b846473
5 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ZR.Service/mes/wms/WmBlankInventoryService.cs
View File

@@ -42,7 +42,7 @@ namespace ZR.Service.mes.wms
{
WmMaterial material = Context.Queryable<WmMaterial>()
.Where(it => it.BlankNum == item.BlankNum)
.Where(it => it.Remarks == "毛坯")
.Where(it => it.Type == 2)
.First();
if (material == null)
{
@@ -125,7 +125,7 @@ namespace ZR.Service.mes.wms
{
int num = 0;
List<WmMaterial> materials = Context.Queryable<WmMaterial>()
.Where(it => it.Remarks == "毛坯")
.Where(it => it.Type == 2)
.Where(it => !string.IsNullOrEmpty(it.BlankNum))
.OrderBy(it => it.BlankNum)
.ToList();

3
ZR.Service/mes/wms/WmMaterialService.cs
View File

@@ -34,7 +34,8 @@ namespace ZR.Service.mes.wms
.AndIF(parm.Color != null, it => it.Color.Contains(parm.Color))
.AndIF(parm.Specification != null, it => it.Specification.Contains(parm.Specification))
.AndIF(parm.Description != null, it => it.Description.Contains(parm.Description))
.AndIF(parm.Search1 != null, it => it.Search1.Contains(parm.Search1) || it.Search2.Contains(parm.Search1))
.AndIF(!string.IsNullOrEmpty( parm.Search1), it => it.Search1.Contains(parm.Search1) || it.Search1.Contains(parm.Search2))
.AndIF(parm.Type > 0, it => it.Type == parm.Type)
.AndIF(parm.Status > -1, it => it.Status == parm.Status);