yangw
/
lj_plc
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep

Browse Source 
# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs
dep_nodyang
wangsr 1 year ago
parent e8899e6ec7 fad95ec358
commit 0cf3236699
21 changed files with 5129 additions and 4923 deletions
Show Stats Download Patch File Download Diff File

9138
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs
View File

File diff suppressed because it is too large Load Diff

2
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/PlcCommunicationUtil.cs
Unescape Escape View File

@ -4,7 +4,7 @@
namespace Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode
{
public class PlcCommunicationUtil
{
/// <summary>

2
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/MaterialInfoTypeHelp.cs
Unescape Escape View File

@ -107,7 +107,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial
{
string sql = @"update [lj_material] set
[MTypeId]=@MtypeId,
[MaterialName] = @MaterialName where id=@id";
[MaterialName] = @MaterialName where id=@id";
IDictionary<string, object> dic = new Dictionary<string, object>();
dic.Add("@MaterialName",materialinfoTypeName);

2
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/Db/LjFormulaDb.cs
Unescape Escape View File

@ -48,7 +48,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning.Db
public static List<MyNameValue> GetDrp()
{
string sql = "select Id, FormulaNo, FormulaName from Lj_Formula";
string sql = "select Id, FormulaNo, FormulaName from Lj_Formula where IsEnable = 1";
var dataTable = GetTable(sql);
List < MyNameValue> myNames=new List<MyNameValue>();
foreach (DataRow item in dataTable.Rows) {

41
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DelAction.cs
Unescape Escape View File

@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
using Mesnac.Action.Base;
@ -9,8 +10,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
{
private DbMCControl _materialGridControl = null; //物料列表控件
private RuntimeParameter _runtime;
public static event EventHandler OnDelete;
public void Run(RuntimeParameter runtime)
@ -24,19 +25,41 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
DataGridView clientGridView = this._materialGridControl.BaseControl as DataGridView;
//验证是否选中某物料
if (clientGridView.SelectedRows.Count != 1)
{
MessageBox.Show("请选择要修改的数据", Mesnac.Basic.LanguageHelper.Caption,
MessageBoxButtons.OK, MessageBoxIcon.Information);
MessageBox.Show("请选择要修改的数据", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information);
this._runtime.IsReturn = true;
return;
}
var dataGridViewRow = clientGridView.SelectedRows[0];
var id = Convert.ToInt32(dataGridViewRow.Cells["Id"].Value);
LjPlanningDb.SoftDel(id);
List<int> ls = new List<int>()
{
0
};
if (MessageBox.Show("确定删除？", "删除确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
var dataGridViewRow = clientGridView.SelectedRows[0];
var id = Convert.ToInt32(dataGridViewRow.Cells["Id"].Value);
var status=LjPlanningDb.GetStatusById(id);
if (ls.Contains(status))
{
LjPlanningDb.SoftDel(id);
}
else
{
MessageBox.Show("禁止删除");
}
}
else
{
return;
}
if (OnDelete != null)
{

53
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs
Unescape Escape View File

@ -12,6 +12,7 @@ using Mesnac.Action.ChemicalWeighing.LjMixManager;
using Mesnac.Action.ChemicalWeighing.LjPlanning.Db;
using Mesnac.Action.ChemicalWeighing.LjPlanning.Entity;
using Mesnac.Action.ChemicalWeighing.LjProdcutLine;
using DataBlockHelper.DBHelpers;
@ -48,9 +49,52 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
var id = Convert.ToInt32(dataGridViewRow.Cells["Id"].Value);
var ljPlanningView = LjPlanningDb.GetById(id);
if (MessageBox.Show("确定下传配方？", "下传确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
{
return;
}
LoadingHelper.ShowLoadingScreen();
//int unit = Convert.ToInt32(dataGridViewRow.Cells["Unit"].Value);
//DB2105Helper dB2105 = new DB2105Helper();
//bool isUnitOpen = false;
//switch (unit)
//{
// case 1:
// isUnitOpen = dB2105.Status[0];
// break;
// case 2:
// isUnitOpen = dB2105.Status[1];
// break;
// case 3:
// isUnitOpen = dB2105.Status[2];
// break;
// case 4:
// isUnitOpen = dB2105.Status[3];
// break;
// default:
// MessageBox.Show("产线编号不正确！");
// LoadingHelper.CloseForm();
// return;
//}
//if (isUnitOpen == false)
//{
// MessageBox.Show("产线未启动，无法下发！");
// LoadingHelper.CloseForm();
// return;
//}
var watchDog = LjHelp.WatchDog;
if (watchDog == 0)
{
@ -169,6 +213,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//把状态变成执行
LjPlanningDb.UpdateStatus(1, ljPlanningView.Id);
LjPlanningDb.UpdateBeginTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), ljPlanningView.Id);
break;
case 2:
@ -237,6 +285,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
plc.PlcWriteByDataKey(plc.Plan1_Start, new object[] { 1 });
//把状态变成执行
LjPlanningDb.UpdateStatus(1, ljPlanningView.Id);
LjPlanningDb.UpdateBeginTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), ljPlanningView.Id);
break;
case 3:
@ -292,6 +341,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
plc.PlcWriteByDataKey(plc.Plan2_Start, new object[] { 1 });
//把状态变成执行
LjPlanningDb.UpdateStatus(1, ljPlanningView.Id);
LjPlanningDb.UpdateBeginTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), ljPlanningView.Id);
break;
case 4:
@ -352,6 +402,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
plc.PlcWriteByDataKey(plc.Plan3_Start, new object[] { 1 });
//把状态变成执行
LjPlanningDb.UpdateStatus(1, ljPlanningView.Id);
LjPlanningDb.UpdateBeginTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), ljPlanningView.Id);
break;
}

74
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmPlanning.Designer.cs generated
Unescape Escape View File

@ -50,49 +50,48 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(77, 104);
this.label3.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
this.label3.Location = new System.Drawing.Point(113, 107);
this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(53, 18);
this.label3.Size = new System.Drawing.Size(35, 12);
this.label3.TabIndex = 49;
this.label3.Text = "配方:";
//
// DrpFormula
//
this.DrpFormula.FormattingEnabled = true;
this.DrpFormula.Location = new System.Drawing.Point(160, 96);
this.DrpFormula.Margin = new System.Windows.Forms.Padding(4);
this.DrpFormula.Location = new System.Drawing.Point(156, 104);
this.DrpFormula.Name = "DrpFormula";
this.DrpFormula.Size = new System.Drawing.Size(192, 26);
this.DrpFormula.Size = new System.Drawing.Size(129, 20);
this.DrpFormula.TabIndex = 52;
this.DrpFormula.SelectedIndexChanged += new System.EventHandler(this.DrpProductLine_SelectedIndexChanged);
//
// txtCarNumber
//
this.txtCarNumber.Location = new System.Drawing.Point(160, 162);
this.txtCarNumber.Margin = new System.Windows.Forms.Padding(8);
this.txtCarNumber.Location = new System.Drawing.Point(156, 141);
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(77, 172);
this.label2.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
this.label2.Location = new System.Drawing.Point(111, 144);
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 = "车次:";
//
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Location = new System.Drawing.Point(243, 413);
this.btnCancel.Margin = new System.Windows.Forms.Padding(8);
this.btnCancel.Location = new System.Drawing.Point(213, 262);
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;
@ -100,10 +99,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
// btnOK
//
this.btnOK.Location = new System.Drawing.Point(64, 413);
this.btnOK.Margin = new System.Windows.Forms.Padding(8);
this.btnOK.Location = new System.Drawing.Point(91, 262);
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;
@ -111,67 +110,65 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
// txtName
//
this.txtName.Location = new System.Drawing.Point(160, 46);
this.txtName.Margin = new System.Windows.Forms.Padding(8);
this.txtName.Location = new System.Drawing.Point(156, 69);
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 = 62;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(61, 50);
this.label1.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
this.label1.Location = new System.Drawing.Point(89, 72);
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 = 61;
this.label1.Text = "计划名称:";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(77, 231);
this.label4.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
this.label4.Location = new System.Drawing.Point(111, 182);
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 = 49;
this.label4.Text = "班次:";
//
// cbClass
//
this.cbClass.FormattingEnabled = true;
this.cbClass.Location = new System.Drawing.Point(160, 223);
this.cbClass.Margin = new System.Windows.Forms.Padding(4);
this.cbClass.Location = new System.Drawing.Point(156, 179);
this.cbClass.Name = "cbClass";
this.cbClass.Size = new System.Drawing.Size(192, 26);
this.cbClass.Size = new System.Drawing.Size(129, 20);
this.cbClass.TabIndex = 52;
this.cbClass.SelectedIndexChanged += new System.EventHandler(this.DrpProductLine_SelectedIndexChanged);
//
// cbUnit
//
this.cbUnit.FormattingEnabled = true;
this.cbUnit.Location = new System.Drawing.Point(160, 300);
this.cbUnit.Margin = new System.Windows.Forms.Padding(4);
this.cbUnit.Location = new System.Drawing.Point(156, 217);
this.cbUnit.Name = "cbUnit";
this.cbUnit.Size = new System.Drawing.Size(192, 26);
this.cbUnit.Size = new System.Drawing.Size(129, 20);
this.cbUnit.TabIndex = 64;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(77, 308);
this.label5.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
this.label5.Location = new System.Drawing.Point(111, 220);
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 = 63;
this.label5.Text = "产线:";
//
// 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(550, 633);
this.ClientSize = new System.Drawing.Size(417, 394);
this.Controls.Add(this.cbUnit);
this.Controls.Add(this.label5);
this.Controls.Add(this.txtName);
@ -184,6 +181,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.Controls.Add(this.label4);
this.Controls.Add(this.DrpFormula);
this.Controls.Add(this.label3);
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "FrmPlanning";
this.Text = "计划管理";
this.ResumeLayout(false);

293
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs generated
Unescape Escape View File

@ -71,25 +71,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.dataGridViewComboBoxColumn1 = new System.Windows.Forms.DataGridViewComboBoxColumn();
this.BtnSave = new System.Windows.Forms.Button();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.tabControl3 = new System.Windows.Forms.TabControl();
this.tabPage5 = new System.Windows.Forms.TabPage();
this.CbWeterH = new System.Windows.Forms.CheckBox();
this.label6 = new System.Windows.Forms.Label();
this.dataGridWeter1 = new System.Windows.Forms.DataGridView();
this.ComBoxWeter1Code = new System.Windows.Forms.DataGridViewComboBoxColumn();
this.ComBoxWeter1TimeInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxWeter1Temp = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxWeter1Speed = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxWeter1SetValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxWeter1SetTolerance = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.tabPage6 = new System.Windows.Forms.TabPage();
this.dataGridWeter2 = new System.Windows.Forms.DataGridView();
this.ComBoxWeter2Code = new System.Windows.Forms.DataGridViewComboBoxColumn();
this.ComBoxWeter2TimeInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxWeter2Temp = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxWeter2Speed = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxWeter2SetValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxWeter2SetTolerance = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.dataGridSiloH1 = new System.Windows.Forms.DataGridView();
@ -109,6 +90,25 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxDryer1TimeInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxDryer1Temp = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxDryer1Speed = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.tabControl3 = new System.Windows.Forms.TabControl();
this.tabPage5 = new System.Windows.Forms.TabPage();
this.CbWeterH = new System.Windows.Forms.CheckBox();
this.label6 = new System.Windows.Forms.Label();
this.dataGridWeter1 = new System.Windows.Forms.DataGridView();
this.ComBoxWeter1Code = new System.Windows.Forms.DataGridViewComboBoxColumn();
this.ComBoxWeter1TimeInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxWeter1Temp = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxWeter1Speed = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxWeter1SetValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxWeter1SetTolerance = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.tabPage6 = new System.Windows.Forms.TabPage();
this.dataGridWeter2 = new System.Windows.Forms.DataGridView();
this.ComBoxWeter2Code = new System.Windows.Forms.DataGridViewComboBoxColumn();
this.ComBoxWeter2TimeInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxWeter2Temp = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxWeter2Speed = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxWeter2SetValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxWeter2SetTolerance = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.BtnCanel = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
@ -124,11 +124,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.groupBox3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridDryer)).BeginInit();
this.groupBox5.SuspendLayout();
this.tabControl3.SuspendLayout();
this.tabPage5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridWeter1)).BeginInit();
this.tabPage6.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridWeter2)).BeginInit();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridSiloH1)).BeginInit();
@ -136,6 +131,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
((System.ComponentModel.ISupportInitialize)(this.dataGridSiloH2)).BeginInit();
this.groupBox7.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridDryer1Action)).BeginInit();
this.tabControl3.SuspendLayout();
this.tabPage5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridWeter1)).BeginInit();
this.tabPage6.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridWeter2)).BeginInit();
this.SuspendLayout();
//
// groupBox1
@ -215,7 +215,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.groupBox2.Controls.Add(this.groupBox3);
this.groupBox2.Location = new System.Drawing.Point(12, 76);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(445, 637);
this.groupBox2.Size = new System.Drawing.Size(445, 579);
this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "称量配方";
@ -227,7 +227,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabControl2.Location = new System.Drawing.Point(6, 212);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
this.tabControl2.Size = new System.Drawing.Size(433, 419);
this.tabControl2.Size = new System.Drawing.Size(433, 363);
this.tabControl2.TabIndex = 1;
//
// tabPage3
@ -242,13 +242,14 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage3.TabIndex = 0;
this.tabPage3.Text = "糊化机(#A)";
this.tabPage3.UseVisualStyleBackColor = true;
this.tabPage3.Click += new System.EventHandler(this.tabPage3_Click);
//
// groupBox6
//
this.groupBox6.Controls.Add(this.dataGridWater1);
this.groupBox6.Location = new System.Drawing.Point(6, 225);
this.groupBox6.Location = new System.Drawing.Point(3, 168);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(413, 161);
this.groupBox6.Size = new System.Drawing.Size(419, 165);
this.groupBox6.TabIndex = 71;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "水称";
@ -260,11 +261,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxSilo1BinWater,
this.TxtSilo1WeightWater,
this.TxtSilo1ToleranceWater});
this.dataGridWater1.Location = new System.Drawing.Point(6, 20);
this.dataGridWater1.Location = new System.Drawing.Point(4, 20);
this.dataGridWater1.Name = "dataGridWater1";
this.dataGridWater1.RowHeadersWidth = 62;
this.dataGridWater1.RowTemplate.Height = 23;
this.dataGridWater1.Size = new System.Drawing.Size(401, 136);
this.dataGridWater1.Size = new System.Drawing.Size(410, 139);
this.dataGridWater1.TabIndex = 69;
this.dataGridWater1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWater1_DefaultValuesNeeded);
//
@ -314,7 +315,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.dataGridSilo1.Name = "dataGridSilo1";
this.dataGridSilo1.RowHeadersWidth = 62;
this.dataGridSilo1.RowTemplate.Height = 23;
this.dataGridSilo1.Size = new System.Drawing.Size(414, 191);
this.dataGridSilo1.Size = new System.Drawing.Size(414, 134);
this.dataGridSilo1.TabIndex = 63;
this.dataGridSilo1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSilo_DefaultValuesNeeded);
//
@ -357,9 +358,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// groupBox4
//
this.groupBox4.Controls.Add(this.dataGridWater2);
this.groupBox4.Location = new System.Drawing.Point(7, 217);
this.groupBox4.Location = new System.Drawing.Point(3, 171);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(413, 132);
this.groupBox4.Size = new System.Drawing.Size(419, 163);
this.groupBox4.TabIndex = 73;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "水称";
@ -371,11 +372,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxSilo2BinWater,
this.TxtSilo2WeightWater,
this.TxtSilo2ToleranceWater});
this.dataGridWater2.Location = new System.Drawing.Point(6, 20);
this.dataGridWater2.Location = new System.Drawing.Point(3, 20);
this.dataGridWater2.Name = "dataGridWater2";
this.dataGridWater2.RowHeadersWidth = 62;
this.dataGridWater2.RowTemplate.Height = 23;
this.dataGridWater2.Size = new System.Drawing.Size(400, 97);
this.dataGridWater2.Size = new System.Drawing.Size(410, 137);
this.dataGridWater2.TabIndex = 69;
this.dataGridWater2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWater2_DefaultValuesNeeded);
//
@ -410,11 +411,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxSilo2Bin,
this.TxtSilo2Weight,
this.TxtSilo2Tolerance});
this.dataGridSilo2.Location = new System.Drawing.Point(3, 8);
this.dataGridSilo2.Location = new System.Drawing.Point(6, 8);
this.dataGridSilo2.Name = "dataGridSilo2";
this.dataGridSilo2.RowHeadersWidth = 62;
this.dataGridSilo2.RowTemplate.Height = 23;
this.dataGridSilo2.Size = new System.Drawing.Size(420, 203);
this.dataGridSilo2.Size = new System.Drawing.Size(414, 157);
this.dataGridSilo2.TabIndex = 72;
this.dataGridSilo2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSilo2_DefaultValuesNeeded);
//
@ -506,7 +507,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
// BtnSave
//
this.BtnSave.Location = new System.Drawing.Point(88, 719);
this.BtnSave.Location = new System.Drawing.Point(917, 711);
this.BtnSave.Name = "BtnSave";
this.BtnSave.Size = new System.Drawing.Size(119, 47);
this.BtnSave.TabIndex = 2;
@ -516,12 +517,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
// groupBox5
//
this.groupBox5.Controls.Add(this.tabControl3);
this.groupBox5.Controls.Add(this.tabControl1);
this.groupBox5.Controls.Add(this.groupBox7);
this.groupBox5.Location = new System.Drawing.Point(463, 76);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(721, 692);
this.groupBox5.Size = new System.Drawing.Size(588, 579);
this.groupBox5.TabIndex = 3;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "混合配方";
@ -720,7 +720,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabControl1.Location = new System.Drawing.Point(6, 232);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(709, 197);
this.tabControl1.Size = new System.Drawing.Size(577, 343);
this.tabControl1.TabIndex = 4;
//
// tabPage1
@ -742,11 +742,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxSilo1TimeInfo,
this.ComBoxSilo1Temp,
this.ComBoxSilo1Speed});
this.dataGridSiloH1.Location = new System.Drawing.Point(6, 9);
this.dataGridSiloH1.Location = new System.Drawing.Point(3, 3);
this.dataGridSiloH1.Name = "dataGridSiloH1";
this.dataGridSiloH1.RowHeadersWidth = 62;
this.dataGridSiloH1.RowTemplate.Height = 23;
this.dataGridSiloH1.Size = new System.Drawing.Size(689, 155);
this.dataGridSiloH1.Size = new System.Drawing.Size(563, 311);
this.dataGridSiloH1.TabIndex = 66;
this.dataGridSiloH1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSiloH1_DefaultValuesNeeded);
//
@ -806,7 +806,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.dataGridSiloH2.Name = "dataGridSiloH2";
this.dataGridSiloH2.RowHeadersWidth = 62;
this.dataGridSiloH2.RowTemplate.Height = 23;
this.dataGridSiloH2.Size = new System.Drawing.Size(695, 165);
this.dataGridSiloH2.Size = new System.Drawing.Size(563, 311);
this.dataGridSiloH2.TabIndex = 64;
this.dataGridSiloH2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSiloH2_DefaultValuesNeeded);
//
@ -847,7 +847,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.groupBox7.Controls.Add(this.dataGridDryer1Action);
this.groupBox7.Location = new System.Drawing.Point(6, 20);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(709, 208);
this.groupBox7.Size = new System.Drawing.Size(573, 208);
this.groupBox7.TabIndex = 0;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "干混机(#A)";
@ -864,7 +864,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.dataGridDryer1Action.Name = "dataGridDryer1Action";
this.dataGridDryer1Action.RowHeadersWidth = 62;
this.dataGridDryer1Action.RowTemplate.Height = 23;
this.dataGridDryer1Action.Size = new System.Drawing.Size(702, 189);
this.dataGridDryer1Action.Size = new System.Drawing.Size(564, 189);
this.dataGridDryer1Action.TabIndex = 63;
this.dataGridDryer1Action.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridDryer1Action_DefaultValuesNeeded);
//
@ -902,9 +902,196 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxDryer1Speed.Name = "ComBoxDryer1Speed";
this.ComBoxDryer1Speed.Width = 150;
//
// tabControl3
//
this.tabControl3.Controls.Add(this.tabPage5);
this.tabControl3.Controls.Add(this.tabPage6);
this.tabControl3.Location = new System.Drawing.Point(12, 661);
this.tabControl3.Name = "tabControl3";
this.tabControl3.SelectedIndex = 0;
this.tabControl3.Size = new System.Drawing.Size(879, 256);
this.tabControl3.TabIndex = 5;
//
// tabPage5
//
this.tabPage5.Controls.Add(this.CbWeterH);
this.tabPage5.Controls.Add(this.label6);
this.tabPage5.Controls.Add(this.dataGridWeter1);
this.tabPage5.Location = new System.Drawing.Point(4, 22);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(871, 230);
this.tabPage5.TabIndex = 0;
this.tabPage5.Text = "湿混机(#A)";
this.tabPage5.UseVisualStyleBackColor = true;
//
// CbWeterH
//
this.CbWeterH.AutoSize = true;
this.CbWeterH.Location = new System.Drawing.Point(5, 7);
this.CbWeterH.Name = "CbWeterH";
this.CbWeterH.Size = new System.Drawing.Size(138, 16);
this.CbWeterH.TabIndex = 70;
this.CbWeterH.Text = "复制湿混机A混合配方";
this.CbWeterH.UseVisualStyleBackColor = true;
this.CbWeterH.CheckedChanged += new System.EventHandler(this.CbWeterH_CheckedChanged);
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(147, 7);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(191, 12);
this.label6.TabIndex = 69;
this.label6.Text = "如果湿混机B采用相同的配方请勾选";
//
// dataGridWeter1
//
this.dataGridWeter1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridWeter1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.ComBoxWeter1Code,
this.ComBoxWeter1TimeInfo,
this.ComBoxWeter1Temp,
this.ComBoxWeter1Speed,
this.ComBoxWeter1SetValue,
this.ComBoxWeter1SetTolerance});
this.dataGridWeter1.Location = new System.Drawing.Point(6, 28);
this.dataGridWeter1.Name = "dataGridWeter1";
this.dataGridWeter1.RowHeadersWidth = 62;
this.dataGridWeter1.RowTemplate.Height = 23;
this.dataGridWeter1.Size = new System.Drawing.Size(857, 196);
this.dataGridWeter1.TabIndex = 64;
this.dataGridWeter1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWeter1_DefaultValuesNeeded_1);
//
// ComBoxWeter1Code
//
this.ComBoxWeter1Code.HeaderText = "动作";
this.ComBoxWeter1Code.MinimumWidth = 8;
this.ComBoxWeter1Code.Name = "ComBoxWeter1Code";
this.ComBoxWeter1Code.Width = 150;
//
// ComBoxWeter1TimeInfo
//
this.ComBoxWeter1TimeInfo.DataPropertyName = "TimeInfo";
this.ComBoxWeter1TimeInfo.HeaderText = "时间";
this.ComBoxWeter1TimeInfo.MaxInputLength = 100;
this.ComBoxWeter1TimeInfo.MinimumWidth = 8;
this.ComBoxWeter1TimeInfo.Name = "ComBoxWeter1TimeInfo";
this.ComBoxWeter1TimeInfo.Width = 95;
//
// ComBoxWeter1Temp
//
this.ComBoxWeter1Temp.DataPropertyName = "Temp";
this.ComBoxWeter1Temp.HeaderText = "温度";
this.ComBoxWeter1Temp.MinimumWidth = 8;
this.ComBoxWeter1Temp.Name = "ComBoxWeter1Temp";
this.ComBoxWeter1Temp.Width = 95;
//
// ComBoxWeter1Speed
//
this.ComBoxWeter1Speed.DataPropertyName = "Speed";
this.ComBoxWeter1Speed.HeaderText = "速度";
this.ComBoxWeter1Speed.MinimumWidth = 8;
this.ComBoxWeter1Speed.Name = "ComBoxWeter1Speed";
this.ComBoxWeter1Speed.Width = 150;
//
// ComBoxWeter1SetValue
//
this.ComBoxWeter1SetValue.DataPropertyName = "SetValue";
this.ComBoxWeter1SetValue.HeaderText = "设定重量";
this.ComBoxWeter1SetValue.MinimumWidth = 8;
this.ComBoxWeter1SetValue.Name = "ComBoxWeter1SetValue";
this.ComBoxWeter1SetValue.Width = 150;
//
// ComBoxWeter1SetTolerance
//
this.ComBoxWeter1SetTolerance.DataPropertyName = "SetTolerance";
this.ComBoxWeter1SetTolerance.HeaderText = "设定公差";
this.ComBoxWeter1SetTolerance.MinimumWidth = 8;
this.ComBoxWeter1SetTolerance.Name = "ComBoxWeter1SetTolerance";
this.ComBoxWeter1SetTolerance.Width = 150;
//
// tabPage6
//
this.tabPage6.Controls.Add(this.dataGridWeter2);
this.tabPage6.Location = new System.Drawing.Point(4, 22);
this.tabPage6.Name = "tabPage6";
this.tabPage6.Padding = new System.Windows.Forms.Padding(3);
this.tabPage6.Size = new System.Drawing.Size(871, 230);
this.tabPage6.TabIndex = 1;
this.tabPage6.Text = "湿混机(#B)";
this.tabPage6.UseVisualStyleBackColor = true;
//
// dataGridWeter2
//
this.dataGridWeter2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridWeter2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.ComBoxWeter2Code,
this.ComBoxWeter2TimeInfo,
this.ComBoxWeter2Temp,
this.ComBoxWeter2Speed,
this.ComBoxWeter2SetValue,
this.ComBoxWeter2SetTolerance});
this.dataGridWeter2.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridWeter2.Location = new System.Drawing.Point(3, 3);
this.dataGridWeter2.Name = "dataGridWeter2";
this.dataGridWeter2.RowHeadersWidth = 62;
this.dataGridWeter2.RowTemplate.Height = 23;
this.dataGridWeter2.Size = new System.Drawing.Size(865, 224);
this.dataGridWeter2.TabIndex = 65;
this.dataGridWeter2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWeter2_DefaultValuesNeeded);
//
// ComBoxWeter2Code
//
this.ComBoxWeter2Code.HeaderText = "动作";
this.ComBoxWeter2Code.MinimumWidth = 8;
this.ComBoxWeter2Code.Name = "ComBoxWeter2Code";
this.ComBoxWeter2Code.Width = 150;
//
// ComBoxWeter2TimeInfo
//
this.ComBoxWeter2TimeInfo.DataPropertyName = "TimeInfo";
this.ComBoxWeter2TimeInfo.HeaderText = "时间";
this.ComBoxWeter2TimeInfo.MaxInputLength = 100;
this.ComBoxWeter2TimeInfo.MinimumWidth = 8;
this.ComBoxWeter2TimeInfo.Name = "ComBoxWeter2TimeInfo";
this.ComBoxWeter2TimeInfo.Width = 95;
//
// ComBoxWeter2Temp
//
this.ComBoxWeter2Temp.DataPropertyName = "Temp";
this.ComBoxWeter2Temp.HeaderText = "温度";
this.ComBoxWeter2Temp.MinimumWidth = 8;
this.ComBoxWeter2Temp.Name = "ComBoxWeter2Temp";
this.ComBoxWeter2Temp.Width = 95;
//
// ComBoxWeter2Speed
//
this.ComBoxWeter2Speed.DataPropertyName = "Speed";
this.ComBoxWeter2Speed.HeaderText = "速度";
this.ComBoxWeter2Speed.MinimumWidth = 8;
this.ComBoxWeter2Speed.Name = "ComBoxWeter2Speed";
this.ComBoxWeter2Speed.Width = 150;
//
// ComBoxWeter2SetValue
//
this.ComBoxWeter2SetValue.DataPropertyName = "SetValue";
this.ComBoxWeter2SetValue.HeaderText = "设定重量";
this.ComBoxWeter2SetValue.MinimumWidth = 8;
this.ComBoxWeter2SetValue.Name = "ComBoxWeter2SetValue";
this.ComBoxWeter2SetValue.Width = 150;
//
// ComBoxWeter2SetTolerance
//
this.ComBoxWeter2SetTolerance.DataPropertyName = "SetTolerance";
this.ComBoxWeter2SetTolerance.HeaderText = "设定公差";
this.ComBoxWeter2SetTolerance.MinimumWidth = 8;
this.ComBoxWeter2SetTolerance.Name = "ComBoxWeter2SetTolerance";
this.ComBoxWeter2SetTolerance.Width = 150;
//
// BtnCanel
//
this.BtnCanel.Location = new System.Drawing.Point(258, 719);
this.BtnCanel.Location = new System.Drawing.Point(917, 828);
this.BtnCanel.Name = "BtnCanel";
this.BtnCanel.Size = new System.Drawing.Size(119, 47);
this.BtnCanel.TabIndex = 2;
@ -941,12 +1128,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.groupBox3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridDryer)).EndInit();
this.groupBox5.ResumeLayout(false);
this.tabControl3.ResumeLayout(false);
this.tabPage5.ResumeLayout(false);
this.tabPage5.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridWeter1)).EndInit();
this.tabPage6.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridWeter2)).EndInit();
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridSiloH1)).EndInit();
@ -954,6 +1135,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
((System.ComponentModel.ISupportInitialize)(this.dataGridSiloH2)).EndInit();
this.groupBox7.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridDryer1Action)).EndInit();
this.tabControl3.ResumeLayout(false);
this.tabPage5.ResumeLayout(false);
this.tabPage5.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridWeter1)).EndInit();
this.tabPage6.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridWeter2)).EndInit();
this.ResumeLayout(false);
}

