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

kyy

6 天以前 9010fdfa1f7f6fe29c76111ef95d6383c74ea313

 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs

@@ -770,7 +770,8 @@
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                    }
                    getGxList(dy.aboutGuid.ToString());
                    //2025-09-16 kyy
                   // getGxList(dy.aboutGuid.ToString());
                }
                else
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
@@ -780,34 +781,35 @@
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

        //2025-09-16 kyy
        /// <summary>
        /// 读取工序
        /// </summary>
        /// <param name="daaGuid"></param>
        private void getGxList(string daaGuid)
        {
            txt_fmrmode.Properties.Items.Clear();
            var _obj = new
            {
                guid = daaGuid,
            };
            var json = JsonConvert.SerializeObject(_obj);
            try
            {
                var strReturn = UtilityHelper.HttpPost("", "WomdaaManager/GetGyList", json);
                var dd = UtilityHelper.ReturnToList(strReturn);
                var dt = dd.rtnData;
                foreach (DataRow row in dt.Rows)
                {
                    txt_fmrmode.Properties.Items.Add(row["processNo"].ToString());
                }
            }
            catch (Exception ex)
            {
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

        //private void getGxList(string daaGuid)
        //{
        //    txt_fmrmode.Properties.Items.Clear();
        //    var _obj = new
        //    {
        //        guid = daaGuid,
        //    };
        //    var json = JsonConvert.SerializeObject(_obj);
        //    try
        //    {
        //        var strReturn = UtilityHelper.HttpPost("", "WomdaaManager/GetGyList", json);
        //        var dd = UtilityHelper.ReturnToList(strReturn);
        //        var dt = dd.rtnData;
        //        foreach (DataRow row in dt.Rows)
        //        {
        //            txt_fmrmode.Properties.Items.Add(row["processNo"].ToString());
        //        }
        //    }
        //    catch (Exception ex)
        //    {
        //        MsgHelper.ShowError("提示：" + ex.Message);
        //    }
        //}

        /// <summary>
        /// 选项卡切换