From 48d66a079c307356997fb400d27907ff6d363b7b Mon Sep 17 00:00:00 2001
From: liudl <673013083@qq.com>
Date: 星期一, 20 一月 2025 08:35:37 +0800
Subject: [PATCH] 修改2楼分拣和1楼拆垛时获取拆垛信息接口
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 390cd4c..311e7ce 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -69,9 +69,10 @@
/// </summary>
public static void Init()
{
+ // var strMsg = new HttpService().RequestPackWcs("LN000001");
cts.Cancel();
listPlc = _db.Queryable<WcsPlc>()
- .Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine || s.Type == PLCTypeEnum.BoxConveyorLine)
+ .Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine || s.Type == PLCTypeEnum.BoxConveyorLine || s.Type == PLCTypeEnum.StackingRobot)
.Where(s => s.Enable == YesNoEnum.Y)
.ToList();
listPlcDevice = _db.Queryable<WcsDevice>().ToList();
@@ -161,7 +162,7 @@
{
//Console.WriteLine($"{modPlc.IP}璇诲彇{modDevice.DbNumber}.{modDevice.PlcPos}鐨勫�间负锛歿value}");
//鏃犳祦绋嬭烦鍑�
- if (value == 0 )// && modPlc.Type!= PLCTypeEnum.BoxConveyorLine
+ if (value == 0)// && modPlc.Type!= PLCTypeEnum.BoxConveyorLine
continue;
var dto = modDevice.Adapt<WcsDeviceDto>();
dto.Value = value;
@@ -315,7 +316,7 @@
listPulish.Add(modAlarm);
}
//鍙栨秷鎶ヨ
- else if (value && modAlarm.Status == YesNoEnum.Y)
+ else if (!value && modAlarm.Status == YesNoEnum.Y)
{
modAlarm.AlarmTime = null;
modAlarm.Status = YesNoEnum.N;
@@ -332,7 +333,8 @@
modLog.Id = 0;
listLog.Add(modLog);
}
- _db.Insertable(listLog).ExecuteCommand();
+ if (listLog.Count >= 0)
+ _db.Insertable(listLog).ExecuteCommand();
HubUtil.PublicAlarm(listPulish);
}
}
@@ -374,8 +376,8 @@
if (modPlcUtil == null)
continue;
var plcIp = modPlcUtil.PlcIP;
- var listDevice = listPlcDevice.Where(s => s.PlcId == modPlcUtil.PlcId && s.DeviceType == DeviceTypeEnum.Show).ToList();
- var modPlc = listPlc.FirstOrDefault(s => s.Id == modPlcUtil.PlcId);
+ var listDevice = listPlcDevice.Where(s => s.PlcId == modPlcUtil.PlcId && s.DeviceType == DeviceTypeEnum.Show).ToList();
+ var modPlc = listPlc.FirstOrDefault(s => s.Id == modPlcUtil.PlcId);
var listaddress = new Dictionary<string, PLCDataTypeEnum>();
foreach (var modDevice in listDevice)
{
@@ -434,7 +436,7 @@
{
bl = false;
}
- else
+ else
{
bl = true;
}
--
Gitblit v1.8.0