33
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs
Unescape Escape View File

@ -29,7 +29,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public FrmWeiRecipeDataAdd()
{
InitializeComponent();
Init();
FillDryer();
FillSilo();
@ -39,6 +41,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
FillDataGridDryer1Action();
//糊化
FillDataGridSilo1Action();
FillDataGridWeter1Action();
@ -287,7 +290,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
DrpCpType.ValueMember = "Id";
DrpCpType.DisplayMember = "Name";
var ls = new List<MyNameValue>();
string sql = "select recipetype_Id as Id,recipetype_Name as Name from Base_RecipeType";
string sql = "select recipetype_Id as Id,recipetype_Name as Name from Base_RecipeType";
var dataTable = DBHelp.GetTable(sql);
var dr = dataTable.Rows;
@ -332,15 +335,19 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
private List<MyNameValue> GetAction(int deviceUnitId)
{
string sql = "select ActionCode.id,code,ActionName,ActionCode.Remark,DeviceUnitId,DeviceUnit.Name\r\n from ActionCode\r\n left join DeviceUnit on ActionCode.DeviceUnitId = DeviceUnit.Id ";
string sql = "select ActionCode.id, code, ActionName, ActionCode.Remark, DeviceUnitId, DeviceUnit.Name \r\n " +
" from ActionCode\r\n " +
" left join DeviceUnit on ActionCode.DeviceUnitId = DeviceUnit.Id where IsEnable=1";
if(deviceUnitId > 0)
{
sql += " where DeviceUnitId=" + deviceUnitId ;
sql += " and DeviceUnitId=" + deviceUnitId ;
sql += " order by code";
}
sql += " order by code";
var dataTable = DBHelp.GetTable(sql);
List<MyNameValue> ls = new List<MyNameValue>();
foreach (DataRow o in dataTable.Rows)
@ -358,7 +365,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
private DataRow GetCodeActionById(int id)
{
string sql = "select code as Code,ActionName as Name from ActionCode where Id=" + id;
string sql = "select code as Code, ActionName as Name from ActionCode where Id=" + id;
var dataTable = DBHelp.GetTable(sql);
return dataTable.Rows[0];
@ -431,7 +438,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
DataGridViewComboBoxColumn comboxWater2 = dataGridWater2.Columns["ComBoxSilo2BinWater"] as DataGridViewComboBoxColumn;
var comboxWater2List = GetStockMaterrial(1);
var comboxWater2List = GetStockMaterrial(4);
comboxWater2.DataSource = comboxWater2List;
comboxWater2.DisplayMember = "Name";
comboxWater2.ValueMember = "Id";
@ -473,15 +480,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//干混机
List<ClEntity> clDry = GetClEnity(dataGridDryer);
if (clDry.Count == 0)
{
MessageBox.Show("");
return;
}
else
{
//
}
//湿混机1
List<ClEntity> clSoil1 = GetClEnity(dataGridSilo1);
@ -1151,11 +1150,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
}
}
private void FrmWeiRecipeDataAdd_Load(object sender, EventArgs e)
private void tabPage3_Click(object sender, EventArgs e)
{
}
}

