|
|
|
@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|
|
|
using System.Linq;
|
|
|
|
using System.Linq;
|
|
|
|
using CncService.Interface;
|
|
|
|
using CncService.Interface;
|
|
|
|
using CncModels.Dto;
|
|
|
|
using CncModels.Dto;
|
|
|
|
|
|
|
|
using CncModels.Dto.Machine;
|
|
|
|
using CncModels.Dto.Worker;
|
|
|
|
using CncModels.Dto.Worker;
|
|
|
|
using CncModels.Entity;
|
|
|
|
using CncModels.Entity;
|
|
|
|
using CncModels.Constants;
|
|
|
|
using CncModels.Constants;
|
|
|
|
@ -215,8 +216,8 @@ namespace CncService.Impl
|
|
|
|
/// <inheritdoc/>
|
|
|
|
/// <inheritdoc/>
|
|
|
|
public List<WorkerAvailableMachineItem> GetAvailableMachines()
|
|
|
|
public List<WorkerAvailableMachineItem> GetAvailableMachines()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// 获取所有在线且启用的机床,排除已绑定的
|
|
|
|
// 获取所有机床(不限在线状态),排除已绑定的
|
|
|
|
var allMachines = _machineRepository.GetEnabledOnline();
|
|
|
|
var allMachines = _machineRepository.GetList(new MachineQuery { PageSize = 9999 }).Items;
|
|
|
|
var result = new List<WorkerAvailableMachineItem>();
|
|
|
|
var result = new List<WorkerAvailableMachineItem>();
|
|
|
|
foreach (var m in allMachines)
|
|
|
|
foreach (var m in allMachines)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|