Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

lu

2025-10-30 d9da11dca9011f6e923e80023eb1a3f4ea4eea88

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs

@@ -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);