Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
be979c3e77
2 files changed
+29
-2
No files matched your search
@@ -172,6 +172,27 @@ namespace DyeingComputer.View
|
|||||||
this.Visibility = Visibility.Collapsed;//隐藏控件
|
this.Visibility = Visibility.Collapsed;//隐藏控件
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public struct Date
|
||||||
|
{
|
||||||
|
public string Step;
|
||||||
|
public string StepID;
|
||||||
|
public string StepNAME;
|
||||||
|
public string PNAME;
|
||||||
|
public string P1;
|
||||||
|
public string P2;
|
||||||
|
public string P3;
|
||||||
|
public string P4;
|
||||||
|
public string P5;
|
||||||
|
public string P6;
|
||||||
|
public string P7;
|
||||||
|
public string P8;
|
||||||
|
public string P9;
|
||||||
|
public string P10;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
using System;
|
using DyeingComputer.View;
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Data;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
@@ -36,6 +38,9 @@ namespace DyeingComputer.Windows
|
|||||||
e.Handled = !re.IsMatch(e.Text);
|
e.Handled = !re.IsMatch(e.Text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private readonly string[] a = {"001","007","008","013","017", "020", "022", "031", "035", "036", "039", "040", "041", "049", "050",
|
private readonly string[] a = {"001","007","008","013","017", "020", "022", "031", "035", "036", "039", "040", "041", "049", "050",
|
||||||
"051", "054", "055", "056","064","065","066","067","090","091","093","094" };
|
"051", "054", "055", "056","064","065","066","067","090","091","093","094" };
|
||||||
|
|
||||||
@@ -84,6 +89,7 @@ namespace DyeingComputer.Windows
|
|||||||
{
|
{
|
||||||
boxID.SelectedIndex =-1;
|
boxID.SelectedIndex =-1;
|
||||||
// boxNAME.Text = Properties.Resources.Invalidfeatures;//功能无效
|
// boxNAME.Text = Properties.Resources.Invalidfeatures;//功能无效
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user