100
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.resx
Unescape Escape View File

@ -207,148 +207,136 @@
<metadata name="TxtDryer1Tolerance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter1Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter1TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter1Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter1Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter1SetValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxSilo1Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter1SetTolerance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxSilo1TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter1Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxSilo1Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter1TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxSilo1Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter1Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxSilo2Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter1Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxSilo2TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter1SetValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxSilo2Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter1SetTolerance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxSilo2Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter2Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxSilo2Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter2TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxSilo2TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter2Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxSilo2Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter2Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxSilo2Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter2SetValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxDryer1Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter2SetTolerance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxDryer1TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter2Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxDryer1Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter2TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxDryer1Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter2Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxDryer1Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter2Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxDryer1TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter2SetValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxDryer1Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter2SetTolerance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxDryer1Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter1Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter1TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter1Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter1Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter1SetValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter1SetTolerance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter1Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter1TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo2Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter1Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo2TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter1Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo2Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter1SetValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo2Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter1SetTolerance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo2Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter2Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo2TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter2TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo2Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter2Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo2Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter2Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxDryer1Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter2SetValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxDryer1TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter2SetTolerance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxDryer1Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter2Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxDryer1Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter2TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxDryer1Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter2Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxDryer1TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter2Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxDryer1Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter2SetValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxDryer1Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxWeter2SetTolerance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>

