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 | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
index 21fc4f5..71fad93 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
@@ -351,39 +351,51 @@
var listPosition = await _wcsDeviceRep.Context.Queryable<WcsPosition>().Where(s => s.DeviceId == modDevice.Id).ToListAsync();
var result = new IoTClient.Result();
//浠诲姟鍙�
- if (!modDevice.TaskNo.IsNullOrEmpty())
+ if (modDevice.TaskNo != null)
{
var modPositionTask = listPosition.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
if (modPositionTask != null)
- result = modUtil.SetPlcDBValue(modPositionTask.PosType, modDbDevice.DbNumber + "." + modPositionTask.PlcPos, modDevice.TaskNo);
+ result = modUtil.SetPlcDBValue(modPositionTask.PosType, modDbDevice.DbNumber, modPositionTask.PlcPos, modDevice.TaskNo);
}
//浠诲姟绫诲瀷
- if (!modDevice.TaskType.IsNullOrEmpty())
+ if (modDevice.TaskType != null)
{
var modPositionTaskType = listPosition.FirstOrDefault(s => s.Text == "浠诲姟绫诲瀷");
if (modPositionTaskType != null)
- result = modUtil.SetPlcDBValue(modPositionTaskType.PosType, modDbDevice.DbNumber + "." + modPositionTaskType.PlcPos, ((int)modDevice.TaskType).ToString());
+ result = modUtil.SetPlcDBValue(modPositionTaskType.PosType, modDbDevice.DbNumber, modPositionTaskType.PlcPos, ((int)modDevice.TaskType).ToString());
}
//璧峰宸ヤ綅
- if (!modDevice.StartLocatNo.IsNullOrEmpty())
+ if (modDevice.StartLocatNo != null)
{
var modPositionStartLocatNo = listPosition.FirstOrDefault(s => s.Text == "璧峰宸ヤ綅");
if (modPositionStartLocatNo != null)
- result = modUtil.SetPlcDBValue(modPositionStartLocatNo.PosType, modDbDevice.DbNumber + "." + modPositionStartLocatNo.PlcPos, modDevice.StartLocatNo.ToString());
+ result = modUtil.SetPlcDBValue(modPositionStartLocatNo.PosType, modDbDevice.DbNumber, modPositionStartLocatNo.PlcPos, modDevice.StartLocatNo.ToString());
}
//鐩殑宸ヤ綅
- if (!modDevice.EndLocatNo.IsNullOrEmpty())
+ if (modDevice.EndLocatNo != null)
{
var modPositionEndLocatNo = listPosition.FirstOrDefault(s => s.Text == "鐩殑宸ヤ綅");
if (modPositionEndLocatNo != null)
- result = modUtil.SetPlcDBValue(modPositionEndLocatNo.PosType, modDbDevice.DbNumber + "." + modPositionEndLocatNo.PlcPos, modDevice.EndLocatNo.ToString());
+ result = modUtil.SetPlcDBValue(modPositionEndLocatNo.PosType, modDbDevice.DbNumber, modPositionEndLocatNo.PlcPos, modDevice.EndLocatNo.ToString());
}
//鎵樼洏鐮�
- if (!modDevice.PalletNo.IsNullOrEmpty())
+ if (modDevice.PalletNo != null)
{
var modPositionPalletNo = listPosition.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
if (modPositionPalletNo != null)
- result = modUtil.SetPlcDBValue(modPositionPalletNo.PosType, modDbDevice.DbNumber + "." + modPositionPalletNo.PlcPos, modDevice.PalletNo.ToString());
+ result = modUtil.SetPlcDBValue(modPositionPalletNo.PosType, modDbDevice.DbNumber, modPositionPalletNo.PlcPos, modDevice.PalletNo.ToString());
+ }
+ if (modDevice.Plc != null)
+ {
+ var modPositionPLC = listPosition.FirstOrDefault(s => s.Text == "PLC娴佺▼瀛�");
+ if (modPositionPLC != null)
+ result = modUtil.SetPlcDBValue(modPositionPLC.PosType, modDbDevice.DbNumber, modPositionPLC.PlcPos, modDevice.Plc);
+ }
+ if (modDevice.Wcs != null)
+ {
+ var modPositionWCS = listPosition.FirstOrDefault(s => s.Text == "WCS娴佺▼瀛�");
+ if (modPositionWCS != null)
+ result = modUtil.SetPlcDBValue(modPositionWCS.PosType, modDbDevice.DbNumber, modPositionWCS.PlcPos, modDevice.Wcs);
}
if (modPlc.Type == PLCTypeEnum.ConveyorLine)
{
@@ -392,42 +404,42 @@
{
var modPositionReleaseRow = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣鎺�");
if (modPositionReleaseRow != null)
- modUtil.SetPlcDBValue(modPositionReleaseRow.PosType, modDbDevice.DbNumber + "." + modPositionReleaseRow.PlcPos, modDevice.ReleaseRow.ToString());
+ modUtil.SetPlcDBValue(modPositionReleaseRow.PosType, modDbDevice.DbNumber, modPositionReleaseRow.PlcPos, modDevice.ReleaseRow.ToString());
}
//鏀捐揣鍒�
if (modDevice.ReleaseCol != null)
{
var modPositionReleaseCol = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣鍒�");
if (modPositionReleaseCol != null)
- modUtil.SetPlcDBValue(modPositionReleaseCol.PosType, modDbDevice.DbNumber + "." + modPositionReleaseCol.PlcPos, modDevice.ReleaseCol.ToString());
+ modUtil.SetPlcDBValue(modPositionReleaseCol.PosType, modDbDevice.DbNumber, modPositionReleaseCol.PlcPos, modDevice.ReleaseCol.ToString());
}
//鏀捐揣灞�
if (modDevice.ReleaseStorey != null)
{
var modPositionReleaseStorey = listPosition.FirstOrDefault(s => s.Text == "鏀捐揣灞�");
if (modPositionReleaseStorey != null)
- modUtil.SetPlcDBValue(modPositionReleaseStorey.PosType, modDbDevice.DbNumber + "." + modPositionReleaseStorey.PlcPos, modDevice.ReleaseStorey.ToString());
+ modUtil.SetPlcDBValue(modPositionReleaseStorey.PosType, modDbDevice.DbNumber, modPositionReleaseStorey.PlcPos, modDevice.ReleaseStorey.ToString());
}
//鍙栬揣鎺�
if (modDevice.PickRow != null)
{
var modPositionPickRow = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣鎺�");
if (modPositionPickRow != null)
- modUtil.SetPlcDBValue(modPositionPickRow.PosType, modDbDevice.DbNumber + "." + modPositionPickRow.PlcPos, modDevice.PickRow.ToString());
+ modUtil.SetPlcDBValue(modPositionPickRow.PosType, modDbDevice.DbNumber, modPositionPickRow.PlcPos, modDevice.PickRow.ToString());
}
//鍙栬揣鍒�
if (modDevice.PickCol != null)
{
var modPositionPickCol = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣鍒�");
if (modPositionPickCol != null)
- modUtil.SetPlcDBValue(modPositionPickCol.PosType, modDbDevice.DbNumber + "." + modPositionPickCol.PlcPos, modDevice.PickCol.ToString());
+ modUtil.SetPlcDBValue(modPositionPickCol.PosType, modDbDevice.DbNumber, modPositionPickCol.PlcPos, modDevice.PickCol.ToString());
}
//鍙栬揣灞�
if (modDevice.PickStorey != null)
{
var modPositionPickStorey = listPosition.FirstOrDefault(s => s.Text == "鍙栬揣灞�");
if (modPositionPickStorey != null)
- modUtil.SetPlcDBValue(modPositionPickStorey.PosType, modDbDevice.DbNumber + "." + modPositionPickStorey.PlcPos, modDevice.PickStorey.ToString());
+ modUtil.SetPlcDBValue(modPositionPickStorey.PosType, modDbDevice.DbNumber, modPositionPickStorey.PlcPos, modDevice.PickStorey.ToString());
}
}
modUtil.Close();
@@ -464,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,
@@ -479,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