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

change - 输送界面添加除尘控件 空间更改

Browse Source
dep_deliver
wangsr 1 year ago
parent ff3e513557
commit c61051b460
9 changed files with 726 additions and 551 deletions
Show Stats Download Patch File Download Diff File

33
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
Unescape Escape View File

@ -59,6 +59,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
ThreeWayValveEntity ThreeWayValveE = new ThreeWayValveEntity(); ThreeWayValveEntity ThreeWayValveE = new ThreeWayValveEntity();
LjSwitchEntity LjSwitchE = new LjSwitchEntity(); LjSwitchEntity LjSwitchE = new LjSwitchEntity();
MCLabelEntity LabelE = new MCLabelEntity(); MCLabelEntity LabelE = new MCLabelEntity();
ControlCabinetEntity CabinetE = new ControlCabinetEntity();
/// <summary> /// <summary>
/// 报警滚动条 /// 报警滚动条
/// </summary> /// </summary>
@ -103,6 +105,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
ControlsHelper.ControlImport<ThreeWayValve>(ThreeWayValveE, Controls); ControlsHelper.ControlImport<ThreeWayValve>(ThreeWayValveE, Controls);
ControlsHelper.ControlImport<LjSwith>(LjSwitchE, Controls); ControlsHelper.ControlImport<LjSwith>(LjSwitchE, Controls);
ControlsHelper.ControlImport<MCLabel>(LabelE, Controls); ControlsHelper.ControlImport<MCLabel>(LabelE, Controls);
ControlsHelper.ControlImport<ControlCabinet>(CabinetE, Controls);
this.AlarmMoveText.Font = new Font("宋体", 15f, FontStyle.Regular, GraphicsUnit.Point, 134); this.AlarmMoveText.Font = new Font("宋体", 15f, FontStyle.Regular, GraphicsUnit.Point, 134);
this.AlarmMoveText.ForeColor = Color.White; this.AlarmMoveText.ForeColor = Color.White;
@ -408,6 +411,19 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
PlcTemp.DM1DSM01_Alarm = DB91.DM1DSM01.Alarm; PlcTemp.DM1DSM01_Alarm = DB91.DM1DSM01.Alarm;
PlcTemp.DM2DSM01_Alarm = DB91.DM2DSM01.Alarm; PlcTemp.DM2DSM01_Alarm = DB91.DM2DSM01.Alarm;
PlcTemp.DM3DSM01_Alarm = DB91.DM3DSM01.Alarm; PlcTemp.DM3DSM01_Alarm = DB91.DM3DSM01.Alarm;
PlcTemp.DM1ASIG01_Set = DB91.DM1ASIG01.Running;
PlcTemp.DM1BSIG01_Set = DB91.DM1BSIG01.Running;
PlcTemp.DM1CSIG01_Set = DB91.DM1CSIG01.Running;
PlcTemp.DM1DSIG01_Set = DB91.DM1DSIG01.Running;
PlcTemp.DM1ESIG01_Set = DB91.DM1ESIG01.Running;
PlcTemp.DM1ASIG01_Alarm = DB91.DM1ASIG01.Alarm;
PlcTemp.DM1BSIG01_Alarm = DB91.DM1BSIG01.Alarm;
PlcTemp.DM1CSIG01_Alarm = DB91.DM1CSIG01.Alarm;
PlcTemp.DM1DSIG01_Alarm = DB91.DM1DSIG01.Alarm;
PlcTemp.DM1ESIG01_Alarm = DB91.DM1ESIG01.Alarm;
} }
private void DBOtherGetData() private void DBOtherGetData()
@ -607,6 +623,23 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
ControlsHelper.SetSwitchLight(SwitchlightE.DM1DSM01, PlcTemp.DM1DSM01_Set, PlcTemp.DM1DSM01_Alarm); ControlsHelper.SetSwitchLight(SwitchlightE.DM1DSM01, PlcTemp.DM1DSM01_Set, PlcTemp.DM1DSM01_Alarm);
ControlsHelper.SetSwitchLight(SwitchlightE.DM2DSM01, PlcTemp.DM2DSM01_Set, PlcTemp.DM2DSM01_Alarm); ControlsHelper.SetSwitchLight(SwitchlightE.DM2DSM01, PlcTemp.DM2DSM01_Set, PlcTemp.DM2DSM01_Alarm);
ControlsHelper.SetSwitchLight(SwitchlightE.DM3DSM01, PlcTemp.DM3DSM01_Set, PlcTemp.DM3DSM01_Alarm); ControlsHelper.SetSwitchLight(SwitchlightE.DM3DSM01, PlcTemp.DM3DSM01_Set, PlcTemp.DM3DSM01_Alarm);
ControlsHelper.SetControlCabinet(CabinetE.DM1ASIG011, PlcTemp.DM1ASIG01_Set, PlcTemp.DM1ASIG01_Alarm);
ControlsHelper.SetControlCabinet(CabinetE.DM1ASIG012, PlcTemp.DM1ASIG01_Set, PlcTemp.DM1ASIG01_Alarm);
ControlsHelper.SetControlCabinet(CabinetE.DM1ASIG013, PlcTemp.DM1ASIG01_Set, PlcTemp.DM1ASIG01_Alarm);
ControlsHelper.SetControlCabinet(CabinetE.DM1ASIG014, PlcTemp.DM1ASIG01_Set, PlcTemp.DM1ASIG01_Alarm);
ControlsHelper.SetControlCabinet(CabinetE.DM1BSIG011, PlcTemp.DM1BSIG01_Set, PlcTemp.DM1BSIG01_Alarm);
ControlsHelper.SetControlCabinet(CabinetE.DM1BSIG012, PlcTemp.DM1BSIG01_Set, PlcTemp.DM1BSIG01_Alarm);
ControlsHelper.SetControlCabinet(CabinetE.DM1CSIG011, PlcTemp.DM1CSIG01_Set, PlcTemp.DM1CSIG01_Alarm);
ControlsHelper.SetControlCabinet(CabinetE.DM1CSIG012, PlcTemp.DM1CSIG01_Set, PlcTemp.DM1CSIG01_Alarm);
ControlsHelper.SetControlCabinet(CabinetE.DM1CSIG013, PlcTemp.DM1CSIG01_Set, PlcTemp.DM1CSIG01_Alarm);
ControlsHelper.SetControlCabinet(CabinetE.DM1CSIG014, PlcTemp.DM1CSIG01_Set, PlcTemp.DM1CSIG01_Alarm);
ControlsHelper.SetControlCabinet(CabinetE.DM1DSIG011, PlcTemp.DM1DSIG01_Set, PlcTemp.DM1DSIG01_Alarm);
ControlsHelper.SetControlCabinet(CabinetE.DM1DSIG012, PlcTemp.DM1DSIG01_Set, PlcTemp.DM1DSIG01_Alarm);
ControlsHelper.SetControlCabinet(CabinetE.DM1DSIG013, PlcTemp.DM1DSIG01_Set, PlcTemp.DM1DSIG01_Alarm);
ControlsHelper.SetControlCabinet(CabinetE.DM1DSIG014, PlcTemp.DM1DSIG01_Set, PlcTemp.DM1DSIG01_Alarm);
ControlsHelper.SetControlCabinet(CabinetE.DM1ESIG01, PlcTemp.DM1ESIG01_Set, PlcTemp.DM1ESIG01_Alarm);
} }
private void DBOtherSetData() private void DBOtherSetData()

