From 83a982e1e889cb8f6ba03cab92b222d83434a398 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 06 九月 2024 16:55:50 +0800
Subject: [PATCH] 新增箱码明细表；开发分拣码垛绑定任务功能
---
Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
index 3949be6..dce21ac 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
@@ -219,7 +219,9 @@
//璇诲彇plc鐨勫��
var modConn = PLCTaskAction.listPlcConn.FirstOrDefault(s => s != null && s.PlcId == modDevice.PlcId);
if (modConn == null)
- break;
+ {
+ continue;
+ }
try
{
var listPosition = await _wcsDeviceRep.Context.Queryable<WcsPosition>().Where(s => s.DeviceId == modDevice.Id).ToListAsync();
@@ -229,7 +231,7 @@
modDevice.Wcs = Convert.ToString(wcs);
//浠诲姟鍙�
var modPositionTask = listPosition.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
- (result, var taskNo) = modConn.GetPlcDBValue(modPositionTask.PosType, modDevice.DbNumber, modPositionTask.PlcPos);
+ (result, var taskNo) = modConn.GetPlcDBValue(modPositionTask.PosType, modDevice.DbNumber, modPositionTask.PlcPos, modPositionTask.StringLength);
modDevice.TaskNo = Convert.ToString(taskNo);
//浠诲姟绫诲瀷
var modPositionTaskType = listPosition.FirstOrDefault(s => s.Text == "浠诲姟绫诲瀷");
@@ -245,7 +247,7 @@
modDevice.EndLocatNo = Convert.ToString(endLocatNo);
//鎵樼洏鐮�
var modPositionPalletNo = listPosition.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
- (result, var palletNo) = modConn.GetPlcDBValue(modPositionPalletNo.PosType, modDevice.DbNumber, modPositionPalletNo.PlcPos);
+ (result, var palletNo) = modConn.GetPlcDBValue(modPositionPalletNo.PosType, modDevice.DbNumber, modPositionPalletNo.PlcPos, modPositionPalletNo.StringLength);
modDevice.PalletNo = Convert.ToString(palletNo);
}
catch (Exception)
@@ -284,11 +286,11 @@
{
return await _wcsDeviceRep.Context.Queryable<WcsPlc>()
.Where(w => w.Type == PLCTypeEnum.RobotPalletizer || w.Type == PLCTypeEnum.StackingRobot)
- .OrderBy(o => o.Type)
+ .OrderByDescending(o => o.Type)
.Select(u => new
{
id = u.Id,
- name = u.Text
+ name = u.Text
}
).ToListAsync();
}
--
Gitblit v1.8.0