From 79ad6097cbe4b4d6cee66dd8ad9c3c1c8f2b5243 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期二, 15 十月 2024 16:42:49 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 59066e6..e4ef889 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -17,6 +17,10 @@
public static bool boDemo = false;
//婊氱瓛鍙嶈浆
public static bool boDrumReversal = false;
+ //鍑哄簱閿佸畾
+ public static bool boOutLock = false;
+ //鍏ュ簱閿佸畾
+ public static bool boEnterLock = false;
public static List<PlcPositionInfo> listPositionInfo = new List<PlcPositionInfo>();
@@ -55,6 +59,8 @@
boRefresh = _sysConfigService.GetConfigValue<bool>("sys_Refresh").Result;
boDemo = _sysConfigService.GetConfigValue<bool>("sys_demo").Result;
boDrumReversal = _sysConfigService.GetConfigValue<bool>("sys_DrumReversal").Result;
+ boOutLock = _sysConfigService.GetConfigValue<bool>("sys_BoOutLock").Result;
+ boEnterLock = _sysConfigService.GetConfigValue<bool>("sys_BoEnterLock").Result;
}
/// <summary>
/// 鍒濆鍖朠LC杩炴帴
@@ -153,7 +159,7 @@
{
//Console.WriteLine($"{modPlc.IP}璇诲彇{modDevice.DbNumber}.{modDevice.PlcPos}鐨勫�间负锛歿value}");
//鏃犳祦绋嬭烦鍑�
- if (value == 0)
+ if (value == 0 )// && modPlc.Type!= PLCTypeEnum.BoxConveyorLine
continue;
var dto = modDevice.Adapt<WcsDeviceDto>();
dto.Value = value;
@@ -374,7 +380,7 @@
if (modPlcUtil == null)
continue;
var plcIp = modPlcUtil.PlcIP;
- var listDevice = listPlcDevice.Where(s => s.PlcId == modPlcUtil.PlcId ).ToList(); //&& s.DeviceType == DeviceTypeEnum.Show
+ 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)
@@ -430,7 +436,7 @@
{
var bl = false;
int value = Convert.ToInt32(item.Value);
- if (value == 0 || value == 720)
+ if (value == 0)
{
bl = false;
}
@@ -438,11 +444,12 @@
{
bl = true;
}
-
- var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum.PadLeft(3, '0'), BoHaveItem = bl };
- HubUtil.PublicPosition(modInfo);
- UpdatePosition(modInfo);
-
+ if (bl != modDevice.BoHaveItem)
+ {
+ var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum.PadLeft(3, '0'), BoHaveItem = bl };
+ HubUtil.PublicPosition(modInfo);
+ UpdatePosition(modInfo);
+ }
// liudl 娉ㄩ噴锛氬拰鐢垫皵宸ョ▼甯堢‘璁ら〉闈㈠睍绀轰氦浜掑瓧鍚庡惎鐢ㄣ��
//var value = Convert.ToBoolean(item.Value);
//if (!value == modDevice.BoHaveItem)
--
Gitblit v1.8.0