Commit 8bf1202a authored by 潘栩锋's avatar 潘栩锋 🚴

添加称重的741,还没改完

parent 3f198b37
......@@ -1020,123 +1020,44 @@ namespace FLY.Weight.Common
public string Number { get; set; }
private bool mixLight;
/// <summary>
/// 混料 进行中
/// </summary>
public bool MixLight
{
get { return mixLight; }
set
{
if (mixLight != value)
{
mixLight = value;
NotifyPropertyChanged("MixLight");
}
}
}
public bool MixLight { get; set; }
private float mixPSet;
/// <summary>
/// 比例设定
/// </summary>
public float MixPSet
{
get { return mixPSet; }
set
{
if (mixPSet != value)
{
mixPSet = value;
NotifyPropertyChanged("MixPSet");
}
}
}
public float MixPSet { get; set; }
private float mixPDisp;
/// <summary>
/// 比例显示
/// </summary>
public float MixPDisp
{
get { return mixPDisp; }
set
{
if (mixPDisp != value)
{
mixPDisp = value;
NotifyPropertyChanged("MixPDisp");
}
}
}
public float MixPDisp { get; set; }
private float mixCumPercent;
/// <summary>
/// 累计重量比例
/// </summary>
public float MixCumPercent
{
get { return mixCumPercent; }
set
{
if (mixCumPercent != value)
{
mixCumPercent = value;
NotifyPropertyChanged("MixCumPercent");
}
}
}
private float mixset;
public float MixCumPercent { get; set; }
/// <summary>
/// 重量设定
/// </summary>
public float MixSet
{
get { return mixset; }
set
{
if (mixset != value)
{
mixset = value;
NotifyPropertyChanged("MixSet");
}
}
}
public float MixSet { get; set; }
private float mixdisp;
/// <summary>
/// 重量显示
/// </summary>
public float MixDisp
{
get { return mixdisp; }
set
{
if (mixdisp != value)
{
mixdisp = value;
NotifyPropertyChanged("MixDisp");
}
}
}
public float MixDisp { get; set; }
private float mixcum;
/// <summary>
/// 累计重量
/// </summary>
public float MixCum
{
get { return mixcum; }
set
{
if (mixcum != value)
{
mixcum = value;
NotifyPropertyChanged("MixCum");
}
}
}
public float MixCum { get; set; }
public IngredientCell()
......@@ -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;
}
......@@ -1161,108 +1075,39 @@ namespace FLY.Weight.Common
/// </summary>
public string Number { get; set; }
private float feedingDeviation;
/// <summary>
/// 补料偏差
/// </summary>
public float FeedingDeviation
{
get { return feedingDeviation; }
set
{
if (feedingDeviation != value)
{
feedingDeviation = value;
NotifyPropertyChanged("FeedingDeviation");
}
}
}
public float FeedingDeviation { get; set; }
private float feedSet;
/// <summary>
/// 加料设定
/// </summary>
public float FeedSet
{
get { return feedSet; }
set
{
if (feedSet != value)
{
feedSet = value;
NotifyPropertyChanged("FeedSet");
}
}
}
public float FeedSet { get; set; }
private float initTime;
/// <summary>
/// 初始时间
/// </summary>
public float InitTime
{
get { return initTime; }
set
{
if (initTime != value)
{
initTime = value;
NotifyPropertyChanged("InitTime");
}
}
}
private float minTime;
public float InitTime { get; set; }
/// <summary>
/// 最小时间
/// </summary>
public float MinTime
{
get { return minTime; }
set
{
if (minTime != value)
{
minTime = value;
NotifyPropertyChanged("MinTime");
}
}
}
public float MinTime { get; set; }
private float stableTime;
/// <summary>
/// 稳重时间
/// </summary>
public float StableTime
{
get { return stableTime; }
set
{
if (stableTime != value)
{
stableTime = value;
NotifyPropertyChanged("StableTime");
}
}
}
public float StableTime { get; set; }
private float binAlarmSet;
/// <summary>
/// 料仓报警设定
/// </summary>
public float BinAlarmSet
{
get { return binAlarmSet; }
set
{
if (binAlarmSet != value)
{
binAlarmSet = value;
NotifyPropertyChanged("BinAlarmSet");
}
}
}
public float BinAlarmSet { get; set; }
public IngredientParamCell()
......@@ -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;
}
......
#!/bin/bash
cp WS.xml ../../../../Project.FLY.Weight/FLY.Weight.UI.Server/bin/Debug/Gage1
$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