diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/DeviceMaterrial.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/DeviceMaterrial.cs
index 3b52274..7866553 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/DeviceMaterrial.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/DeviceMaterrial.cs
@@ -4,10 +4,10 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
{
public class DeviceMaterrial
{
+
[Column(IsPrimary = true, IsIdentity = true)]
public int Id { get; set; }
-
///
/// 设备编号
///
@@ -25,6 +25,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
public int Type { get; set; }
+ ///
+ /// 数据库code
+ ///
public int Code { get; set; }
}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/StockMaterrialDBHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/StockMaterrialDBHelp.cs
index ed8f400..b8b76f2 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/StockMaterrialDBHelp.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/StockMaterrialDBHelp.cs
@@ -67,6 +67,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
return dt;
}
+
+
///
/// 根据物料获取罐号
///
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs
index 4ea1dc5..47afe6d 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs
@@ -39,11 +39,17 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.Entity
public IBaseControl WetDryWeight { get; set; }
public IBaseControl WetMixTime { get; set; }
public IBaseControl WetOutDelayTime { get; set; }
+ public IBaseControl ManualWeight { get; set; }
+ public IBaseControl ManualTolerance { get; set; }
public Button WetManualControl { get; set; }
public Button Download { get; set; }
public Button LineStart { get; set; }
public Button LineStop { get; set; }
+ public Button GelManualPowder { get; set; }
+ public Button GelManualColdWater { get; set; }
+ public Button GelManualHotWater { get; set; }
+ public Button WetManualGel { get; set; }
}
}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
index 9481c31..f687c59 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
@@ -119,54 +119,44 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
ControlsEntity.WetDryWeight = GetBaseControl("WetDryWeight");
ControlsEntity.WetMixTime = GetBaseControl("WetMixTime");
ControlsEntity.WetOutDelayTime = GetBaseControl("WetOutDelayTime");
+ ControlsEntity.ManualTolerance = GetBaseControl("ManualTolerance");
+ ControlsEntity.ManualWeight = GetBaseControl("ManualWeight");
ControlsEntity.WetManualControl = GetButtonControl("WetManualControl");
ControlsEntity.Download = GetButtonControl("Download");
ControlsEntity.LineStart = GetButtonControl("LineStart");
ControlsEntity.LineStop = GetButtonControl("LineStop");
+ ControlsEntity.GelManualPowder = GetButtonControl("GelManualPowder");
+ ControlsEntity.GelManualColdWater = GetButtonControl("GelManualColdWater");
+ ControlsEntity.GelManualHotWater = GetButtonControl("GelManualHotWater");
+ ControlsEntity.WetManualGel = GetButtonControl("WetManualGel");
}
private void BottomSelect(RuntimeParameter runtime)
{
- if(ControlsEntity.WetManualControl == runtime.Sender)
- {
- ManualAdd frm = new ManualAdd();
- choose = SingleSelect();
- DialogResult result = frm.ShowDialog();
- this._runtime.BaseControl.MCEnabled = false;
- if (result == DialogResult.OK)
- {
- frm.Dispose();
- }
- this._runtime.BaseControl.MCEnabled = true;
- }
+
if (ControlsEntity.Download == runtime.Sender)
{
-
- List recipes = new List();
+ if (MessageBox.Show("确认下传数据?", "下传确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+ {
+ return;
+ }
int bin1 = Convert.ToInt32(ControlsEntity.ChooseMaterial1.MCValue.ToString());
int bin2 = Convert.ToInt32(ControlsEntity.ChooseMaterial2.MCValue.ToString());
- if(bin1 == -1)
- {
- bin1 = 0;
- }
- if(bin2 == -1)
- {
- bin2 = 0;
- }
+
+ List recipes = new List();
RecipePlcView recipe1 = new RecipePlcView()
{
- Bin = (ushort)bin1,
+ Bin = (ushort)StockMaterrialDbHelp.GetCodeById(bin1),
Set = Convert.ToSingle(ControlsEntity.MaterialWeight1.MCValue.ToString()),
Tolerance = Convert.ToSingle(ControlsEntity.MaterialTolerance1.MCValue.ToString()),
-
};
RecipePlcView recipe2 = new RecipePlcView()
{
- Bin = (ushort)bin2,
+ Bin = (ushort)StockMaterrialDbHelp.GetCodeById(bin2),
Set = Convert.ToSingle(ControlsEntity.MaterialWeight2.MCValue.ToString()),
Tolerance = Convert.ToSingle(ControlsEntity.MaterialTolerance2.MCValue.ToString()),
};
@@ -258,39 +248,67 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
mixSteps.Add(mixStep4);
mixSteps.Add(mixStep5);
+ List materials = new List();
+
+ DeviceMaterrial deviceMaterial1 = new DeviceMaterrial()
+ {
+ DeviceId = SingleSelect(),
+ MaterrialId = bin1,
+ Type = 2,
+ Code = StockMaterrialDbHelp.GetCodeById(bin1)
+ };
+ DeviceMaterrial deviceMaterial2 = new DeviceMaterrial()
+ {
+ DeviceId = SingleSelect(),
+ MaterrialId = bin2,
+ Type = 2,
+ Code = StockMaterrialDbHelp.GetCodeById(bin2)
+ };
+
+ materials.Add(deviceMaterial1);
+ materials.Add(deviceMaterial2);
+
switch (SingleSelect())
{
case 1:
LjPlanningPlcHelp.DownG1Recipe(recipes, steps);
LjPlanningPlcHelp.DownM1Recipe(mixSteps);
+ DeviceMaterrialService.Save(materials);
break;
case 2:
LjPlanningPlcHelp.DownG2Recipe(recipes, steps);
LjPlanningPlcHelp.DownM2Recipe(mixSteps);
+ DeviceMaterrialService.Save(materials);
break;
case 3:
LjPlanningPlcHelp.DownG3Recipe(recipes, steps);
LjPlanningPlcHelp.DownM3Recipe(mixSteps);
+ DeviceMaterrialService.Save(materials);
break;
case 4:
LjPlanningPlcHelp.DownG4Recipe(recipes, steps);
LjPlanningPlcHelp.DownM4Recipe(mixSteps);
+ DeviceMaterrialService.Save(materials);
break;
case 5:
LjPlanningPlcHelp.DownG5Recipe(recipes, steps);
LjPlanningPlcHelp.DownM5Recipe(mixSteps);
+ DeviceMaterrialService.Save(materials);
break;
case 6:
LjPlanningPlcHelp.DownG6Recipe(recipes, steps);
LjPlanningPlcHelp.DownM6Recipe(mixSteps);
+ DeviceMaterrialService.Save(materials);
break;
case 7:
LjPlanningPlcHelp.DownG7Recipe(recipes, steps);
LjPlanningPlcHelp.DownM7Recipe(mixSteps);
+ DeviceMaterrialService.Save(materials);
break;
case 8:
LjPlanningPlcHelp.DownG8Recipe(recipes, steps);
LjPlanningPlcHelp.DownM8Recipe(mixSteps);
+ DeviceMaterrialService.Save(materials);
break;
default:
MessageBox.Show("请选择一条产线!");
@@ -299,8 +317,103 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
}
+ #region 手动控制
+
+ if (ControlsEntity.GelManualPowder == runtime.Sender)
+ {
+ if (MessageBox.Show("确认手动下粉料?", "下粉确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+ {
+ return;
+ }
+ }
+
+ if (ControlsEntity.GelManualColdWater == runtime.Sender)
+ {
+ if (MessageBox.Show("确认下冷水?", "下水确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+ {
+ return;
+ }
+ }
+
+ if (ControlsEntity.GelManualHotWater == runtime.Sender)
+ {
+ if (MessageBox.Show("确认下热水?", "下水确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+ {
+ return;
+ }
+ }
+
+ if (ControlsEntity.WetManualGel == runtime.Sender)
+ {
+ if (MessageBox.Show("确认下糊化料?", "下糊化料确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+ {
+ return;
+ }
+ }
+
+ if (ControlsEntity.WetManualControl == runtime.Sender)
+ {
+ if (MessageBox.Show("确认下传数据?", "下传确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+ {
+ return;
+ }
+ SetValue value = new SetValue()
+ {
+ Value = Convert.ToSingle(ControlsEntity.ManualTolerance.MCValue.ToString()),
+ Toterance = Convert.ToSingle(ControlsEntity.ManualWeight.MCValue.ToString())
+ };
+
+ switch (GelerWeterControl.choose)
+ {
+ case 1:
+ DB2105WriteHelper.WriteManScrewH1();
+ DB2105WriteHelper.WriteSetValueH1(value);
+ break;
+ case 2:
+ DB2105WriteHelper.WriteManScrewH2();
+ DB2105WriteHelper.WriteSetValueH1(value);
+ break;
+ case 3:
+ DB2105WriteHelper.WriteManScrewH3();
+ DB2105WriteHelper.WriteSetValueH2(value);
+ break;
+ case 4:
+ DB2105WriteHelper.WriteManScrewH4();
+ DB2105WriteHelper.WriteSetValueH2(value);
+ break;
+ case 5:
+ DB2105WriteHelper.WriteManScrewH5();
+ DB2105WriteHelper.WriteSetValueH3(value);
+ break;
+ case 6:
+ DB2105WriteHelper.WriteManScrewH6();
+ DB2105WriteHelper.WriteSetValueH3(value);
+ break;
+ case 7:
+ DB2105WriteHelper.WriteManScrewH7();
+ DB2105WriteHelper.WriteSetValueH4(value);
+ break;
+ case 8:
+ DB2105WriteHelper.WriteManScrewH8();
+ DB2105WriteHelper.WriteSetValueH4(value);
+ break;
+ default:
+ MessageBox.Show("当前未选择产线!");
+ return;
+ }
+ }
+
+ #endregion
+
+ #region 自动启停
+
if (ControlsEntity.LineStart == runtime.Sender)
{
+ if (MessageBox.Show("确认启动生产?", "启动确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+ {
+ return;
+ }
+
switch (SingleSelect())
{
case 1:
@@ -365,7 +478,13 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
MessageBox.Show("请选择一条产线!");
return;
}
+
+ MessageBox.Show("已经停止生产");
+
}
+
+ #endregion
+
}
private IBaseControl GetBaseControl(string name)
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
index 1defa70..5102bbb 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
@@ -1,6 +1,8 @@
using Mesnac.Action.Base;
using Mesnac.Action.ChemicalWeighing.AutoControl.DB;
using Mesnac.Action.ChemicalWeighing.AutoControl.Entity;
+using Mesnac.Action.ChemicalWeighing.LjPlanning;
+using Mesnac.Controls.Base;
using Mesnac.Controls.Default;
using Microsoft.Office.Interop.Excel;
using System;
@@ -25,12 +27,114 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
McControls = GetAllControls();
- ControlsEntity.ChooseMaterial1 = McControls.First(x => x.Name == "ChooseMaterial1") as MCCombobox;
- ControlsEntity.ChooseMaterial2 = McControls.First(x => x.Name == "ChooseMaterial2") as MCCombobox;
+ ControlImport();
+ ControlInitFromPLC();
+
+ }
+
+ ///
+ /// 控件从Plc初始化
+ ///
+ private void ControlInitFromPLC()
+ {
+ //switch (SingleSelect())
+ //{
+ // case 1:
+ // LjPlanningPlcHelp.GetGelatG1.
+ //}
ControlsEntity.ChooseMaterial1.DataSource = StockMaterrialDbHelp.GetSiloMaterrial();
ControlsEntity.ChooseMaterial2.DataSource = StockMaterrialDbHelp.GetSiloMaterrial();
+ }
+
+ ///
+ /// 单选选择
+ ///
+ /// 返回单选的产线号 如果未选择返回0
+ private int SingleSelect()
+ {
+ if (Convert.ToBoolean(ControlsEntity.Line1.MCValue) == true)
+ {
+ return 1;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line2.MCValue) == true)
+ {
+ return 2;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line3.MCValue) == true)
+ {
+ return 3;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line4.MCValue) == true)
+ {
+ return 4;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line5.MCValue) == true)
+ {
+ return 5;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line6.MCValue) == true)
+ {
+ return 6;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line7.MCValue) == true)
+ {
+ return 7;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line8.MCValue) == true)
+ {
+ return 8;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+
+ ///
+ /// 控件导入
+ ///
+ private void ControlImport()
+ {
+ ControlsEntity.Line1 = GetBaseControl("Line1");
+ ControlsEntity.Line2 = GetBaseControl("Line2");
+ ControlsEntity.Line3 = GetBaseControl("Line3");
+ ControlsEntity.Line4 = GetBaseControl("Line4");
+ ControlsEntity.Line5 = GetBaseControl("Line5");
+ ControlsEntity.Line6 = GetBaseControl("Line6");
+ ControlsEntity.Line7 = GetBaseControl("Line7");
+ ControlsEntity.Line8 = GetBaseControl("Line8");
+ ControlsEntity.ChooseMaterial1 = GetComboBoxControl("ChooseMaterial1");
+ ControlsEntity.ChooseMaterial2 = GetComboBoxControl("ChooseMaterial2");
+
+ ControlsEntity.MaterialWeight1 = GetBaseControl("MaterialWeight1");
+ ControlsEntity.MaterialWeight2 = GetBaseControl("MaterialWeight2");
+ ControlsEntity.MaterialTolerance1 = GetBaseControl("MaterialTolerance1");
+ ControlsEntity.MaterialTolerance2 = GetBaseControl("MaterialTolerance2");
+ ControlsEntity.GelSpeedSet = GetBaseControl("GelSpeedSet");
+ ControlsEntity.GelPosTimeA = GetBaseControl("GelPosTimeA");
+ ControlsEntity.GelNagTimeB = GetBaseControl("GelNagTimeB");
+ ControlsEntity.GelPosTimeC = GetBaseControl("GelPosTimeC");
+ ControlsEntity.GelWaterTime = GetBaseControl("GelWaterTime");
+ ControlsEntity.GelWaitTime = GetBaseControl("GelWaitTime");
+ ControlsEntity.GelCloseHeatTime = GetBaseControl("GelCloseHeatTime");
+ ControlsEntity.GelOutDelayTime = GetBaseControl("GelOutDelayTime");
+
+ ControlsEntity.WetDryWeight = GetBaseControl("WetDryWeight");
+ ControlsEntity.WetMixTime = GetBaseControl("WetMixTime");
+ ControlsEntity.WetOutDelayTime = GetBaseControl("WetOutDelayTime");
+
+ }
+
+ private IBaseControl GetBaseControl(string name)
+ {
+ return McControls.First(x => x.Name == name) as IBaseControl;
+ }
+
+ private MCCombobox GetComboBoxControl(string name)
+ {
+ return McControls.First(x => x.Name == name) as MCCombobox;
}
}
}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ManualAdd.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ManualAdd.Designer.cs
deleted file mode 100644
index c8a53fc..0000000
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ManualAdd.Designer.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-namespace Mesnac.Action.ChemicalWeighing.AutoControl
-{
- partial class ManualAdd
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.ManualWeight = new System.Windows.Forms.TextBox();
- this.label1 = new System.Windows.Forms.Label();
- this.button1 = new System.Windows.Forms.Button();
- this.label2 = new System.Windows.Forms.Label();
- this.ManualTolerance = new System.Windows.Forms.TextBox();
- this.SuspendLayout();
- //
- // ManualWeight
- //
- this.ManualWeight.Location = new System.Drawing.Point(118, 50);
- this.ManualWeight.Name = "ManualWeight";
- this.ManualWeight.Size = new System.Drawing.Size(121, 25);
- this.ManualWeight.TabIndex = 0;
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(60, 54);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(52, 15);
- this.label1.TabIndex = 1;
- this.label1.Text = "重量:";
- //
- // button1
- //
- this.button1.Location = new System.Drawing.Point(63, 147);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(176, 51);
- this.button1.TabIndex = 2;
- this.button1.Text = "确认";
- this.button1.UseVisualStyleBackColor = true;
- this.button1.Click += new System.EventHandler(this.button1_Click);
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(60, 85);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(52, 15);
- this.label2.TabIndex = 4;
- this.label2.Text = "公差:";
- //
- // ManualTolerance
- //
- this.ManualTolerance.Location = new System.Drawing.Point(118, 81);
- this.ManualTolerance.Name = "ManualTolerance";
- this.ManualTolerance.Size = new System.Drawing.Size(121, 25);
- this.ManualTolerance.TabIndex = 3;
- //
- // ManualAdd
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(312, 236);
- this.Controls.Add(this.label2);
- this.Controls.Add(this.ManualTolerance);
- this.Controls.Add(this.button1);
- this.Controls.Add(this.label1);
- this.Controls.Add(this.ManualWeight);
- this.Name = "ManualAdd";
- this.Text = "手动加粉";
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
-
- #endregion
-
- private System.Windows.Forms.TextBox ManualWeight;
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.Button button1;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TextBox ManualTolerance;
- }
-}
\ No newline at end of file
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ManualAdd.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ManualAdd.cs
deleted file mode 100644
index 980a9d7..0000000
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ManualAdd.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using DataBlockHelper.DBHelpers;
-using Mesnac.Action.ChemicalWeighing.AutoControl.Entity;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Mesnac.Action.ChemicalWeighing.AutoControl
-{
- public partial class ManualAdd : Form
- {
- public ManualAdd()
- {
- InitializeComponent();
- }
-
- private void button1_Click(object sender, EventArgs e)
- {
- SetValue value = new SetValue()
- {
- Value = Convert.ToSingle(ManualTolerance.Text),
- Toterance = Convert.ToSingle(ManualWeight.Text)
- };
-
- switch (GelerWeterControl.choose)
- {
- case 1:
- DB2105WriteHelper.WriteManScrewH1();
- DB2105WriteHelper.WriteSetValueH1(value);
- break;
- case 2:
- DB2105WriteHelper.WriteManScrewH2();
- DB2105WriteHelper.WriteSetValueH1(value);
- break;
- case 3:
- DB2105WriteHelper.WriteManScrewH3();
- DB2105WriteHelper.WriteSetValueH2(value);
- break;
- case 4:
- DB2105WriteHelper.WriteManScrewH4();
- DB2105WriteHelper.WriteSetValueH2(value);
- break;
- case 5:
- DB2105WriteHelper.WriteManScrewH5();
- DB2105WriteHelper.WriteSetValueH3(value);
- break;
- case 6:
- DB2105WriteHelper.WriteManScrewH6();
- DB2105WriteHelper.WriteSetValueH3(value);
- break;
- case 7:
- DB2105WriteHelper.WriteManScrewH7();
- DB2105WriteHelper.WriteSetValueH4(value);
- break;
- case 8:
- DB2105WriteHelper.WriteManScrewH8();
- DB2105WriteHelper.WriteSetValueH4(value);
- break;
- default:
- MessageBox.Show("当前未选择产线!");
- return;
- }
- }
- }
-}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ManualAdd.resx b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ManualAdd.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ManualAdd.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs
index 5f9f0d3..f67bb78 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs
@@ -461,7 +461,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static DryerView GetGelatG6 => GetGelatView(1718);
public static DryerView GetGelatG7 => GetGelatView(1858);
public static DryerView GetGelatG8 => GetGelatView(1998);
-
public static List GetWeterM1 = GetWeterView(2138);
public static List GetWeterM2 = GetWeterView(2338);
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
index d4dc9f8..5b8b513 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
@@ -227,12 +227,6 @@
-
- Form
-
-
- ManualAdd.cs
-
@@ -731,9 +725,6 @@
FrmInsert.cs
-
- ManualAdd.cs
-
FrmBin.cs
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml
index baada35..5e8840a 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml
@@ -1,9 +1,84 @@