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/PLC/PLCTaskAction.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index c66cde7..e97215b 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -60,7 +60,10 @@
public static void Init()
{
cts.Cancel();
- listPlc = _db.Queryable<WcsPlc>().Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine || s.Type == PLCTypeEnum.BoxConveyorLine).ToList();
+ listPlc = _db.Queryable<WcsPlc>()
+ .Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine || s.Type == PLCTypeEnum.BoxConveyorLine)
+ .Where(s => s.Enable == YesNoEnum.Y)
+ .ToList();
listPlcDevice = _db.Queryable<WcsDevice>().ToList();
listPlcPosition = _db.Queryable<WcsPosition>().ToList();
listAlarmInfo = _db.Queryable<WcsAlarmInfo>().ToList();
@@ -282,15 +285,15 @@
{
//鎶ヨ鐐逛綅
var listAlarm = listAlarmInfo.Where(s => s.PlcIP == modUtil.PlcIP.ToString()).ToList();
- Console.WriteLine("鎶ヨ鐐逛綅鏁帮細" + listAlarm.Count);
+ //Console.WriteLine("鎶ヨ鐐逛綅鏁帮細" + listAlarm.Count);
var listaddress = new Dictionary<string, PLCDataTypeEnum>();
foreach (var modAlarm in listAlarm)
{
listaddress.Add(modAlarm.AlarmCode, PLCDataTypeEnum.Bit);
}
- Console.WriteLine($"璇诲彇鐐逛綅{listaddress.Count}涓�");
+ //Console.WriteLine($"璇诲彇鐐逛綅{listaddress.Count}涓�");
var result = modUtil.GetPlcBatchDBValue(listaddress);
- Console.WriteLine("err" + result.Err);
+ //Console.WriteLine("err" + result.Err);
var listPulish = new List<WcsAlarmInfo>();
//娴嬭瘯鎶ヨ
//foreach (var modAlarm in listAlarm)
@@ -300,7 +303,7 @@
foreach (var item in result.Value)
{
var value = Convert.ToBoolean(item.Value);
- Console.WriteLine(item.Key + "+" + value);
+ //Console.WriteLine(item.Key + "+" + value);
var modAlarm = listAlarm.FirstOrDefault(s => s.AlarmCode == item.Key);
if (value && modAlarm.Status == YesNoEnum.N)
{
--
Gitblit v1.8.0