|
|
@@ -112,7 +112,7 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
//如果未打开串口设置为0
|
|
|
int ActualWeight = int.Parse(weight.Text == "" ? "0" : weight.Text);
|
|
|
- if (ActualWeight > MinWeight && ActualWeight < MaxWeight)
|
|
|
+ if ((ActualWeight >= MinWeight) && (ActualWeight <= MaxWeight))
|
|
|
{
|
|
|
//显示最近的三个称量记录
|
|
|
Temp3.Text = Temp2.Text;
|
|
|
@@ -194,11 +194,6 @@ namespace UAS_MES.Make
|
|
|
Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, sncode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
|
|
|
}
|
|
|
|
|
|
- private void Cancel_Click(object sender, EventArgs e)
|
|
|
- {
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
private void StartWeight_Click(object sender, EventArgs e)
|
|
|
{
|
|
|
thread = new Thread(getSerialData);
|