diff --git a/UserClass/AsyncTcpServer.cs b/UserClass/AsyncTcpServer.cs index d784381..c422af7 100644 --- a/UserClass/AsyncTcpServer.cs +++ b/UserClass/AsyncTcpServer.cs @@ -422,8 +422,12 @@ namespace DyeingComputer.UserClass SQLiteHelpers.Update("Dyelot", Product_data, "Dyelot ='" + drEmployee.Field("Dyelot") + "' AND Step ='"+ drEmployee.Field("Step") + "' AND ProductCode='"+ drEmployee.Field("ProductCode") + "'", null); - Product_data.Clear(); + + int dt = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where Dyelot='" + + drEmployee.Field("Dyelot") + "' AND State ='" + drEmployee.Field("State") + + "'", null).Tables[0].Rows.Count; + if (dt == 0) MainWindowViewModel.CALL_FR = false; } SQLiteHelpers.Close(); //关闭连接 diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index d0a021d..5fba54b 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -3039,7 +3039,7 @@ namespace DyeingComputer.ViewModel SYSlog = SYSlog + "\n" + Resources.Medicine + Resources.Tank + "2 [" + Resources.WaterLevel + ":" + string.Format("{0:D4}", Convert.ToInt16(Selet_dtm("1018"))) + "L][" + Resources.Temperature + ":" + string.Format(" {0:###.#}", Convert.ToInt16(Selet_dtm("1013"))) + "°C]"; - SYSlog = SYSlog + "\n" + Resources.Dyelot + ": " + TANK2_DYELOT + "_" + TANK1_REDYE; + SYSlog = SYSlog + "\n" + Resources.Dyelot + ": " + TANK2_DYELOT + "_" + TANK2_REDYE; SYSlog = SYSlog + "\n" + Resources.Step + ": " + TANK2_STEP; SYSlog = SYSlog + "\n" + Resources.WorkingStatus + " : " + TANK2; SYSlog = SYSlog + "\n-------------------------------------------------------"; @@ -3049,7 +3049,7 @@ namespace DyeingComputer.ViewModel SYSlog = SYSlog + "\n" + Resources.Medicine + Resources.Tank + "3 [" + Resources.WaterLevel + ":" + string.Format("{0:D4}", Convert.ToInt16(Selet_dtm("1019"))) + "L][" + Resources.Temperature + ":" + string.Format(" {0:###.#}", Convert.ToInt16(Selet_dtm("1014"))) + "°C]"; - SYSlog = SYSlog + "\n" + Resources.Dyelot + ": " + TANK3_DYELOT + "_" + TANK1_REDYE; + SYSlog = SYSlog + "\n" + Resources.Dyelot + ": " + TANK3_DYELOT + "_" + TANK3_REDYE; SYSlog = SYSlog + "\n" + Resources.Step + ": " + TANK3_STEP; SYSlog = SYSlog + "\n" + Resources.WorkingStatus + " : " + TANK3; SYSlog = SYSlog + "\n-------------------------------------------------------";