From ac899cacbc42b0777f1cf7b4ac4ba233af66449e Mon Sep 17 00:00:00 2001 From: liuwf Date: Mon, 5 Aug 2024 16:28:30 +0800 Subject: [PATCH 1/2] . --- src/Khd.Core.Wcs/MainCentralControl.cs | 2 +- src/Khd.Core.Wcs/Wcs/FirstFloor.cs | 2 +- src/Khd.Core.Wcs/Wcs/SystemTimer.cs | 2 +- src/Khd.Core.Wcs/appsettings.json | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Khd.Core.Wcs/MainCentralControl.cs b/src/Khd.Core.Wcs/MainCentralControl.cs index 2ff49fb..e2bd3b4 100644 --- a/src/Khd.Core.Wcs/MainCentralControl.cs +++ b/src/Khd.Core.Wcs/MainCentralControl.cs @@ -50,7 +50,7 @@ namespace Khd.Core.Wcs plc = new Plc.S7.Plc(plcConfig.CpuType, plcConfig.IP, plcConfig.Port, plcConfig.Rack, plcConfig.Slot); try { - //plc.Open(); + plc.Open(); Console.WriteLine(DateTime.Now + ":连接PLC：" + plcConfig.IP); } catch diff --git a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs index 16cce37..3ece8ae 100644 --- a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs +++ b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs @@ -289,7 +289,7 @@ namespace Khd.Core.Wcs.Wcs BaseEquip baseEquip = dbContext.BaseEquip.First(t => t.objid == 1); if (Convert.ToInt32(linesignal01Value) == 1) { - var wcsTasks = dbContext.WcsTask.ToList(); + gvar wcsTasks = dbContext.WcsTask.ToList(); //判断task表里没有该rfid的未完成的入库 //信息，未下发去向 var task = wcsTasks.Where(t => t.IsDelete == 0 || t.IsDelete == null) diff --git a/src/Khd.Core.Wcs/Wcs/SystemTimer.cs b/src/Khd.Core.Wcs/Wcs/SystemTimer.cs index 9d182a9..14bbe4f 100644 --- a/src/Khd.Core.Wcs/Wcs/SystemTimer.cs +++ b/src/Khd.Core.Wcs/Wcs/SystemTimer.cs @@ -198,7 +198,7 @@ namespace Khd.Core.Wcs.Wcs { try { - StaticData.PlcDic[0].Read(HeartBeat30.plcpointAddress); + StaticData.PlcDic[2].Read(HeartBeat30.plcpointAddress); } catch { diff --git a/src/Khd.Core.Wcs/appsettings.json b/src/Khd.Core.Wcs/appsettings.json index fb47994..a054ded 100644 --- a/src/Khd.Core.Wcs/appsettings.json +++ b/src/Khd.Core.Wcs/appsettings.json @@ -1,9 +1,9 @@ { "ConnectionStrings": { //"DefaultConnection": "server=106.12.13.113;port=3336;database=khd_jyhb;uid=khd;pwd=khd@123;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True", - //"DefaultConnection": "server=172.16.12.100;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khdrkjy2024...;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True" + "DefaultConnection": "server=172.16.12.100;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khdrkjy2024...;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True" //"DefaultConnection": "server=localhost;port=3306;database=jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True" - "DefaultConnection": "server=175.27.215.92;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khd2024;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True" + // "DefaultConnection": "server=175.27.215.92;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khd2024;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True" }, "DeleteLogDays": 10,//删除日志的时间间隔，单位：天 "PlcConfigs": [ From 1eb3d0d521a5680bca37d11ae7e84a2a00fa3318 Mon Sep 17 00:00:00 2001 From: liuwf Date: Mon, 5 Aug 2024 16:29:17 +0800 Subject: [PATCH 2/2] . --- src/Khd.Core.Wcs/Wcs/FirstFloor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs index 3ece8ae..16cce37 100644 --- a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs +++ b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs @@ -289,7 +289,7 @@ namespace Khd.Core.Wcs.Wcs BaseEquip baseEquip = dbContext.BaseEquip.First(t => t.objid == 1); if (Convert.ToInt32(linesignal01Value) == 1) { - gvar wcsTasks = dbContext.WcsTask.ToList(); + var wcsTasks = dbContext.WcsTask.ToList(); //判断task表里没有该rfid的未完成的入库 //信息，未下发去向 var task = wcsTasks.Where(t => t.IsDelete == 0 || t.IsDelete == null)