Skip to content

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

添加称重的741，还没改完

parent 3f198b37
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 199 deletions
Project.FLY.Weight/FLY.Weight/Common/WeighterC.cs
View file @ 8bf1202a
...@@ -1020,123 +1020,44 @@ namespace FLY.Weight.Common ...@@ -1020,123 +1020,44 @@ namespace FLY.Weight.Common
public string Number { get; set; } public string Number { get; set; }
private bool mixLight;
/// <summary> /// <summary>
/// 混料 进行中 /// 混料 进行中
/// </summary> /// </summary>
public bool MixLight public bool MixLight { get; set; }
{
get { return mixLight; }
set
{
if (mixLight != value)
{
mixLight = value;
NotifyPropertyChanged("MixLight");
}
}
}
private float mixPSet; private float mixPSet;
/// <summary> /// <summary>
/// 比例设定 /// 比例设定
/// </summary> /// </summary>
public float MixPSet public float MixPSet { get; set; }
{
get { return mixPSet; }
set
{
if (mixPSet != value)
{
mixPSet = value;
NotifyPropertyChanged("MixPSet");
}
}
}
private float mixPDisp;
/// <summary> /// <summary>
/// 比例显示 /// 比例显示
/// </summary> /// </summary>
public float MixPDisp public float MixPDisp { get; set; }
{
get { return mixPDisp; }
set
{
if (mixPDisp != value)
{
mixPDisp = value;
NotifyPropertyChanged("MixPDisp");
}
}
}
private float mixCumPercent;
/// <summary> /// <summary>
/// 累计重量比例 /// 累计重量比例
/// </summary> /// </summary>
public float MixCumPercent public float MixCumPercent { get; set; }
{
get { return mixCumPercent; }
set
{
if (mixCumPercent != value)
{
mixCumPercent = value;
NotifyPropertyChanged("MixCumPercent");
}
}
}
private float mixset;
/// <summary> /// <summary>
/// 重量设定 /// 重量设定
/// </summary> /// </summary>
public float MixSet public float MixSet { get; set; }
{
get { return mixset; }
set
{
if (mixset != value)
{
mixset = value;
NotifyPropertyChanged("MixSet");
}
}
}
private float mixdisp;
/// <summary> /// <summary>
/// 重量显示 /// 重量显示
/// </summary> /// </summary>
public float MixDisp public float MixDisp { get; set; }
{
get { return mixdisp; }
set
{
if (mixdisp != value)
{
mixdisp = value;
NotifyPropertyChanged("MixDisp");
}
}
}
private float mixcum;
/// <summary> /// <summary>
/// 累计重量 /// 累计重量
/// </summary> /// </summary>
public float MixCum public float MixCum { get; set; }
{
get { return mixcum; }
set
{
if (mixcum != value)
{
mixcum = value;
NotifyPropertyChanged("MixCum");
}
}
}
public IngredientCell() public IngredientCell()
...@@ -1144,13 +1065,6 @@ namespace FLY.Weight.Common ...@@ -1144,13 +1065,6 @@ namespace FLY.Weight.Common
} }
protected void NotifyPropertyChanged(string propertyname)
{
if (PropertyChanged != null)
{
PropertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyname));
}
}
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
} }
...@@ -1161,108 +1075,39 @@ namespace FLY.Weight.Common ...@@ -1161,108 +1075,39 @@ namespace FLY.Weight.Common
/// </summary> /// </summary>
public string Number { get; set; } public string Number { get; set; }
private float feedingDeviation;
/// <summary> /// <summary>
/// 补料偏差 /// 补料偏差
/// </summary> /// </summary>
public float FeedingDeviation public float FeedingDeviation { get; set; }
{
get { return feedingDeviation; }
set
{
if (feedingDeviation != value)
{
feedingDeviation = value;
NotifyPropertyChanged("FeedingDeviation");
}
}
}
private float feedSet;
/// <summary> /// <summary>
/// 加料设定 /// 加料设定
/// </summary> /// </summary>
public float FeedSet public float FeedSet { get; set; }
{
get { return feedSet; }
set
{
if (feedSet != value)
{
feedSet = value;
NotifyPropertyChanged("FeedSet");
}
}
}
private float initTime;
/// <summary> /// <summary>
/// 初始时间 /// 初始时间
/// </summary> /// </summary>
public float InitTime public float InitTime { get; set; }
{
get { return initTime; }
set
{
if (initTime != value)
{
initTime = value;
NotifyPropertyChanged("InitTime");
}
}
}
private float minTime;
/// <summary> /// <summary>
/// 最小时间 /// 最小时间
/// </summary> /// </summary>
public float MinTime public float MinTime { get; set; }
{
get { return minTime; }
set
{
if (minTime != value)
{
minTime = value;
NotifyPropertyChanged("MinTime");
}
}
}
private float stableTime;
/// <summary> /// <summary>
/// 稳重时间 /// 稳重时间
/// </summary> /// </summary>
public float StableTime public float StableTime { get; set; }
{
get { return stableTime; }
set
{
if (stableTime != value)
{
stableTime = value;
NotifyPropertyChanged("StableTime");
}
}
}
private float binAlarmSet;
/// <summary> /// <summary>
/// 料仓报警设定 /// 料仓报警设定
/// </summary> /// </summary>
public float BinAlarmSet public float BinAlarmSet { get; set; }
{
get { return binAlarmSet; }
set
{
if (binAlarmSet != value)
{
binAlarmSet = value;
NotifyPropertyChanged("BinAlarmSet");
}
}
}
public IngredientParamCell() public IngredientParamCell()
...@@ -1270,13 +1115,6 @@ namespace FLY.Weight.Common ...@@ -1270,13 +1115,6 @@ namespace FLY.Weight.Common
} }
protected void NotifyPropertyChanged(string propertyname)
{
if (PropertyChanged != null)
{
PropertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyname));
}
}
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
} }
......
Resource/称重/设备连接变量表_44446/Generated/cp_WS.sh 0 → 100644
View file @ 8bf1202a
#!/bin/bash
cp WS.xml ../../../../Project.FLY.Weight/FLY.Weight.UI.Server/bin/Debug/Gage1
Resource/称重/设备连接变量表_44446/Generated/cp_ws.ps1 deleted 100644 → 0
View file @ 3f198b37
$root_path = $PSScriptRoot
$src_path = $root_path + "\WS.xml"
$dest_dir = $root_path + "\..\..\..\..\Project.FLY.Weight\FLY.Weight.UI.Server\bin\Debug\Gage1"
$dest_path = $dest_dir + "\WS.xml"
if(-not (Test-Path $dest_dir))
{
echo $dest_dir
mkdir $dest_dir
}
echo WS.xml
cp $src_path $dest_path
echo Ƴɹ
pause
\ No newline at end of file
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