sc/DyeingComputer
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sc committed 2025-08-22 01:13:31 +08:00
2 parents 7d88a1887c 6644c8d334
commit e1e1b3bb33
2 files changed
+7 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UserClass/AsyncTcpServer.cs
+5 -1
View File
@@ -422,8 +422,12 @@ namespace DyeingComputer.UserClass
SQLiteHelpers.Update("Dyelot", Product_data, "Dyelot ='" + drEmployee.Field<string>("Dyelot") SQLiteHelpers.Update("Dyelot", Product_data, "Dyelot ='" + drEmployee.Field<string>("Dyelot")
+ "' AND Step ='"+ drEmployee.Field<int>("Step") + "' AND ProductCode='"+ + "' AND Step ='"+ drEmployee.Field<int>("Step") + "' AND ProductCode='"+
drEmployee.Field<string>("ProductCode") + "'", null); drEmployee.Field<string>("ProductCode") + "'", null);
Product_data.Clear(); 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(); //关闭连接 SQLiteHelpers.Close(); //关闭连接
ViewModel/MainWindowViewModel.cs
+2 -2
View File
@@ -3039,7 +3039,7 @@ namespace DyeingComputer.ViewModel
SYSlog = SYSlog + "\n" + Resources.Medicine + Resources.Tank + "2 [" + Resources.WaterLevel + ":" + 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:D4}", Convert.ToInt16(Selet_dtm("1018"))) + "L][" + Resources.Temperature + ":" +
string.Format(" {0:###.#}", Convert.ToInt16(Selet_dtm("1013"))) + "°C]"; 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.Step + ": " + TANK2_STEP;
SYSlog = SYSlog + "\n" + Resources.WorkingStatus + " : " + TANK2; SYSlog = SYSlog + "\n" + Resources.WorkingStatus + " : " + TANK2;
SYSlog = SYSlog + "\n-------------------------------------------------------"; SYSlog = SYSlog + "\n-------------------------------------------------------";
@@ -3049,7 +3049,7 @@ namespace DyeingComputer.ViewModel
SYSlog = SYSlog + "\n" + Resources.Medicine + Resources.Tank + "3 [" + Resources.WaterLevel + ":" + 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:D4}", Convert.ToInt16(Selet_dtm("1019"))) + "L][" + Resources.Temperature + ":" +
string.Format(" {0:###.#}", Convert.ToInt16(Selet_dtm("1014"))) + "°C]"; 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.Step + ": " + TANK3_STEP;
SYSlog = SYSlog + "\n" + Resources.WorkingStatus + " : " + TANK3; SYSlog = SYSlog + "\n" + Resources.WorkingStatus + " : " + TANK3;
SYSlog = SYSlog + "\n-------------------------------------------------------"; SYSlog = SYSlog + "\n-------------------------------------------------------";