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

9/8

Browse Source
This commit is contained in:
DESKTOP-H2PAFLR\Administrator
2023-09-08 13:10:26 +08:00
parent 76452f970f
commit 50c0a7a016
17 changed files with 129 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Service/mes/md/IService/IMdDeviceService.cs
View File

@@ -15,5 +15,7 @@ namespace ZR.Service.mes.md.IService
public int UpdateDevice(MdDevice workshop);
public int deleteDevice(int[] ids);
public List<MdWorkstation> getworkstationList();
}
}

3
ZR.Service/mes/md/IService/IMdWorkstationService.cs
View File

@@ -15,5 +15,8 @@ namespace ZR.Service.mes.md.IService
public int UpdateWorkshop(MdWorkstation workshop);
public int deleteWorkshop(int[] ids);
public List<MdWorkline> GetworkLineList();
}
}

8
ZR.Service/mes/md/MdDeviceService.cs
View File

@@ -35,7 +35,7 @@ namespace ZR.Service.mes.md
.AndIF(!string.IsNullOrEmpty(deviceCode), it => it.DeviceCode.Contains(deviceCode))
.AndIF(!string.IsNullOrEmpty(deviceName), it => it.DeviceName.Contains(deviceName))
.ToExpression();
List<MdDevice> data = Context.Queryable<MdDevice>().Where(predicate).ToPageList(pageNum, pageSize, ref totalNum);
List<MdDevice> data = Context.Queryable<MdDevice>().Includes(x => x.Workstation).Where(predicate).ToPageList(pageNum, pageSize, ref totalNum);
return (totalNum, data);
}
@@ -44,6 +44,10 @@ namespace ZR.Service.mes.md
return Update(workshop, true);
}
public List<MdWorkstation> getworkstationList()
{
return Context.Queryable<MdWorkstation>().ToList();
}
}
}

10
ZR.Service/mes/md/MdWorkstationService.cs
View File

@@ -33,15 +33,19 @@ namespace ZR.Service.mes.md
.AndIF(!string.IsNullOrEmpty(StationCode), it => it.StationCode.Contains(StationCode))
.AndIF(!string.IsNullOrEmpty(StationName), it => it.StationName.Contains(StationName))
.ToExpression();
List<MdWorkstation> data = Context.Queryable<MdWorkstation>().Where(predicate).ToPageList(pageNum, pageSize, ref totalNum);
List<MdWorkstation> data = Context.Queryable<MdWorkstation>().Includes(x => x.Workline).Where(predicate).ToPageList(pageNum, pageSize, ref totalNum);
return (totalNum, data);
}
public int UpdateWorkshop(MdWorkstation workshop)
{
return Update(workshop, true);
}
public List<MdWorkline> GetworkLineList()
{
return Context.Queryable<MdWorkline>().ToList();
}
}
}