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

lu

2025-08-25 014916bf6294dff044014cb7de4f0a334478cf72

 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs

@@ -9,6 +9,7 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;

@@ -48,7 +49,7 @@
            txt_ftype.Text = strType;
            if (strType == QcSeason.iqc.ToString())
            {
                dfValue = 5; 
                dfValue = 5;
                gvMx1.Columns["funit"].Visible = true;
                gvMx1.Columns["funit"].VisibleIndex = 13;
                gvMx1.Columns["fcheckType"].Visible = false;
@@ -62,7 +63,6 @@
            {
                dfValue = 0;
                gvMx1.Columns["ypsl"].Visible = false;
               
            }
            //如果是ipqc巡检，显示工位
            if (strType != QcSeason.ipqc巡检.ToString())
@@ -251,6 +251,8 @@
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
            }
            //2025/07/12加上修改状态下不能修改
            txt_itemId.Enabled = false;
        }

        /// <summary>
@@ -266,6 +268,7 @@
            gridViews.Add(gvMx1);
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
            UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            this.txt_itemId.ReadOnly = true;
        }

        /// <summary>
@@ -435,9 +438,14 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            _sbSqlWhere += " and b.guid is not null";
            _sbSqlWhere += " and a.FTYPE='" + this.strType + "'";
            gcMain1.DataSource = null;

            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and b.guid is not null");
            _sbSqlWhere.Append(" and a.FTYPE='" + this.strType + "'");
            _sbSqlWhere.Append(" and org.fid in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
                "org.FNumber asc ,b.item_no asc,a.FVERSION desc", "", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
@@ -592,6 +600,7 @@
                }
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
@@ -601,7 +610,8 @@
                    Form parentForm = this.FindForm();
                    UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue.ToString());
                }
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
@@ -612,7 +622,7 @@
        #region 以下为种种下拉
        private void _setIno()
        {
            txt_itemId.Click += (s, e) =>
            txt_itemId.ButtonClick += (s, e) =>
            {
                var frm = new JyxmShow(this.strType);
                frm.UpdateParent += (ss, ee) =>
@@ -844,12 +854,17 @@
                        _webServiceName + "DeleteModelMx",
                        JsonConvert.SerializeObject(lst));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    if (_rtn.rtnCode > 0)
                    {
                        getModel(lbGuid.Text);
                        MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                    }
                    else
                        MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                    MsgHelper.ShowError("提示：" + ex.Message);
                }
            }
        }