This commit is contained in:
2024-05-17 15:13:24 +08:00
parent 3c6e4ddf6b
commit 999055fead
33 changed files with 308 additions and 170 deletions
@@ -74,7 +74,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
this.txtValue35.Text = dataInTemp.Value35;
this.txtValue36.Text = dataInTemp.Value36;
this.txtValue37.Text = dataInTemp.Value37;
//this.txtValue38.Text = dataInTemp.Value38;
this.txtValue38.Text = dataInTemp.Value38;
this.lbErrCout.Text = dataInTemp.ToopValue;
}
}
@@ -541,19 +541,18 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
}
}
//if (dataInTemp.Value38 != this.txtValue38.Text.Trim())
//{
// var tempValue38 = allDataInTemp.Where(x => x.Value38 == dataInTemp.Value38 || (x.Value38 == null && dataInTemp.Value38 == null));
// if (tempValue38 != null)
// {
// foreach (var item in tempValue38)
// {
// item.Value38 = this.txtValue38.Text.Trim();
// Funs.DB.SubmitChanges();
// }
// }
//}
if (dataInTemp.Value38 != this.txtValue38.Text.Trim())
{
var tempValue38 = allDataInTemp.Where(x => x.Value38 == dataInTemp.Value38 || (x.Value38 == null && dataInTemp.Value38 == null));
if (tempValue38 != null)
{
foreach (var item in tempValue38)
{
item.Value38 = this.txtValue38.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
}
else
{
@@ -597,8 +596,8 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
newDataInTemp.Value34 = this.txtValue34.Text.Trim();
newDataInTemp.Value35 = this.txtValue35.Text.Trim();
newDataInTemp.Value36 = this.txtValue36.Text.Trim();
//newDataInTemp.Value37 = this.txtValue37.Text.Trim();
//newDataInTemp.Value38 = this.txtValue38.Text.Trim();
newDataInTemp.Value37 = this.txtValue37.Text.Trim();
newDataInTemp.Value38 = this.txtValue38.Text.Trim();
if (!string.IsNullOrEmpty(this.TempId))
{