yangw
/
lj_plc
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'wangsr' of http://175.27.215.92:3000/yangw/lj_plc into wangsr

Browse Source
dep_nodyang
wangsr 1 year ago
parent 3e03c8da8e 26d450e609
commit 7fb60e4423
5 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File

70
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
Unescape Escape View File

@ -33,6 +33,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
private DB2102Helper DB2102 = new DB2102Helper(); private DB2102Helper DB2102 = new DB2102Helper();
private DB2103Helper DB2103 = new DB2103Helper(); private DB2103Helper DB2103 = new DB2103Helper();
private DB2107Helper DB2107 = new DB2107Helper(); private DB2107Helper DB2107 = new DB2107Helper();
private DB2119Helper DB2119 = new DB2119Helper();
private ConcurrentDictionary<string, object> conCurrentCache = new ConcurrentDictionary<string, object>(); private ConcurrentDictionary<string, object> conCurrentCache = new ConcurrentDictionary<string, object>();
private Timer timer; private Timer timer;
@ -151,6 +152,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
DB2102 = new DB2102Helper(); DB2102 = new DB2102Helper();
DB2103 = new DB2103Helper(); DB2103 = new DB2103Helper();
DB2107 = new DB2107Helper(); DB2107 = new DB2107Helper();
DB2119 = new DB2119Helper();
NewThreadDb2102(); NewThreadDb2102();
NewThreadDb2103(); NewThreadDb2103();
@ -691,19 +693,19 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
if (DB2103.DM2ASF01.Running) if (DB2103.DM2ASF01.Running)
{ {
//if (DB2103.DM2ASF01.Polarity) if (DB2119.Spiral_A.Polarty)
//{ {
// DM2ASF01L_Set = true;
// DM2ASF01R_Set = false;
//}
//else
//{
// DM2ASF01L_Set = false;
// DM2ASF01R_Set = true;
//}
PlcReadTemp.DM2ASF01L_Set = true; PlcReadTemp.DM2ASF01L_Set = true;
PlcReadTemp.DM2ASF01R_Set = false;
}
else
{
PlcReadTemp.DM2ASF01L_Set = false;
PlcReadTemp.DM2ASF01R_Set = true; PlcReadTemp.DM2ASF01R_Set = true;
} }
//PlcReadTemp.DM2ASF01L_Set = true;
//PlcReadTemp.DM2ASF01R_Set = true;
}
else else
{ {
PlcReadTemp.DM2ASF01L_Set = false; PlcReadTemp.DM2ASF01L_Set = false;
@ -712,19 +714,19 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
if (DB2103.DM2BSF01.Running) if (DB2103.DM2BSF01.Running)
{ {
//if (DB2103.DM2BSF01.Polarity) if (DB2119.Spiral_B.Polarty)
//{ {
// DM2BSF01L_Set = true;
// DM2BSF01R_Set = false;
//}
//else
//{
// DM2BSF01L_Set = false;
// DM2BSF01R_Set = true;
//}
PlcReadTemp.DM2BSF01L_Set = true; PlcReadTemp.DM2BSF01L_Set = true;
PlcReadTemp.DM2BSF01R_Set = false;
}
else
{
PlcReadTemp.DM2BSF01L_Set = false;
PlcReadTemp.DM2BSF01R_Set = true; PlcReadTemp.DM2BSF01R_Set = true;
} }
//PlcReadTemp.DM2BSF01L_Set = true;
//PlcReadTemp.DM2BSF01R_Set = true;
}
else else
{ {
PlcReadTemp.DM2BSF01L_Set = false; PlcReadTemp.DM2BSF01L_Set = false;
@ -733,19 +735,19 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
if (DB2103.DM2CSF01.Running) if (DB2103.DM2CSF01.Running)
{ {
//if (DB2103.DM2CSF01.Polarity) if (DB2119.Spiral_C.Polarty)
//{ {
// DM2CSF01L_Set = true;
// DM2CSF01R_Set = false;
//}
//else
//{
// DM2CSF01L_Set = false;
// DM2CSF01R_Set = true;
//}
PlcReadTemp.DM2CSF01L_Set = true; PlcReadTemp.DM2CSF01L_Set = true;
PlcReadTemp.DM2CSF01R_Set = false;
}
else
{
PlcReadTemp.DM2CSF01L_Set = false;
PlcReadTemp.DM2CSF01R_Set = true; PlcReadTemp.DM2CSF01R_Set = true;
} }
//PlcReadTemp.DM2CSF01L_Set = true;
//PlcReadTemp.DM2CSF01R_Set = true;
}
else else
{ {
PlcReadTemp.DM2CSF01L_Set = false; PlcReadTemp.DM2CSF01L_Set = false;
@ -756,13 +758,13 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
{ {
//if (DB2103.DM2DSF01.Polarity) //if (DB2103.DM2DSF01.Polarity)
//{ //{
// DM2DSF01L_Set = true; // PlcReadTemp.DM2DSF01L_Set = true;
// DM2DSF01R_Set = false; // PlcReadTemp.DM2DSF01R_Set = false;
//} //}
//else //else
//{ //{
// DM2DSF01L_Set = false; // PlcReadTemp.DM2DSF01L_Set = false;
// DM2DSF01R_Set = true; // PlcReadTemp.DM2DSF01R_Set = true;
//} //}
PlcReadTemp.DM2DSF01L_Set = true; PlcReadTemp.DM2DSF01L_Set = true;
PlcReadTemp.DM2DSF01R_Set = true; PlcReadTemp.DM2DSF01R_Set = true;

12
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs
Unescape Escape View File

@ -407,11 +407,11 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl
{ {
if(DB2119.Spiral_A.Weter_Bin == 1) 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) 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 else
{ {
@ -423,11 +423,11 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl
{ {
if (DB2119.Spiral_B.Weter_Bin == 1) 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) 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 else
{ {
@ -439,11 +439,11 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl
{ {
if (DB2119.Spiral_C.Weter_Bin == 1) 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) 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 else
{ {

4
DataBlockHelper/Entity/DB2119Entity/WaterTempEntity.cs
Unescape Escape View File

@ -19,7 +19,7 @@ namespace DataBlockHelper.Entity.DB2119Entity
Value_Initial = PlcConnect.Instance.ByteTransform.TransInt16(content, 4); Value_Initial = PlcConnect.Instance.ByteTransform.TransInt16(content, 4);
Gela_Bin = PlcConnect.Instance.ByteTransform.TransInt16(content, 6); Gela_Bin = PlcConnect.Instance.ByteTransform.TransInt16(content, 6);
byte byt = content[0]; byte byt = content[8];
Dos_Start = byt.GetBit(0); Dos_Start = byt.GetBit(0);
Dos_Stop = byt.GetBit(1); Dos_Stop = byt.GetBit(1);
@ -30,7 +30,7 @@ namespace DataBlockHelper.Entity.DB2119Entity
Dis_Status = byt.GetBit(6); Dis_Status = byt.GetBit(6);
Dis_End = byt.GetBit(7); Dis_End = byt.GetBit(7);
byt = content[1]; byt = content[9];
In_Value1 = byt.GetBit(0); In_Value1 = byt.GetBit(0);
In_Value2 = byt.GetBit(1); In_Value2 = byt.GetBit(1);

2
Main/MCEdit/Data/MCProject/SCWSProject2.mprj
Unescape Escape View File

@ -29,7 +29,7 @@
<Node Name="FormClient" Text="点击重量设置" ToolTipText="FormClient" Tag="FormClient" ImageIndex="3" SelectedImageIndex="3" /> <Node Name="FormClient" Text="点击重量设置" ToolTipText="FormClient" Tag="FormClient" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="MainDetail" Text="设备细节画面" ToolTipText="MainDetail" Tag="MainDetail" ImageIndex="3" SelectedImageIndex="3" /> <Node Name="MainDetail" Text="设备细节画面" ToolTipText="MainDetail" Tag="MainDetail" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FormDayWhiteEmbryo" Text="糊化机黑粉日统计" ToolTipText="FormDayWhiteEmbryo" Tag="FormDayWhiteEmbryo" ImageIndex="3" SelectedImageIndex="3" /> <Node Name="FormDayWhiteEmbryo" Text="糊化机黑粉日统计" ToolTipText="FormDayWhiteEmbryo" Tag="FormDayWhiteEmbryo" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="GelBlackPowderCount" Text="湿混机锅黑粉下料统计" ToolTipText="GelBlackPowderCount" Tag="GelBlackPowderCount" ImageIndex="3" SelectedImageIndex="3" /> <Node Name="GelBlackPowderCount" Text="湿混机黑粉下料统计" ToolTipText="GelBlackPowderCount" Tag="GelBlackPowderCount" ImageIndex="3" SelectedImageIndex="3" />
</Node> </Node>
<Node Name="nodeDevice" Text="设备" ToolTipText="" Tag="nodeDevice" ImageIndex="2" SelectedImageIndex="2"> <Node Name="nodeDevice" Text="设备" ToolTipText="" Tag="nodeDevice" ImageIndex="2" SelectedImageIndex="2">
<Node Name="ParametersWithPc" Text="ParametersWithPc" ToolTipText="" Tag="ParametersWithPc" ImageIndex="5" SelectedImageIndex="5" /> <Node Name="ParametersWithPc" Text="ParametersWithPc" ToolTipText="" Tag="ParametersWithPc" ImageIndex="5" SelectedImageIndex="5" />

2
Main/MCEdit/Data/MCProject/nodeForm/GelBlackPowderCount.xml
Unescape Escape View File

@ -336,7 +336,7 @@
<Property name="BackColor">Control</Property> <Property name="BackColor">Control</Property>
<Property name="Size">706, 683</Property> <Property name="Size">706, 683</Property>
<Property name="StartPosition">WindowsDefaultLocation</Property> <Property name="StartPosition">WindowsDefaultLocation</Property>
<Property name="Text">湿混机锅黑粉下料统计</Property> <Property name="Text">湿混机黑粉下料统计</Property>
<Property name="WindowState">Normal</Property> <Property name="WindowState">Normal</Property>
<Property name="BackgroundImage" /> <Property name="BackgroundImage" />
<Property name="BackgroundImageLayout">Tile</Property> <Property name="BackgroundImageLayout">Tile</Property>

Write Preview
Loading…
Cancel
Save