21
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/InItDbAction.cs
Unescape Escape View File

@ -20,6 +20,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this._runtime = runtime;
AddAction.OnAdd -= Process_Event;
AddAction.OnAdd += Process_Event;
@ -30,19 +31,35 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
DownloadAction.OnDown -= Process_Event;
DownloadAction.OnDown += Process_Event;
//SelectAction.OnSelect -= Process_Event;
//SelectAction.OnSelect += Process_Event;
DbMCControl materialGridControl =
this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "lj_planning")
.FirstOrDefault(); //获取物料数据控件
this._materialGridControl = materialGridControl;
List<DbMCControl> mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件
IBaseControl startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "startdate").FirstOrDefault().BaseControl;
startdate.MCValue = DateTime.Now.AddDays(-7);
PlanStatus = mcControllist.FirstOrDefault(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey == "PlanStatus").BaseControl as MCCombobox;
String sql = @"select statusid as CmbValue ,statusname as CmbDisplay from lj_planning_status";
DataTable dataTable = DBHelp.GetTable(sql);
string sql = @"select statusid as CmbValue ,statusname as CmbDisplay from lj_planning_status";
DataTable dataTable = DBHelp.GetTable(sql);
var dr = dataTable.NewRow();
dr[0] = "-2";
dr[1] = "全部";
dataTable.Rows.InsertAt(dr, 0);
PlanStatus.DataSource = dataTable;
FileControl();
}

