diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/WarnTable.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/WarnTable.cs
index d2d60d2..7ebb32b 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/WarnTable.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/WarnTable.cs
@@ -28,4 +28,25 @@ namespace Mesnac.Action.ChemicalWeighing.FreeDb
public int Status { get; set; }
}
+
+
+ [Table(Name = "WarnTableInfo")]
+ public class WarnTableInfo
+ {
+ ///
+ /// 主键
+ ///
+ [Column(IsPrimary = true, IsIdentity = true)]
+ public int Id { get; set; }
+
+ public int AlarmId { get; set; }
+
+ public string CnInfo { get; set; }
+ public string OtherInfo { get; set; }
+ public DateTime CreateTime { get; set; }
+ public DateTime UpdateTime { get; set; }
+ public int Num { get; set; }
+
+ public int Status { get; set; }
+ }
}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs
index 483e95a..68408f2 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs
@@ -62,6 +62,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo
WhiteWork = control.FirstOrDefault(x => x.Name == "WhiteWork") as MCButton;
NightWork = control.FirstOrDefault(x => x.Name == "NightWork") as MCButton;
moreData = control.FirstOrDefault(x => x.Name == "MoreData") as MCDataGridView;
+
startDate = control.FirstOrDefault(x => x.Name == "startDate") as MCDateTimePicker;
startTime = control.FirstOrDefault(x => x.Name == "startTime") as MCDateTimePicker;
endDate = control.FirstOrDefault(x => x.Name == "endDate") as MCDateTimePicker;
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
index 9b3a33b..36cc135 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
@@ -569,6 +569,7 @@
+
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Bao.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Bao.cs
new file mode 100644
index 0000000..3bee616
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Bao.cs
@@ -0,0 +1,136 @@
+using DevExpress.XtraRichEdit.Model;
+
+using Mesnac.Action.Base;
+using Mesnac.Action.ChemicalWeighing.FreeDb;
+using Mesnac.Controls.Default;
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Runtime.InteropServices.ComTypes;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.Qu
+{
+ public class Bao : ChemicalWeighingAction, IAction
+ {
+ MCDateTimePicker startDate;
+ MCDateTimePicker startTime;
+ MCDateTimePicker endDate;
+ MCDateTimePicker endTime;
+
+ MCButton SelectButton;
+
+ MCDataGridView MoreData;
+
+ MCCombobox mCCombobox;
+
+ public void Run(RuntimeParameter runtime)
+ {
+ base.RunIni(runtime); //必须调用
+ var control = GetAllControls();
+
+
+ startDate = control.FirstOrDefault(x => x.Name == "startDate") as MCDateTimePicker;
+ startTime = control.FirstOrDefault(x => x.Name == "startTime") as MCDateTimePicker;
+ endDate = control.FirstOrDefault(x => x.Name == "endDate") as MCDateTimePicker;
+ endTime = control.FirstOrDefault(x => x.Name == "endTime") as MCDateTimePicker;
+ SelectButton= control.FirstOrDefault(x => x.Name == "SelectButton") as MCButton;
+
+ SelectButton.Click += SelectButton_Click;
+
+ MoreData= control.FirstOrDefault(x => x.Name == "MoreData") as MCDataGridView;
+
+ MoreData.AutoGenerateColumns=true;
+
+ startTime.MCValue = DateTime.Now.AddHours(-5);
+
+
+ mCCombobox = control.FirstOrDefault(x => x.Name == "MCCombobox1") as MCCombobox;
+ DataTable dataTable = new DataTable();
+
+ dataTable.Columns.Add("CmbValue", typeof(string));
+ dataTable.Columns.Add("CmbDisplay", typeof(string));
+
+
+ var dr = dataTable.NewRow();
+ dr[0] = -1;
+ dr[1] = "全部";
+ dataTable.Rows.Add(dr);
+
+ dr = dataTable.NewRow();
+ dr[0] = 1;
+ dr[1] = "未解决";
+ dataTable.Rows.Add(dr);
+
+ dr = dataTable.NewRow();
+ dr[0] = 0;
+ dr[1] = "解决";
+ dataTable.Rows.Add(dr);
+
+
+ mCCombobox.DataSource = dataTable;
+
+ Sel();
+ }
+
+ private void SelectButton_Click(object sender, EventArgs e)
+ {
+ Sel();
+ }
+
+ private void Sel()
+ {
+ var a=Convert.ToDateTime(GetA());
+ var b= Convert.ToDateTime(GetB());
+
+ int state = Convert.ToInt16(mCCombobox.MCValue.ToString());
+
+
+ var list= FreeDb.FreeSqlUnit.Instance.Queryable().Where(x=>x.UpdateTime>a)
+ .Where(x=>x.UpdateTime-1,x=>x.Status==state)
+ .Take(1000).OrderByDescending(x=>x.UpdateTime).ToList();
+
+
+ var dt = new DataTable();
+ dt.Columns.Add("报警类型", typeof(string));
+ dt.Columns.Add("详细说明", typeof(string));
+ dt.Columns.Add("初始时间", typeof(string));
+ dt.Columns.Add("更新时间", typeof(string));
+ dt.Columns.Add("是否解决", typeof(string));
+
+ foreach (var x in list)
+ {
+ var dr=dt.NewRow();
+ dr[0] = x.CnInfo;
+ dr[1] = x.OtherInfo;
+ dr[2]= Convert.ToDateTime(x.CreateTime).ToString("yyyy-MM-dd hh:mm:ss");
+ dr[3] = Convert.ToDateTime(x.UpdateTime).ToString("yyyy-MM-dd hh:mm:ss");
+ dr[4] = "已解决";
+ if (x.Status == 1)
+ {
+ dr[4] = "未解决";
+ }
+ dt.Rows.Add(dr);
+ }
+
+ MoreData.AutoGenerateColumns = true;
+ MoreData.DataSource = null;
+ MoreData.DataSource = dt;
+
+ }
+
+ private string GetA()
+ {
+ return Convert.ToDateTime(startDate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(startTime.MCValue).ToShortTimeString();
+ }
+
+ private string GetB()
+ {
+ return Convert.ToDateTime(endDate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(endTime.MCValue).ToShortTimeString();
+ }
+ }
+
+}
diff --git a/Main/MCEdit/Data/EventConfig/小料称量/缓存队列取消.xml b/Main/MCEdit/Data/EventConfig/小料称量/缓存队列取消.xml
index 1918e31..fdc53dc 100644
--- a/Main/MCEdit/Data/EventConfig/小料称量/缓存队列取消.xml
+++ b/Main/MCEdit/Data/EventConfig/小料称量/缓存队列取消.xml
@@ -6,6 +6,11 @@
自动控制按钮事件
自动控制按钮事件
+
+
+ 报警日志
+ 报警日志
+
@@ -15,12 +20,17 @@
+
+
+
+
+
diff --git a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
index 1baf9a1..8f9f57b 100644
--- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
+++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
@@ -28,6 +28,7 @@
+
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormJingGao.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormJingGao.xml
new file mode 100644
index 0000000..d58c896
--- /dev/null
+++ b/Main/MCEdit/Data/MCProject/nodeForm/FormJingGao.xml
@@ -0,0 +1,217 @@
+
+
diff --git a/Main/MCEdit/MCEdit.csproj b/Main/MCEdit/MCEdit.csproj
index ecc4316..cd2d7ac 100644
--- a/Main/MCEdit/MCEdit.csproj
+++ b/Main/MCEdit/MCEdit.csproj
@@ -413,7 +413,358 @@
PreserveNewest
+
+ PreserveNewest
+
+
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+ PreserveNewest
+
+
PreserveNewest
diff --git a/Main/MCRun/Data/SysConfig/MenuConfig.dat b/Main/MCRun/Data/SysConfig/MenuConfig.dat
index 857b65a..2e2e744 100644
Binary files a/Main/MCRun/Data/SysConfig/MenuConfig.dat and b/Main/MCRun/Data/SysConfig/MenuConfig.dat differ