From 808b7c1b0e58e2fc076bde534af9259655fe3641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com> Date: Sat, 21 Sep 2024 13:42:20 +0800 Subject: [PATCH] 1 --- src/Khd.Core.Plc/StaticPlcHelper.cs | 1 + src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs | 2 +- src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs | 1 - src/Khd.Core.Wcs/Wcs/SystemTimer.cs | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Khd.Core.Plc/StaticPlcHelper.cs b/src/Khd.Core.Plc/StaticPlcHelper.cs index 3d96e5e..f61f755 100644 --- a/src/Khd.Core.Plc/StaticPlcHelper.cs +++ b/src/Khd.Core.Plc/StaticPlcHelper.cs @@ -69,6 +69,7 @@ namespace Khd.Core.Plc /// public static object GetValue(string? len, object value) { + if (len == "2") { return Convert.ToInt16(value); diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs index 457815b..ed6a216 100644 --- a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs +++ b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs @@ -10,7 +10,6 @@ using Masuit.Tools; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Newtonsoft.Json; -using System.Diagnostics; using Z.EntityFramework.Plus; namespace Khd.Core.Wcs.Wcs @@ -351,6 +350,7 @@ namespace Khd.Core.Wcs.Wcs } return false; } + /// /// 监控上件扫描点位 /// diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs index 8b8bddf..e924958 100644 --- a/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs +++ b/src/Khd.Core.Wcs/Wcs/FiveFloorPoint.cs @@ -63,7 +63,6 @@ namespace Khd.Core.Wcs.Wcs BaseEquip baseEquip = StaticData.BaseEquip.First(t => t.equipType == 1 && t.floorNo == FloorNo); if (rfid != null && isSignal != null) { - //正常读到输送线信息 有到位信号,并且有托盘,获取条码信息 if (Convert.ToInt32(isSignal) == 1)//五楼接驳位 { diff --git a/src/Khd.Core.Wcs/Wcs/SystemTimer.cs b/src/Khd.Core.Wcs/Wcs/SystemTimer.cs index 3b36c73..13a0a12 100644 --- a/src/Khd.Core.Wcs/Wcs/SystemTimer.cs +++ b/src/Khd.Core.Wcs/Wcs/SystemTimer.cs @@ -389,6 +389,7 @@ namespace Khd.Core.Wcs.Wcs var dmsRecordAlarmInfo = CoreMapper.Map(alarmTime); dmsRecordAlarmInfo.AlarmStatus = "0"; dmsRecordAlarmInfo.NoticeStatus = "0"; + dbContext.Add(dmsRecordAlarmTime); dbContext.Add(dmsRecordAlarmInfo); dbContext.SaveChanges(); }