Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

UserClass/AsyncTcpServer.cs

@@ -422,8 +422,12 @@ namespace DyeingComputer.UserClass
                                 SQLiteHelpers.Update("Dyelot", Product_data, "Dyelot ='" + drEmployee.Field<string>("Dyelot") 
                                     + "' AND Step ='"+ drEmployee.Field<int>("Step") + "' AND ProductCode='"+
                                    drEmployee.Field<string>("ProductCode") + "'", null);
-
                                 Product_data.Clear();
+
+                                int dt = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where Dyelot='" + 
+                                    drEmployee.Field<string>("Dyelot") + "' AND State ='" + drEmployee.Field<int>("State") + 
+                                    "'", null).Tables[0].Rows.Count;
+                                if (dt == 0) MainWindowViewModel.CALL_FR = false;
                             }                           
                             SQLiteHelpers.Close();  //关闭连接
 

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-------------------------------------------------------";