From 9057fb6d9bd6c462d8073cb5b636cf6d2a4e48b7 Mon Sep 17 00:00:00 2001 From: wangsr Date: Thu, 16 Nov 2023 10:58:46 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=87=AA=E5=8A=A8=E6=8E=A7?= =?UTF-8?q?=E5=88=B6plc=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoControl/ControlsHelper.cs | 13 +----- .../AutoControl/PlcAutoWriteHelper.cs | 46 +++++++++++++++---- .../LjDeliver/DeliverInitAction.cs | 39 ++++++++++++++-- .../Data/MCProject/nodeForm/LjDeliver.xml | 2 +- 4 files changed, 74 insertions(+), 26 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs index d8ed263..89712d1 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs @@ -1,24 +1,13 @@ -using DataBlockHelper.DBHelpers; -using DevExpress.Utils.Serializing.Helpers; -using DevExpress.XtraEditors.Filtering.Templates; -using Mesnac.Action.ChemicalWeighing.AutoControl.DB; +using Mesnac.Action.ChemicalWeighing.AutoControl.DB; using Mesnac.Action.ChemicalWeighing.AutoControl.Entity; using Mesnac.Action.ChemicalWeighing.FreeDb; using Mesnac.Action.ChemicalWeighing.LjMixManager; using Mesnac.Action.ChemicalWeighing.LjPlanning; using Mesnac.Action.ChemicalWeighing.Util; -using Mesnac.Controls.Base; -using Mesnac.Controls.ChemicalWeighing; -using Mesnac.Controls.Default; using System; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Reflection; using System.Runtime.Serialization.Json; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace Mesnac.Action.ChemicalWeighing.AutoControl { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs index ee12798..7505c0f 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs @@ -1,7 +1,5 @@ using DataBlockHelper.DBHelpers; using DataBlockHelper.Entity.DB2104Entity; -using DevExpress.DataAccess.Native.Web; -using DevExpress.XtraEditors.Filtering.Templates; using Mesnac.Action.ChemicalWeighing.AutoControl.DB; using Mesnac.Action.ChemicalWeighing.AutoControl.Entity; using Mesnac.Action.ChemicalWeighing.LjMixManager; @@ -11,14 +9,8 @@ using Mesnac.Controls.Default; using Mesnac.Core.Service; using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; -using System.Xml.Serialization; using static Mesnac.Action.ChemicalWeighing.AutoControl.AutoLogHelper; -using Newtonsoft.Json; -using DevExpress.DataAccess.Native.Json; namespace Mesnac.Action.ChemicalWeighing.AutoControl { @@ -259,14 +251,13 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl if (!GWComparePLC(recipes, steps, mixSteps, RadioE)) { - MessageBox.Show("下传数据不完整，请重新下传数据！"); + MessageBox.Show("湿混糊化产线下传数据不完整，请重新下传数据！"); } } private static bool GWComparePLC(List recipes, List steps, List mixSteps, MCRadioButtonEntity RadioE) { - bool flag = false; var getGelatG1 = LjPlanningPlcHelp.GetGelatG1; var getWeterM1 = LjPlanningPlcHelp.GetWeterM1; var getGelatG2 = LjPlanningPlcHelp.GetGelatG2; @@ -380,6 +371,41 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl DeviceMaterrialService.Save(materials); break; } + + if (!DYComparePLC(recipes, steps, RadioE)) + { + MessageBox.Show("干混产线下传数据不完整，请重新下传数据！"); + } + } + + private static bool DYComparePLC(List recipes, List steps, MCRadioButtonEntity RadioE) + { + var getDryerD1 = LjPlanningPlcHelp.GetDryerD1; + var getDryerD2 = LjPlanningPlcHelp.GetDryerD2; + var getDryerD3 = LjPlanningPlcHelp.GetDryerD3; + var getDryerD4 = LjPlanningPlcHelp.GetDryerD4; + + string j1 = ControlsHelper.JsonSerialize(recipes); + string j2 = ControlsHelper.JsonSerialize(steps); + + switch (ControlsHelper.SingleSelect(RadioE)) + { + case 1: + return j1 == ControlsHelper.JsonSerialize(getDryerD1.RecipePlcViews) + && j2 == ControlsHelper.JsonSerialize(getDryerD1.RecipeSteps); + case 2: + return j1 == ControlsHelper.JsonSerialize(getDryerD2.RecipePlcViews) + && j2 == ControlsHelper.JsonSerialize(getDryerD2.RecipeSteps); + case 3: + return j1 == ControlsHelper.JsonSerialize(getDryerD3.RecipePlcViews) + && j2 == ControlsHelper.JsonSerialize(getDryerD3.RecipeSteps); + case 4: + return j1 == ControlsHelper.JsonSerialize(getDryerD4.RecipePlcViews) + && j2 == ControlsHelper.JsonSerialize(getDryerD4.RecipeSteps); + default: + MessageBox.Show("未选择产线！"); + return true; + } } #endregion diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs index e0d9b00..19dd47d 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs @@ -1,4 +1,5 @@ using DevExpress.Data.Filtering.Helpers; +using DevExpress.Utils.FormShadow; using Mesnac.Action.Base; using Mesnac.Action.ChemicalWeighing.LjDeliver.Entity; using Mesnac.Controls.ChemicalWeighing; @@ -27,10 +28,40 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver ControlsHelper.ControlImport(bottleE, Controls); - wangsr(); + //wangsr(); } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + //测试程序 private void wangsr() { Random rd = new Random(); @@ -62,8 +93,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver } int num; - - while (Application.OpenForms["LjDeliver"] != null) + var obj = Application.OpenForms["LjDeliver"]; + while (obj != null) { num = 0; @@ -96,6 +127,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver num++; } Thread.Sleep(1); + + obj = Application.OpenForms["LjDeliver"]; } }); Thread thread = new Thread(threadStart); diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml index 4541c1b..29fcaf6 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml @@ -4689,7 +4689,7 @@ Fill 0, 0 Panel15 - 1736, 917 + 1738, 925 AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDcxODhEMjExMkM4NTQ1NEI5OEIyQTFDMjk2RDBCQzU3BgYAAAAV6L6T6YCB55WM6Z2i5Yid5aeL5YyWBgcAAAAV6L6T6YCB55WM6Z2i5Yid5aeL5YyWCw==