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

解决合并冲突 最终正常期望版本

Browse Source
master
wangsr 1 year ago
parent e6ce524df2 26358bdfbd
commit 62bbcfaf91
8 changed files with 3950 additions and 2705 deletions
Show Stats Download Patch File Download Diff File

1
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchService.cs
Unescape Escape View File

@ -114,6 +114,7 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch
{ {
#region 0、实时刷新自动保存报警 #region 0、实时刷新自动保存报警
ReportWetMixerSaveHelper.Instance.SaveWetMixerReport(); ReportWetMixerSaveHelper.Instance.SaveWetMixerReport();
#endregion #endregion

2
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs
Unescape Escape View File

@ -11,7 +11,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public class DownloadAction:ChemicalWeighingAction, IAction public class DownloadAction:ChemicalWeighingAction, IAction
{ {
private DbMCControl _materialGridControl = null; private DbMCControl _materialGridControl = null; //物料列表控件
private RuntimeParameter _runtime; private RuntimeParameter _runtime;
public void Run(RuntimeParameter runtime) public void Run(RuntimeParameter runtime)

1
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmPlanning.Designer.cs generated
Unescape Escape View File

@ -310,7 +310,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.groupBox3.PerformLayout(); this.groupBox3.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
} }
#endregion #endregion

12
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs
Unescape Escape View File

@ -40,7 +40,15 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
private void DoWord() private void DoWord()
{ {
LoadingHelper.ShowLoadingScreen();
var i = LjHelp.WatchDog;
if (i == 0)
{
LoadingHelper.CloseForm();
MessageBox.Show("PLC通讯失败");
ICSharpCode.Core.LoggingService<UpAction>.Warn("PLC通讯失败");
return;
}
var pressureSettingViews = PressurePLC.UpdateFromPlc(); var pressureSettingViews = PressurePLC.UpdateFromPlc();
foreach (var v in pressureSettingViews) foreach (var v in pressureSettingViews)
@ -50,7 +58,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
DBHelp.ExecuteNonQuery(sql); DBHelp.ExecuteNonQuery(sql);
} }
LoadingHelper.CloseForm();
if (OnHandler != null) if (OnHandler != null)
{ {

36
Main/MCEdit/Data/MCProject/nodeDevice.xml
Unescape Escape View File

@ -7669,6 +7669,42 @@
<Data name="SV1GDS01_P1" runname="SV1GDS01_P1" start="76" len="1" method="Default_Bit(15,1)" max="" issave="True" subtractor="" remark="" /> <Data name="SV1GDS01_P1" runname="SV1GDS01_P1" start="76" len="1" method="Default_Bit(15,1)" max="" issave="True" subtractor="" remark="" />
</Data> </Data>
</Group> </Group>
<Group name="DB2105-PlanFromPC" block="2105" start="0" len="26" access="ReadWrite" remark="db2105" isautoread="True">
<Data>
<Data name="Plan0_RecipeCode" runname="Plan0_RecipeCode" start="0" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="配方代码" />
<Data name="Plan0_PlanCode" runname="Plan0_PlanCode" start="1" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="计划代码" />
<Data name="Plan0_Batch" runname="Plan0_Batch" start="2" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="数量" />
<Data name="Plan0_Start" runname="Plan0_Start" start="3" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="启动" />
<Data name="Plan0_Pause" runname="Plan0_Pause" start="4" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="暂停" />
<Data name="Plan0_Stop" runname="Plan0_Stop" start="5" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="取消" />
<Data name="Plan1_RecipeCode" runname="Plan1_RecipeCode" start="6" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="配方代码" />
<Data name="Plan1_PlanCode" runname="Plan1_PlanCode" start="7" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="计划代码" />
<Data name="Plan1_Batch" runname="Plan1_Batch" start="8" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="数量" />
<Data name="Plan1_Start" runname="Plan1_Start" start="9" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="启动" />
<Data name="Plan1_Pause" runname="Plan1_Pause" start="10" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="暂停" />
<Data name="Plan1_Stop" runname="Plan1_Stop" start="11" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="取消" />
<Data name="Plan2_RecipeCode" runname="Plan2_RecipeCode" start="12" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="配方代码" />
<Data name="Plan2_PlanCode" runname="Plan2_PlanCode" start="13" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="计划代码" />
<Data name="Plan2_Batch" runname="Plan2_Batch" start="14" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="数量" />
<Data name="Plan2_Start" runname="Plan2_Start" start="15" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="启动" />
<Data name="Plan2_Pause" runname="Plan2_Pause" start="16" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="暂停" />
<Data name="Plan2_Stop" runname="Plan2_Stop" start="17" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="取消" />
<Data name="Plan3_RecipeCode" runname="Plan3_RecipeCode" start="18" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="配方代码" />
<Data name="Plan3_PlanCode" runname="Plan3_PlanCode" start="19" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="计划代码" />
<Data name="Plan3_Batch" runname="Plan3_Batch" start="20" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="数量" />
<Data name="Plan3_Start" runname="Plan3_Start" start="21" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="启动" />
<Data name="Plan3_Pause" runname="Plan3_Pause" start="22" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="暂停" />
<Data name="Plan3_Stop" runname="Plan3_Stop" start="23" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="取消" />
<Data name="Status0" runname="Status0" start="24" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="Line1" />
<Data name="Status1" runname="Status1" start="24" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="Line2" />
<Data name="Status2" runname="Status2" start="24" len="1" method="Default_Bit(2,1)" max="" issave="True" subtractor="" remark="Line3" />
<Data name="Status3" runname="Status3" start="24" len="1" method="Default_Bit(3,1)" max="" issave="True" subtractor="" remark="Line4" />
<Data name="End0" runname="End0" start="0" len="25" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="Line1" />
<Data name="End1" runname="End1" start="0" len="25" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="Line2" />
<Data name="End2" runname="End2" start="0" len="25" method="Default_Bit(2,1)" max="" issave="True" subtractor="" remark="Line3" />
<Data name="End3" runname="End3" start="0" len="25" method="Default_Bit(3,1)" max="" issave="True" subtractor="" remark="Line4" />
</Data>
</Group>
</Group> </Group>
</Equip> </Equip>
</EquipFactory> </EquipFactory>

5838
Main/MCEdit/Data/MCProject/nodeForm/FormDeliver.xml
View File

File diff suppressed because it is too large Load Diff

761
Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml
View File

File diff suppressed because it is too large Load Diff

4
Main/MCRun/Program.cs
Unescape Escape View File

@ -127,6 +127,10 @@ namespace MCRun
//初始化连接报警器 //初始化连接报警器
// DoControl.Instance.ComOn(); // DoControl.Instance.ComOn();
} }
//if (!Mesnac.Basic.InfluxDbHelper.Instance.IsStartDbServer) //if (!Mesnac.Basic.InfluxDbHelper.Instance.IsStartDbServer)

Write Preview
Loading…
Cancel
Save