diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/PauseAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/PauseAction.cs index 4c4c7bc..f0777ec 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/PauseAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/PauseAction.cs @@ -38,8 +38,29 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning var id = Convert.ToInt32(dataGridViewRow.Cells["Id"].Value); - + //Pause + + var i = BasePlcHelper.Instance.RecipePause.LastValue.ToInt(); + string message = ""; + if (i == 1) + { + MessageBox.Show(""); + message = "系统已经暂停 是否恢复系统"; + } + else + { + message = "是否暂停系统"; + } + + if (MessageBox.Show(message, "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == + DialogResult.OK) + { + i = BasePlcHelper.Instance.Pause.LastValue.ToInt(); + var bo = !Convert.ToBoolean(i); + BasePlcHelper.Instance.PlcWriteByDataKey(BasePlcHelper.Instance.Pause, new object[] { bo }); + } + } } } \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊生产计划管理.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊生产计划管理.xml index 25dad42..82a5ce3 100644 --- a/Main/MCEdit/Data/EventConfig/小料称量/榄菊生产计划管理.xml +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊生产计划管理.xml @@ -25,6 +25,13 @@ 下发计划管理 下发计划管理 + + + 暂停计划管理 + 暂停计划管理 + + + @@ -54,7 +61,10 @@ - + + + + @@ -65,6 +75,7 @@ + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormPlan.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormPlan.xml index 99e5fbd..d8e55ad 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormPlan.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormPlan.xml @@ -88,7 +88,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAQAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDk4NUMwMjhDNjNBNjM1NTZEMTlFMzAwMDJBMEE3QjMwBgYAAAAS5Yid5aeL6K6h5YiS566h55CGBgcAAAAS5Yid5aeL6K6h5YiS566h55CGCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAASAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDQ2NUU1MEZERDE5REQwQUM2NkYyOEU0NDg5RjVGMURBBgYAAAAS5pqC5YGc6K6h5YiS566h55CGBgcAAAAS5pqC5YGc6K6h5YiS566h55CGCw==