19
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs
Unescape Escape View File

@ -226,4 +226,23 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity
public HslBottle Bottle14 { get; set; } public HslBottle Bottle14 { get; set; }
public HslBottle Bottle15 { get; set; } public HslBottle Bottle15 { get; set; }
} }
internal class ControlCabinetEntity
{
public ControlCabinet DM1ASIG011 { get; set; }
public ControlCabinet DM1ASIG012 { get; set; }
public ControlCabinet DM1ASIG013 { get; set; }
public ControlCabinet DM1ASIG014 { get; set; }
public ControlCabinet DM1BSIG011 { get; set; }
public ControlCabinet DM1BSIG012 { get; set; }
public ControlCabinet DM1CSIG011 { get; set; }
public ControlCabinet DM1CSIG012 { get; set; }
public ControlCabinet DM1CSIG013 { get; set; }
public ControlCabinet DM1CSIG014 { get; set; }
public ControlCabinet DM1DSIG011 { get; set; }
public ControlCabinet DM1DSIG012 { get; set; }
public ControlCabinet DM1DSIG013 { get; set; }
public ControlCabinet DM1DSIG014 { get; set; }
public ControlCabinet DM1ESIG01 { get; set; }
}
} }

11
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/PlcTempEntity.cs
Unescape Escape View File

