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

cdk

2025-11-01 cbb5315301b1490b57497212256c5255e5eb7eb6

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