From 26d450e60912dc32cd96bac58e5615b1ba058188 Mon Sep 17 00:00:00 2001 From: wangsr Date: Wed, 18 Oct 2023 04:45:14 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=96=87=E5=AD=97=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=9B=B4=E6=94=B9=20=E8=9E=BA=E6=97=8B=E6=AD=A3?= =?UTF-8?q?=E5=8F=8D=E8=BD=AC=E6=98=BE=E7=A4=BA=E5=AE=9E=E7=8E=B0=20dbhelp?= =?UTF-8?q?er=E9=94=99=E8=AF=AF=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainDetailControlAction.cs | 82 ++++++++++--------- .../ManualControl/InitAction.cs | 12 +-- .../Entity/DB2119Entity/WaterTempEntity.cs | 4 +- Main/MCEdit/Data/MCProject/SCWSProject2.mprj | 2 +- .../nodeForm/GelBlackPowderCount.xml | 2 +- 5 files changed, 52 insertions(+), 50 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index ad1a905..4807981 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -33,6 +33,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl private DB2102Helper DB2102 = new DB2102Helper(); private DB2103Helper DB2103 = new DB2103Helper(); private DB2107Helper DB2107 = new DB2107Helper(); + private DB2119Helper DB2119 = new DB2119Helper(); private ConcurrentDictionary conCurrentCache = new ConcurrentDictionary(); private Timer timer; @@ -151,6 +152,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl DB2102 = new DB2102Helper(); DB2103 = new DB2103Helper(); DB2107 = new DB2107Helper(); + DB2119 = new DB2119Helper(); NewThreadDb2102(); NewThreadDb2103(); @@ -691,18 +693,18 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl if (DB2103.DM2ASF01.Running) { - //if (DB2103.DM2ASF01.Polarity) - //{ - // DM2ASF01L_Set = true; - // DM2ASF01R_Set = false; - //} - //else - //{ - // DM2ASF01L_Set = false; - // DM2ASF01R_Set = true; - //} - PlcReadTemp.DM2ASF01L_Set = true; - PlcReadTemp.DM2ASF01R_Set = true; + if (DB2119.Spiral_A.Polarty) + { + PlcReadTemp.DM2ASF01L_Set = true; + PlcReadTemp.DM2ASF01R_Set = false; + } + else + { + PlcReadTemp.DM2ASF01L_Set = false; + PlcReadTemp.DM2ASF01R_Set = true; + } + //PlcReadTemp.DM2ASF01L_Set = true; + //PlcReadTemp.DM2ASF01R_Set = true; } else { @@ -712,18 +714,18 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl if (DB2103.DM2BSF01.Running) { - //if (DB2103.DM2BSF01.Polarity) - //{ - // DM2BSF01L_Set = true; - // DM2BSF01R_Set = false; - //} - //else - //{ - // DM2BSF01L_Set = false; - // DM2BSF01R_Set = true; - //} - PlcReadTemp.DM2BSF01L_Set = true; - PlcReadTemp.DM2BSF01R_Set = true; + if (DB2119.Spiral_B.Polarty) + { + PlcReadTemp.DM2BSF01L_Set = true; + PlcReadTemp.DM2BSF01R_Set = false; + } + else + { + PlcReadTemp.DM2BSF01L_Set = false; + PlcReadTemp.DM2BSF01R_Set = true; + } + //PlcReadTemp.DM2BSF01L_Set = true; + //PlcReadTemp.DM2BSF01R_Set = true; } else { @@ -733,18 +735,18 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl if (DB2103.DM2CSF01.Running) { - //if (DB2103.DM2CSF01.Polarity) - //{ - // DM2CSF01L_Set = true; - // DM2CSF01R_Set = false; - //} - //else - //{ - // DM2CSF01L_Set = false; - // DM2CSF01R_Set = true; - //} - PlcReadTemp.DM2CSF01L_Set = true; - PlcReadTemp.DM2CSF01R_Set = true; + if (DB2119.Spiral_C.Polarty) + { + PlcReadTemp.DM2CSF01L_Set = true; + PlcReadTemp.DM2CSF01R_Set = false; + } + else + { + PlcReadTemp.DM2CSF01L_Set = false; + PlcReadTemp.DM2CSF01R_Set = true; + } + //PlcReadTemp.DM2CSF01L_Set = true; + //PlcReadTemp.DM2CSF01R_Set = true; } else { @@ -756,13 +758,13 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl { //if (DB2103.DM2DSF01.Polarity) //{ - // DM2DSF01L_Set = true; - // DM2DSF01R_Set = false; + // PlcReadTemp.DM2DSF01L_Set = true; + // PlcReadTemp.DM2DSF01R_Set = false; //} //else //{ - // DM2DSF01L_Set = false; - // DM2DSF01R_Set = true; + // PlcReadTemp.DM2DSF01L_Set = false; + // PlcReadTemp.DM2DSF01R_Set = true; //} PlcReadTemp.DM2DSF01L_Set = true; PlcReadTemp.DM2DSF01R_Set = true; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs index ba84f65..b3671e2 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs @@ -407,11 +407,11 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { if(DB2119.Spiral_A.Weter_Bin == 1) { - ManualLogControl("糊化锅1称量结束", DB2119.Spiral_A.Value_Weight, 4, 1, 2); + ManualLogControl("湿混机1称量结束", DB2119.Spiral_A.Value_Weight, 4, 1, 2); } else if(DB2119.Spiral_A.Weter_Bin == 2) { - ManualLogControl("糊化锅2称量结束", DB2119.Spiral_A.Value_Weight, 4, 2, 2); + ManualLogControl("湿混机2称量结束", DB2119.Spiral_A.Value_Weight, 4, 2, 2); } else { @@ -423,11 +423,11 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { if (DB2119.Spiral_B.Weter_Bin == 1) { - ManualLogControl("糊化锅3称量结束", DB2119.Spiral_B.Value_Weight, 4, 3, 2); + ManualLogControl("湿混机3称量结束", DB2119.Spiral_B.Value_Weight, 4, 3, 2); } else if (DB2119.Spiral_B.Weter_Bin == 2) { - ManualLogControl("糊化锅4称量结束", DB2119.Spiral_B.Value_Weight, 4, 4, 2); + ManualLogControl("湿混机4称量结束", DB2119.Spiral_B.Value_Weight, 4, 4, 2); } else { @@ -439,11 +439,11 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { if (DB2119.Spiral_C.Weter_Bin == 1) { - ManualLogControl("糊化锅5称量结束", DB2119.Spiral_C.Value_Weight, 4, 5, 2); + ManualLogControl("湿混机5称量结束", DB2119.Spiral_C.Value_Weight, 4, 5, 2); } else if (DB2119.Spiral_C.Weter_Bin == 2) { - ManualLogControl("糊化锅6称量结束", DB2119.Spiral_C.Value_Weight, 4, 6, 2); + ManualLogControl("湿混机6称量结束", DB2119.Spiral_C.Value_Weight, 4, 6, 2); } else { diff --git a/DataBlockHelper/Entity/DB2119Entity/WaterTempEntity.cs b/DataBlockHelper/Entity/DB2119Entity/WaterTempEntity.cs index 391f9c6..ca3ebcc 100644 --- a/DataBlockHelper/Entity/DB2119Entity/WaterTempEntity.cs +++ b/DataBlockHelper/Entity/DB2119Entity/WaterTempEntity.cs @@ -19,7 +19,7 @@ namespace DataBlockHelper.Entity.DB2119Entity Value_Initial = PlcConnect.Instance.ByteTransform.TransInt16(content, 4); Gela_Bin = PlcConnect.Instance.ByteTransform.TransInt16(content, 6); - byte byt = content[0]; + byte byt = content[8]; Dos_Start = byt.GetBit(0); Dos_Stop = byt.GetBit(1); @@ -30,7 +30,7 @@ namespace DataBlockHelper.Entity.DB2119Entity Dis_Status = byt.GetBit(6); Dis_End = byt.GetBit(7); - byt = content[1]; + byt = content[9]; In_Value1 = byt.GetBit(0); In_Value2 = byt.GetBit(1); diff --git a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj index 3387d21..97f7d5e 100644 --- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj +++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj @@ -29,7 +29,7 @@ - + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml b/Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml index 29b63cf..d22b55b 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml @@ -337,7 +337,7 @@ Control 706, 683 WindowsDefaultLocation - 湿混机锅黑粉下料统计 + 湿混机黑粉下料统计 Normal Tile