From 27cefef04209f14e1835645c9906dbff6a20f1e0 Mon Sep 17 00:00:00 2001 From: liuwf Date: Sat, 3 Aug 2024 18:17:17 +0800 Subject: [PATCH 1/6] . --- src/Khd.Core.Wcs/MainCentralControl.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 0af2e8c54ae4ce5441a7704e8c5c976e4d2abc97 Mon Sep 17 00:00:00 2001 From: liuwf Date: Sun, 4 Aug 2024 16:36:41 +0800 Subject: [PATCH 2/6] =?UTF-8?q?change-=E4=BF=AE=E6=AD=A35F=E7=BB=A7?= =?UTF-8?q?=E7=BB=AD=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Khd.Core.Application/WcsTaskApplication.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Khd.Core.Application/WcsTaskApplication.cs b/src/Khd.Core.Application/WcsTaskApplication.cs index a91d715..b7c1a40 100644 --- a/src/Khd.Core.Application/WcsTaskApplication.cs +++ b/src/Khd.Core.Application/WcsTaskApplication.cs @@ -222,7 +222,7 @@ namespace Khd.Core.Application _dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload()); var wcsTask = _dbContext.WcsTask .Where(t => t.taskType == 47) - .Where(t => t.masterId == taskContinue.materialId) + .Where(t => t.materialId == taskContinue.materialId) .FirstOrDefault(); if (wcsTask != null) { From a0bcd4d1217c5d7b36ec063c0c957ac54fe7524c Mon Sep 17 00:00:00 2001 From: liuwf Date: Sun, 4 Aug 2024 17:03:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Khd.Core.Wcs/Global/StaticData.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Khd.Core.Wcs/Global/StaticData.cs b/src/Khd.Core.Wcs/Global/StaticData.cs index 6918588..f04db89 100644 --- a/src/Khd.Core.Wcs/Global/StaticData.cs +++ b/src/Khd.Core.Wcs/Global/StaticData.cs @@ -64,7 +64,8 @@ namespace Khd.Core.Wcs.Global public static List basePlcs = new List(); public static List PlcConfigs { get; set; } public static int DeleteLogDay { get; internal set; } - public static List BigContainerCodes = new List(){ "JYHB01020001", "JYHB01020002", "JYHB01020003", "JYHB01020004"}; + + public static List BigContainerCodes = new List(){ "JYHB01020001", "JYHB01020002", "JYHB01020003", "JYHB01020004" }; public static Dictionary> PlcPoints = new Dictionary>(); public static Dictionary PlcDic = new Dictionary(); From fec79ed5c2c04421ad206f859dc7f12918d79a64 Mon Sep 17 00:00:00 2001 From: liuwf Date: Sun, 4 Aug 2024 17:23:57 +0800 Subject: [PATCH 4/6] . --- src/Khd.Core.Wpf/appsettings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Khd.Core.Wpf/appsettings.json b/src/Khd.Core.Wpf/appsettings.json index 70f45a7..a56496f 100644 --- a/src/Khd.Core.Wpf/appsettings.json +++ b/src/Khd.Core.Wpf/appsettings.json @@ -3,8 +3,8 @@ //mysql 本地 //"DefaultConnection": "server=106.12.13.113;port=3306;database=khd_jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True" //khd服务器 - //"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=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=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=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=localhost;port=3306;database=jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True" }, "PlcConfigs": [ From 2f87fb998964240f0bfe938f4ca82bee818523cc Mon Sep 17 00:00:00 2001 From: liuwf Date: Sun, 4 Aug 2024 17:38:35 +0800 Subject: [PATCH 5/6] =?UTF-8?q?change-=E8=83=8C=E6=9D=BF=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=BF=87=E6=BB=A4=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Khd.Core.Wcs/MainCentralControl.cs | 88 +++++++++++----------- src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs | 9 ++- 2 files changed, 50 insertions(+), 47 deletions(-) diff --git a/src/Khd.Core.Wcs/MainCentralControl.cs b/src/Khd.Core.Wcs/MainCentralControl.cs index e2bd3b4..fb7c0d7 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 @@ -61,64 +61,64 @@ namespace Khd.Core.Wcs } } //创建定时器 - SystemTimer systemTimer = new SystemTimer(_host); - systemTimer.Start(); + //SystemTimer systemTimer = new SystemTimer(_host); + //systemTimer.Start(); //创建任务 CreateTaskByRecord createTaskByRecord = new(_host); createTaskByRecord.StartPoint(); //一楼提升机以及接驳位 - FirstFloor firstFloor = new(_host); - firstFloor.StartPoint(); + //FirstFloor firstFloor = new(_host); + //firstFloor.StartPoint(); - //二层接驳位 - var SecondBaseFloorEquip = StaticData.BaseEquip.Where(t => t.floorNo == 2 && t.equipType == 1).First(); - SecondFloorPoint secondFloorPoint = new(_host, SecondBaseFloorEquip.floorNo.Value); - secondFloorPoint.StartPoint(); + ////二层接驳位 + //var SecondBaseFloorEquip = StaticData.BaseEquip.Where(t => t.floorNo == 2 && t.equipType == 1).First(); + //SecondFloorPoint secondFloorPoint = new(_host, SecondBaseFloorEquip.floorNo.Value); + //secondFloorPoint.StartPoint(); - //二层AGV - var SecondFloorAgvEquip = StaticData.BaseEquip.Where(t => t.floorNo == 2 && t.equipType == 4).First(); - SecondFloorAGV secondFloorAGV = new(_host, SecondFloorAgvEquip.floorNo.Value); - secondFloorAGV.StartPoint(); + ////二层AGV + //var SecondFloorAgvEquip = StaticData.BaseEquip.Where(t => t.floorNo == 2 && t.equipType == 4).First(); + //SecondFloorAGV secondFloorAGV = new(_host, SecondFloorAgvEquip.floorNo.Value); + //secondFloorAGV.StartPoint(); - //二楼线体 - var SecondFloorLineEquip = StaticData.BaseEquip.Where(t => t.floorNo == 2 && t.equipType == 17).First(); - SecondFloorLine secondFloorLine = new(_host, SecondFloorLineEquip.floorNo.Value); - secondFloorLine.StartPoint(); + ////二楼线体 + //var SecondFloorLineEquip = StaticData.BaseEquip.Where(t => t.floorNo == 2 && t.equipType == 17).First(); + //SecondFloorLine secondFloorLine = new(_host, SecondFloorLineEquip.floorNo.Value); + //secondFloorLine.StartPoint(); - //三层接驳位 - var ThirdBaseFloorEquip = StaticData.BaseEquip.Where(t => t.floorNo == 3 && t.equipType == 1).First(); - ThirdFloorPoint thirdFloorPoint = new(_host, ThirdBaseFloorEquip.floorNo.Value); - thirdFloorPoint.StartPoint(); + ////三层接驳位 + //var ThirdBaseFloorEquip = StaticData.BaseEquip.Where(t => t.floorNo == 3 && t.equipType == 1).First(); + //ThirdFloorPoint thirdFloorPoint = new(_host, ThirdBaseFloorEquip.floorNo.Value); + //thirdFloorPoint.StartPoint(); - //三层AGV - var ThirdFloorAgvEquip = StaticData.BaseEquip.Where(t => t.floorNo == 3 && t.equipType == 4).First(); - ThirdFloorAGV thirdFloorAGV = new(_host, ThirdFloorAgvEquip.floorNo.Value); - thirdFloorAGV.StartPoint(); + ////三层AGV + //var ThirdFloorAgvEquip = StaticData.BaseEquip.Where(t => t.floorNo == 3 && t.equipType == 4).First(); + //ThirdFloorAGV thirdFloorAGV = new(_host, ThirdFloorAgvEquip.floorNo.Value); + //thirdFloorAGV.StartPoint(); - //四楼接驳位 - FourthFloorPoint fourthFloorPoint = new FourthFloorPoint(_host, 4); - fourthFloorPoint.StartPoint(); + ////四楼接驳位 + //FourthFloorPoint fourthFloorPoint = new FourthFloorPoint(_host, 4); + //fourthFloorPoint.StartPoint(); - //五层接驳位 - var FifthBaseFloorEquip = StaticData.BaseEquip.Where(t => t.floorNo == 5 && t.equipType == 1).First(); - FiveFloorPoint fifthFloorPoint = new(_host, FifthBaseFloorEquip.floorNo.Value); - fifthFloorPoint.StartPoint(); + ////五层接驳位 + //var FifthBaseFloorEquip = StaticData.BaseEquip.Where(t => t.floorNo == 5 && t.equipType == 1).First(); + //FiveFloorPoint fifthFloorPoint = new(_host, FifthBaseFloorEquip.floorNo.Value); + //fifthFloorPoint.StartPoint(); - //五层CTU - var FiveFloorCTUEquip = StaticData.BaseEquip.Where(t => t.floorNo == 5 && t.equipType == 6).First(); - FiveFloorCTU fiveFloorCTU = new(_host, FiveFloorCTUEquip.floorNo.Value); - fiveFloorCTU.StartPoint(); + ////五层CTU + //var FiveFloorCTUEquip = StaticData.BaseEquip.Where(t => t.floorNo == 5 && t.equipType == 6).First(); + //FiveFloorCTU fiveFloorCTU = new(_host, FiveFloorCTUEquip.floorNo.Value); + //fiveFloorCTU.StartPoint(); - //五层AGV - var FifthFloorAgvEquip = StaticData.BaseEquip.Where(t => t.floorNo == 5 && t.equipType == 5).First(); - FiveFloorAGV fifthFloorAGV = new(_host, FifthFloorAgvEquip.floorNo.Value); - fifthFloorAGV.StartPoint(); + ////五层AGV + //var FifthFloorAgvEquip = StaticData.BaseEquip.Where(t => t.floorNo == 5 && t.equipType == 5).First(); + //FiveFloorAGV fifthFloorAGV = new(_host, FifthFloorAgvEquip.floorNo.Value); + //fifthFloorAGV.StartPoint(); - //背负式Agv - var FifthFloorBearAgvEquip = StaticData.BaseEquip.Where(t => t.objid == 28).First(); - FiveFloorBearAgv fiveFloorBearAgv = new(_host, FifthFloorBearAgvEquip.floorNo.Value); - fiveFloorBearAgv.StartPoint(); + ////背负式Agv + //var FifthFloorBearAgvEquip = StaticData.BaseEquip.Where(t => t.objid == 28).First(); + //FiveFloorBearAgv fiveFloorBearAgv = new(_host, FifthFloorBearAgvEquip.floorNo.Value); + //fiveFloorBearAgv.StartPoint(); } catch (Exception ex) { diff --git a/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs b/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs index 45e1854..aad9891 100644 --- a/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs +++ b/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs @@ -1648,9 +1648,7 @@ namespace Khd.Core.Wcs.Wcs try { dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload()); - //原材料库存 - var rawStock = dbContext.WmsRawStock - .Where(t => t.activeFlag == "1").ToList(); + //原材料出库记录 var rawOutStock = dbContext.WmsRawOutstock .Where(t => t.executeStatus == "0" || t.executeStatus == "1") @@ -1820,6 +1818,9 @@ namespace Khd.Core.Wcs.Wcs #endregion if (endEquip.equipType == 10)//CTU出库到装配区 { + //原材料库存 + var rawStock = dbContext.WmsRawStock + .Where(t => t.activeFlag == "1").ToList(); BaseEquip endStationCodeEquip = dbContext.BaseEquip.First(t => t.objid == 10); if (!string.IsNullOrEmpty(endStationCodeEquip.endStationCode) ) //if (!string.IsNullOrEmpty(endStationCodeEquip.endStationCode) && endStationCodeEquip.IsOut == 1) @@ -2045,6 +2046,8 @@ namespace Khd.Core.Wcs.Wcs } if (endEquip.equipType == 12 || endEquip.equipType == 13)//原材料到柜体验收区,背板安装 { + var rawStock = dbContext.WmsRawStock + .Where(t => t.activeFlag == "1").ToList(); bool hasTask = dbContext.WcsTask.Where(t => t.currPointId == endEquip.objid || t.endPointId == endEquip.objid).Any(); if (!hasTask) { From f51629e3d7a0676c851721d25f6929ecb58e78f4 Mon Sep 17 00:00:00 2001 From: liuwf Date: Sun, 4 Aug 2024 18:12:13 +0800 Subject: [PATCH 6/6] . --- src/Khd.Core.Wcs/MainCentralControl.cs | 88 +++++++++++++------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/src/Khd.Core.Wcs/MainCentralControl.cs b/src/Khd.Core.Wcs/MainCentralControl.cs index fb7c0d7..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 @@ -61,64 +61,64 @@ namespace Khd.Core.Wcs } } //创建定时器 - //SystemTimer systemTimer = new SystemTimer(_host); - //systemTimer.Start(); + SystemTimer systemTimer = new SystemTimer(_host); + systemTimer.Start(); //创建任务 CreateTaskByRecord createTaskByRecord = new(_host); createTaskByRecord.StartPoint(); //一楼提升机以及接驳位 - //FirstFloor firstFloor = new(_host); - //firstFloor.StartPoint(); + FirstFloor firstFloor = new(_host); + firstFloor.StartPoint(); - ////二层接驳位 - //var SecondBaseFloorEquip = StaticData.BaseEquip.Where(t => t.floorNo == 2 && t.equipType == 1).First(); - //SecondFloorPoint secondFloorPoint = new(_host, SecondBaseFloorEquip.floorNo.Value); - //secondFloorPoint.StartPoint(); + //二层接驳位 + var SecondBaseFloorEquip = StaticData.BaseEquip.Where(t => t.floorNo == 2 && t.equipType == 1).First(); + SecondFloorPoint secondFloorPoint = new(_host, SecondBaseFloorEquip.floorNo.Value); + secondFloorPoint.StartPoint(); - ////二层AGV - //var SecondFloorAgvEquip = StaticData.BaseEquip.Where(t => t.floorNo == 2 && t.equipType == 4).First(); - //SecondFloorAGV secondFloorAGV = new(_host, SecondFloorAgvEquip.floorNo.Value); - //secondFloorAGV.StartPoint(); + //二层AGV + var SecondFloorAgvEquip = StaticData.BaseEquip.Where(t => t.floorNo == 2 && t.equipType == 4).First(); + SecondFloorAGV secondFloorAGV = new(_host, SecondFloorAgvEquip.floorNo.Value); + secondFloorAGV.StartPoint(); - ////二楼线体 - //var SecondFloorLineEquip = StaticData.BaseEquip.Where(t => t.floorNo == 2 && t.equipType == 17).First(); - //SecondFloorLine secondFloorLine = new(_host, SecondFloorLineEquip.floorNo.Value); - //secondFloorLine.StartPoint(); + //二楼线体 + var SecondFloorLineEquip = StaticData.BaseEquip.Where(t => t.floorNo == 2 && t.equipType == 17).First(); + SecondFloorLine secondFloorLine = new(_host, SecondFloorLineEquip.floorNo.Value); + secondFloorLine.StartPoint(); - ////三层接驳位 - //var ThirdBaseFloorEquip = StaticData.BaseEquip.Where(t => t.floorNo == 3 && t.equipType == 1).First(); - //ThirdFloorPoint thirdFloorPoint = new(_host, ThirdBaseFloorEquip.floorNo.Value); - //thirdFloorPoint.StartPoint(); + //三层接驳位 + var ThirdBaseFloorEquip = StaticData.BaseEquip.Where(t => t.floorNo == 3 && t.equipType == 1).First(); + ThirdFloorPoint thirdFloorPoint = new(_host, ThirdBaseFloorEquip.floorNo.Value); + thirdFloorPoint.StartPoint(); - ////三层AGV - //var ThirdFloorAgvEquip = StaticData.BaseEquip.Where(t => t.floorNo == 3 && t.equipType == 4).First(); - //ThirdFloorAGV thirdFloorAGV = new(_host, ThirdFloorAgvEquip.floorNo.Value); - //thirdFloorAGV.StartPoint(); + //三层AGV + var ThirdFloorAgvEquip = StaticData.BaseEquip.Where(t => t.floorNo == 3 && t.equipType == 4).First(); + ThirdFloorAGV thirdFloorAGV = new(_host, ThirdFloorAgvEquip.floorNo.Value); + thirdFloorAGV.StartPoint(); - ////四楼接驳位 - //FourthFloorPoint fourthFloorPoint = new FourthFloorPoint(_host, 4); - //fourthFloorPoint.StartPoint(); + //四楼接驳位 + FourthFloorPoint fourthFloorPoint = new FourthFloorPoint(_host, 4); + fourthFloorPoint.StartPoint(); - ////五层接驳位 - //var FifthBaseFloorEquip = StaticData.BaseEquip.Where(t => t.floorNo == 5 && t.equipType == 1).First(); - //FiveFloorPoint fifthFloorPoint = new(_host, FifthBaseFloorEquip.floorNo.Value); - //fifthFloorPoint.StartPoint(); + //五层接驳位 + var FifthBaseFloorEquip = StaticData.BaseEquip.Where(t => t.floorNo == 5 && t.equipType == 1).First(); + FiveFloorPoint fifthFloorPoint = new(_host, FifthBaseFloorEquip.floorNo.Value); + fifthFloorPoint.StartPoint(); - ////五层CTU - //var FiveFloorCTUEquip = StaticData.BaseEquip.Where(t => t.floorNo == 5 && t.equipType == 6).First(); - //FiveFloorCTU fiveFloorCTU = new(_host, FiveFloorCTUEquip.floorNo.Value); - //fiveFloorCTU.StartPoint(); + //五层CTU + var FiveFloorCTUEquip = StaticData.BaseEquip.Where(t => t.floorNo == 5 && t.equipType == 6).First(); + FiveFloorCTU fiveFloorCTU = new(_host, FiveFloorCTUEquip.floorNo.Value); + fiveFloorCTU.StartPoint(); - ////五层AGV - //var FifthFloorAgvEquip = StaticData.BaseEquip.Where(t => t.floorNo == 5 && t.equipType == 5).First(); - //FiveFloorAGV fifthFloorAGV = new(_host, FifthFloorAgvEquip.floorNo.Value); - //fifthFloorAGV.StartPoint(); + //五层AGV + var FifthFloorAgvEquip = StaticData.BaseEquip.Where(t => t.floorNo == 5 && t.equipType == 5).First(); + FiveFloorAGV fifthFloorAGV = new(_host, FifthFloorAgvEquip.floorNo.Value); + fifthFloorAGV.StartPoint(); - ////背负式Agv - //var FifthFloorBearAgvEquip = StaticData.BaseEquip.Where(t => t.objid == 28).First(); - //FiveFloorBearAgv fiveFloorBearAgv = new(_host, FifthFloorBearAgvEquip.floorNo.Value); - //fiveFloorBearAgv.StartPoint(); + //背负式Agv + var FifthFloorBearAgvEquip = StaticData.BaseEquip.Where(t => t.objid == 28).First(); + FiveFloorBearAgv fiveFloorBearAgv = new(_host, FifthFloorBearAgvEquip.floorNo.Value); + fiveFloorBearAgv.StartPoint(); } catch (Exception ex) {