@ -346,5 +346,16 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity
public bool HighLevel1 { get; set; } public bool HighLevel1 { get; set; }
public bool HighLevel2 { get; set; } public bool HighLevel2 { get; set; }
public bool HighLevel3 { get; set; } public bool HighLevel3 { get; set; }
public bool DM1ASIG01_Set { get; set; }
public bool DM1BSIG01_Set { get; set; }
public bool DM1CSIG01_Set { get; set; }
public bool DM1DSIG01_Set { get; set; }
public bool DM1ESIG01_Set { get; set; }
public bool DM1ASIG01_Alarm { get; set; }
public bool DM1BSIG01_Alarm { get; set; }
public bool DM1CSIG01_Alarm { get; set; }
public bool DM1DSIG01_Alarm { get; set; }
public bool DM1ESIG01_Alarm { get; set; }
} }
} }

156
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs
Unescape Escape View File

@ -41,8 +41,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList(); recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin = 58; int begin = 58;
DownCleanD1Recipe(begin); DownCleanD1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
var view = recipePlcViews[i]; var view = recipePlcViews[i];
@ -59,7 +59,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
begin += 12; begin += 12;
} }
PlcConnect.Instance.Write($"DB2104.53.6",true); PlcConnect.Instance.Write($"DB2104.53.6", true);
} }
@ -147,7 +147,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownG1Recipe(List<RecipePlcView> recipePlcViews,List<Step> recipeSteps) public static void DownG1Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList(); recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin = 1018; int begin = 1018;
@ -168,7 +168,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
} }
PlcConnect.Instance.Write($"DB2104.53.6",true); PlcConnect.Instance.Write($"DB2104.53.6", true);
} }
@ -228,7 +228,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownG4Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps) public static void DownG4Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList(); recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin = 1438; int begin = 1438;
DownCleanG1Recipe(begin); DownCleanG1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
@ -255,7 +255,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownG5Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps) public static void DownG5Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList(); recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin = 1578; int begin = 1578;
DownCleanG1Recipe(begin); DownCleanG1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
@ -281,7 +281,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownG6Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps) public static void DownG6Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList(); recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin =1718; int begin = 1718;
DownCleanG1Recipe(begin); DownCleanG1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
@ -308,7 +308,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownG7Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps) public static void DownG7Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList(); recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin =1858; int begin = 1858;
DownCleanG1Recipe(begin); DownCleanG1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
@ -335,7 +335,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList(); recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin =1998; int begin = 1998;
DownCleanG1Recipe(begin); DownCleanG1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
@ -404,75 +404,75 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
PlcConnect.Instance.Write($"DB2104.55.4", true); PlcConnect.Instance.Write($"DB2104.55.4", true);
} }
public static void DownM4Recipe(List<MixStep> recipeSteps) public static void DownM4Recipe(List<MixStep> recipeSteps)
{ {
int begin = 2738; int begin = 2738;
DownM1CleanRecipe(begin); DownM1CleanRecipe(begin);
for (int i = 0; i < recipeSteps.Count(); i++) for (int i = 0; i < recipeSteps.Count(); i++)
{ {
var view = recipeSteps[i]; var view = recipeSteps[i];
DowMSteps(begin, view); DowMSteps(begin, view);
begin += 20; begin += 20;
} }
PlcConnect.Instance.Write($"DB2104.55.5", true); PlcConnect.Instance.Write($"DB2104.55.5", true);
} }
public static void DownM5Recipe(List<MixStep> recipeSteps) public static void DownM5Recipe(List<MixStep> recipeSteps)
{ {
int begin = 2938; int begin = 2938;
DownM1CleanRecipe(begin); DownM1CleanRecipe(begin);
for (int i = 0; i < recipeSteps.Count(); i++) for (int i = 0; i < recipeSteps.Count(); i++)
{ {
var view = recipeSteps[i]; var view = recipeSteps[i];
DowMSteps(begin, view); DowMSteps(begin, view);
begin += 20; begin += 20;
} }
PlcConnect.Instance.Write($"DB2104.55.6", true); PlcConnect.Instance.Write($"DB2104.55.6", true);
} }
public static void DownM6Recipe(List<MixStep> recipeSteps) public static void DownM6Recipe(List<MixStep> recipeSteps)
{ {
int begin = 3138; int begin = 3138;
DownM1CleanRecipe(begin); DownM1CleanRecipe(begin);
for (int i = 0; i < recipeSteps.Count(); i++) for (int i = 0; i < recipeSteps.Count(); i++)
{ {
var view = recipeSteps[i]; var view = recipeSteps[i];
DowMSteps(begin, view); DowMSteps(begin, view);
begin += 20; begin += 20;
} }
PlcConnect.Instance.Write($"DB2104.55.7", true); PlcConnect.Instance.Write($"DB2104.55.7", true);
} }
public static void DownM7Recipe(List<MixStep> recipeSteps) public static void DownM7Recipe(List<MixStep> recipeSteps)
{ {
int begin = 3338; int begin = 3338;
DownM1CleanRecipe(begin); DownM1CleanRecipe(begin);
for (int i = 0; i < recipeSteps.Count(); i++) for (int i = 0; i < recipeSteps.Count(); i++)
{ {
var view = recipeSteps[i]; var view = recipeSteps[i];
DowMSteps(begin, view); DowMSteps(begin, view);
begin += 20; begin += 20;
} }
PlcConnect.Instance.Write($"DB2104.56.0", true); PlcConnect.Instance.Write($"DB2104.56.0", true);
} }
public static void DownM8Recipe(List<MixStep> recipeSteps) public static void DownM8Recipe(List<MixStep> recipeSteps)
{ {
int begin = 3538; int begin = 3538;
DownM1CleanRecipe(begin); DownM1CleanRecipe(begin);
for (int i = 0; i < recipeSteps.Count(); i++) for (int i = 0; i < recipeSteps.Count(); i++)
{ {
var view = recipeSteps[i]; var view = recipeSteps[i];
DowMSteps(begin, view); DowMSteps(begin, view);
begin += 20; begin += 20;
} }
PlcConnect.Instance.Write($"DB2104.56.1", true); PlcConnect.Instance.Write($"DB2104.56.1", true);
} }
private static DryerView GetDryerView(int start) private static DryerView GetDryerView(int start)
{ {
@ -697,7 +697,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
private static void DowMSteps(int start, MixStep step) private static void DowMSteps(int start, MixStep step)
{ {
int mixCode = start; int mixCode = start;
var s= PlcConnect.Instance.Write($"DB2104.{mixCode}.0", step.MixCode); var s = PlcConnect.Instance.Write($"DB2104.{mixCode}.0", step.MixCode);
int mixTime = start + 2; int mixTime = start + 2;
PlcConnect.Instance.Write($"DB2104.{mixTime}.0", step.MixTime); PlcConnect.Instance.Write($"DB2104.{mixTime}.0", step.MixTime);

24
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
Unescape Escape View File

@ -1666,18 +1666,18 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
ControlsHelper.SetJzf(JzfE.AS8GET02, PlcReadTemp.AS8GET02_Set); ControlsHelper.SetJzf(JzfE.AS8GET02, PlcReadTemp.AS8GET02_Set);
ControlsHelper.SetControlCabinet(ControlCabinetE.PM1ADF01, PlcReadTemp.PM1ADF01_Set); ControlsHelper.SetControlCabinet(ControlCabinetE.PM1ADF01, PlcReadTemp.PM1ADF01_Set, false);
ControlsHelper.SetControlCabinet(ControlCabinetE.PM1BDF01, PlcReadTemp.PM1BDF01_Set); ControlsHelper.SetControlCabinet(ControlCabinetE.PM1BDF01, PlcReadTemp.PM1BDF01_Set, false);
ControlsHelper.SetControlCabinet(ControlCabinetE.PM1CDF01, PlcReadTemp.PM1CDF01_Set); ControlsHelper.SetControlCabinet(ControlCabinetE.PM1CDF01, PlcReadTemp.PM1CDF01_Set, false);
ControlsHelper.SetControlCabinet(ControlCabinetE.PM1DDF01, PlcReadTemp.PM1DDF01_Set); ControlsHelper.SetControlCabinet(ControlCabinetE.PM1DDF01, PlcReadTemp.PM1DDF01_Set, false);
ControlsHelper.SetControlCabinet(ControlCabinetE.PM1EDF01, PlcReadTemp.PM1EDF01_Set); ControlsHelper.SetControlCabinet(ControlCabinetE.PM1EDF01, PlcReadTemp.PM1EDF01_Set, false);
ControlsHelper.SetControlCabinet(ControlCabinetE.PM1FDF01, PlcReadTemp.PM1FDF01_Set); ControlsHelper.SetControlCabinet(ControlCabinetE.PM1FDF01, PlcReadTemp.PM1FDF01_Set, false);
ControlsHelper.SetControlCabinet(ControlCabinetE.PM1GDF01, PlcReadTemp.PM1GDF01_Set); ControlsHelper.SetControlCabinet(ControlCabinetE.PM1GDF01, PlcReadTemp.PM1GDF01_Set, false);
ControlsHelper.SetControlCabinet(ControlCabinetE.PM1HDF01, PlcReadTemp.PM1HDF01_Set); ControlsHelper.SetControlCabinet(ControlCabinetE.PM1HDF01, PlcReadTemp.PM1HDF01_Set, false);
ControlsHelper.SetControlCabinet(ControlCabinetE.PM1IDF01, PlcReadTemp.PM1IDF01_Set); ControlsHelper.SetControlCabinet(ControlCabinetE.PM1IDF01, PlcReadTemp.PM1IDF01_Set, false);
ControlsHelper.SetControlCabinet(ControlCabinetE.PM1JDF01, PlcReadTemp.PM1JDF01_Set); ControlsHelper.SetControlCabinet(ControlCabinetE.PM1JDF01, PlcReadTemp.PM1JDF01_Set, false);
ControlsHelper.SetControlCabinet(ControlCabinetE.PM1KDF01, PlcReadTemp.PM1KDF01_Set); ControlsHelper.SetControlCabinet(ControlCabinetE.PM1KDF01, PlcReadTemp.PM1KDF01_Set, false);
ControlsHelper.SetControlCabinet(ControlCabinetE.PM1LDF01, PlcReadTemp.PM1LDF01_Set); ControlsHelper.SetControlCabinet(ControlCabinetE.PM1LDF01, PlcReadTemp.PM1LDF01_Set, false);
ControlsHelper.SetMCLabel(LabelE.DryMode4, DB2107.Dryer[3].Mode, 1); ControlsHelper.SetMCLabel(LabelE.DryMode4, DB2107.Dryer[3].Mode, 1);
ControlsHelper.SetMCLabel(LabelE.DryStatus4, DB2107.Dryer[3].Status, 2); ControlsHelper.SetMCLabel(LabelE.DryStatus4, DB2107.Dryer[3].Status, 2);

8
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs
Unescape Escape View File

@ -244,9 +244,13 @@ namespace Mesnac.Action.ChemicalWeighing.Util
/// </summary> /// </summary>
/// <param name="obj"></param> /// <param name="obj"></param>
/// <param name="set"></param> /// <param name="set"></param>
public static void SetControlCabinet(ControlCabinet obj, bool set) public static void SetControlCabinet(ControlCabinet obj, bool set, bool alarm)
{ {
if (set == true) if (alarm == true)
{
obj.Status = ControlCabinet.Statuses.Alarm;
}
else if (set == true)
{ {
obj.Status = ControlCabinet.Statuses.TurnOn; obj.Status = ControlCabinet.Statuses.TurnOn;
} }

8
Controls/Mesnac.Controls.ChemicalWeighing/ControlCabinet.cs
Unescape Escape View File

@ -17,7 +17,8 @@ namespace Mesnac.Controls.ChemicalWeighing
public enum Statuses public enum Statuses
{ {
TurnOff = 0, TurnOff = 0,
TurnOn = 1 TurnOn = 1,
Alarm = 2,
} }
private bool bNewPic = false; private bool bNewPic = false;
private string _statusName; private string _statusName;
@ -39,9 +40,10 @@ namespace Mesnac.Controls.ChemicalWeighing
{ {
base.Init(); base.Init();
_imageStream = null; _imageStream = null;
sImages = new string[2]; sImages = new string[3];
sImages[0] = "Mesnac.Controls.ChemicalWeighing.Resources.controlCabinet.png";//zsTurnOff sImages[0] = "Mesnac.Controls.ChemicalWeighing.Resources.controlCabinet.png";//zsTurnOff
sImages[1] = "Mesnac.Controls.ChemicalWeighing.Resources.controlCabinet1.png";//zsTurnOn sImages[1] = "Mesnac.Controls.ChemicalWeighing.Resources.controlCabinet1.png";//zsTurnOn
sImages[2] = "Mesnac.Controls.ChemicalWeighing.Resources.controlCabinet0.png";//zsAlarm
_status = Statuses.TurnOff; _status = Statuses.TurnOff;
} }
@ -90,7 +92,7 @@ namespace Mesnac.Controls.ChemicalWeighing
{ {
_status = (Statuses)0; _status = (Statuses)0;
} }
else if ((int)value > 1) else if ((int)value > 2)
{ {
_status = (Statuses)1; _status = (Statuses)1;
} }

13
DataBlockHelper/DBHelpers/DB91Helper.cs
Unescape Escape View File

@ -21,17 +21,18 @@ namespace DataBlockHelper.DBHelpers
public ForMotorEntity DM1BSIG01 => new ForMotorEntity(4, bytes); public ForMotorEntity DM1BSIG01 => new ForMotorEntity(4, bytes);
public ForMotorEntity DM1CSIG01 => new ForMotorEntity(6, bytes); public ForMotorEntity DM1CSIG01 => new ForMotorEntity(6, bytes);
public ForMotorEntity DM1DSIG01 => new ForMotorEntity(8, bytes); public ForMotorEntity DM1DSIG01 => new ForMotorEntity(8, bytes);
public ForMotorEntity DM1GDS01 => new ForMotorEntity(10, bytes); public ForMotorEntity DM1ESIG01 => new ForMotorEntity(10, bytes);
public ForMotorEntity DM1GDS02 => new ForMotorEntity(12, bytes); public ForMotorEntity DM1GDS01 => new ForMotorEntity(12, bytes);
public ForMotorEntity DM1GDS02 => new ForMotorEntity(14, bytes);
public ForMotorEntity DM1GDS03 => new ForMotorEntity(14, bytes); public ForMotorEntity DM1GDS03 => new ForMotorEntity(16, bytes);
public ForMotorEntity DM1GDS04 => new ForMotorEntity(16, bytes); public ForMotorEntity DM1GDS04 => new ForMotorEntity(18, bytes);
public ForMotorEntity DM1GDS05 => new ForMotorEntity(18, bytes); public ForMotorEntity DM1GDS05 => new ForMotorEntity(20, bytes);
public ForMotorEntity DM1GDS06 => new ForMotorEntity(20, bytes); public ForMotorEntity DM1GDS06 => new ForMotorEntity(22, bytes);
public ForMotorEntity DM1GDS07 => new ForMotorEntity(24, bytes); public ForMotorEntity DM1GDS07 => new ForMotorEntity(24, bytes);

853
Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save