diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Alarm/LRAlarmLog/SelectAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Alarm/LRAlarmLog/SelectAction.cs
index e8a6d2f..6c50831 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Alarm/LRAlarmLog/SelectAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Alarm/LRAlarmLog/SelectAction.cs
@@ -31,7 +31,7 @@ namespace Mesnac.Action.ChemicalWeighing.Alarm.LRAlarmLog
IBaseControl starttime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "starttime").FirstOrDefault().BaseControl;
if (startdate != null && starttime != null)
{
- sbSql.AppendLine(@"AND LR_Alarmlog.Alarm_OccurTime>='" + Convert.ToDateTime(startdate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(starttime.MCValue).ToShortTimeString() + "' ");
+ sbSql.AppendLine(@"AND CONVERT(datetime, LR_Alarmlog.Alarm_OccurTime)>='" + Convert.ToDateTime(startdate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(starttime.MCValue).ToShortTimeString() + "' ");
}
else
{
@@ -42,7 +42,7 @@ namespace Mesnac.Action.ChemicalWeighing.Alarm.LRAlarmLog
IBaseControl endtime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "endtime").FirstOrDefault().BaseControl;
if (enddate != null && endtime != null)
{
- sbSql.AppendLine(@"AND LR_Alarmlog.Alarm_OccurTime<='" + Convert.ToDateTime(enddate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(endtime.MCValue).ToShortTimeString() + "' ");
+ sbSql.AppendLine(@"AND CONVERT(datetime, LR_Alarmlog.Alarm_OccurTime)<='" + Convert.ToDateTime(enddate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(endtime.MCValue).ToShortTimeString() + "' ");
}
else
{
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/AlarmSaveHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/AlarmSaveHelper.cs
index 8573197..2702761 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/AlarmSaveHelper.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/AlarmSaveHelper.cs
@@ -1,12 +1,15 @@
using DevExpress.Xpo.DB;
+using FastReport.Export.Dbf;
using HslCommunication;
using Mesnac.Codd.Session;
+using Mesnac.DoUtils;
using Mesnac.PlcUtils;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
+using System.Threading;
namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
{
@@ -23,6 +26,8 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
private static PlcBusiness plcBusiness = PlcBusiness.Instance;
+ private static DoControl doControl = DoControl.Instance;
+
///
/// 保存报警信息
///
@@ -123,6 +128,10 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
{
sai.AlarmData = Convert.ToInt16(result.Content); //对起始字偏移，为当前字的报警值
+ //打开报警灯:FIRST 关闭绿灯 SECOND 打开红灯
+ doControl.DOControl(DoUtils.enumInfo.DOName.Green, DoUtils.enumInfo.DOOnOff.Off);
+ doControl.DOControl(DoUtils.enumInfo.DOName.Red, DoUtils.enumInfo.DOOnOff.On);
+
//更新报警状态
Entity.PmtAlarmInfo alarmInfo = Cache.CacheHelper.GetPmtAlarmInfoFromCache(sai.AlramPLC, sai.AlarmBlock, sai.AlarmAddress, Convert.ToInt32(sai.AlarmBit));
if (alarmInfo != null)
@@ -145,9 +154,7 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
alarmLogData.Alarm_Status = 1;
alarmLogData.Alarm_GUID = Guid.NewGuid().ToString().ToUpper();
- Alarm.AlarmHelper.InsertAlarmLogData(alarmLogData); //这里保存数据库有问题
- ICSharpCode.Core.LoggingService.Error("这里保存数据库有问题");
-
+ Alarm.AlarmHelper.InsertAlarmLogData(alarmLogData);
Global.PublicVar.Instance.AlarmStrList.Add(alarmInfo.AlarmName);
Global.PublicVar.Instance.isFlashFlag = true;
Global.PublicVar.Instance.isFlashFlagExtend = true;
@@ -155,8 +162,18 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
}
}
}
+ else
+ {
+ // 关闭报警灯:FIRST 打开红灯 SECOND 关闭绿灯
+ doControl.DOControl(DoUtils.enumInfo.DOName.Red, DoUtils.enumInfo.DOOnOff.Off);
+ doControl.DOControl(DoUtils.enumInfo.DOName.Green, DoUtils.enumInfo.DOOnOff.On);
+ }
}
+ else
+ {
+ doControl.DOControl(DoUtils.enumInfo.DOName.Red, DoUtils.enumInfo.DOOnOff.Off);
+ }
}
#region 触发事件
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.Designer.cs
index 3763080..affee15 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.Designer.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.Designer.cs
@@ -65,7 +65,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
this.DrpType.FormattingEnabled = true;
this.DrpType.Location = new System.Drawing.Point(83, 44);
this.DrpType.Name = "DrpType";
- this.DrpType.Size = new System.Drawing.Size(129, 20);
+ this.DrpType.Size = new System.Drawing.Size(228, 20);
this.DrpType.TabIndex = 18;
this.DrpType.SelectedIndexChanged += new System.EventHandler(this.DrpType_SelectedIndexChanged);
//
@@ -74,7 +74,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
this.comboBox1.FormattingEnabled = true;
this.comboBox1.Location = new System.Drawing.Point(83, 70);
this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(129, 20);
+ this.comboBox1.Size = new System.Drawing.Size(228, 20);
this.comboBox1.TabIndex = 19;
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
@@ -101,7 +101,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(239, 18);
+ this.label2.Location = new System.Drawing.Point(16, 99);
this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(59, 12);
@@ -111,24 +111,25 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
// comboBox2
//
this.comboBox2.FormattingEnabled = true;
- this.comboBox2.Location = new System.Drawing.Point(306, 15);
+ this.comboBox2.Location = new System.Drawing.Point(83, 96);
this.comboBox2.Name = "comboBox2";
- this.comboBox2.Size = new System.Drawing.Size(129, 20);
+ this.comboBox2.Size = new System.Drawing.Size(228, 20);
this.comboBox2.TabIndex = 19;
this.comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
// TxtWeight
//
- this.TxtWeight.Location = new System.Drawing.Point(306, 43);
+ this.TxtWeight.Location = new System.Drawing.Point(387, 15);
this.TxtWeight.Margin = new System.Windows.Forms.Padding(5);
+ this.TxtWeight.MaxLength = 100;
this.TxtWeight.Name = "TxtWeight";
- this.TxtWeight.Size = new System.Drawing.Size(129, 21);
+ this.TxtWeight.Size = new System.Drawing.Size(228, 21);
this.TxtWeight.TabIndex = 21;
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(261, 46);
+ this.label4.Location = new System.Drawing.Point(342, 18);
this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(35, 12);
@@ -138,7 +139,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(261, 77);
+ this.label5.Location = new System.Drawing.Point(342, 49);
this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(35, 12);
@@ -147,10 +148,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
//
// txtDifference
//
- this.txtDifference.Location = new System.Drawing.Point(306, 74);
+ this.txtDifference.Location = new System.Drawing.Point(387, 46);
this.txtDifference.Margin = new System.Windows.Forms.Padding(5);
+ this.txtDifference.MaxLength = 100;
this.txtDifference.Name = "txtDifference";
- this.txtDifference.Size = new System.Drawing.Size(129, 21);
+ this.txtDifference.Size = new System.Drawing.Size(228, 21);
this.txtDifference.TabIndex = 21;
//
// label6
@@ -167,16 +169,17 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
//
this.txtName.Location = new System.Drawing.Point(83, 15);
this.txtName.Margin = new System.Windows.Forms.Padding(5);
+ this.txtName.MaxLength = 100;
this.txtName.Name = "txtName";
- this.txtName.Size = new System.Drawing.Size(129, 21);
+ this.txtName.Size = new System.Drawing.Size(228, 21);
this.txtName.TabIndex = 21;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.dataGridView1);
- this.groupBox1.Location = new System.Drawing.Point(12, 193);
+ this.groupBox1.Location = new System.Drawing.Point(12, 126);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(611, 289);
+ this.groupBox1.Size = new System.Drawing.Size(618, 289);
this.groupBox1.TabIndex = 22;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "称量配方";
@@ -185,6 +188,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
//
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
+ this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.No,
@@ -198,7 +202,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
this.dataGridView1.ReadOnly = true;
this.dataGridView1.RowHeadersWidth = 62;
this.dataGridView1.RowTemplate.Height = 23;
- this.dataGridView1.Size = new System.Drawing.Size(605, 269);
+ this.dataGridView1.Size = new System.Drawing.Size(612, 269);
this.dataGridView1.TabIndex = 0;
this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
//
@@ -227,7 +231,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
this.DeviceName.MinimumWidth = 8;
this.DeviceName.Name = "DeviceName";
this.DeviceName.ReadOnly = true;
- this.DeviceName.Width = 200;
//
// Weight
//
@@ -247,7 +250,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
//
// button1
//
- this.button1.Location = new System.Drawing.Point(18, 126);
+ this.button1.Location = new System.Drawing.Point(517, 75);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(98, 45);
this.button1.TabIndex = 23;
@@ -257,7 +260,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
//
// button2
//
- this.button2.Location = new System.Drawing.Point(337, 126);
+ this.button2.Location = new System.Drawing.Point(387, 75);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(98, 45);
this.button2.TabIndex = 23;
@@ -268,7 +271,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(522, 490);
+ this.btnCancel.Location = new System.Drawing.Point(529, 423);
this.btnCancel.Margin = new System.Windows.Forms.Padding(5);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(98, 45);
@@ -279,7 +282,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(15, 490);
+ this.btnOK.Location = new System.Drawing.Point(15, 423);
this.btnOK.Margin = new System.Windows.Forms.Padding(5);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(98, 45);
@@ -292,7 +295,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(635, 549);
+ this.ClientSize = new System.Drawing.Size(641, 479);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);
this.Controls.Add(this.button2);
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.Designer.cs
index 004b0db..7e8b098 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.Designer.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.Designer.cs
@@ -68,20 +68,18 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixFormula
//
// button2
//
- this.button2.Location = new System.Drawing.Point(463, 497);
- this.button2.Margin = new System.Windows.Forms.Padding(4);
+ this.button2.Location = new System.Drawing.Point(610, 12);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(112, 34);
+ this.button2.Size = new System.Drawing.Size(114, 44);
this.button2.TabIndex = 35;
this.button2.Text = "删除动作";
this.button2.UseVisualStyleBackColor = true;
//
// button1
//
- this.button1.Location = new System.Drawing.Point(143, 497);
- this.button1.Margin = new System.Windows.Forms.Padding(4);
+ this.button1.Location = new System.Drawing.Point(610, 84);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(112, 34);
+ this.button1.Size = new System.Drawing.Size(114, 44);
this.button1.TabIndex = 36;
this.button1.Text = "添加动作";
this.button1.UseVisualStyleBackColor = true;
@@ -89,159 +87,161 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixFormula
//
// txtName
//
- this.txtName.Location = new System.Drawing.Point(265, 55);
- this.txtName.Margin = new System.Windows.Forms.Padding(8);
+ this.txtName.Location = new System.Drawing.Point(84, 14);
+ this.txtName.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txtName.MaxLength = 100;
this.txtName.Name = "txtName";
- this.txtName.Size = new System.Drawing.Size(192, 28);
+ this.txtName.Size = new System.Drawing.Size(206, 21);
this.txtName.TabIndex = 32;
//
// txtDifference
//
- this.txtDifference.Location = new System.Drawing.Point(267, 419);
- this.txtDifference.Margin = new System.Windows.Forms.Padding(8);
+ this.txtDifference.Location = new System.Drawing.Point(365, 107);
+ this.txtDifference.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txtDifference.MaxLength = 100;
this.txtDifference.Name = "txtDifference";
- this.txtDifference.Size = new System.Drawing.Size(192, 28);
+ this.txtDifference.Size = new System.Drawing.Size(206, 21);
this.txtDifference.TabIndex = 33;
//
// TxtSendTime
//
- this.TxtSendTime.Location = new System.Drawing.Point(267, 229);
- this.TxtSendTime.Margin = new System.Windows.Forms.Padding(8);
+ this.TxtSendTime.Location = new System.Drawing.Point(84, 107);
+ this.TxtSendTime.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.TxtSendTime.MaxLength = 100;
this.TxtSendTime.Name = "TxtSendTime";
- this.TxtSendTime.Size = new System.Drawing.Size(192, 28);
+ this.TxtSendTime.Size = new System.Drawing.Size(206, 21);
this.TxtSendTime.TabIndex = 34;
//
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(143, 55);
- this.label6.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label6.Location = new System.Drawing.Point(17, 17);
+ this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(89, 18);
+ this.label6.Size = new System.Drawing.Size(59, 12);
this.label6.TabIndex = 31;
this.label6.Text = "配方名称:";
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(145, 419);
- this.label5.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label5.Location = new System.Drawing.Point(308, 110);
+ this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(53, 18);
+ this.label5.Size = new System.Drawing.Size(35, 12);
this.label5.TabIndex = 30;
this.label5.Text = "公差:";
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(145, 229);
- this.label4.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label4.Location = new System.Drawing.Point(41, 110);
+ this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(53, 18);
+ this.label4.Size = new System.Drawing.Size(35, 12);
this.label4.TabIndex = 29;
this.label4.Text = "时间:";
//
// DrpDeviceUnit
//
this.DrpDeviceUnit.FormattingEnabled = true;
- this.DrpDeviceUnit.Location = new System.Drawing.Point(265, 110);
- this.DrpDeviceUnit.Margin = new System.Windows.Forms.Padding(4);
+ this.DrpDeviceUnit.Location = new System.Drawing.Point(84, 46);
this.DrpDeviceUnit.Name = "DrpDeviceUnit";
- this.DrpDeviceUnit.Size = new System.Drawing.Size(180, 26);
+ this.DrpDeviceUnit.Size = new System.Drawing.Size(206, 20);
this.DrpDeviceUnit.TabIndex = 26;
this.DrpDeviceUnit.SelectedIndexChanged += new System.EventHandler(this.DrpDeviceUnit_SelectedIndexChanged);
//
// DrpAction
//
this.DrpAction.FormattingEnabled = true;
- this.DrpAction.Location = new System.Drawing.Point(265, 163);
- this.DrpAction.Margin = new System.Windows.Forms.Padding(4);
+ this.DrpAction.Location = new System.Drawing.Point(84, 76);
this.DrpAction.Name = "DrpAction";
- this.DrpAction.Size = new System.Drawing.Size(180, 26);
+ this.DrpAction.Size = new System.Drawing.Size(206, 20);
this.DrpAction.TabIndex = 28;
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(143, 117);
- this.label3.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label3.Location = new System.Drawing.Point(17, 49);
+ this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(89, 18);
+ this.label3.Size = new System.Drawing.Size(59, 12);
this.label3.TabIndex = 24;
this.label3.Text = "配方类型:";
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(143, 167);
- this.label1.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label1.Location = new System.Drawing.Point(41, 79);
+ this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(53, 18);
+ this.label1.Size = new System.Drawing.Size(35, 12);
this.label1.TabIndex = 25;
this.label1.Text = "动作:";
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(145, 273);
- this.label2.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label2.Location = new System.Drawing.Point(308, 17);
+ this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(53, 18);
+ this.label2.Size = new System.Drawing.Size(35, 12);
this.label2.TabIndex = 29;
this.label2.Text = "温度:";
//
// txtTemperature
//
- this.txtTemperature.Location = new System.Drawing.Point(267, 273);
- this.txtTemperature.Margin = new System.Windows.Forms.Padding(8);
+ this.txtTemperature.Location = new System.Drawing.Point(365, 14);
+ this.txtTemperature.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txtTemperature.MaxLength = 100;
this.txtTemperature.Name = "txtTemperature";
- this.txtTemperature.Size = new System.Drawing.Size(192, 28);
+ this.txtTemperature.Size = new System.Drawing.Size(206, 21);
this.txtTemperature.TabIndex = 34;
//
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(145, 317);
- this.label7.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label7.Location = new System.Drawing.Point(308, 48);
+ this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(53, 18);
+ this.label7.Size = new System.Drawing.Size(35, 12);
this.label7.TabIndex = 29;
this.label7.Text = "速度:";
//
// txtSpeed
//
- this.txtSpeed.Location = new System.Drawing.Point(267, 317);
- this.txtSpeed.Margin = new System.Windows.Forms.Padding(8);
+ this.txtSpeed.Location = new System.Drawing.Point(365, 45);
+ this.txtSpeed.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txtSpeed.MaxLength = 100;
this.txtSpeed.Name = "txtSpeed";
- this.txtSpeed.Size = new System.Drawing.Size(192, 28);
+ this.txtSpeed.Size = new System.Drawing.Size(206, 21);
this.txtSpeed.TabIndex = 34;
//
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(145, 361);
- this.label8.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label8.Location = new System.Drawing.Point(308, 79);
+ this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(53, 18);
+ this.label8.Size = new System.Drawing.Size(35, 12);
this.label8.TabIndex = 29;
this.label8.Text = "重量:";
//
// txtWeight
//
- this.txtWeight.Location = new System.Drawing.Point(267, 361);
- this.txtWeight.Margin = new System.Windows.Forms.Padding(8);
+ this.txtWeight.Location = new System.Drawing.Point(365, 76);
+ this.txtWeight.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txtWeight.MaxLength = 100;
this.txtWeight.Name = "txtWeight";
- this.txtWeight.Size = new System.Drawing.Size(192, 28);
+ this.txtWeight.Size = new System.Drawing.Size(206, 21);
this.txtWeight.TabIndex = 34;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.dataGridView1);
- this.groupBox1.Location = new System.Drawing.Point(61, 575);
- this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.groupBox1.Location = new System.Drawing.Point(12, 136);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox1.Size = new System.Drawing.Size(1228, 434);
+ this.groupBox1.Size = new System.Drawing.Size(790, 289);
this.groupBox1.TabIndex = 37;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "称量配方";
@@ -250,16 +250,23 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixFormula
//
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
+ this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.No, this.MaterialName, this.DeviceName, this.Temperature, this.Speed, this.Weight, this.Difference });
+ this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.No,
+ this.MaterialName,
+ this.DeviceName,
+ this.Temperature,
+ this.Speed,
+ this.Weight,
+ this.Difference});
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.dataGridView1.Location = new System.Drawing.Point(4, 25);
- this.dataGridView1.Margin = new System.Windows.Forms.Padding(4);
+ this.dataGridView1.Location = new System.Drawing.Point(3, 17);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.ReadOnly = true;
this.dataGridView1.RowHeadersWidth = 62;
this.dataGridView1.RowTemplate.Height = 23;
- this.dataGridView1.Size = new System.Drawing.Size(1220, 405);
+ this.dataGridView1.Size = new System.Drawing.Size(784, 269);
this.dataGridView1.TabIndex = 0;
//
// No
@@ -270,7 +277,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixFormula
this.No.MinimumWidth = 8;
this.No.Name = "No";
this.No.ReadOnly = true;
- this.No.Width = 150;
//
// MaterialName
//
@@ -279,7 +285,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixFormula
this.MaterialName.MinimumWidth = 8;
this.MaterialName.Name = "MaterialName";
this.MaterialName.ReadOnly = true;
- this.MaterialName.Width = 200;
//
// DeviceName
//
@@ -288,7 +293,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixFormula
this.DeviceName.MinimumWidth = 8;
this.DeviceName.Name = "DeviceName";
this.DeviceName.ReadOnly = true;
- this.DeviceName.Width = 200;
//
// Temperature
//
@@ -297,7 +301,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixFormula
this.Temperature.MinimumWidth = 8;
this.Temperature.Name = "Temperature";
this.Temperature.ReadOnly = true;
- this.Temperature.Width = 150;
//
// Speed
//
@@ -306,7 +309,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixFormula
this.Speed.MinimumWidth = 8;
this.Speed.Name = "Speed";
this.Speed.ReadOnly = true;
- this.Speed.Width = 150;
//
// Weight
//
@@ -315,7 +317,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixFormula
this.Weight.MinimumWidth = 8;
this.Weight.Name = "Weight";
this.Weight.ReadOnly = true;
- this.Weight.Width = 150;
//
// Difference
//
@@ -324,15 +325,14 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixFormula
this.Difference.MinimumWidth = 8;
this.Difference.Name = "Difference";
this.Difference.ReadOnly = true;
- this.Difference.Width = 150;
//
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(524, 1134);
- this.btnCancel.Margin = new System.Windows.Forms.Padding(8);
+ this.btnCancel.Location = new System.Drawing.Point(349, 756);
+ this.btnCancel.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.btnCancel.Name = "btnCancel";
- this.btnCancel.Size = new System.Drawing.Size(147, 68);
+ this.btnCancel.Size = new System.Drawing.Size(98, 45);
this.btnCancel.TabIndex = 50;
this.btnCancel.Text = "取消";
this.btnCancel.UseVisualStyleBackColor = true;
@@ -340,10 +340,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixFormula
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(265, 1134);
- this.btnOK.Margin = new System.Windows.Forms.Padding(8);
+ this.btnOK.Location = new System.Drawing.Point(177, 756);
+ this.btnOK.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(147, 68);
+ this.btnOK.Size = new System.Drawing.Size(98, 45);
this.btnOK.TabIndex = 49;
this.btnOK.Text = "确认";
this.btnOK.UseVisualStyleBackColor = true;
@@ -351,9 +351,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixFormula
//
// FrmMixFormula
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1373, 1328);
+ this.ClientSize = new System.Drawing.Size(815, 438);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);
this.Controls.Add(this.groupBox1);
@@ -375,12 +375,14 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixFormula
this.Controls.Add(this.DrpAction);
this.Controls.Add(this.label3);
this.Controls.Add(this.label1);
+ this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "FrmMixFormula";
this.Text = "混合配方";
this.groupBox1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
+
}
private System.Windows.Forms.Button btnCancel;
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.resx b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.resx
index 2ea61cd..594820a 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.resx
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.resx
@@ -123,4 +123,10 @@
True
+
+ True
+
+
+ True
+
\ No newline at end of file
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixA.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixA.Designer.cs
index 551f531..bc3eeea 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixA.Designer.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixA.Designer.cs
@@ -46,10 +46,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(414, 434);
- this.btnCancel.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
+ this.btnCancel.Location = new System.Drawing.Point(129, 98);
+ this.btnCancel.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.btnCancel.Name = "btnCancel";
- this.btnCancel.Size = new System.Drawing.Size(147, 68);
+ this.btnCancel.Size = new System.Drawing.Size(98, 45);
this.btnCancel.TabIndex = 68;
this.btnCancel.Text = "取消";
this.btnCancel.UseVisualStyleBackColor = true;
@@ -57,10 +57,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(156, 434);
- this.btnOK.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
+ this.btnOK.Location = new System.Drawing.Point(11, 98);
+ this.btnOK.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(147, 68);
+ this.btnOK.Size = new System.Drawing.Size(98, 45);
this.btnOK.TabIndex = 67;
this.btnOK.Text = "确认";
this.btnOK.UseVisualStyleBackColor = true;
@@ -72,9 +72,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.DrpMetageA);
this.groupBox1.Controls.Add(this.label4);
- this.groupBox1.Location = new System.Drawing.Point(93, 122);
+ this.groupBox1.Location = new System.Drawing.Point(11, 11);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(639, 190);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.groupBox1.Size = new System.Drawing.Size(216, 80);
this.groupBox1.TabIndex = 64;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "干混机";
@@ -82,55 +84,53 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
// DrpMixA
//
this.DrpMixA.FormattingEnabled = true;
- this.DrpMixA.Location = new System.Drawing.Point(182, 110);
- this.DrpMixA.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.DrpMixA.Location = new System.Drawing.Point(74, 45);
this.DrpMixA.Name = "DrpMixA";
- this.DrpMixA.Size = new System.Drawing.Size(187, 26);
+ this.DrpMixA.Size = new System.Drawing.Size(126, 20);
this.DrpMixA.TabIndex = 52;
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(40, 112);
- this.label5.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label5.Location = new System.Drawing.Point(7, 48);
+ this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(89, 18);
+ this.label5.Size = new System.Drawing.Size(59, 12);
this.label5.TabIndex = 49;
this.label5.Text = "混合步骤:";
//
// DrpMetageA
//
this.DrpMetageA.FormattingEnabled = true;
- this.DrpMetageA.Location = new System.Drawing.Point(182, 58);
- this.DrpMetageA.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.DrpMetageA.Location = new System.Drawing.Point(74, 19);
this.DrpMetageA.Name = "DrpMetageA";
- this.DrpMetageA.Size = new System.Drawing.Size(187, 26);
+ this.DrpMetageA.Size = new System.Drawing.Size(126, 20);
this.DrpMetageA.TabIndex = 52;
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(40, 62);
- this.label4.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label4.Location = new System.Drawing.Point(7, 22);
+ this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(89, 18);
+ this.label4.Size = new System.Drawing.Size(59, 12);
this.label4.TabIndex = 49;
this.label4.Text = "粉料称量:";
//
// FrmMixA
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(819, 1048);
+ this.ClientSize = new System.Drawing.Size(241, 160);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);
this.Controls.Add(this.groupBox1);
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "FrmMixA";
this.Text = "干混机配方管理";
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.ResumeLayout(false);
+
}
private System.Windows.Forms.Button btnCancel;
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixB.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixB.Designer.cs
index b7826e8..8510539 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixB.Designer.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixB.Designer.cs
@@ -43,7 +43,7 @@
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(282, 444);
+ this.btnCancel.Location = new System.Drawing.Point(129, 125);
this.btnCancel.Margin = new System.Windows.Forms.Padding(5);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(98, 45);
@@ -54,7 +54,7 @@
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(110, 444);
+ this.btnOK.Location = new System.Drawing.Point(11, 125);
this.btnOK.Margin = new System.Windows.Forms.Padding(5);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(98, 45);
@@ -71,11 +71,11 @@
this.groupBox2.Controls.Add(this.label6);
this.groupBox2.Controls.Add(this.DrpMetageB1);
this.groupBox2.Controls.Add(this.label7);
- this.groupBox2.Location = new System.Drawing.Point(77, 121);
+ this.groupBox2.Location = new System.Drawing.Point(11, 11);
this.groupBox2.Margin = new System.Windows.Forms.Padding(2);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(2);
- this.groupBox2.Size = new System.Drawing.Size(426, 157);
+ this.groupBox2.Size = new System.Drawing.Size(216, 107);
this.groupBox2.TabIndex = 64;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "糊化机";
@@ -83,7 +83,7 @@
// DrpMixB
//
this.DrpMixB.FormattingEnabled = true;
- this.DrpMixB.Location = new System.Drawing.Point(121, 103);
+ this.DrpMixB.Location = new System.Drawing.Point(74, 71);
this.DrpMixB.Name = "DrpMixB";
this.DrpMixB.Size = new System.Drawing.Size(126, 20);
this.DrpMixB.TabIndex = 52;
@@ -91,7 +91,7 @@
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(27, 108);
+ this.label8.Location = new System.Drawing.Point(7, 71);
this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(59, 12);
@@ -101,7 +101,7 @@
// DrpMetageB2
//
this.DrpMetageB2.FormattingEnabled = true;
- this.DrpMetageB2.Location = new System.Drawing.Point(121, 73);
+ this.DrpMetageB2.Location = new System.Drawing.Point(74, 45);
this.DrpMetageB2.Name = "DrpMetageB2";
this.DrpMetageB2.Size = new System.Drawing.Size(126, 20);
this.DrpMetageB2.TabIndex = 52;
@@ -109,7 +109,7 @@
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(27, 75);
+ this.label6.Location = new System.Drawing.Point(19, 48);
this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(47, 12);
@@ -119,7 +119,7 @@
// DrpMetageB1
//
this.DrpMetageB1.FormattingEnabled = true;
- this.DrpMetageB1.Location = new System.Drawing.Point(121, 39);
+ this.DrpMetageB1.Location = new System.Drawing.Point(74, 19);
this.DrpMetageB1.Name = "DrpMetageB1";
this.DrpMetageB1.Size = new System.Drawing.Size(126, 20);
this.DrpMetageB1.TabIndex = 52;
@@ -127,7 +127,7 @@
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(27, 41);
+ this.label7.Location = new System.Drawing.Point(7, 22);
this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(59, 12);
@@ -138,7 +138,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(573, 742);
+ this.ClientSize = new System.Drawing.Size(239, 186);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);
this.Controls.Add(this.groupBox2);
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixC.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixC.Designer.cs
index a319d05..b199fbc 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixC.Designer.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixC.Designer.cs
@@ -39,7 +39,7 @@
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(271, 336);
+ this.btnCancel.Location = new System.Drawing.Point(129, 73);
this.btnCancel.Margin = new System.Windows.Forms.Padding(5);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(98, 45);
@@ -50,7 +50,7 @@
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(99, 336);
+ this.btnOK.Location = new System.Drawing.Point(11, 73);
this.btnOK.Margin = new System.Windows.Forms.Padding(5);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(98, 45);
@@ -63,11 +63,11 @@
//
this.groupBox3.Controls.Add(this.DrpMixC);
this.groupBox3.Controls.Add(this.label9);
- this.groupBox3.Location = new System.Drawing.Point(52, 70);
+ this.groupBox3.Location = new System.Drawing.Point(11, 11);
this.groupBox3.Margin = new System.Windows.Forms.Padding(2);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Padding = new System.Windows.Forms.Padding(2);
- this.groupBox3.Size = new System.Drawing.Size(426, 127);
+ this.groupBox3.Size = new System.Drawing.Size(216, 55);
this.groupBox3.TabIndex = 64;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "湿混机";
@@ -75,7 +75,7 @@
// DrpMixC
//
this.DrpMixC.FormattingEnabled = true;
- this.DrpMixC.Location = new System.Drawing.Point(121, 73);
+ this.DrpMixC.Location = new System.Drawing.Point(74, 19);
this.DrpMixC.Name = "DrpMixC";
this.DrpMixC.Size = new System.Drawing.Size(126, 20);
this.DrpMixC.TabIndex = 52;
@@ -83,7 +83,7 @@
// label9
//
this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(27, 75);
+ this.label9.Location = new System.Drawing.Point(7, 22);
this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(59, 12);
@@ -94,7 +94,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(565, 618);
+ this.ClientSize = new System.Drawing.Size(238, 131);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);
this.Controls.Add(this.groupBox3);
@@ -103,6 +103,7 @@
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.ResumeLayout(false);
+
}
#endregion
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixManager.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixManager.Designer.cs
index f5891ab..86f5152 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixManager.Designer.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixManager.Designer.cs
@@ -59,11 +59,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
//
this.groupBox3.Controls.Add(this.DrpMixC);
this.groupBox3.Controls.Add(this.label9);
- this.groupBox3.Location = new System.Drawing.Point(94, 423);
+ this.groupBox3.Location = new System.Drawing.Point(11, 217);
this.groupBox3.Margin = new System.Windows.Forms.Padding(2);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Padding = new System.Windows.Forms.Padding(2);
- this.groupBox3.Size = new System.Drawing.Size(426, 127);
+ this.groupBox3.Size = new System.Drawing.Size(220, 63);
this.groupBox3.TabIndex = 61;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "湿混机";
@@ -71,7 +71,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
// DrpMixC
//
this.DrpMixC.FormattingEnabled = true;
- this.DrpMixC.Location = new System.Drawing.Point(121, 73);
+ this.DrpMixC.Location = new System.Drawing.Point(74, 24);
this.DrpMixC.Name = "DrpMixC";
this.DrpMixC.Size = new System.Drawing.Size(126, 20);
this.DrpMixC.TabIndex = 52;
@@ -79,7 +79,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
// label9
//
this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(27, 75);
+ this.label9.Location = new System.Drawing.Point(7, 27);
this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(59, 12);
@@ -94,11 +94,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
this.groupBox2.Controls.Add(this.label6);
this.groupBox2.Controls.Add(this.DrpMetageB1);
this.groupBox2.Controls.Add(this.label7);
- this.groupBox2.Location = new System.Drawing.Point(94, 235);
+ this.groupBox2.Location = new System.Drawing.Point(11, 98);
this.groupBox2.Margin = new System.Windows.Forms.Padding(2);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(2);
- this.groupBox2.Size = new System.Drawing.Size(426, 157);
+ this.groupBox2.Size = new System.Drawing.Size(220, 115);
this.groupBox2.TabIndex = 60;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "糊化机";
@@ -106,7 +106,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
// DrpMixB
//
this.DrpMixB.FormattingEnabled = true;
- this.DrpMixB.Location = new System.Drawing.Point(121, 103);
+ this.DrpMixB.Location = new System.Drawing.Point(74, 77);
this.DrpMixB.Name = "DrpMixB";
this.DrpMixB.Size = new System.Drawing.Size(126, 20);
this.DrpMixB.TabIndex = 52;
@@ -114,7 +114,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(27, 108);
+ this.label8.Location = new System.Drawing.Point(7, 80);
this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(59, 12);
@@ -124,7 +124,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
// DrpMetageB2
//
this.DrpMetageB2.FormattingEnabled = true;
- this.DrpMetageB2.Location = new System.Drawing.Point(121, 73);
+ this.DrpMetageB2.Location = new System.Drawing.Point(74, 51);
this.DrpMetageB2.Name = "DrpMetageB2";
this.DrpMetageB2.Size = new System.Drawing.Size(126, 20);
this.DrpMetageB2.TabIndex = 52;
@@ -132,7 +132,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(27, 75);
+ this.label6.Location = new System.Drawing.Point(19, 54);
this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(47, 12);
@@ -142,7 +142,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
// DrpMetageB1
//
this.DrpMetageB1.FormattingEnabled = true;
- this.DrpMetageB1.Location = new System.Drawing.Point(121, 39);
+ this.DrpMetageB1.Location = new System.Drawing.Point(74, 25);
this.DrpMetageB1.Name = "DrpMetageB1";
this.DrpMetageB1.Size = new System.Drawing.Size(126, 20);
this.DrpMetageB1.TabIndex = 52;
@@ -150,7 +150,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(27, 41);
+ this.label7.Location = new System.Drawing.Point(7, 28);
this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(59, 12);
@@ -163,11 +163,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.DrpMetageA);
this.groupBox1.Controls.Add(this.label4);
- this.groupBox1.Location = new System.Drawing.Point(94, 77);
+ this.groupBox1.Location = new System.Drawing.Point(11, 11);
this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
- this.groupBox1.Size = new System.Drawing.Size(426, 127);
+ this.groupBox1.Size = new System.Drawing.Size(220, 83);
this.groupBox1.TabIndex = 59;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "干混机";
@@ -175,7 +175,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
// DrpMixA
//
this.DrpMixA.FormattingEnabled = true;
- this.DrpMixA.Location = new System.Drawing.Point(121, 73);
+ this.DrpMixA.Location = new System.Drawing.Point(74, 47);
this.DrpMixA.Name = "DrpMixA";
this.DrpMixA.Size = new System.Drawing.Size(126, 20);
this.DrpMixA.TabIndex = 52;
@@ -183,7 +183,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(27, 75);
+ this.label5.Location = new System.Drawing.Point(7, 50);
this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(59, 12);
@@ -193,7 +193,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
// DrpMetageA
//
this.DrpMetageA.FormattingEnabled = true;
- this.DrpMetageA.Location = new System.Drawing.Point(121, 39);
+ this.DrpMetageA.Location = new System.Drawing.Point(74, 21);
this.DrpMetageA.Name = "DrpMetageA";
this.DrpMetageA.Size = new System.Drawing.Size(126, 20);
this.DrpMetageA.TabIndex = 52;
@@ -201,7 +201,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(27, 41);
+ this.label4.Location = new System.Drawing.Point(7, 24);
this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(59, 12);
@@ -211,7 +211,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(282, 690);
+ this.btnCancel.Location = new System.Drawing.Point(133, 287);
this.btnCancel.Margin = new System.Windows.Forms.Padding(5);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(98, 45);
@@ -221,7 +221,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(110, 690);
+ this.btnOK.Location = new System.Drawing.Point(11, 287);
this.btnOK.Margin = new System.Windows.Forms.Padding(5);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(98, 45);
@@ -233,7 +233,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(636, 858);
+ this.ClientSize = new System.Drawing.Size(242, 344);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);
this.Controls.Add(this.groupBox3);
@@ -248,6 +248,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.ResumeLayout(false);
+
}
private System.Windows.Forms.GroupBox groupBox3;
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmPlanning.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmPlanning.Designer.cs
index 37f1d3e..17adfdb 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmPlanning.Designer.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmPlanning.Designer.cs
@@ -63,47 +63,48 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(30, 55);
- this.label3.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label3.Location = new System.Drawing.Point(11, 15);
+ this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(71, 18);
+ this.label3.Size = new System.Drawing.Size(47, 12);
this.label3.TabIndex = 49;
this.label3.Text = "生产线:";
//
// DrpProductLine
//
this.DrpProductLine.FormattingEnabled = true;
- this.DrpProductLine.Location = new System.Drawing.Point(171, 52);
- this.DrpProductLine.Margin = new System.Windows.Forms.Padding(4);
+ this.DrpProductLine.Location = new System.Drawing.Point(68, 12);
this.DrpProductLine.Name = "DrpProductLine";
- this.DrpProductLine.Size = new System.Drawing.Size(187, 26);
+ this.DrpProductLine.Size = new System.Drawing.Size(129, 20);
this.DrpProductLine.TabIndex = 52;
this.DrpProductLine.SelectedIndexChanged += new System.EventHandler(this.DrpProductLine_SelectedIndexChanged);
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(399, 60);
+ this.label1.Location = new System.Drawing.Point(202, 15);
+ this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(62, 18);
+ this.label1.Size = new System.Drawing.Size(41, 12);
this.label1.TabIndex = 53;
this.label1.Text = "label1";
//
// txtCarNumber
//
- this.txtCarNumber.Location = new System.Drawing.Point(164, 110);
- this.txtCarNumber.Margin = new System.Windows.Forms.Padding(8);
+ this.txtCarNumber.Location = new System.Drawing.Point(68, 40);
+ this.txtCarNumber.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txtCarNumber.MaxLength = 100;
this.txtCarNumber.Name = "txtCarNumber";
- this.txtCarNumber.Size = new System.Drawing.Size(192, 28);
+ this.txtCarNumber.Size = new System.Drawing.Size(129, 21);
this.txtCarNumber.TabIndex = 55;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(35, 112);
- this.label2.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label2.Location = new System.Drawing.Point(23, 43);
+ this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(53, 18);
+ this.label2.Size = new System.Drawing.Size(35, 12);
this.label2.TabIndex = 54;
this.label2.Text = "车次:";
//
@@ -113,9 +114,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.DrpMetageA);
this.groupBox1.Controls.Add(this.label4);
- this.groupBox1.Location = new System.Drawing.Point(49, 232);
+ this.groupBox1.Location = new System.Drawing.Point(11, 68);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(639, 191);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.groupBox1.Size = new System.Drawing.Size(240, 80);
this.groupBox1.TabIndex = 56;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "干混机";
@@ -123,38 +126,36 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// DrpMixA
//
this.DrpMixA.FormattingEnabled = true;
- this.DrpMixA.Location = new System.Drawing.Point(181, 110);
- this.DrpMixA.Margin = new System.Windows.Forms.Padding(4);
+ this.DrpMixA.Location = new System.Drawing.Point(74, 45);
this.DrpMixA.Name = "DrpMixA";
- this.DrpMixA.Size = new System.Drawing.Size(187, 26);
+ this.DrpMixA.Size = new System.Drawing.Size(153, 20);
this.DrpMixA.TabIndex = 52;
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(40, 113);
- this.label5.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label5.Location = new System.Drawing.Point(7, 48);
+ this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(89, 18);
+ this.label5.Size = new System.Drawing.Size(59, 12);
this.label5.TabIndex = 49;
this.label5.Text = "混合步骤:";
//
// DrpMetageA
//
this.DrpMetageA.FormattingEnabled = true;
- this.DrpMetageA.Location = new System.Drawing.Point(181, 59);
- this.DrpMetageA.Margin = new System.Windows.Forms.Padding(4);
+ this.DrpMetageA.Location = new System.Drawing.Point(74, 19);
this.DrpMetageA.Name = "DrpMetageA";
- this.DrpMetageA.Size = new System.Drawing.Size(187, 26);
+ this.DrpMetageA.Size = new System.Drawing.Size(153, 20);
this.DrpMetageA.TabIndex = 52;
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(40, 62);
- this.label4.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label4.Location = new System.Drawing.Point(7, 22);
+ this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(89, 18);
+ this.label4.Size = new System.Drawing.Size(59, 12);
this.label4.TabIndex = 49;
this.label4.Text = "粉料称量:";
//
@@ -166,9 +167,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.groupBox2.Controls.Add(this.label6);
this.groupBox2.Controls.Add(this.DrpMetageB1);
this.groupBox2.Controls.Add(this.label7);
- this.groupBox2.Location = new System.Drawing.Point(49, 469);
+ this.groupBox2.Location = new System.Drawing.Point(11, 152);
+ this.groupBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(639, 235);
+ this.groupBox2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.groupBox2.Size = new System.Drawing.Size(240, 106);
this.groupBox2.TabIndex = 57;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "糊化机";
@@ -176,57 +179,54 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// DrpMixB
//
this.DrpMixB.FormattingEnabled = true;
- this.DrpMixB.Location = new System.Drawing.Point(181, 154);
- this.DrpMixB.Margin = new System.Windows.Forms.Padding(4);
+ this.DrpMixB.Location = new System.Drawing.Point(74, 71);
this.DrpMixB.Name = "DrpMixB";
- this.DrpMixB.Size = new System.Drawing.Size(187, 26);
+ this.DrpMixB.Size = new System.Drawing.Size(153, 20);
this.DrpMixB.TabIndex = 52;
//
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(40, 162);
- this.label8.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label8.Location = new System.Drawing.Point(7, 74);
+ this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(89, 18);
+ this.label8.Size = new System.Drawing.Size(59, 12);
this.label8.TabIndex = 49;
this.label8.Text = "混合步骤:";
//
// DrpMetageB2
//
this.DrpMetageB2.FormattingEnabled = true;
- this.DrpMetageB2.Location = new System.Drawing.Point(181, 110);
- this.DrpMetageB2.Margin = new System.Windows.Forms.Padding(4);
+ this.DrpMetageB2.Location = new System.Drawing.Point(74, 45);
this.DrpMetageB2.Name = "DrpMetageB2";
- this.DrpMetageB2.Size = new System.Drawing.Size(187, 26);
+ this.DrpMetageB2.Size = new System.Drawing.Size(153, 20);
this.DrpMetageB2.TabIndex = 52;
//
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(40, 113);
- this.label6.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label6.Location = new System.Drawing.Point(19, 48);
+ this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(71, 18);
+ this.label6.Size = new System.Drawing.Size(47, 12);
this.label6.TabIndex = 49;
this.label6.Text = "水称量:";
//
// DrpMetageB1
//
this.DrpMetageB1.FormattingEnabled = true;
- this.DrpMetageB1.Location = new System.Drawing.Point(181, 59);
- this.DrpMetageB1.Margin = new System.Windows.Forms.Padding(4);
+ this.DrpMetageB1.Location = new System.Drawing.Point(74, 19);
this.DrpMetageB1.Name = "DrpMetageB1";
- this.DrpMetageB1.Size = new System.Drawing.Size(187, 26);
+ this.DrpMetageB1.Size = new System.Drawing.Size(153, 20);
this.DrpMetageB1.TabIndex = 52;
//
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(40, 62);
- this.label7.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label7.Location = new System.Drawing.Point(7, 22);
+ this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(89, 18);
+ this.label7.Size = new System.Drawing.Size(59, 12);
this.label7.TabIndex = 49;
this.label7.Text = "粉料称量:";
//
@@ -234,9 +234,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
this.groupBox3.Controls.Add(this.DrpMixC);
this.groupBox3.Controls.Add(this.label9);
- this.groupBox3.Location = new System.Drawing.Point(49, 752);
+ this.groupBox3.Location = new System.Drawing.Point(11, 262);
+ this.groupBox3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.groupBox3.Name = "groupBox3";
- this.groupBox3.Size = new System.Drawing.Size(639, 191);
+ this.groupBox3.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.groupBox3.Size = new System.Drawing.Size(240, 53);
this.groupBox3.TabIndex = 58;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "湿混机";
@@ -244,29 +246,28 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// DrpMixC
//
this.DrpMixC.FormattingEnabled = true;
- this.DrpMixC.Location = new System.Drawing.Point(181, 110);
- this.DrpMixC.Margin = new System.Windows.Forms.Padding(4);
+ this.DrpMixC.Location = new System.Drawing.Point(74, 19);
this.DrpMixC.Name = "DrpMixC";
- this.DrpMixC.Size = new System.Drawing.Size(187, 26);
+ this.DrpMixC.Size = new System.Drawing.Size(153, 20);
this.DrpMixC.TabIndex = 52;
//
// label9
//
this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(40, 113);
- this.label9.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label9.Location = new System.Drawing.Point(7, 22);
+ this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(89, 18);
+ this.label9.Size = new System.Drawing.Size(59, 12);
this.label9.TabIndex = 49;
this.label9.Text = "混合步骤:";
//
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(362, 1090);
- this.btnCancel.Margin = new System.Windows.Forms.Padding(8);
+ this.btnCancel.Location = new System.Drawing.Point(241, 727);
+ this.btnCancel.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.btnCancel.Name = "btnCancel";
- this.btnCancel.Size = new System.Drawing.Size(147, 68);
+ this.btnCancel.Size = new System.Drawing.Size(98, 45);
this.btnCancel.TabIndex = 60;
this.btnCancel.Text = "取消";
this.btnCancel.UseVisualStyleBackColor = true;
@@ -274,10 +275,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(103, 1090);
- this.btnOK.Margin = new System.Windows.Forms.Padding(8);
+ this.btnOK.Location = new System.Drawing.Point(69, 727);
+ this.btnOK.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(147, 68);
+ this.btnOK.Size = new System.Drawing.Size(98, 45);
this.btnOK.TabIndex = 59;
this.btnOK.Text = "确认";
this.btnOK.UseVisualStyleBackColor = true;
@@ -285,9 +286,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
// FrmPlanning
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(777, 1228);
+ this.ClientSize = new System.Drawing.Size(263, 328);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);
this.Controls.Add(this.groupBox3);
@@ -298,6 +299,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.Controls.Add(this.label1);
this.Controls.Add(this.DrpProductLine);
this.Controls.Add(this.label3);
+ this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "FrmPlanning";
this.Text = "计划管理";
this.groupBox1.ResumeLayout(false);
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.Designer.cs
index 5dc3d27..7f9ba6d 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.Designer.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.Designer.cs
@@ -46,17 +46,20 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
// HighLimit
//
this.HighLimit.Enabled = false;
- this.HighLimit.Location = new System.Drawing.Point(194, 176);
+ this.HighLimit.Location = new System.Drawing.Point(108, 58);
this.HighLimit.Margin = new System.Windows.Forms.Padding(5);
+ this.HighLimit.MaxLength = 100;
this.HighLimit.Name = "HighLimit";
this.HighLimit.Size = new System.Drawing.Size(129, 21);
this.HighLimit.TabIndex = 47;
+ this.HighLimit.TextChanged += new System.EventHandler(this.HighLimit_TextChanged);
//
// LowLimit
//
this.LowLimit.Enabled = false;
- this.LowLimit.Location = new System.Drawing.Point(194, 125);
+ this.LowLimit.Location = new System.Drawing.Point(108, 27);
this.LowLimit.Margin = new System.Windows.Forms.Padding(5);
+ this.LowLimit.MaxLength = 100;
this.LowLimit.Name = "LowLimit";
this.LowLimit.Size = new System.Drawing.Size(129, 21);
this.LowLimit.TabIndex = 48;
@@ -64,7 +67,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(288, 452);
+ this.btnCancel.Location = new System.Drawing.Point(139, 139);
this.btnCancel.Margin = new System.Windows.Forms.Padding(5);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(98, 45);
@@ -75,7 +78,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(115, 452);
+ this.btnOK.Location = new System.Drawing.Point(29, 139);
this.btnOK.Margin = new System.Windows.Forms.Padding(5);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(98, 45);
@@ -87,7 +90,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(113, 176);
+ this.label4.Location = new System.Drawing.Point(27, 61);
this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(71, 12);
@@ -97,7 +100,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(113, 125);
+ this.label3.Location = new System.Drawing.Point(27, 30);
this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(71, 12);
@@ -107,7 +110,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(113, 220);
+ this.label1.Location = new System.Drawing.Point(39, 90);
this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(59, 12);
@@ -117,9 +120,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
// Alarm
//
this.Alarm.FormattingEnabled = true;
- this.Alarm.Location = new System.Drawing.Point(194, 217);
+ this.Alarm.Location = new System.Drawing.Point(108, 87);
this.Alarm.Name = "Alarm";
- this.Alarm.Size = new System.Drawing.Size(121, 20);
+ this.Alarm.Size = new System.Drawing.Size(129, 20);
this.Alarm.TabIndex = 51;
this.Alarm.SelectedIndexChanged += new System.EventHandler(this.Alarm_SelectedIndexChanged);
//
@@ -127,7 +130,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(498, 571);
+ this.ClientSize = new System.Drawing.Size(268, 206);
this.Controls.Add(this.Alarm);
this.Controls.Add(this.HighLimit);
this.Controls.Add(this.LowLimit);
@@ -140,6 +143,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
this.Text = "需改压力参数";
this.ResumeLayout(false);
this.PerformLayout();
+
}
private System.Windows.Forms.ComboBox Alarm;
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.cs
index 4ce89f8..9f5be01 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.cs
@@ -98,5 +98,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
this.DialogResult = System.Windows.Forms.DialogResult.OK;
}
+
+ private void HighLimit_TextChanged(object sender, EventArgs e)
+ {
+
+ }
}
}
\ No newline at end of file
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.Designer.cs
index 4dbc06f..022536e 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.Designer.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.Designer.cs
@@ -42,10 +42,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjProdcutLine
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(136, 538);
- this.btnOK.Margin = new System.Windows.Forms.Padding(8);
+ this.btnOK.Location = new System.Drawing.Point(14, 296);
+ this.btnOK.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(147, 68);
+ this.btnOK.Size = new System.Drawing.Size(98, 45);
this.btnOK.TabIndex = 66;
this.btnOK.Text = "确认";
this.btnOK.UseVisualStyleBackColor = true;
@@ -54,28 +54,29 @@ namespace Mesnac.Action.ChemicalWeighing.LjProdcutLine
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(123, 86);
- this.label3.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label3.Location = new System.Drawing.Point(101, 41);
+ this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(89, 18);
+ this.label3.Size = new System.Drawing.Size(59, 12);
this.label3.TabIndex = 65;
this.label3.Text = "产线名称:";
//
// TxtName
//
- this.TxtName.Location = new System.Drawing.Point(245, 86);
- this.TxtName.Margin = new System.Windows.Forms.Padding(8);
+ this.TxtName.Location = new System.Drawing.Point(170, 38);
+ this.TxtName.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.TxtName.MaxLength = 100;
this.TxtName.Name = "TxtName";
- this.TxtName.Size = new System.Drawing.Size(192, 28);
+ this.TxtName.Size = new System.Drawing.Size(129, 21);
this.TxtName.TabIndex = 68;
//
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(396, 538);
- this.btnCancel.Margin = new System.Windows.Forms.Padding(8);
+ this.btnCancel.Location = new System.Drawing.Point(322, 296);
+ this.btnCancel.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.btnCancel.Name = "btnCancel";
- this.btnCancel.Size = new System.Drawing.Size(147, 68);
+ this.btnCancel.Size = new System.Drawing.Size(98, 45);
this.btnCancel.TabIndex = 67;
this.btnCancel.Text = "取消";
this.btnCancel.UseVisualStyleBackColor = true;
@@ -84,26 +85,29 @@ namespace Mesnac.Action.ChemicalWeighing.LjProdcutLine
// checkedListBox1
//
this.checkedListBox1.FormattingEnabled = true;
- this.checkedListBox1.Location = new System.Drawing.Point(136, 196);
+ this.checkedListBox1.Location = new System.Drawing.Point(14, 93);
+ this.checkedListBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.checkedListBox1.Name = "checkedListBox1";
- this.checkedListBox1.Size = new System.Drawing.Size(607, 303);
+ this.checkedListBox1.Size = new System.Drawing.Size(406, 196);
this.checkedListBox1.TabIndex = 69;
//
// FrmProductLine
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(800, 781);
+ this.ClientSize = new System.Drawing.Size(434, 352);
this.Controls.Add(this.checkedListBox1);
this.Controls.Add(this.btnOK);
this.Controls.Add(this.label3);
this.Controls.Add(this.TxtName);
this.Controls.Add(this.btnCancel);
+ this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "FrmProductLine";
this.Text = "产线配置";
this.Load += new System.EventHandler(this.FrmProductLine_Load);
this.ResumeLayout(false);
this.PerformLayout();
+
}
private System.Windows.Forms.Button btnOK;
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.Designer.cs
index 4ad0f4b..194855c 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.Designer.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.Designer.cs
@@ -41,8 +41,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional
//
// SV
//
- this.SV.Location = new System.Drawing.Point(152, 60);
+ this.SV.Location = new System.Drawing.Point(121, 32);
this.SV.Margin = new System.Windows.Forms.Padding(5);
+ this.SV.MaxLength = 100;
this.SV.Name = "SV";
this.SV.Size = new System.Drawing.Size(129, 21);
this.SV.TabIndex = 64;
@@ -50,7 +51,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(217, 138);
+ this.btnCancel.Location = new System.Drawing.Point(168, 82);
this.btnCancel.Margin = new System.Windows.Forms.Padding(5);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(98, 45);
@@ -61,7 +62,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(44, 138);
+ this.btnOK.Location = new System.Drawing.Point(34, 82);
this.btnOK.Margin = new System.Windows.Forms.Padding(5);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(98, 45);
@@ -73,7 +74,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(71, 60);
+ this.label3.Location = new System.Drawing.Point(40, 35);
this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(71, 12);
@@ -84,7 +85,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(397, 450);
+ this.ClientSize = new System.Drawing.Size(301, 145);
this.Controls.Add(this.SV);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);
@@ -94,6 +95,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional
this.Text = "比例阀参数设定";
this.ResumeLayout(false);
this.PerformLayout();
+
}
private System.Windows.Forms.TextBox SV;
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/FrmStock.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/FrmStock.Designer.cs
index db4f78f..c508411 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/FrmStock.Designer.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/FrmStock.Designer.cs
@@ -46,16 +46,17 @@ namespace Mesnac.Action.ChemicalWeighing.LjStock
// TankName
//
this.TankName.Enabled = false;
- this.TankName.Location = new System.Drawing.Point(141, 113);
+ this.TankName.Location = new System.Drawing.Point(81, 66);
this.TankName.Margin = new System.Windows.Forms.Padding(5);
+ this.TankName.MaxLength = 100;
this.TankName.Name = "TankName";
- this.TankName.Size = new System.Drawing.Size(129, 21);
+ this.TankName.Size = new System.Drawing.Size(161, 21);
this.TankName.TabIndex = 29;
//
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(225, 220);
+ this.btnCancel.Location = new System.Drawing.Point(144, 97);
this.btnCancel.Margin = new System.Windows.Forms.Padding(5);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(98, 45);
@@ -66,7 +67,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjStock
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(52, 220);
+ this.btnOK.Location = new System.Drawing.Point(14, 97);
this.btnOK.Margin = new System.Windows.Forms.Padding(5);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(98, 45);
@@ -78,7 +79,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjStock
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(52, 116);
+ this.label4.Location = new System.Drawing.Point(18, 69);
this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(53, 12);
@@ -88,24 +89,24 @@ namespace Mesnac.Action.ChemicalWeighing.LjStock
// DrpType
//
this.DrpType.FormattingEnabled = true;
- this.DrpType.Location = new System.Drawing.Point(141, 16);
+ this.DrpType.Location = new System.Drawing.Point(81, 12);
this.DrpType.Name = "DrpType";
- this.DrpType.Size = new System.Drawing.Size(121, 20);
+ this.DrpType.Size = new System.Drawing.Size(161, 20);
this.DrpType.TabIndex = 42;
this.DrpType.SelectedIndexChanged += new System.EventHandler(this.DrpType_SelectedIndexChanged);
//
// comboBox2
//
this.comboBox2.FormattingEnabled = true;
- this.comboBox2.Location = new System.Drawing.Point(141, 54);
+ this.comboBox2.Location = new System.Drawing.Point(81, 38);
this.comboBox2.Name = "comboBox2";
- this.comboBox2.Size = new System.Drawing.Size(121, 20);
+ this.comboBox2.Size = new System.Drawing.Size(161, 20);
this.comboBox2.TabIndex = 43;
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(52, 24);
+ this.label3.Location = new System.Drawing.Point(14, 15);
this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(59, 12);
@@ -115,7 +116,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjStock
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(54, 62);
+ this.label2.Location = new System.Drawing.Point(14, 41);
this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(59, 12);
@@ -126,7 +127,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjStock
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(362, 450);
+ this.ClientSize = new System.Drawing.Size(255, 157);
this.Controls.Add(this.DrpType);
this.Controls.Add(this.comboBox2);
this.Controls.Add(this.label3);
@@ -139,6 +140,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjStock
this.Text = "大仓物料";
this.ResumeLayout(false);
this.PerformLayout();
+
}
private System.Windows.Forms.ComboBox DrpType;
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.Designer.cs
index 77dba14..11ab234 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.Designer.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.Designer.cs
@@ -46,10 +46,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(372, 627);
- this.btnCancel.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
+ this.btnCancel.Location = new System.Drawing.Point(142, 97);
+ this.btnCancel.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.btnCancel.Name = "btnCancel";
- this.btnCancel.Size = new System.Drawing.Size(147, 68);
+ this.btnCancel.Size = new System.Drawing.Size(98, 45);
this.btnCancel.TabIndex = 13;
this.btnCancel.Text = "取消";
this.btnCancel.UseVisualStyleBackColor = true;
@@ -57,10 +57,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(112, 627);
- this.btnOK.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
+ this.btnOK.Location = new System.Drawing.Point(14, 97);
+ this.btnOK.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(147, 68);
+ this.btnOK.Size = new System.Drawing.Size(98, 45);
this.btnOK.TabIndex = 12;
this.btnOK.Text = "确认";
this.btnOK.UseVisualStyleBackColor = true;
@@ -69,66 +69,65 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(110, 117);
- this.label1.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label1.Location = new System.Drawing.Point(14, 41);
+ this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(89, 18);
+ this.label1.Size = new System.Drawing.Size(59, 12);
this.label1.TabIndex = 11;
this.label1.Text = "物料名称:";
//
// comboBox1
//
this.comboBox1.FormattingEnabled = true;
- this.comboBox1.Location = new System.Drawing.Point(231, 112);
- this.comboBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.comboBox1.Location = new System.Drawing.Point(81, 38);
this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(180, 26);
+ this.comboBox1.Size = new System.Drawing.Size(159, 20);
this.comboBox1.TabIndex = 15;
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(110, 32);
- this.label3.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label3.Location = new System.Drawing.Point(14, 15);
+ this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(89, 18);
+ this.label3.Size = new System.Drawing.Size(59, 12);
this.label3.TabIndex = 11;
this.label3.Text = "物料类别:";
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(110, 213);
- this.label4.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label4.Location = new System.Drawing.Point(14, 69);
+ this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(89, 18);
+ this.label4.Size = new System.Drawing.Size(59, 12);
this.label4.TabIndex = 11;
this.label4.Text = "日罐名称:";
//
// DayBinName
//
this.DayBinName.Enabled = false;
- this.DayBinName.Location = new System.Drawing.Point(231, 213);
- this.DayBinName.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
+ this.DayBinName.Location = new System.Drawing.Point(81, 66);
+ this.DayBinName.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.DayBinName.MaxLength = 100;
this.DayBinName.Name = "DayBinName";
- this.DayBinName.Size = new System.Drawing.Size(192, 28);
+ this.DayBinName.Size = new System.Drawing.Size(159, 21);
this.DayBinName.TabIndex = 14;
//
// DrpType
//
this.DrpType.FormattingEnabled = true;
- this.DrpType.Location = new System.Drawing.Point(231, 24);
- this.DrpType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.DrpType.Location = new System.Drawing.Point(81, 12);
this.DrpType.Name = "DrpType";
- this.DrpType.Size = new System.Drawing.Size(180, 26);
+ this.DrpType.Size = new System.Drawing.Size(159, 20);
this.DrpType.TabIndex = 15;
this.DrpType.SelectedIndexChanged += new System.EventHandler(this.DrpType_SelectedIndexChanged);
//
// FrmTankNum
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(680, 804);
+ this.ClientSize = new System.Drawing.Size(253, 155);
this.Controls.Add(this.DrpType);
this.Controls.Add(this.comboBox1);
this.Controls.Add(this.DayBinName);
@@ -137,9 +136,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum
this.Controls.Add(this.label4);
this.Controls.Add(this.label3);
this.Controls.Add(this.label1);
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "FrmTankNum";
this.Text = "日罐物料对应";
+ this.Load += new System.EventHandler(this.FrmTankNum_Load);
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs
index 85d02e9..804518a 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs
@@ -96,5 +96,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum
comboBox1.DisplayMember = "Name";
}
+
+ private void FrmTankNum_Load(object sender, EventArgs e)
+ {
+
+ }
}
}
\ No newline at end of file
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.Designer.cs
index 7336a9d..1ede7b3 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.Designer.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.Designer.cs
@@ -39,43 +39,45 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight
this.btnOK = new System.Windows.Forms.Button();
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// HighWeight
//
this.HighWeight.Enabled = false;
- this.HighWeight.Location = new System.Drawing.Point(316, 176);
- this.HighWeight.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
+ this.HighWeight.Location = new System.Drawing.Point(98, 64);
+ this.HighWeight.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.HighWeight.Name = "HighWeight";
- this.HighWeight.Size = new System.Drawing.Size(192, 28);
+ this.HighWeight.Size = new System.Drawing.Size(129, 21);
this.HighWeight.TabIndex = 57;
//
// LowWeight
//
this.LowWeight.Enabled = false;
- this.LowWeight.Location = new System.Drawing.Point(316, 99);
- this.LowWeight.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
+ this.LowWeight.Location = new System.Drawing.Point(98, 33);
+ this.LowWeight.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.LowWeight.Name = "LowWeight";
- this.LowWeight.Size = new System.Drawing.Size(192, 28);
+ this.LowWeight.Size = new System.Drawing.Size(129, 21);
this.LowWeight.TabIndex = 58;
//
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(432, 380);
- this.btnCancel.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
+ this.btnCancel.Location = new System.Drawing.Point(163, 117);
+ this.btnCancel.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.btnCancel.Name = "btnCancel";
- this.btnCancel.Size = new System.Drawing.Size(147, 68);
+ this.btnCancel.Size = new System.Drawing.Size(98, 45);
this.btnCancel.TabIndex = 56;
this.btnCancel.Text = "取消";
this.btnCancel.UseVisualStyleBackColor = true;
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(172, 380);
- this.btnOK.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
+ this.btnOK.Location = new System.Drawing.Point(14, 117);
+ this.btnOK.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(147, 68);
+ this.btnOK.Size = new System.Drawing.Size(98, 45);
this.btnOK.TabIndex = 55;
this.btnOK.Text = "确认";
this.btnOK.UseVisualStyleBackColor = true;
@@ -84,36 +86,57 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(195, 176);
- this.label4.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label4.Location = new System.Drawing.Point(130, 117);
+ this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(107, 18);
+ this.label4.Size = new System.Drawing.Size(0, 12);
this.label4.TabIndex = 52;
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(195, 99);
- this.label3.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+ this.label3.Location = new System.Drawing.Point(155, 85);
+ this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(107, 18);
+ this.label3.Size = new System.Drawing.Size(0, 12);
this.label3.TabIndex = 54;
//
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(37, 36);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(53, 12);
+ this.label1.TabIndex = 59;
+ this.label1.Text = "低料位：";
+ this.label1.Click += new System.EventHandler(this.label1_Click);
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(37, 67);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(53, 12);
+ this.label2.TabIndex = 60;
+ this.label2.Text = "高料位：";
+ //
// FrmWeight
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(846, 798);
+ this.ClientSize = new System.Drawing.Size(274, 176);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.label1);
this.Controls.Add(this.HighWeight);
this.Controls.Add(this.LowWeight);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);
this.Controls.Add(this.label4);
this.Controls.Add(this.label3);
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "FrmWeight";
this.ResumeLayout(false);
this.PerformLayout();
+
}
private System.Windows.Forms.TextBox HighWeight;
@@ -124,5 +147,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight
private System.Windows.Forms.Label label3;
#endregion
+
+ private Label label1;
+ private Label label2;
}
}
\ No newline at end of file
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.cs
index 838e038..8db152a 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.cs
@@ -60,5 +60,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight
WeightSettingPlc.DownToPlc(new []{view});
}
+
+ private void label1_Click(object sender, EventArgs e)
+ {
+
+ }
}
}
\ No newline at end of file
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
index 5c98ca4..92c9fc2 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
@@ -791,6 +791,10 @@
{28acacf1-9936-4e97-a866-f84366ec5286}
Mesnac.Basic
+
+ {ad132cad-5288-44dc-a38f-4b0658fc228c}
+ Mesnac.DoUtils
+
{88eac8d1-8783-478c-ad9d-f916673b7004}
Mesnac.PlcUtils
diff --git a/Main/MCRun/MCRun.csproj b/Main/MCRun/MCRun.csproj
index 9dec82d..f9f7c87 100644
--- a/Main/MCRun/MCRun.csproj
+++ b/Main/MCRun/MCRun.csproj
@@ -251,6 +251,10 @@
{d0c0324f-434e-47eb-8f7c-ba6cd7f233b4}
Mesnac.Controls.Feeding
+
+ {ad132cad-5288-44dc-a38f-4b0658fc228c}
+ Mesnac.DoUtils
+
{88eac8d1-8783-478c-ad9d-f916673b7004}
Mesnac.PlcUtils
diff --git a/Main/MCRun/Program.cs b/Main/MCRun/Program.cs
index baf2532..b432696 100644
--- a/Main/MCRun/Program.cs
+++ b/Main/MCRun/Program.cs
@@ -10,6 +10,7 @@ using Mesnac.Gui.Run.Global;
namespace MCRun
{
using Mesnac.Core.Service;
+ using Mesnac.DoUtils;
using Mesnac.Gui.Workbench;
using Mesnac.PlcUtils;
using Mesnac.PlcUtils.common;
@@ -101,6 +102,11 @@ namespace MCRun
if (Mesnac.Gui.Common.RunEngine.Instance.Init(projectPath, true, true, true)) //初始化运行引擎
{
AppConfigHandler.Instance.InitCustomerMenuAndToolStrip(WorkbenchSingleton.Workbench.TopMenu, WorkbenchSingleton.Workbench.ToolStrip); //初始化自定义系统菜单和工具栏
+
+ //初始化HslCommunication 11.0.6.0
+ PlcBusiness.Instance.InitPlcConnect(PlcType.SiemensPlc, "127.0.0.1", 12);
+ //初始化连接报警器
+ DoControl.Instance.ComOn();
}
//if (!Mesnac.Basic.InfluxDbHelper.Instance.IsStartDbServer)
@@ -119,8 +125,6 @@ namespace MCRun
};
WorkbenchSingleton.InitializeWorkbench();
- PlcBusiness.Instance.InitPlcConnect(PlcType.SiemensPlc, "127.0.0.1", 12);
-
ICSharpCode.Core.LoggingService.Debug("starting workbench...");
Form frmMain = WorkbenchSingleton.Workbench as Form;
diff --git a/Mesnac.DoUtils/DoControl.cs b/Mesnac.DoUtils/DoControl.cs
new file mode 100644
index 0000000..e5b8f6c
--- /dev/null
+++ b/Mesnac.DoUtils/DoControl.cs
@@ -0,0 +1,164 @@
+using Mesnac.DoUtils.enumInfo;
+using System;
+using System.Collections.Generic;
+using System.IO.Ports;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace Mesnac.DoUtils
+{
+ ///
+ /// 报警灯控制类
+ ///
+ public sealed class DoControl
+ {
+ public SerialPort serialPort = new SerialPort("COM5");
+ private static readonly Lazy lazy = new Lazy(() => new DoControl());
+ public static DoControl Instance
+ {
+ get
+ {
+ return lazy.Value;
+ }
+ }
+
+ private DoControl()
+ {
+ serialPort.BaudRate = 115200;
+ serialPort.DataBits = 8;
+ serialPort.StopBits = StopBits.One;
+ serialPort.Parity = Parity.None;
+ }
+
+ ///
+ /// 串口启动
+ ///
+ public void ComOn()
+ {
+ try
+ {
+ if (!serialPort.IsOpen)
+ {
+ serialPort.Open();
+ ICSharpCode.Core.LoggingService.Debug($"打开报警器串口成功，串口：{serialPort.PortName}；波特率：{serialPort.BaudRate}");
+ }
+ }catch (Exception ex)
+ {
+ ICSharpCode.Core.LoggingService.Error($"报警器串口打开异常，串口：{serialPort.PortName}；波特率：{serialPort.BaudRate}；异常信息：{ex.Message}");
+ }
+ }
+ ///
+ /// 串口关闭
+ ///
+ public void ComOff()
+ {
+ if (serialPort.IsOpen)
+ {
+ serialPort.Close();
+ }
+ }
+
+ ///
+ /// DO1设备启动（红灯）
+ ///
+ public void redLightOn()
+ {
+ DOControl(DOName.Red, DOOnOff.On);
+ }
+
+ ///
+ /// DO2设备启动（绿灯）
+ ///
+ public void greenLightOn()
+ {
+ DOControl(DOName.Green, DOOnOff.On);
+ }
+
+ ///
+ /// DO3设备启动（蜂鸣器）
+ ///
+ public void buzzerOn()
+ {
+ DOControl(DOName.Buzzer, DOOnOff.On);
+ }
+
+ ///
+ /// DO1设备关闭（红灯）
+ ///
+ public void redLightOff()
+ {
+ DOControl(DOName.Red, DOOnOff.Off);
+ }
+
+ ///
+ /// DO2设备关闭（绿灯）
+ ///
+ public void greenLightOff()
+ {
+ DOControl(DOName.Green, DOOnOff.Off);
+ }
+
+ ///
+ /// DO3设备关闭（蜂鸣器）
+ ///
+ public void buzzerOff()
+ {
+ DOControl(DOName.Buzzer, DOOnOff.On);
+ }
+
+ ///
+ /// 重置串口和DO状态
+ ///
+ public void Reset()
+ {
+ SetOff();
+ ComOff();
+ }
+
+ ///
+ /// 重置DO状态
+ ///
+ public void SetOff()
+ {
+ foreach (DOName dOName in Enum.GetValues(typeof(DOName)))
+ {
+ DOControl(dOName, DOOnOff.Off);
+ }
+ }
+
+ ///
+ /// DO启停控制
+ ///
+ /// DegitalOut接口名称
+ /// 启停状态
+ public void DOControl(DOName dOName, DOOnOff dOOnOff)
+ {
+ if (serialPort.IsOpen)
+ {
+ serialPort.Write(new byte[] { 0xE3, 0x01, 0x09, (byte)dOName, (byte)dOOnOff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0, 12);
+ }
+ else
+ {
+ ComOn();
+ }
+ }
+
+ ///
+ /// 文本框传输数据控制COM5串口
+ ///
+ public void DOTestSend(string str)
+ {
+ //ComOn();
+ string[] strArray = str.Split(' ');
+ byte[] bytes = new byte[strArray.Length];
+ for (int i = 0; i < bytes.Length; i++)
+ {
+ bytes[i] = Convert.ToByte(strArray[i], 16);
+ }
+ serialPort.Write(bytes, 0, bytes.Length);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Mesnac.DoUtils/Mesnac.DoUtils.csproj b/Mesnac.DoUtils/Mesnac.DoUtils.csproj
new file mode 100644
index 0000000..4806769
--- /dev/null
+++ b/Mesnac.DoUtils/Mesnac.DoUtils.csproj
@@ -0,0 +1,59 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {AD132CAD-5288-44DC-A38F-4B0658FC228C}
+ Library
+ Properties
+ Mesnac.DoUtils
+ Mesnac.DoUtils
+ v4.5.2
+ 512
+ true
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+ false
+
+
+
+ ..\PlugInPlatform\ICSharpCode.Core.dll
+
+
+ ..\PlugInPlatform\ICSharpCode.Data.Core.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Mesnac.DoUtils/Properties/AssemblyInfo.cs b/Mesnac.DoUtils/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..dab90a9
--- /dev/null
+++ b/Mesnac.DoUtils/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("Mesnac.DoUtils")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Mesnac.DoUtils")]
+[assembly: AssemblyCopyright("Copyright © 2023")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("ad132cad-5288-44dc-a38f-4b0658fc228c")]
+
+// 程序集的版本信息由下列四个值组成:
+//
+// 主版本
+// 次版本
+// 生成号
+// 修订号
+//
+//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
+//通过使用 "*"，如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Mesnac.DoUtils/enumInfo/DOName.cs b/Mesnac.DoUtils/enumInfo/DOName.cs
new file mode 100644
index 0000000..14a612b
--- /dev/null
+++ b/Mesnac.DoUtils/enumInfo/DOName.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.DoUtils.enumInfo
+{
+ public enum DOName
+ {
+ Red = 0x01,
+ Green = 0x02,
+ Buzzer = 0x03,
+ dO_4 = 0x04,
+ dO_5 = 0x05,
+ dO_6 = 0x06,
+ dO_7 = 0x07,
+ dO_8 = 0x08,
+ }
+}
diff --git a/Mesnac.DoUtils/enumInfo/DOOnOff.cs b/Mesnac.DoUtils/enumInfo/DOOnOff.cs
new file mode 100644
index 0000000..1457a15
--- /dev/null
+++ b/Mesnac.DoUtils/enumInfo/DOOnOff.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.DoUtils.enumInfo
+{
+ public enum DOOnOff
+ {
+ Off = 0x00,
+ On = 0x01
+ }
+}
diff --git a/Mesnac.PlcUtils/Impl/OmronNJPlc.cs b/Mesnac.PlcUtils/Impl/OmronNJPlc.cs
index de87a40..5ce008a 100644
--- a/Mesnac.PlcUtils/Impl/OmronNJPlc.cs
+++ b/Mesnac.PlcUtils/Impl/OmronNJPlc.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
namespace Mesnac.PlcUtils.Impl
{
- public class OmronNJPlc
+ public class OmronNJPlc:IPlc
{
private StringChange stringChange = StringChange.Instance;
diff --git a/SlnMix.VS2013.sln b/SlnMix.VS2013.sln
index 9e0c4ca..0dd68d4 100644
--- a/SlnMix.VS2013.sln
+++ b/SlnMix.VS2013.sln
@@ -162,6 +162,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PlcUtils", "PlcUtils", "{DE
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mesnac.PlcUtils", "Mesnac.PlcUtils\Mesnac.PlcUtils.csproj", "{88EAC8D1-8783-478C-AD9D-F916673B7004}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DoUtils", "DoUtils", "{9F21B6A6-9B19-4AAC-88EF-A430D8808540}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mesnac.DoUtils", "Mesnac.DoUtils\Mesnac.DoUtils.csproj", "{AD132CAD-5288-44DC-A38F-4B0658FC228C}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -328,6 +332,18 @@ Global
{88EAC8D1-8783-478C-AD9D-F916673B7004}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{88EAC8D1-8783-478C-AD9D-F916673B7004}.Release|x86.ActiveCfg = Release|Any CPU
{88EAC8D1-8783-478C-AD9D-F916673B7004}.Release|x86.Build.0 = Release|Any CPU
+ {AD132CAD-5288-44DC-A38F-4B0658FC228C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AD132CAD-5288-44DC-A38F-4B0658FC228C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AD132CAD-5288-44DC-A38F-4B0658FC228C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {AD132CAD-5288-44DC-A38F-4B0658FC228C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {AD132CAD-5288-44DC-A38F-4B0658FC228C}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {AD132CAD-5288-44DC-A38F-4B0658FC228C}.Debug|x86.Build.0 = Debug|Any CPU
+ {AD132CAD-5288-44DC-A38F-4B0658FC228C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AD132CAD-5288-44DC-A38F-4B0658FC228C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AD132CAD-5288-44DC-A38F-4B0658FC228C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {AD132CAD-5288-44DC-A38F-4B0658FC228C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {AD132CAD-5288-44DC-A38F-4B0658FC228C}.Release|x86.ActiveCfg = Release|Any CPU
+ {AD132CAD-5288-44DC-A38F-4B0658FC228C}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -357,6 +373,7 @@ Global
{D0C0324F-434E-47EB-8F7C-BA6CD7F233B4} = {DE938080-4A00-4686-9CE4-1C33FCA86346}
{6A2190C6-B530-4D5B-BD34-29EFB0431F67} = {66F3B234-E56C-4EF4-AB6D-BB6D91467855}
{88EAC8D1-8783-478C-AD9D-F916673B7004} = {DE8C4FC3-17D6-4217-8AB1-72ADE8D85810}
+ {AD132CAD-5288-44DC-A38F-4B0658FC228C} = {9F21B6A6-9B19-4AAC-88EF-A430D8808540}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {125BF7F5-E6EF-487C-B939-0631965DB3C1}