From d239f2cccb5b84d52c8c202557ea8e75cc6ab984 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 14 九月 2024 16:51:17 +0800
Subject: [PATCH] 任务管理新增功能增加分配拆垛工位功能；调整分拣码垛页面，更改拆垛机器人属性
---
Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
index 46f52d9..71fad93 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
@@ -476,10 +476,11 @@
public async Task<List<WcsDeviceTaskOrderDto>> WcsPackStationPlcList([FromQuery] WcsDeviceBaseInput entry)
{
return await _wcsDeviceRep.Context.Queryable<WcsDevice>()
- .LeftJoin<WcsCheckTask>((device, task) => device.StationNum == task.Port)
- .Where((device, task) => device.PlcId == entry.PlcId)
- .OrderBy((device, task) => device.CreateTime)
- .Select((device, task) => new WcsDeviceTaskOrderDto()
+ .InnerJoin<WcsPlc>((device, plc) => device.PlcId == plc.Id)
+ .LeftJoin<WcsCheckTask>((device, plc, task) => device.StationNum == task.Port)
+ .Where((device, plc, task) => device.PlcId == entry.PlcId)
+ .OrderBy((device, plc, task) => device.CreateTime)
+ .Select((device, plc, task) => new WcsDeviceTaskOrderDto()
{
Id = device.Id,
Text = device.Text,
@@ -491,7 +492,9 @@
LineNo = task.LineNo,
Status = task.Status,
PZNo = task.PZNo,
- Qty = task.Qty
+ Qty = task.Qty,
+
+ Type = plc.Type
})
.ToListAsync();
}
--
Gitblit v1.8.0