diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index 7c3b2a2..c6c5083 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -208,7 +208,7 @@ 計量 - + 排隊 未執行 diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index a612749..f0a51c2 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -2930,8 +2930,8 @@ namespace DyeingComputer.ViewModel else { SQLI = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where " + - "Dyelot = '" + Dyelot + "' AND Step = '" + STEP + "' AND Redye ='" + SYS_REDYE + - "'", null).Tables[0].Rows.Count; + "Dyelot = '" + Dyelot + "' AND Step = '" + STEP + "' AND Redye ='" + SYS_REDYE + + "' AND State != '301'", null).Tables[0].Rows.Count; } if (SQLI > 0) SQLiteHelpers.Update("Dyelot", dat_FR, "Dyelot = '" + Dyelot + "' AND Step = '" + STEP + "' AND Redye ='" + SYS_REDYE + "'", null);//行更新