Skip to content

H
hemei
Commit eb14b806 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

合并。。。

parents 561c75a3 116261ae
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 247 deletions
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Server/WdSetup.xaml.cs
View file @ eb14b806
......@@ -89,7 +89,10 @@ namespace FLY.FeedbackRenZiJia.UI.Server
}
break;
}
Application.Current.Shutdown();
//切换为exe的目录，这样程序再次进入时，才能 进入Gage1 文件夹
System.Environment.CurrentDirectory = "../";
//重启软件
AppHelper.AppJustOne.Restart();
}
}
}
......
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia/Common/ERRNOs.cs
View file @ eb14b806
......@@ -10,10 +10,10 @@ namespace FLY.FeedbackRenZiJia.Common
{
static ERRNOs()
{
ERRNO_PLC_DISCONNECTED = new ERRNO() { Code = 255, Descrption = "风环 PLC连接断开" };
ERRNO_PLC_DISCONNECTED = new ERRNO() { Code = 65535, Descrption = "风环 PLC连接断开" };
#region 收卷
ERRNO_NO_FAN = new ERRNO() { Code = 0, Descrption = "风机没开，不能加热" , OffIsError=true};
ERRNO_NO_FAN = new ERRNO() { Code = 0, Descrption = "风机没开，不能加热" };
ERRNO_OPEN_CIRCUIT = new ERRNO() { Code = 1, Descrption = "加热棒断路" };
ERRNO_SHORT_CIRCUIT = new ERRNO() { Code = 2, Descrption = "加热控制板短路" };
ERRNO_POWER_OFF = new ERRNO() { Code = 3, Descrption = "电源没开启或电流计损坏" };
......
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia/Server/FeedbackHeat.cs
View file @ eb14b806
......@@ -298,7 +298,7 @@ namespace FLY.FeedbackRenZiJia.Server
FObjBase.PollModule.Current.Poll_Config(PollModule.POLL_CONFIG.ADD,
() =>
{
Misc.BindingOperations.SetBinding(this, "IsConnectedWithPLC", () =>
Misc.BindingOperations.SetBinding(this, nameof(IsConnectedWithPLC), () =>
{
bool b = !IsConnectedWithPLC;
......
Project.FLY.IBC/FLY.IBC.UI.Server/WdSetup.xaml.cs
View file @ eb14b806
......@@ -98,8 +98,10 @@ namespace FLY.IBC.UI.Server
}
if (MessageBox.Show("需要重启，才能生效", "提示", MessageBoxButton.OKCancel) == MessageBoxResult.OK) {
File.Copy(item.Path, "plcgroup.json", true);
//System.Windows.Forms.Application.Restart();
Application.Current.Shutdown();
//切换为exe的目录，这样程序再次进入时，才能 进入Gage1 文件夹
System.Environment.CurrentDirectory = "../";
//重启软件
AppHelper.AppJustOne.Restart();
}
}
}
......
Project.FLY.IBC/FLY.IBC/Server/IBCSystem.cs
View file @ eb14b806
......@@ -77,7 +77,7 @@ namespace FLY.IBC.Server
//--------------------------------------------------------------------------------
//step 2 报警配置
errorConf = new ErrorConf(PLCos, this.warning, "IBC");
errorConf = new ErrorConf(plcos, this.warning, "IBC");
errorConf.AddErrorAction(Item);
for (int i = 0; i < TAreas.Count(); i++)
{
......
Project.FLY.Integrated/FLY.Integrated/Server/IntegratedSystem.cs
View file @ eb14b806
......@@ -101,14 +101,14 @@ namespace FLY.Integrated.Server
"plcgroup.json",
(plcgroup) => new Dictionary<string, INotifyPropertyChanged>
{
{ "Ibc", Ibc },
{ "Accessory", Accessory }
{ nameof(Ibc), Ibc },
{ nameof(Accessory), Accessory }
}
);
//--------------------------------------------------------------------------------
//step 2 报警配置
errorConf = new ErrorConf(PLCos, this.warning, "综合IBC");
errorConf = new ErrorConf(plcos, this.warning, "综合IBC");
errorConf.AddErrorAction(Accessory);
errorConf.AddErrorAction(Ibc);
errorConf.InitError();
......@@ -118,8 +118,11 @@ namespace FLY.Integrated.Server
//step 3 历史数据记录
//添加任务
PLCos.SetPlan("Ibc", new string[] {
"FilmWidth","InletAirFreq","OutletAirFreq","ExCoolFreq"
PLCos.SetPlan(nameof(Ibc), new string[] {
nameof(Ibc.FilmWidth),
nameof(Ibc.InletAirFreq),
nameof(Ibc.OutletAirFreq),
nameof(Ibc.ExCoolFreq)
}, 0);
psdWidth = new PeriodicallySaveData<Db_Width>();
......@@ -144,8 +147,11 @@ namespace FLY.Integrated.Server
};
});
PLCos.SetPlan("Accessory", new string[] {
"TractionVelocity","RotaryFreq","IsRotaryForw","IsRotaryBackw"
PLCos.SetPlan(nameof(Accessory), new string[] {
nameof(Accessory.TractionVelocity),
nameof(Accessory.RotaryFreq),
nameof(Accessory.IsRotaryForw),
nameof(Accessory.IsRotaryBackw)
}, 0);
psdWinderInfo = new PeriodicallySaveData<Db_WinderInfo>();
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/BlowingDetect.cs
View file @ eb14b806
......@@ -1074,19 +1074,17 @@ namespace FLY.Thick.Blowing.Server
{
if (mRollList.Count > 1)
{
DateTime sysTime0 = flyad.Now;
DateTime sysTime1 = mRollList[mRollList.Count - 1].sysTime;
int cnt = 5;
if (cnt > mRollList.Count)
cnt = mRollList.Count;
DateTime sysTime4 = mRollList[mRollList.Count - (cnt - 1)].dt;
DateTime sysTime5 = mRollList[mRollList.Count - cnt].sysTime;
DateTime sysTime2 = mRollList[mRollList.Count - cnt].sysTime;
TimeSpan ts_last = TimeSpan.FromTicks((sysTime1 - sysTime2).Ticks / (cnt - 1));//5次的平均滤波, 使用AD盒的时间算出来的时间差，最准
TimeSpan ts_last = TimeSpan.FromTicks((sysTime1 - sysTime5).Ticks / (cnt - 1));//5次的平均滤波
//未来的 5次的平均滤波 时间差
TimeSpan ts_now = TimeSpan.FromTicks((sysTime0 - sysTime4).Ticks / (cnt - 1));
DateTime dt11 = mRollList[mRollList.Count - (cnt - 1)].dt;
//因为没有使用AD盒的时间，所以可以用DateTime.Now 比较
TimeSpan ts_now = TimeSpan.FromTicks((DateTime.Now - dt11).Ticks / (cnt - 1));//使用 电脑的时间，算出来的时间差，大概而已
TimeSpan ts_max;
if (ts_now > (ts_last + ts_last))//超过了2倍的时间，肯定是慢下来了
{
......@@ -1552,40 +1550,6 @@ namespace FLY.Thick.Blowing.Server
/// <returns></returns>
double RollList_GetVelocity(int idx)
{
//TODO
//速度是准的
//if (idx>5)
//{
// DateTime sysTime0 = flyad.Now;
// DateTime sysTime1 = mRollList[mRollList.Count - 1].sysTime;
// int cnt = 5;
// if (cnt > mRollList.Count)
// cnt = mRollList.Count;
// DateTime sysTime4 = mRollList[mRollList.Count - (cnt - 1)].dt;
// DateTime sysTime5 = mRollList[mRollList.Count - cnt].sysTime;
// TimeSpan ts_last = TimeSpan.FromTicks((sysTime1 - sysTime5).Ticks / (cnt - 1));//5次的平均滤波
// //未来的 5次的平均滤波 时间差
// TimeSpan ts_now = TimeSpan.FromTicks((sysTime0 - sysTime4).Ticks / (cnt - 1));
// TimeSpan ts_max;
// if (ts_now > (ts_last + ts_last))//超过了2倍的时间，肯定是慢下来了
// {
// ts_max = ts_now;
// }
// else
// {
// ts_max = ts_last;
// }
// FilmVelocity = RollPerimeter / 1000.0 / ts_max.TotalMinutes;
// BufTotalTime = DateTime.Now - mRollList[0].dt;//这里用回电脑的时间
//}
DateTime dt1 = mRollList[idx + 1].dt;
DateTime dt2 = mRollList[idx].dt;
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan/Server/TDGage.cs
View file @ eb14b806
......@@ -332,25 +332,6 @@ namespace FLY.Thick.BlowingScan.Server
}
};
//------------------------------------------------------------------------------------------------------------------------------------
//线速度------------------------------------------------------------------------------------------------------------------------------
flyAd.PropertyChanged += (s, e) =>
{
if (e.PropertyName == nameof(flyAd.Speed2))
{
if (initParam.FilmVSrc != FilmVSRC.EN2)
return;
double speed = flyAd.Speed2 * initParam.Encoder2_mmpp;//mm/s
speed = speed * 60 / 1000;//m/min
dynArea.FilmVelocity = speed;
}
};
//------------------------------------------------------------------------------------------------------------------------------------
//辊信号生成线速度-----------------------------------------------------------------------------------------------------------------------------
InitRoundFilmVelocity();
//------------------------------------------------------------------------------------------------------------------------------------
//数据有效-----------------------------------------------------------------------------------------------------------------------------
......@@ -521,7 +502,7 @@ namespace FLY.Thick.BlowingScan.Server
Misc.BindingOperations.SetBinding(initParam, nameof(initParam.VScan), gmRenZiJiaScan, nameof(gmRenZiJiaScan.Velocity));
Misc.BindingOperations.SetBinding(gmRenZiJiaScan.mPDetect, nameof(gmRenZiJiaScan.mPDetect.RollPerimeter), initParam, nameof(initParam.MmOfR), BindingOperations.BindingMode.TwoWay);
Misc.BindingOperations.SetBinding(gmRenZiJiaScan, nameof(gmRenZiJiaScan.mPDetect.FilmVelocity), dynArea, nameof(dynArea.FilmVelocity));
Misc.BindingOperations.SetBinding(gmRenZiJiaScan.mPDetect, nameof(gmRenZiJiaScan.mPDetect.FilmVelocity), dynArea, nameof(dynArea.FilmVelocity));
dynArea.NBolts = gmRenZiJiaScan.NBolts;
dynArea.FirstBoltNo = 1;
......@@ -689,92 +670,6 @@ namespace FLY.Thick.BlowingScan.Server
}
}
#region 辊信号生成 线速度
DispatcherTimer round_t;
DateTime dtRound = DateTime.MinValue;
void InitRoundFilmVelocity()
{
round_t = new DispatcherTimer();
round_t.Interval = TimeSpan.FromSeconds(1);
round_t.Tick += new EventHandler(round_t_Tick);
flyAd.IStatusChangedEvent += new IStatusChangedEventHandler(mFlyAD_IStatusChangedEvent_round);
}
void mFlyAD_IStatusChangedEvent_round(object sender, IStatusChangedEventArgs e)
{
if (initParam.FilmVSrc != FilmVSRC.ROUND)
return;
if (!Misc.MyBase.CHECKBIT(e.IChanged, 11 - 1))
return;
if (Misc.MyBase.CHECKBIT(e.IStatus, 11 - 1))
return;
//1->0
DateTime dt = e.Time;
if (dt <= dtRound)
return;
if (dtRound != DateTime.MinValue)
{
double v = initParam.MmOfR / 1000.0 / (dt - dtRound).TotalMinutes;
if (v < 1)
{
dt = DateTime.MinValue;
v = 0;
}
dynArea.FilmVelocity = v;
}
dtRound = dt;
if (dtRound != DateTime.MinValue)
{
if (!round_t.IsEnabled)
round_t.Start();
}
}
void round_t_Tick(object sender, EventArgs e)
{
if (initParam.FilmVSrc != FilmVSRC.ROUND)
{
round_t.Stop();
return;
}
if (dtRound == DateTime.MinValue)
{
round_t.Stop();
return;
}
//1->0
DateTime dt = DateTime.Now;
if (dt <= dtRound)
return;
double v = initParam.MmOfR / 1000.0 / (dt - dtRound).TotalMinutes;
if (v < (dynArea.FilmVelocity - 1))
{
if (v < 2)
{
dtRound = DateTime.MinValue;
v = 0;
}
dynArea.FilmVelocity = v;
}
if (dtRound == DateTime.MinValue)
{
round_t.Stop();
return;
}
}
#endregion
void mDynArea_PropertyChanged(object sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == nameof(dynArea.FilmVelocity))
......
Project.FLY.Weight/FLY.Weight.UI.Server/MainWindow.xaml
View file @ eb14b806
......@@ -7,10 +7,10 @@
<Grid x:Name="grid_plcos"/>
<Grid x:Name="grid_WeightSystem"/>
<StackPanel Margin="5">
<StackPanel Orientation="Vertical" Margin="4" DataContext="{Binding ElementName=grid_WeightSystem,Path=DataContext}">
<TextBlock Text="当前线速度设置m/min*10" />
<StackPanel Margin="5" DataContext="{Binding ElementName=grid_WeightSystem,Path=DataContext}">
<TextBlock Text="当前线速度设置m/min" />
<TextBlock FontSize="20">
<Run Text="{Binding Accessory.CurrentVelocitySet,StringFormat=\{0:F0\}, Mode=OneWay}" />
<Run Text="{Binding Accessory.CurrentVelocitySet,StringFormat={}{0:F1}, Mode=OneWay}" />
</TextBlock>
</StackPanel>
<ItemsControl x:Name="itemcontrol">
......
Project.FLY.Weight/FLY.Weight.UI.Server/WdSetup.xaml.cs
View file @ eb14b806
......@@ -133,8 +133,11 @@ namespace FLY.Weight.UI.Server
if (MessageBox.Show("需要重启，才能生效", "提示", MessageBoxButton.OKCancel) == MessageBoxResult.OK)
{
File.Copy(item.Path, "plcgroup.json", true);
//System.Windows.Forms.Application.Restart();
Application.Current.Shutdown();
//切换为exe的目录，这样程序再次进入时，才能 进入Gage1 文件夹
System.Environment.CurrentDirectory = "../";
//重启软件
AppHelper.AppJustOne.Restart();
}
}
......
Project.FLY.Weight/FLY.Weight/Common/ERRNOs.cs deleted 100644 → 0
View file @ 561c75a3
using FLY.OBJComponents.Common;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace FLY.Weight.Common
{
public static class ERRNOs
{
static ERRNOs()
{
ERRNO_PLC_DISCONNECTED = new ERRNO() { Code = 255, Descrption = "称重 PLC连接断开" };
ERRNO_PLC_REG = new ERRNO() { Code = 0, Descrption = "通过 PLC寄存器 触发的报警信息" };
}
/// <summary>
/// PLC连接断开
/// </summary>
public static ERRNO ERRNO_PLC_DISCONNECTED;
/// <summary>
/// 通过 PLC寄存器 触发的报警信息
/// </summary>
public static ERRNO ERRNO_PLC_REG;
}
}
Project.FLY.Weight/FLY.Weight/Common/WeighterC.cs
View file @ eb14b806
......@@ -829,86 +829,86 @@ namespace FLY.Weight.Common
public float BinAlarmSet_6{ get; set; }
/// <summary>
/// No.1料仓缺料报警
/// 1#料仓缺料报警
/// </summary>
[Description("No.1料仓缺料报警")]
[Description("1#料仓缺料报警")]
[IsError()]
public bool IsErrorOfLack_1{ get; set; }
/// <summary>
/// No.2料仓缺料报警
/// 2#料仓缺料报警
/// </summary>
[Description("No.2料仓缺料报警")]
[Description("2#料仓缺料报警")]
[IsError()]
public bool IsErrorOfLack_2{ get; set; }
/// <summary>
/// No.3料仓缺料报警
/// 3#料仓缺料报警
/// </summary>
[Description("No.3料仓缺料报警")]
[Description("3#料仓缺料报警")]
[IsError()]
public bool IsErrorOfLack_3{ get; set; }
/// <summary>
/// No.4料仓缺料报警
/// 4#料仓缺料报警
/// </summary>
[Description("No.4料仓缺料报警")]
[Description("4#料仓缺料报警")]
[IsError()]
public bool IsErrorOfLack_4{ get; set; }
/// <summary>
/// No.5料仓缺料报警
/// 5#料仓缺料报警
/// </summary>
[Description("No.5料仓缺料报警")]
[Description("5#料仓缺料报警")]
[IsError()]
public bool IsErrorOfLack_5{ get; set; }
/// <summary>
/// No.6料仓缺料报警
/// 6#料仓缺料报警
/// </summary>
[Description("No.6料仓缺料报警")]
[Description("6#料仓缺料报警")]
[IsError()]
public bool IsErrorOfLack_6{ get; set; }
/// <summary>
/// No.1料斗加料异常
/// 1#料斗加料异常
/// </summary>
[Description("No.1料斗加料异常")]
[Description("1#料斗加料异常")]
[IsError()]
public bool IsErrorOfAdd_1{ get; set; }
/// <summary>
/// No.2料斗加料异常
/// 2#料斗加料异常
/// </summary>
[Description("No.2料斗加料异常")]
[Description("2#料斗加料异常")]
[IsError()]
public bool IsErrorOfAdd_2{ get; set; }
/// <summary>
/// No.3料斗加料异常
/// 3#料斗加料异常
/// </summary>
[Description("No.3料斗加料异常")]
[Description("3#料斗加料异常")]
[IsError()]
public bool IsErrorOfAdd_3{ get; set; }
/// <summary>
/// No.4料斗加料异常
/// 4#料斗加料异常
/// </summary>
[Description("No.4料斗加料异常")]
[Description("4#料斗加料异常")]
[IsError()]
public bool IsErrorOfAdd_4{ get; set; }
/// <summary>
/// No.5料斗加料异常
/// 5#料斗加料异常
/// </summary>
[Description("No.5料斗加料异常")]
[Description("5#料斗加料异常")]
[IsError()]
public bool IsErrorOfAdd_5{ get; set; }
/// <summary>
/// No.6料斗加料异常
/// 6#料斗加料异常
/// </summary>
[Description("No.6料斗加料异常")]
[Description("63料斗加料异常")]
[IsError()]
public bool IsErrorOfAdd_6{ get; set; }
......@@ -999,6 +999,47 @@ namespace FLY.Weight.Common
[IsError()]
public bool IsErrorOfBinLack{ get; set; }
/// <summary>
/// 1#配料偏差大
/// </summary>
[Description("1#配料偏差大")]
[IsError()]
public bool IsErrorOfDosing_1 { get; set; }
/// <summary>
/// 2#配料偏差大
/// </summary>
[Description("2#配料偏差大")]
[IsError()]
public bool IsErrorOfDosing_2 { get; set; }
/// <summary>
/// 3#配料偏差大
/// </summary>
[Description("3#配料偏差大")]
[IsError()]
public bool IsErrorOfDosing_3 { get; set; }
/// <summary>
/// 4#配料偏差大
/// </summary>
[Description("4#配料偏差大")]
[IsError()]
public bool IsErrorOfDosing_4 { get; set; }
/// <summary>
/// 5#配料偏差大
/// </summary>
[Description("5#配料偏差大")]
[IsError()]
public bool IsErrorOfDosing_5 { get; set; }
/// <summary>
/// 6#配料偏差大
/// </summary>
[Description("6#配料偏差大")]
[IsError()]
public bool IsErrorOfDosing_6 { get; set; }
#endregion
......
Project.FLY.Weight/FLY.Weight/FLY.Weight.csproj
View file @ eb14b806
......@@ -54,7 +54,6 @@
<Compile Include="IService\IBulkDbMixService.cs" />
<Compile Include="IService\IBulkDbFlowService.cs" />
<Compile Include="OBJ_INTERFACE\OBJ_INTERFACE.cs" />
<Compile Include="Common\ERRNOs.cs" />
<Compile Include="Common\WeighterC.cs" />
<Compile Include="Client\WeightSystemServiceClient.cs" />
<Compile Include="IService\IWeightSystemService.cs" />
......
Project.FLY.Weight/FLY.Weight/Server/TDGage.cs
View file @ eb14b806
......@@ -86,9 +86,9 @@ namespace FLY.Weight.Server
private void MBDetect_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
{
if (e.PropertyName == "FilmVelocity")
if (e.PropertyName == nameof(mBDetect.FilmVelocity))
{
mData.Accessory.CurrentVelocitySet = (((int)(mBDetect.FilmVelocity * 10)) / 10.0f);
mData.Accessory.CurrentVelocitySet = (float)mBDetect.FilmVelocity;
}
}
......
Project.FLY.Weight/FLY.Weight/Server/WeightSystem.cs
View file @ eb14b806
......@@ -68,8 +68,6 @@ namespace FLY.Weight.Server
/// 周期保存Ibc数据
/// </summary>
PeriodicallySaveData<Lc_Flow> psdFlow;
public WeightSystem()
{
if (!LoadNumberNames())
......@@ -90,7 +88,7 @@ namespace FLY.Weight.Server
//--------------------------------------------------------------------------------
//step 2 报警配置
errorConf = new ErrorConf(PLCos, this.warning, "称重");
errorConf = new ErrorConf(plcos, this.warning, "称重");
errorConf.AddErrorAction(Accessory);
for (int i = 0; i < Items.Count(); i++)
{
......@@ -123,7 +121,7 @@ namespace FLY.Weight.Server
{
for (int i = 0; i < ItemsCnt; i++)
{
Items[i].IsAlarmReseted = false;
Items[i].IsAlarmReseted = true;
}
}
});
......@@ -142,7 +140,7 @@ namespace FLY.Weight.Server
//Test();
//--------------------------------------------------------------------------------
//添加任务
......@@ -158,7 +156,11 @@ namespace FLY.Weight.Server
nameof(WeighterC.CurrentFlow),
nameof(WeighterC.ScrewPSet),
nameof(WeighterC.ScrewPDisp),
nameof(WeighterC.ScrewMotorFreq)
nameof(WeighterC.ScrewMotorFreq),
//报警复位用
nameof(WeighterC.IsAlarmReseted),
nameof(WeighterC.AlarmIsOn)
};
for (int j = 0; j < Items[i].BinCnt; j++)
......
Project.FLY.Weight2/FLY.Weight2.UI.Server/WdSetup.xaml.cs
View file @ eb14b806
......@@ -98,8 +98,11 @@ namespace FLY.Weight2.UI.Server
}
if (MessageBox.Show("需要重启，才能生效", "提示", MessageBoxButton.OKCancel) == MessageBoxResult.OK) {
File.Copy(item.Path, "plcgroup.json", true);
//System.Windows.Forms.Application.Restart();
Application.Current.Shutdown();
//切换为exe的目录，这样程序再次进入时，才能 进入Gage1 文件夹
System.Environment.CurrentDirectory = "../";
//重启软件
AppHelper.AppJustOne.Restart();
}
}
}
......
Project.FLY.Weight2/FLY.Weight2/Server/WeightSystem.cs
View file @ eb14b806
......@@ -80,7 +80,7 @@ namespace FLY.Weight2.Server
//--------------------------------------------------------------------------------
//step 2 报警配置
errorConf = new ErrorConf(PLCos, this.warning, "称重");
errorConf = new ErrorConf(plcos, this.warning, "称重");
errorConf.AddErrorAction(Accessory);
for (int i = 0; i < Items.Count(); i++)
{
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Server/WdSetup.xaml.cs
View file @ eb14b806
......@@ -95,8 +95,11 @@ namespace FLY.Winder.UI.Server
}
if (MessageBox.Show("需要重启，才能生效", "提示", MessageBoxButton.OKCancel) == MessageBoxResult.OK) {
File.Copy(item.Path, "plcgroup.json", true);
//System.Windows.Forms.Application.Restart();
Application.Current.Shutdown();
//切换为exe的目录，这样程序再次进入时，才能 进入Gage1 文件夹
System.Environment.CurrentDirectory = "../";
//重启软件
AppHelper.AppJustOne.Restart();
}
}
}
......
Project.FLY.Winder_20190413/FLY.Winder/Server/WinderSystem.cs
View file @ eb14b806
......@@ -72,9 +72,9 @@ namespace FLY.Winder.Server
{
//PLCos.ObjNames[n].Key 必须与 plcgroup.json 中的 OwnerName 一致！！！！
var objNames = new Dictionary<string, INotifyPropertyChanged>();
objNames.Add("Accessory", Accessory);
objNames.Add(nameof(Accessory), Accessory);
for (int i = 0; i < Items.Count(); i++)
objNames.Add($"Items[{i}]", Items[i]);
objNames.Add($"{nameof(Items)}[{i}]", Items[i]);
return objNames;
}
......@@ -83,7 +83,7 @@ namespace FLY.Winder.Server
//--------------------------------------------------------------------------------
//step 2 报警配置
errorConf = new ErrorConf(PLCos, this.warning, "收卷");
errorConf = new ErrorConf(plcos, this.warning, "收卷");
//反射找出全部是报警的property
......@@ -107,20 +107,20 @@ namespace FLY.Winder.Server
//step 3 历史数据记录
//添加任务
PLCos.SetPlan("Accessory", new string[] {
"Velocity",
"Traction1Current",
"Traction2Current",
"Traction2TensionKg",
"RotaryCurrent",
"RotaryFreq",
"IsRotaryForw",
"IsRotaryBackw"
PLCos.SetPlan(nameof(Accessory), new string[] {
nameof(Accessory.Velocity),
nameof(Accessory.Traction1Current),
nameof(Accessory.Traction2Current),
nameof(Accessory.Traction2TensionKg),
nameof(Accessory.RotaryCurrent),
nameof(Accessory.RotaryFreq),
nameof(Accessory.IsRotaryForw),
nameof(Accessory.IsRotaryBackw)
}, 0);
for (int i = 0; i < Items.Count(); i++)
PLCos.SetPlan($"Items[{i}]", new string[] {
"TensionKg",
"Current"
PLCos.SetPlan($"{nameof(Items)}[{i}]", new string[] {
nameof(WinderInsideOutside.TensionKg),
nameof(WinderInsideOutside.Current)
}, 0);
psdWinderInfo = new PeriodicallySaveData<Db_WinderInfo>();
......
thick_public @ 21ae28ec
Subproject commit 8957f54bb1bf04be95af6d047cc4d08ed142639c
Subproject commit 21ae28ec4f8ada4b9caf2c829a6f40ddb0f971e0
脚本/版本描述.txt
View file @ eb14b806
和美安装包_v6.22.5 -20210529
1. 优化 报警码升级为 uint16
2. 优化 报警管理界面 删除 【消音】
3. 添加 称重添加 444_v3.1(偏差报警)
和美安装包_v6.22.4 -20210521
1. 修复 扫描测厚仪 主界面 FilmVelocity一直显示为0
和美安装包_v6.22.3 -20210510
1. 修复 扫描测厚仪 FilmVelocity 同时由两个源生成。
2. 修复 追边,扫描测厚仪 FilmVelocity 使用了 电脑时间生成后，不准的问题。
3. 修复 系统有多个PLC，但只显示第1个PLC的连接状态，现在任何一个断开都会触发报警
4. 优化 服务器 设置完参数，能自动重启了。
和美安装包_v6.22.2 -20210425
1. 修复 追边,扫描测厚仪服务器主界面都改回用window控件. 解决 WindowBigClose 找不到MahApps.Brush.Accent 出错。
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment