diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_GelDoser_Detail.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_GelDoser_Detail.cs
index 433a192..c8c1128 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_GelDoser_Detail.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_GelDoser_Detail.cs
@@ -46,7 +46,7 @@ namespace Mesnac.Action.ChemicalWeighing.FreeDb.DBEntity.Report
public int? eqNo { get; set; }
///
- /// 1 糊化机 2 hotWater 3 coolWater
+ /// 1 糊化机Dos 2 hotWater 3 coolWater 4 mixing
///
public int? kinds { get; set; }
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
index 8dca538..bf6fed2 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
@@ -624,6 +624,7 @@
+
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs
new file mode 100644
index 0000000..f48b998
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs
@@ -0,0 +1,472 @@
+using DataBlockHelper;
+using DataBlockHelper.DBHelpers;
+using DataBlockHelper.Entity.DB2106Entity;
+using DataBlockHelper.Entity.DB2107Entity;
+
+using DevExpress.Utils.Extensions;
+
+using ICSharpCode.Core;
+
+using Mesnac.Action.ChemicalWeighing.FreeDb;
+using Mesnac.Action.ChemicalWeighing.FreeDb.DBEntity;
+using Mesnac.Action.ChemicalWeighing.FreeDb.DBEntity.Report;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Mesnac.Action.ChemicalWeighing.Report
+{
+ public class ReportReadDb
+ {
+ public static void Read()
+ {
+ LoggingService.InfoFormatted("开始读取报表");
+ DB2107Helper dB2107Helper = new DB2107Helper();
+ NormalStatusEntity normal = dB2107Helper.NormalStatus;
+ if (normal.RdyRpt_D1)
+ {
+ LoggingService.InfoFormatted("干混机1读取报表");
+ InsertD(1);
+ PlcConnect.Instance.Write("DB2017.5.6", false);
+ }
+ if (normal.RdyRpt_D2)
+ {
+ LoggingService.InfoFormatted("干混机2读取报表");
+ InsertD(2);
+ PlcConnect.Instance.Write("DB2017.5.7", false);
+ }
+
+ if (normal.RdyRpt_D3)
+ {
+ LoggingService.InfoFormatted("干混机3读取报表");
+ InsertD(3);
+ PlcConnect.Instance.Write("DB2017.6.0", false);
+ }
+
+ if (normal.RdyRpt_D4)
+ {
+ LoggingService.InfoFormatted("干混机4读取报表");
+ InsertD(4);
+ PlcConnect.Instance.Write("DB2017.6.1", false);
+ }
+
+ //InsertG
+
+ if (normal.RdyRpt_G1)
+ {
+ LoggingService.InfoFormatted("糊化机1读取报表");
+ InsertG(1);
+ PlcConnect.Instance.Write("DB2017.6.2", false);
+ }
+
+ if (normal.RdyRpt_G2)
+ {
+ LoggingService.InfoFormatted("糊化机2读取报表");
+ InsertG(2);
+ PlcConnect.Instance.Write("DB2017.6.3", false);
+ }
+ if (normal.RdyRpt_G3)
+ {
+ LoggingService.InfoFormatted("糊化机3读取报表");
+ InsertG(3);
+ PlcConnect.Instance.Write("DB2017.6.4", false);
+ }
+
+ if (normal.RdyRpt_G4)
+ {
+ LoggingService.InfoFormatted("糊化机4读取报表");
+ InsertG(4);
+ PlcConnect.Instance.Write("DB2017.6.5", false);
+ }
+
+ if (normal.RdyRpt_G5)
+ {
+ LoggingService.InfoFormatted("糊化机5读取报表");
+ InsertG(5);
+ PlcConnect.Instance.Write("DB2017.6.6", false);
+ }
+
+
+ if (normal.RdyRpt_G6)
+ {
+ LoggingService.InfoFormatted("糊化机6读取报表");
+ InsertG(6);
+ PlcConnect.Instance.Write("DB2017.6.7", false);
+ }
+
+ if (normal.RdyRpt_G7)
+ {
+ LoggingService.InfoFormatted("糊化机7读取报表");
+ InsertG(7);
+ PlcConnect.Instance.Write("DB2017.7.0", false);
+ }
+
+ if (normal.RdyRpt_G8)
+ {
+ LoggingService.InfoFormatted("糊化机8读取报表");
+ InsertG(8);
+ PlcConnect.Instance.Write("DB2017.7.1", false);
+ }
+
+ if (normal.RdyRpt_M1)
+ {
+ LoggingService.InfoFormatted("湿混机1读取报表");
+ InsertM(1);
+ PlcConnect.Instance.Write("DB2017.7.2", false);
+ }
+
+ if (normal.RdyRpt_M2)
+ {
+ LoggingService.InfoFormatted("湿混机2读取报表");
+ InsertM(2);
+ PlcConnect.Instance.Write("DB2017.7.3", false);
+ }
+
+ if (normal.RdyRpt_M3)
+ {
+ LoggingService.InfoFormatted("湿混机3读取报表");
+ InsertM(3);
+ PlcConnect.Instance.Write("DB2017.7.4", false);
+ }
+
+ if (normal.RdyRpt_M4)
+ {
+ LoggingService.InfoFormatted("湿混机4读取报表");
+ InsertM(4);
+ PlcConnect.Instance.Write("DB2017.7.5", false);
+ }
+
+ if (normal.RdyRpt_M5)
+ {
+ LoggingService.InfoFormatted("湿混机5读取报表");
+ InsertM(5);
+ PlcConnect.Instance.Write("DB2017.7.6", false);
+ }
+
+
+ if (normal.RdyRpt_M6)
+ {
+ LoggingService.InfoFormatted("湿混机6读取报表");
+ InsertM(6);
+ PlcConnect.Instance.Write("DB2017.7.7", false);
+ }
+
+ if (normal.RdyRpt_M7)
+ {
+ LoggingService.InfoFormatted("湿混机7读取报表");
+ InsertM(7);
+ PlcConnect.Instance.Write("DB2017.8.0", false);
+ }
+
+ if (normal.RdyRpt_M8)
+ {
+ LoggingService.InfoFormatted("湿混机8读取报表");
+ InsertM(8);
+ PlcConnect.Instance.Write("DB2017.8.1", false);
+ }
+ }
+
+
+ private static void InsertD(int no)
+ {
+ DB2106Helper dB2106 = new DB2106Helper();
+ Dryer_ dryer = null;
+ switch (no)
+ {
+ case 1:
+ dryer = dB2106.DryReport.Dryer_A;
+ break;
+ case 2:
+ dryer = dB2106.DryReport.Dryer_B;
+ break;
+ case 3:
+ dryer = dB2106.DryReport.Dryer_C;
+ break;
+ case 4:
+ dryer = dB2106.DryReport.Dryer_D;
+ break;
+ }
+
+ Report_Dry dry = new Report_Dry();
+ List lsDos = new List();
+ List lsMix = new List();
+
+ dry.reportId = Guid.NewGuid().ToString("N");
+ dry.recipeCode = 0;
+ dry.recipeName = "";
+
+ dry.planCode = 0;
+ dry.planName = "";
+ dry.recordTime = DateTime.Now;
+ dry.dryNo = no;
+ dry.Batch = 0;
+
+ foreach (var item in dryer.Dos)
+ {
+ if (item.EqNo != 0)
+ {
+ lsDos.Add(new Report_DryDos_Detail()
+ {
+ reportId = dry.reportId,
+ eqNo = item.EqNo,
+ batch = item.Batch,
+ matCode = item.MatCode,
+ setToler = item.SetToler,
+ setValue = item.SetValue,
+ actToler = item.ActToler,
+ actValue = item.ActValue,
+ recordTime = DateTime.Now
+
+ });
+ }
+ }
+
+ foreach (var item in dryer.Mix)
+ {
+ if (item.EqNo != 0)
+ {
+ lsMix.Add(new Report_DryMixer_Detail()
+ {
+ reportId = dry.reportId,
+ eqNo = item.EqNo,
+ mixBatch = item.MixBatch,
+ mixStep = item.MixStep,
+ mixSpeed = item.MixSpeed,
+ mixTemp = item.MixTemp,
+ mixTime = item.MixTime,
+ recordTime = DateTime.Now
+ });
+ }
+ }
+
+ FreeSqlUnit.Instance.Insert(dry).ExecuteAffrows();
+ FreeSqlUnit.Instance.Insert(lsDos).ExecuteAffrows();
+ FreeSqlUnit.Instance.Insert(lsMix).ExecuteAffrows();
+
+ }
+
+ private static void InsertG(int no)
+ {
+ DB2106Helper dB2106 = new DB2106Helper();
+ Gel_ gel = null;
+ switch (no)
+ {
+ case 1:
+ gel = dB2106.GelReport.Gel_A;
+ break;
+ case 2:
+ gel = dB2106.GelReport.Gel_B;
+ break;
+ case 3:
+ gel = dB2106.GelReport.Gel_C;
+ break;
+ case 4:
+ gel = dB2106.GelReport.Gel_D;
+ break;
+
+
+ case 5:
+ gel = dB2106.GelReport.Gel_E;
+ break;
+ case 6:
+ gel = dB2106.GelReport.Gel_F;
+ break;
+ case 7:
+ gel = dB2106.GelReport.Gel_G;
+ break;
+ case 8:
+ gel = dB2106.GelReport.Gel_H;
+ break;
+ }
+ Report_Gel gelDb = new Report_Gel();
+
+ gelDb.reportId = Guid.NewGuid().ToString("N");
+ gelDb.recipeCode = 0;
+ gelDb.recipeName = "";
+
+ gelDb.planCode = 0;
+ gelDb.planName = "";
+ gelDb.recordTime = DateTime.Now;
+ gelDb.gelNo = no;
+ gelDb.Batch = 0;
+
+
+ List lsdetail = new List();
+ List lsMixing = new List();
+
+ var dosList = gel.GelDosing;
+ foreach (var dos in dosList)
+ {
+ if (dos.EqNo != 0)
+ {
+ lsdetail.Add(new Report_GelDoser_Detail()
+ {
+ eqNo = dos.EqNo,
+ batch = dos.Batch,
+ matCode = dos.MatCode,
+ setValue = dos.SetValue,
+ setToler = dos.SetToler,
+ actToLer = dos.ActToler,
+ actValue = dos.ActValue,
+ reportId = gelDb.reportId,
+ recordTime = DateTime.Now,
+
+ kinds = 1
+ });
+ }
+ }
+
+
+ var mixList = gel.GelMixing;
+ foreach (var mix in mixList)
+ {
+ if (mix.EqNo != 0)
+ {
+ lsMixing.Add(new Report_GelMixing_Detail()
+ {
+ eqNo = mix.EqNo,
+ mixBatch = mix.MixBatch,
+ mixStep = mix.MixStep,
+ actCode = mix.ActCode,
+ mixTime = mix.MixTime,
+
+ mixSpeed = mix.MixSpeed,
+
+ mixTemp = mix.MixTemp,
+
+ reportId = gelDb.reportId,
+ recordTime = DateTime.Now,
+
+
+ });
+ }
+ }
+
+
+ var hotWater = gel.HotWater;
+ if (hotWater != null)
+ {
+ lsdetail.Add(new Report_GelDoser_Detail()
+ {
+ eqNo = hotWater.EqNo,
+ batch = hotWater.Batch,
+ matCode = hotWater.MatCode,
+ setValue = hotWater.SetValue,
+ setToler = hotWater.SetToler,
+ actToLer = hotWater.ActToler,
+ actValue = hotWater.ActValue,
+ reportId = gelDb.reportId,
+ recordTime = DateTime.Now,
+
+ kinds = 2
+ });
+ }
+
+ var coolWater = gel.CoolWater;
+ if (coolWater != null)
+ {
+ lsdetail.Add(new Report_GelDoser_Detail()
+ {
+ eqNo = coolWater.EqNo,
+ batch = coolWater.Batch,
+ matCode = coolWater.MatCode,
+ setValue = coolWater.SetValue,
+ setToler = coolWater.SetToler,
+ actToLer = coolWater.ActToler,
+ actValue = coolWater.ActValue,
+ reportId = gelDb.reportId,
+ recordTime = DateTime.Now,
+
+ kinds = 3
+ });
+ }
+
+
+ FreeSqlUnit.Instance.Insert(gelDb).ExecuteAffrows();
+ FreeSqlUnit.Instance.Insert(lsdetail).ExecuteAffrows();
+ FreeSqlUnit.Instance.Insert(lsMixing).ExecuteAffrows();
+ }
+
+
+
+ private static void InsertM(int no)
+ {
+ DB2106Helper dB2106 = new DB2106Helper();
+ List ls = null;
+ switch (no)
+ {
+ case 1:
+ ls = dB2106.WetReport.WetMixing_A;
+ break;
+ case 2:
+ ls = dB2106.WetReport.WetMixing_B;
+ break;
+ case 3:
+ ls = dB2106.WetReport.WetMixing_C;
+ break;
+ case 4:
+ ls = dB2106.WetReport.WetMixing_D;
+ break;
+
+
+ case 5:
+ ls = dB2106.WetReport.WetMixing_E;
+ break;
+ case 6:
+ ls = dB2106.WetReport.WetMixing_F;
+ break;
+ case 7:
+ ls = dB2106.WetReport.WetMixing_G;
+ break;
+ case 8:
+ ls = dB2106.WetReport.WetMixing_H;
+ break;
+ }
+
+
+ Report_WetMixer report = new Report_WetMixer();
+
+ report.reportId = Guid.NewGuid().ToString("N");
+ report.recipeCode = 0;
+ report.recipeName = "";
+
+ report.planCode = 0;
+ report.planName = "";
+ report.recordTime = DateTime.Now;
+ report.WetNo = no;
+ report.Batch = 0;
+
+ List lde = new List();
+ foreach (var item in ls)
+ {
+ if (item.EqNo != 0)
+ {
+ lde.Add(new Report_WetMixer_Detail()
+ {
+ recordTime = DateTime.Now,
+ reportId = report.reportId,
+ eqNo = item.EqNo,
+ mixBatch = item.MixBatch,
+ mixSpeed = item.MixSpeed,
+ actCode = item.ActCode,
+ mixTemp = item.MixTemp,
+ mixStep = item.MixStep,
+ mixTime = item.MixTime,
+ actTolerence = item.ActTolerence,
+ actWeight = item.ActWeight,
+
+ });
+ }
+
+ }
+
+
+ FreeSqlUnit.Instance.Insert(report).ExecuteAffrows();
+ FreeSqlUnit.Instance.Insert(lde).ExecuteAffrows();
+ }
+ }
+}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
index f43cec2..b946f16 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
@@ -5,6 +5,7 @@ using System.Diagnostics;
using System.Drawing;
using System.Linq;
using System.Text;
+using System.Threading;
using System.Windows.Forms;
using DataBlockHelper.DBHelpers;
@@ -12,6 +13,8 @@ using DataBlockHelper.DBHelpers;
using DevExpress.XtraEditors.Filtering.Templates;
using ICSharpCode.Core;
+using log4net;
+
using Mesnac.Action.Base;
using Mesnac.Action.ChemicalWeighing.LjReport.OpenDoor;
@@ -29,18 +32,16 @@ namespace Mesnac.Action.ChemicalWeighing.Test
{
public class TestAction : DatabaseAction, IAction
{
- HslLanternAlarm lanternAlarm;
+
MCButton mCButton;
- HslSwitch hslSwitch;
-
+ // LoggingService _log;
- HslLedDisplay hslLed;
- public void timer1EventProcessor(object source, EventArgs e)
+ public void theout(object source, EventArgs e)
{
- hslLed.DisplayText = DateTime.Now.ToString("mm:ss");
+ mCButton.Text = DateTime.Now.ToString();
}
@@ -50,44 +51,13 @@ namespace Mesnac.Action.ChemicalWeighing.Test
var allDb=GetAllControls();
mCButton = allDb.FirstOrDefault(x => x.Name == "MCButton1") as MCButton;
- mCButton.Click += new EventHandler(timer1EventProcessor);
-
-
- hslSwitch = allDb.FirstOrDefault(x => x.Name == "HsSwitch1") as HslSwitch;
-
- hslSwitch.OnSwitchChanged += HslSwitch_OnSwitchChanged;
-
-
- hslLed= allDb.FirstOrDefault(x => x.Name == "HslLedDisplay1") as HslLedDisplay;
- hslLed.LeftRightOffect = 0;
-
- this.hslLed.BackColor = Color.FromArgb(46, 46, 46);
- this.hslLed.DisplayBackColor = Color.FromArgb(62, 62, 62);
- this.hslLed.DisplayNumber = 5;
- this.hslLed.DisplayText = "12:00";
- this.hslLed.ForeColor = Color.Pink;
- this.hslLed.LedNumberSize = 2;
- this.hslLed.Location = new Point(555, 203);
- this.hslLed.Margin = new Padding(3, 16, 3, 16);
- this.hslLed.Name = "hslLedDisplay12";
- this.hslLed.Size = new Size(113, 33);
- this.hslLed.TabIndex = 8;
-
- //MCButton1
-
- //OpenDoorService
-
-
+ System.Timers.Timer t = new System.Timers.Timer(1000);//实例化Timer类，设置间隔时间为10000毫秒；
+ t.Elapsed += new System.Timers.ElapsedEventHandler(theout);//到达时间的时候执行事件；
+ t.AutoReset = true;//设置是执行一次（false）还是一直执行(true)；
+ t.Enabled = true;//是否执行System.Timers.Timer.Elapsed事件；
}
- private void HslSwitch_OnSwitchChanged(object arg1, bool arg2)
- {
- HslSwitch hsl= (HslSwitch)arg1;
- hslSwitch.Text = "测试:"+arg2;
- bool b = arg2;
-
-
- }
+
}
}
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml b/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml
index 277944f..8bf25ec 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml
@@ -1,26 +1,6 @@