22
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningDb.cs
Unescape Escape View File

@ -77,7 +77,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
/// <returns></returns>
public static int GetStatusById(int id)
{
string sql = $"select Id, No, Status from lj_planning where id={id}";
string sql = $"select Status from lj_planning where id={id}";
DataTable dt = GetTable(sql);
if (dt.Rows.Count == 1)
{
@ -94,11 +94,21 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
ExecuteNonQuery(sql);
return 1;
}
public static int UpdateBeginTime(string begTime, int id)
{
string sql = $"update lj_planning set BegTime='{begTime}' where id={id}";
ExecuteNonQuery(sql);
return 1;
}
//
public static LjPlanningView GetById(int id)
{
string sql = $"select Id, PlanNo, Status, CreateTime, UpdateTime, BegTime, EndTime, NumCar, Unit, Remark, IsEnable, FormulaId, FormulaName, PlanName, ClassName from lj_planning where Id = " + id;

59
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/SelectAction.cs
Unescape Escape View File

@ -6,12 +6,15 @@ using System.Data;
using System.Linq;
using System.Text;
using Mesnac.Codd.Session;
using Mesnac.Controls.Default;
using Mesnac.Action.ChemicalWeighing.LjMaterial;
namespace Mesnac.Action.ChemicalWeighing.LjPlanning
{
public class SelectAction : ChemicalWeighingAction, IAction
{
//public static event EventHandler OnSelect;
private DbMCControl _materialGridControl = null; //物料列表控件
private RuntimeParameter _runtime;
public void Run(RuntimeParameter runtime)
@ -27,6 +30,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
StringBuilder sbSql = new StringBuilder(@" select Id, PlanName, PlanNo, Status, CreateTime, UpdateTime, BegTime, EndTime, NumCar, Unit, Remark, IsEnable, FormulaId, FormulaName,'' as StatusName
,ClassName from lj_planning where IsEnable=1");
List<DbMCControl> mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件
IBaseControl startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "startdate").FirstOrDefault().BaseControl;
@ -51,14 +58,60 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
ICSharpCode.Core.LoggingService<SelectAction>.Debug("{榄菊计划报表查询} 缺少key值为enddate的时间查询条件...");
return;
}
sbSql.Append(" ORDER BY CreateTime desc");
MCCombobox PlanStatus = mcControllist.FirstOrDefault(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey == "PlanStatus").BaseControl as MCCombobox;
if (Convert.ToString(PlanStatus.MCValue) != "-2")
{
sbSql.Append(@" and Status = " + PlanStatus.MCValue);
}
sbSql.Append(@" ORDER BY CreateTime desc");
dbHelper.CommandText = sbSql.ToString();
dbHelper.CommandType = System.Data.CommandType.Text;
DataTable table = dbHelper.ToDataTable();
if (table.Columns["StatusName"].ReadOnly)
{
table.Columns["StatusName"].ReadOnly = false;
}
table.Columns["StatusName"].MaxLength = 20;
//-1 任务暂停 0 新建任务 1 任务下发 2 重发 3执行中 10 任务完成 11 放弃 20 异常
foreach (DataRow tableRow in table.Rows)
{
int status = Convert.ToInt32(tableRow["Status"].ToString());
string statusName = "";
switch (status)
{
case -1:
statusName = "任务暂停";
break;
case 0:
statusName = "新建任务";
break;
case 1:
statusName = "任务下发";
break;
case 2:
statusName = "重发";
break;
case 3:
statusName = "执行中";
break;
case 10:
statusName = "任务完成";
break;
case 20:
statusName = "异常";
break;
}
tableRow["StatusName"] = statusName;
}
_materialGridControl.BaseControl.BindDataSource = table;

113
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
Unescape Escape View File

@ -234,79 +234,6 @@
<Compile Include="DeviceParamManage\InitDeviceParamInfo.cs" />
<Compile Include="DeviceParamManage\SelectDeviceParamInfo.cs" />
<Compile Include="DeviceParamManage\WriteDeviceParamInfo.cs" />
<Compile Include="EngineeringDebuggingMode\ElectronicMachineryDataStateMonitor\ElectronicMachineryDataStateMonitor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="EngineeringDebuggingMode\ElectronicMachineryDataStateMonitor\ElectronicMachineryDataStateMonitor.Designer.cs">
<DependentUpon>ElectronicMachineryDataStateMonitor.cs</DependentUpon>
</Compile>
<Compile Include="EngineeringDebuggingMode\MotorInitStateMonitor\MotorInitStateMonitor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="EngineeringDebuggingMode\MotorInitStateMonitor\MotorInitStateMonitor.Designer.cs">
<DependentUpon>MotorInitStateMonitor.cs</DependentUpon>
</Compile>
<Compile Include="EngineeringDebuggingMode\ParametersWithPCStateMonitor\ParametersWithPCStateMonitor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="EngineeringDebuggingMode\ParametersWithPCStateMonitor\ParametersWithPCStateMonitor.Designer.cs">
<DependentUpon>ParametersWithPCStateMonitor.cs</DependentUpon>
</Compile>
<Compile Include="EngineeringDebuggingMode\ParametersWithPCStateMonitor\ParametersWithPCStateMonitor_Normal_HMI.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="EngineeringDebuggingMode\ParametersWithPCStateMonitor\ParametersWithPCStateMonitor_Normal_HMI.Designer.cs">
<DependentUpon>ParametersWithPCStateMonitor_Normal_HMI.cs</DependentUpon>
</Compile>
<Compile Include="EngineeringDebuggingMode\ParametersWithPCStateMonitor\ParametersWithPCStateMonitor_Para.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="EngineeringDebuggingMode\ParametersWithPCStateMonitor\ParametersWithPCStateMonitor_Para.Designer.cs">
<DependentUpon>ParametersWithPCStateMonitor_Para.cs</DependentUpon>
</Compile>
<Compile Include="EngineeringDebuggingMode\x-Contorl\ElectronicMachinery\ElectronicMachinery.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="EngineeringDebuggingMode\x-Contorl\ElectronicMachinery\ElectronicMachinery.Designer.cs">
<DependentUpon>ElectronicMachinery.cs</DependentUpon>
</Compile>
<Compile Include="EngineeringDebuggingMode\x-Contorl\ElectronicMachinery\ElectronicMachinery_2.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="EngineeringDebuggingMode\x-Contorl\ElectronicMachinery\ElectronicMachinery_2.Designer.cs">
<DependentUpon>ElectronicMachinery_2.cs</DependentUpon>
</Compile>
<Compile Include="EngineeringDebuggingMode\x-Contorl\ElectronicMachinery\ElectronicMachinery_3.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="EngineeringDebuggingMode\x-Contorl\ElectronicMachinery\ElectronicMachinery_3.Designer.cs">
<DependentUpon>ElectronicMachinery_3.cs</DependentUpon>
</Compile>
<Compile Include="EngineeringDebuggingMode\InstrumentDataStateMonitor\InstrumentDataStateMonitor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="EngineeringDebuggingMode\InstrumentDataStateMonitor\InstrumentDataStateMonitor.Designer.cs">
<DependentUpon>InstrumentDataStateMonitor.cs</DependentUpon>
</Compile>
<Compile Include="EngineeringDebuggingMode\ValveInitStateMonitor\ValveInitStateMonitor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="EngineeringDebuggingMode\ValveInitStateMonitor\ValveInitStateMonitor.Designer.cs">
<DependentUpon>ValveInitStateMonitor.cs</DependentUpon>
</Compile>
<Compile Include="EngineeringDebuggingMode\PlcCommunicationUtil.cs" />
<Compile Include="EngineeringDebuggingMode\x-Contorl\ValveStateControl\ValveStateControl.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="EngineeringDebuggingMode\x-Contorl\ValveStateControl\ValveStateControl.Designer.cs">
<DependentUpon>ValveStateControl.cs</DependentUpon>
</Compile>
<Compile Include="EngineeringDebuggingMode\ValveDataStateMonitor\ValveStateMonitor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="EngineeringDebuggingMode\ValveDataStateMonitor\ValveStateMonitor.Designer.cs">
<DependentUpon>ValveStateMonitor.cs</DependentUpon>
</Compile>
<Compile Include="Entity\RecordSaveDataInfo.cs" />
<Compile Include="Entity\Report\LR_BarcodeLog.cs" />
<Compile Include="Entity\Report\Report_GelDoser.cs" />
@ -575,7 +502,7 @@
<Compile Include="MaterialManage\MaterialHelper.cs" />
<Compile Include="MaterialManage\ModifyMaterialAction.cs" />
<Compile Include="OliveEQSetting\InItDbAction.cs" />
<Compile Include="Pl\Class1.cs" />
<Compile Include="Pl\PlcConnect.cs" />
<Compile Include="Product\PptPlan\entity\Base_PlanInfo.cs" />
<Compile Include="Product\PptPlan\FrmBudget.cs">
<SubType>Form</SubType>
@ -795,44 +722,6 @@
<EmbeddedResource Include="BinManage\FrmBin.resx">
<DependentUpon>FrmBin.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="EngineeringDebuggingMode\ElectronicMachineryDataStateMonitor\ElectronicMachineryDataStateMonitor.resx">
<DependentUpon>ElectronicMachineryDataStateMonitor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="EngineeringDebuggingMode\MotorInitStateMonitor\MotorInitStateMonitor.resx">
<DependentUpon>MotorInitStateMonitor.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="EngineeringDebuggingMode\ParametersWithPCStateMonitor\ParametersWithPCStateMonitor.resx">
<DependentUpon>ParametersWithPCStateMonitor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="EngineeringDebuggingMode\ParametersWithPCStateMonitor\ParametersWithPCStateMonitor_Normal_HMI.resx">
<DependentUpon>ParametersWithPCStateMonitor_Normal_HMI.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="EngineeringDebuggingMode\ParametersWithPCStateMonitor\ParametersWithPCStateMonitor_Para.resx">
<DependentUpon>ParametersWithPCStateMonitor_Para.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="EngineeringDebuggingMode\ValveInitStateMonitor\ValveInitStateMonitor.resx">
<DependentUpon>ValveInitStateMonitor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="EngineeringDebuggingMode\x-Contorl\ElectronicMachinery\ElectronicMachinery.resx">
<DependentUpon>ElectronicMachinery.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="EngineeringDebuggingMode\x-Contorl\ElectronicMachinery\ElectronicMachinery_2.resx">
<DependentUpon>ElectronicMachinery_2.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="EngineeringDebuggingMode\x-Contorl\ElectronicMachinery\ElectronicMachinery_3.resx">
<DependentUpon>ElectronicMachinery_3.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="EngineeringDebuggingMode\InstrumentDataStateMonitor\InstrumentDataStateMonitor.resx">
<DependentUpon>InstrumentDataStateMonitor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="EngineeringDebuggingMode\x-Contorl\ValveStateControl\ValveStateControl.resx">
<DependentUpon>ValveStateControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="EngineeringDebuggingMode\ValveDataStateMonitor\ValveStateMonitor.resx">
<DependentUpon>ValveStateMonitor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="LjDevice\FrmDevice.resx">
<DependentUpon>FrmDevice.cs</DependentUpon>
</EmbeddedResource>

4
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Pl/Class1.cs → Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Pl/PlcConnect.cs
Unescape Escape View File

@ -21,14 +21,14 @@ namespace Mesnac.Action.ChemicalWeighing.Pl
}
private SiemensS7Net SiemensS7NetConnection()
{
SiemensPLCS siemensPLCS = SiemensPLCS.S1500;
SiemensS7Net s7 = new SiemensS7Net(siemensPLCS);
s7.IpAddress ="192.168.1.50";
s7.IpAddress ="172.18.4.100";
s7.Port =102;
s7.ConnectServer();
return s7;

9
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
Unescape Escape View File

@ -7,14 +7,7 @@ using System.Text;
using System.Windows.Forms;
using ICSharpCode.Core;
using Mesnac.Action.Base;
using Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode.ElectronicMachinaryStateMonitor;
using Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode.ElectronicMachinery;
using Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode.InstrumentDataStateMonitor;
using Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode.MotorInitStateMonitor;
using Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode.NewFolder1;
using Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode.ParametersWithPCStateMonitor;
using Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode.ValveStateControl;
using Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode.ValveStateMonitor;
using Mesnac.Action.ChemicalWeighing.Entity;
using Mesnac.Action.ChemicalWeighing.FreeDb;
using Mesnac.Action.ChemicalWeighing.LjMetageFormula;

2
DataBlockHelper/PlcConnect.cs
Unescape Escape View File

@ -31,7 +31,7 @@ namespace DataBlockHelper
{
SiemensPLCS siemensPLCS = SiemensPLCS.S1500;
SiemensS7Net s7 = new SiemensS7Net(siemensPLCS);
s7.IpAddress = "192.168.1.50";
s7.IpAddress = "172.18.4.100";
s7.Port = 102;
s7.ConnectServer();
return s7;

2
Main/MCEdit/Data/MCProject/nodeDevice.xml
Unescape Escape View File

@ -7,7 +7,7 @@
<ReadHz value="2000" />
<UnitLen value="8" />
<Connection mode="Net">
<IP value="192.168.1.50" />
<IP value="172.18.4.100" />
<Rack value="0" />
<Slot value="0" />
</Connection>

78
Main/MCEdit/Data/MCProject/nodeForm/FormLJRecipeData.xml
Unescape Escape View File

@ -36,7 +36,7 @@
<Property name="Dock">Fill</Property>
<Property name="Location">3, 17</Property>
<Property name="Name">MCDataGridView3</Property>
<Property name="Size">1088, 280</Property>
<Property name="Size">1878, 386</Property>
<Property name="TabIndex">1</Property>
</Object>
<Property name="TabStop">False</Property>
@ -44,13 +44,13 @@
<Property name="Dock">Fill</Property>
<Property name="Location">0, 0</Property>
<Property name="Name">GroupBox1</Property>
<Property name="Size">1094, 300</Property>
<Property name="Size">1884, 406</Property>
<Property name="TabIndex">0</Property>
</Object>
<Property name="Dock">Fill</Property>
<Property name="Location">0, 0</Property>
<Property name="Name">Panel1</Property>
<Property name="Size">1094, 300</Property>
<Property name="Size">1884, 406</Property>
</Object>
<Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel11" children="Controls">
<Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox2" children="Controls">
@ -86,7 +86,7 @@
<Property name="Dock">Fill</Property>
<Property name="Location">0, 0</Property>
<Property name="Name">MCDataGridView16</Property>
<Property name="Size">541, 143</Property>
<Property name="Size">892, 143</Property>
<Property name="TabIndex">13</Property>
</Object>
<Property name="Text">湿混机(#A)</Property>
@ -123,15 +123,15 @@
<Property name="Dock">Fill</Property>
<Property name="Location">0, 0</Property>
<Property name="Name">MCDataGridView17</Property>
<Property name="Size">541, 143</Property>
<Property name="Size">892, 143</Property>
<Property name="TabIndex">16</Property>
</Object>
<Property name="Text">湿混机(#B)</Property>
<Property name="Name">TabPage8</Property>
</Object>
<Property name="Location">539, 325</Property>
<Property name="Location">962, 322</Property>
<Property name="Name">TabControl4</Property>
<Property name="Size">549, 169</Property>
<Property name="Size">900, 169</Property>
</Object>
<Object type="System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="TabControl3" children="Controls">
<Object type="System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="TabPage5" children="Controls">
@ -165,7 +165,7 @@
<Property name="Dock">Fill</Property>
<Property name="Location">0, 0</Property>
<Property name="Name">MCDataGridView13</Property>
<Property name="Size">541, 140</Property>
<Property name="Size">892, 140</Property>
<Property name="TabIndex">5</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView14" children="Controls">
@ -198,7 +198,7 @@
<Property name="Dock">Fill</Property>
<Property name="Location">0, 0</Property>
<Property name="Name">MCDataGridView14</Property>
<Property name="Size">541, 140</Property>
<Property name="Size">892, 140</Property>
<Property name="TabIndex">4</Property>
</Object>
<Property name="Text">糊化机(#A)</Property>
@ -235,15 +235,15 @@
<Property name="Dock">Fill</Property>
<Property name="Location">0, 0</Property>
<Property name="Name">MCDataGridView15</Property>
<Property name="Size">541, 140</Property>
<Property name="Size">892, 140</Property>
<Property name="TabIndex">6</Property>
</Object>
<Property name="Text">糊化机(#B)</Property>
<Property name="Name">TabPage6</Property>
</Object>
<Property name="Location">539, 153</Property>
<Property name="Location">962, 150</Property>
<Property name="Name">TabControl3</Property>
<Property name="Size">549, 166</Property>
<Property name="Size">900, 166</Property>
</Object>
<Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox4" children="Controls">
<Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView2" children="Controls">
@ -276,14 +276,14 @@
<Property name="Dock">Fill</Property>
<Property name="Location">3, 17</Property>
<Property name="Name">MCDataGridView2</Property>
<Property name="Size">524, 107</Property>
<Property name="Size">894, 107</Property>
<Property name="TabIndex">3</Property>
</Object>
<Property name="TabStop">False</Property>
<Property name="Text">干混机称量配方</Property>
<Property name="Location">6, 20</Property>
<Property name="Location">31, 20</Property>
<Property name="Name">GroupBox4</Property>
<Property name="Size">530, 127</Property>
<Property name="Size">900, 127</Property>
<Property name="TabIndex">4</Property>
</Object>
<Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox3" children="Controls">
@ -317,7 +317,7 @@
<Property name="Dock">Fill</Property>
<Property name="Location">3, 17</Property>
<Property name="Name">MCDataGridView8</Property>
<Property name="Size">543, 107</Property>
<Property name="Size">894, 107</Property>
<Property name="TabIndex">3</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView9" children="Controls">
@ -350,14 +350,14 @@
<Property name="Dock">Fill</Property>
<Property name="Location">3, 17</Property>
<Property name="Name">MCDataGridView9</Property>
<Property name="Size">543, 107</Property>
<Property name="Size">894, 107</Property>
<Property name="TabIndex">2</Property>
</Object>
<Property name="TabStop">False</Property>
<Property name="Text">干混机混合配方</Property>
<Property name="Location">539, 20</Property>
<Property name="Location">962, 20</Property>
<Property name="Name">GroupBox3</Property>
<Property name="Size">549, 127</Property>
<Property name="Size">900, 127</Property>
<Property name="TabIndex">1</Property>
</Object>
<Object type="System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="TabControl1" children="Controls">
@ -391,7 +391,7 @@
<Property name="MultiSelect">False</Property>
<Property name="Location">4, 158</Property>
<Property name="Name">MCDataGridView5</Property>
<Property name="Size">516, 155</Property>
<Property name="Size">882, 155</Property>
<Property name="TabIndex">4</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView1" children="Controls">
@ -423,7 +423,7 @@
<Property name="MultiSelect">False</Property>
<Property name="Location">4, 3</Property>
<Property name="Name">MCDataGridView1</Property>
<Property name="Size">516, 149</Property>
<Property name="Size">882, 149</Property>
<Property name="TabIndex">3</Property>
</Object>
<Property name="Text">糊化机(#A)</Property>
@ -459,7 +459,7 @@
<Property name="MultiSelect">False</Property>
<Property name="Location">4, 158</Property>
<Property name="Name">MCDataGridView6</Property>
<Property name="Size">516, 155</Property>
<Property name="Size">885, 155</Property>
<Property name="TabIndex">6</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView7" children="Controls">
@ -491,33 +491,33 @@
<Property name="MultiSelect">False</Property>
<Property name="Location">4, 3</Property>
<Property name="Name">MCDataGridView7</Property>
<Property name="Size">516, 149</Property>
<Property name="Size">885, 149</Property>
<Property name="TabIndex">5</Property>
</Object>
<Property name="Text">糊化机(#B)</Property>
<Property name="Name">TabPage2</Property>
</Object>
<Property name="Location">6, 150</Property>
<Property name="Location">31, 150</Property>
<Property name="Name">TabControl1</Property>
<Property name="Size">531, 344</Property>
<Property name="Size">900, 344</Property>
</Object>
<Property name="TabStop">False</Property>
<Property name="Text">明细</Property>
<Property name="Dock">Fill</Property>
<Property name="Location">0, 0</Property>
<Property name="Name">GroupBox2</Property>
<Property name="Size">1094, 500</Property>
<Property name="Size">1884, 500</Property>
<Property name="TabIndex">0</Property>
</Object>
<Property name="Dock">Bottom</Property>
<Property name="Location">0, 300</Property>
<Property name="Location">0, 406</Property>
<Property name="Name">Panel11</Property>
<Property name="Size">1094, 500</Property>
<Property name="Size">1884, 500</Property>
</Object>
<Property name="Dock">Fill</Property>
<Property name="Location">0, 55</Property>
<Property name="Name">Panel10</Property>
<Property name="Size">1094, 800</Property>
<Property name="Size">1884, 906</Property>
</Object>
<Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel9" children="Controls">
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel2" children="Controls">
@ -535,7 +535,7 @@
<Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property>
<Property name="Text">配方类别</Property>
<Property name="Location">587, 21</Property>
<Property name="Location">1024, 21</Property>
<Property name="Name">MCLabel2</Property>
<Property name="Size">53, 12</Property>
</Object>
@ -554,7 +554,7 @@
<Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property>
<Property name="Text">配方名称</Property>
<Property name="Location">764, 21</Property>
<Property name="Location">1201, 21</Property>
<Property name="Name">MCLabel1</Property>
<Property name="Size">53, 12</Property>
</Object>
@ -576,7 +576,7 @@
<Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property>
<Property name="TextName" />
<Property name="Location">823, 17</Property>
<Property name="Location">1260, 17</Property>
<Property name="Name">MCTextBox1</Property>
<Property name="Size">153, 21</Property>
<Property name="TabIndex">18</Property>
@ -603,7 +603,7 @@
<Property name="DbOptionType">Query</Property>
<Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property>
<Property name="Location">646, 18</Property>
<Property name="Location">1083, 18</Property>
<Property name="Name">MCCombobox1</Property>
<Property name="Size">112, 20</Property>
<Property name="TabIndex">17</Property>
@ -628,7 +628,7 @@
<Property name="OldFillColor">DarkGray</Property>
<Property name="Text">查询</Property>
<Property name="Font">宋体, 14.25pt, style=Bold</Property>
<Property name="Location">982, 12</Property>
<Property name="Location">1419, 12</Property>
<Property name="Name">MCButton6</Property>
<Property name="Size">100, 30</Property>
<Property name="TabIndex">16</Property>
@ -739,22 +739,22 @@
<Property name="Dock">Top</Property>
<Property name="Location">0, 0</Property>
<Property name="Name">Panel9</Property>
<Property name="Size">1094, 55</Property>
<Property name="Size">1884, 55</Property>
</Object>
<Property name="Dock">Fill</Property>
<Property name="Location">0, 0</Property>
<Property name="Name">Panel8</Property>
<Property name="Size">1094, 855</Property>
<Property name="Size">1884, 961</Property>
</Object>
<Property name="Dock">Fill</Property>
<Property name="Location">0, 0</Property>
<Property name="Name">Panel3</Property>
<Property name="Size">1094, 855</Property>
<Property name="Size">1884, 961</Property>
</Object>
<Property name="Dock">Fill</Property>
<Property name="Location">0, 0</Property>
<Property name="Name">Panel2</Property>
<Property name="Size">1094, 855</Property>
<Property name="Size">1884, 961</Property>
</Object>
<Property name="LoadActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDQ4NkNGRDNGQTlGQjQ4NzIwRjI4MkM3NTMyMUI5NDRFBgYAAAAb5qaE6I+K6YWN5pa5566h55CG5Yid5aeL5YyWBgcAAAAb5qaE6I+K6YWN5pa5566h55CG5Yid5aeL5YyWCw==</Binary>
@ -772,7 +772,7 @@
<Property name="MCPurview">False</Property>
<Property name="AllowOriginalSizeShow">False</Property>
<Property name="BackColor">Control</Property>
<Property name="Size">1110, 894</Property>
<Property name="Size">1900, 1000</Property>
<Property name="StartPosition">WindowsDefaultLocation</Property>
<Property name="Text">榄菊配方管理</Property>
<Property name="WindowState">Normal</Property>

4
Main/MCEdit/Data/MCProject/nodeForm/FormPlan.xml
Unescape Escape View File

@ -52,7 +52,7 @@
<Property name="MCEnabled">True</Property>
<Property name="TextAlign">TopCenter</Property>
<Property name="Text">计划状态</Property>
<Property name="Location">533, 18</Property>
<Property name="Location">575, 18</Property>
<Property name="Name">MCLabel3</Property>
<Property name="Size">53, 12</Property>
</Object>
@ -78,7 +78,7 @@
<Property name="DbOptionType">Query</Property>
<Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property>
<Property name="Location">592, 15</Property>
<Property name="Location">634, 15</Property>
<Property name="Name">MCCombobox1</Property>
<Property name="Size">95, 20</Property>
<Property name="TabIndex">31</Property>

BIN
PlugInPlatform/HslCommunication.dll
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save