From cbb5315301b1490b57497212256c5255e5eb7eb6 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 01 十一月 2025 17:06:58 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index 2556e59..897b18c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -339,7 +339,7 @@
var row = gvMx3.GetDataRow(i);
if (row != null)
{
- if (string.IsNullOrEmpty(row["aqlType"].ToString()))
+ if (string.IsNullOrEmpty(row["FacLevel"].ToString()))
{
MsgHelper.ShowError("鎷掓敹璐ㄩ噺姘村钩涓嶈兘涓虹┖锛�");
return;
@@ -347,10 +347,10 @@
qmaql4.Add(new MesQmAql4
{
Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
- AqlType = Convert.ToDecimal(row["AqlType"].ToString()),
AqlTypeCr = row["AqlTypeCr"].ToString(),
AqlTypeMa = row["AqlTypeMa"].ToString(),
AqlTypeMi = row["AqlTypeMi"].ToString(),
+ FacLevel = row["FacLevel"].ToString(),
});
}
}
@@ -510,6 +510,7 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
+
foreach (var a in _job["rtnData"]["mesQmAql3s"])
{
mesQmAql3s.Add(a);
@@ -524,8 +525,9 @@
}
else
{
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
}
+
foreach (var a in _job["rtnData"]["mesQmAql4s"])
{
@@ -543,6 +545,7 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3);
}
+
}
else
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
--
Gitblit v1.9.3