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

Revert "输送报表"

Browse Source 
This reverts commit 9d43038d2e.
dep
杨威 6 months ago
parent 06580fe6e5
commit b28d76761b
3 changed files with 4 additions and 94 deletions
Show Stats Download Patch File Download Diff File

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

@ -506,7 +506,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
if (ButtonE.PasteWet == runtime.Sender)
{
int index = ComboE.PasteChooseWet.SelectedIndex + 1;
ControlsHelper.GWInit2(index, ComboE, TextE);
ControlsHelper.GWInit(index, ComboE, TextE);
}
if (ButtonE.PasteDry == runtime.Sender)

94
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs
Unescape Escape View File

@ -149,73 +149,6 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
}
}
public static void GWInit2(int select, MCComboBoxEntity ComboE, MCTextBoxEntity TextE)
{
var selected = FreeSqlUnit.Instance.Select<DeviceMaterrial>().Where(x => x.DeviceId == select && x.Type == 2).ToList();
if (selected.Count != 0)
{
ComboE.ChooseMaterial1.SelectedValue = selected[0].MaterrialId;
ComboE.ChooseMaterial2.SelectedValue = selected[1].MaterrialId;
}
else
{
ComboE.ChooseMaterial1.SelectedIndex = 0;
ComboE.ChooseMaterial2.SelectedIndex = 0;
}
var getGelatG1 = LjPlanningPlcHelp.GetGelatG1;
var getWeterM1 = LjPlanningPlcHelp.GetWeterM1;
var getGelatG2 = LjPlanningPlcHelp.GetGelatG2;
var getWeterM2 = LjPlanningPlcHelp.GetWeterM2;
var getGelatG3 = LjPlanningPlcHelp.GetGelatG3;
var getWeterM3 = LjPlanningPlcHelp.GetWeterM3;
var getGelatG4 = LjPlanningPlcHelp.GetGelatG4;
var getWeterM4 = LjPlanningPlcHelp.GetWeterM4;
var getGelatG5 = LjPlanningPlcHelp.GetGelatG5;
var getWeterM5 = LjPlanningPlcHelp.GetWeterM5;
var getGelatG6 = LjPlanningPlcHelp.GetGelatG6;
var getWeterM6 = LjPlanningPlcHelp.GetWeterM6;
var getGelatG7 = LjPlanningPlcHelp.GetGelatG7;
var getWeterM7 = LjPlanningPlcHelp.GetWeterM7;
var getGelatG8 = LjPlanningPlcHelp.GetGelatG8;
var getWeterM8 = LjPlanningPlcHelp.GetWeterM8;
switch (select)
{
case 1:
GWDataShow2(getGelatG1, getWeterM1, TextE);
break;
case 2:
GWDataShow2(getGelatG2, getWeterM2, TextE);
break;
case 3:
GWDataShow2(getGelatG3, getWeterM3, TextE);
break;
case 4:
GWDataShow2(getGelatG4, getWeterM4, TextE);
break;
case 5:
GWDataShow2(getGelatG5, getWeterM5, TextE);
break;
case 6:
GWDataShow2(getGelatG6, getWeterM6, TextE);
break;
case 7:
GWDataShow2(getGelatG7, getWeterM7, TextE);
break;
case 8:
GWDataShow2(getGelatG8, getWeterM8, TextE);
break;
default:
return;
}
}
public static void DInit(int select, MCComboBoxEntity ComboE, MCTextBoxEntity TextE)
{
var drtSelected = FreeSqlUnit.Instance.Select<DeviceMaterrial>().
@ -350,35 +283,12 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
TextE.GelCloseHeatTime.MCValue = Gel.RecipeSteps[7].MixTime;
TextE.GelOutDelayTime.MCValue = Gel.RecipeSteps[7].MixTemp;
TextE.WetDryWeight.MCValue = Wet[1].SetValue;
//20240221 不更新
// TextE.WetDryWeight.MCValue = Wet[1].SetValue;
TextE.WetMixTime.MCValue = Wet[2].MixTime;
TextE.WetOutDelayTime.MCValue = Wet[4].MixTime;
}
public static void GWDataShow2(DryerView Gel, List<MixStep> Wet, MCTextBoxEntity TextE)
{
TextE.MaterialWeight1.MCValue = Gel.RecipePlcViews[0].Set;
TextE.MaterialWeight2.MCValue = Gel.RecipePlcViews[1].Set;
TextE.MaterialTolerance1.MCValue = Gel.RecipePlcViews[0].Tolerance;
TextE.MaterialTolerance2.MCValue = Gel.RecipePlcViews[1].Tolerance;
TextE.GelSpeedSet.MCValue = Gel.RecipeSteps[0].MixSpeed;
TextE.GelPosTimeA.MCValue = Gel.RecipeSteps[2].MixTemp;
TextE.GelNagTimeB.MCValue = Gel.RecipeSteps[2].MixSpeed;
TextE.GelPosTimeC.MCValue = Gel.RecipeSteps[2].MixTime;
TextE.GelWaterTime.MCValue = Gel.RecipeSteps[4].MixTime;
TextE.GelWaitTime.MCValue = Gel.RecipeSteps[6].MixTime;
TextE.GelCloseHeatTime.MCValue = Gel.RecipeSteps[7].MixTime;
TextE.GelOutDelayTime.MCValue = Gel.RecipeSteps[7].MixTemp;
//TextE.WetDryWeight.MCValue = Wet[1].SetValue;
TextE.WetMixTime.MCValue = Wet[2].MixTime;
TextE.WetOutDelayTime.MCValue = Wet[4].MixTime;
}
/// <summary>
/// 将C#数据实体转化为JSON数据
/// </summary>

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

@ -3622,7 +3622,7 @@
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
</Property>
<Property name="BHaveAction">False</Property>
<Property name="MCPurview">True</Property>
<Property name="MCPurview">False</Property>
<Property name="AllowOriginalSizeShow">False</Property>
<Property name="BackColor">Control</Property>
<Property name="Size">1366, 861</Property>

Write Preview
Loading…
Cancel
Save