检验

lu

2025-05-27 557bbc16b5341d4e9ba1352ec48e66fc573b88cb

检验

 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs

@@ -1391,8 +1391,6 @@
            this.gvMx1fcheckItemDesc.MinWidth = 50;
            this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
            this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
            this.gvMx1fcheckItemDesc.Visible = true;
            this.gvMx1fcheckItemDesc.VisibleIndex = 2;
            this.gvMx1fcheckItemDesc.Width = 120;
            // 
            // gvMx1fspecRequ
@@ -1404,7 +1402,7 @@
            this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
            this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
            this.gvMx1fspecRequ.Visible = true;
            this.gvMx1fspecRequ.VisibleIndex = 3;
            this.gvMx1fspecRequ.VisibleIndex = 2;
            this.gvMx1fspecRequ.Width = 120;
            // 
            // gvMx1fupAllow
@@ -1416,7 +1414,7 @@
            this.gvMx1fupAllow.Name = "gvMx1fupAllow";
            this.gvMx1fupAllow.Tag = "query_a.fup_allow";
            this.gvMx1fupAllow.Visible = true;
            this.gvMx1fupAllow.VisibleIndex = 4;
            this.gvMx1fupAllow.VisibleIndex = 3;
            this.gvMx1fupAllow.Width = 50;
            // 
            // gvMx1fstand
@@ -1428,7 +1426,7 @@
            this.gvMx1fstand.Name = "gvMx1fstand";
            this.gvMx1fstand.Tag = "query_a.fstand";
            this.gvMx1fstand.Visible = true;
            this.gvMx1fstand.VisibleIndex = 5;
            this.gvMx1fstand.VisibleIndex = 4;
            this.gvMx1fstand.Width = 70;
            // 
            // gvMx1fdownAllow
@@ -1440,7 +1438,7 @@
            this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
            this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
            this.gvMx1fdownAllow.Visible = true;
            this.gvMx1fdownAllow.VisibleIndex = 6;
            this.gvMx1fdownAllow.VisibleIndex = 5;
            this.gvMx1fdownAllow.Width = 50;
            // 
            // gvMx1freQty
@@ -1452,7 +1450,7 @@
            this.gvMx1freQty.Name = "gvMx1freQty";
            this.gvMx1freQty.Tag = "query_a.fre_qty";
            this.gvMx1freQty.Visible = true;
            this.gvMx1freQty.VisibleIndex = 7;
            this.gvMx1freQty.VisibleIndex = 6;
            this.gvMx1freQty.Width = 50;
            // 
            // gvMx1checkQyt
@@ -1464,7 +1462,7 @@
            this.gvMx1checkQyt.Name = "gvMx1checkQyt";
            this.gvMx1checkQyt.Tag = "query_a.check_qyt";
            this.gvMx1checkQyt.Visible = true;
            this.gvMx1checkQyt.VisibleIndex = 8;
            this.gvMx1checkQyt.VisibleIndex = 7;
            this.gvMx1checkQyt.Width = 60;
            // 
            // gvMx1fenterQty
@@ -1476,7 +1474,7 @@
            this.gvMx1fenterQty.Name = "gvMx1fenterQty";
            this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
            this.gvMx1fenterQty.Visible = true;
            this.gvMx1fenterQty.VisibleIndex = 9;
            this.gvMx1fenterQty.VisibleIndex = 8;
            this.gvMx1fenterQty.Width = 60;
            // 
            // gvMx1fcheckResu
@@ -1492,7 +1490,7 @@
            this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
            this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
            this.gvMx1fcheckResu.Visible = true;
            this.gvMx1fcheckResu.VisibleIndex = 10;
            this.gvMx1fcheckResu.VisibleIndex = 9;
            this.gvMx1fcheckResu.Width = 94;
            // 
            // gvMx1fngRate
@@ -1504,7 +1502,7 @@
            this.gvMx1fngRate.Name = "gvMx1fngRate";
            this.gvMx1fngRate.Tag = "query_a.fng_rate";
            this.gvMx1fngRate.Visible = true;
            this.gvMx1fngRate.VisibleIndex = 11;
            this.gvMx1fngRate.VisibleIndex = 10;
            this.gvMx1fngRate.Width = 94;
            // 
            // gvMx1fngQty
@@ -1516,7 +1514,7 @@
            this.gvMx1fngQty.Name = "gvMx1fngQty";
            this.gvMx1fngQty.Tag = "query_a.fng_qty";
            this.gvMx1fngQty.Visible = true;
            this.gvMx1fngQty.VisibleIndex = 12;
            this.gvMx1fngQty.VisibleIndex = 11;
            this.gvMx1fngQty.Width = 50;
            // 
            // gvMx1sampleSizeNo
@@ -1528,7 +1526,7 @@
            this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
            this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
            this.gvMx1sampleSizeNo.Visible = true;
            this.gvMx1sampleSizeNo.VisibleIndex = 13;
            this.gvMx1sampleSizeNo.VisibleIndex = 12;
            this.gvMx1sampleSizeNo.Width = 200;
            // 
            // gvMx1fcheckLevel
@@ -1540,7 +1538,7 @@
            this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
            this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
            this.gvMx1fcheckLevel.Visible = true;
            this.gvMx1fcheckLevel.VisibleIndex = 14;
            this.gvMx1fcheckLevel.VisibleIndex = 13;
            this.gvMx1fcheckLevel.Width = 200;
            // 
            // gvMx1facLevel
@@ -1552,7 +1550,7 @@
            this.gvMx1facLevel.Name = "gvMx1facLevel";
            this.gvMx1facLevel.Tag = "query_a.fac_level";
            this.gvMx1facLevel.Visible = true;
            this.gvMx1facLevel.VisibleIndex = 15;
            this.gvMx1facLevel.VisibleIndex = 14;
            this.gvMx1facLevel.Width = 200;
            // 
            // splitYangLi

 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs

@@ -186,6 +186,12 @@
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
            }
        }

        /// <summary>
        /// 读取实体
        /// </summary>
        /// <param name="strGuid"></param>
        /// <param name="guid5"></param>
        private void getModel(string strGuid, string guid5)
        {
            bool isEdit = false;

 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs

@@ -464,8 +464,6 @@
            this.gv_itemId.Name = "gv_itemId";
            this.gv_itemId.OptionsColumn.AllowEdit = false;
            this.gv_itemId.Tag = "query_a.item_id";
            this.gv_itemId.Visible = true;
            this.gv_itemId.VisibleIndex = 7;
            this.gv_itemId.Width = 30;
            // 
            // gv_itemNo
@@ -478,7 +476,7 @@
            this.gv_itemNo.OptionsColumn.AllowEdit = false;
            this.gv_itemNo.Tag = "query_a.item_no";
            this.gv_itemNo.Visible = true;
            this.gv_itemNo.VisibleIndex = 8;
            this.gv_itemNo.VisibleIndex = 7;
            this.gv_itemNo.Width = 136;
            // 
            // gv_boardStyle
@@ -491,7 +489,7 @@
            this.gv_boardStyle.OptionsColumn.AllowEdit = false;
            this.gv_boardStyle.Tag = "query_a.board_style";
            this.gv_boardStyle.Visible = true;
            this.gv_boardStyle.VisibleIndex = 9;
            this.gv_boardStyle.VisibleIndex = 8;
            this.gv_boardStyle.Width = 164;
            // 
            // gridColumn14
@@ -502,7 +500,7 @@
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.OptionsColumn.ReadOnly = true;
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 10;
            this.gridColumn14.VisibleIndex = 9;
            this.gridColumn14.Width = 200;
            // 
            // gv_fcovertQty
@@ -516,7 +514,7 @@
            this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
            this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
            this.gv_fcovertQty.Visible = true;
            this.gv_fcovertQty.VisibleIndex = 11;
            this.gv_fcovertQty.VisibleIndex = 10;
            this.gv_fcovertQty.Width = 60;
            // 
            // gv_fbatchQty
@@ -529,7 +527,7 @@
            this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
            this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
            this.gv_fbatchQty.Visible = true;
            this.gv_fbatchQty.VisibleIndex = 12;
            this.gv_fbatchQty.VisibleIndex = 11;
            this.gv_fbatchQty.Width = 80;
            // 
            // gv_fcheckResu
@@ -555,7 +553,7 @@
            this.gv_remarks.OptionsColumn.AllowEdit = false;
            this.gv_remarks.Tag = "query_a.remarks";
            this.gv_remarks.Visible = true;
            this.gv_remarks.VisibleIndex = 13;
            this.gv_remarks.VisibleIndex = 12;
            this.gv_remarks.Width = 100;
            // 
            // gv_fcheckBy
@@ -568,7 +566,7 @@
            this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
            this.gv_fcheckBy.Tag = "query_a.fcheck_by";
            this.gv_fcheckBy.Visible = true;
            this.gv_fcheckBy.VisibleIndex = 14;
            this.gv_fcheckBy.VisibleIndex = 13;
            this.gv_fcheckBy.Width = 118;
            // 
            // gv_fcheckDate
@@ -581,7 +579,7 @@
            this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
            this.gv_fcheckDate.Tag = "query_a.fcheck_date";
            this.gv_fcheckDate.Visible = true;
            this.gv_fcheckDate.VisibleIndex = 15;
            this.gv_fcheckDate.VisibleIndex = 14;
            this.gv_fcheckDate.Width = 182;
            // 
            // gv_createBy
@@ -594,7 +592,7 @@
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Tag = "query_a.create_by";
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 16;
            this.gv_createBy.VisibleIndex = 15;
            this.gv_createBy.Width = 67;
            // 
            // gridColumn15
@@ -604,7 +602,7 @@
            this.gridColumn15.MinWidth = 25;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 17;
            this.gridColumn15.VisibleIndex = 16;
            this.gridColumn15.Width = 94;
            // 
            // gv_lastupdateBy
@@ -617,7 +615,7 @@
            this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
            this.gv_lastupdateBy.Visible = true;
            this.gv_lastupdateBy.VisibleIndex = 18;
            this.gv_lastupdateBy.VisibleIndex = 17;
            this.gv_lastupdateBy.Width = 60;
            // 
            // gv_lastupdateDate
@@ -630,7 +628,7 @@
            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
            this.gv_lastupdateDate.Visible = true;
            this.gv_lastupdateDate.VisibleIndex = 19;
            this.gv_lastupdateDate.VisibleIndex = 18;
            this.gv_lastupdateDate.Width = 120;
            // 
            // gridColumn18
@@ -640,7 +638,7 @@
            this.gridColumn18.MinWidth = 25;
            this.gridColumn18.Name = "gridColumn18";
            this.gridColumn18.Visible = true;
            this.gridColumn18.VisibleIndex = 20;
            this.gridColumn18.VisibleIndex = 19;
            this.gridColumn18.Width = 94;
            // 
            // gridColumn19
@@ -650,7 +648,7 @@
            this.gridColumn19.MinWidth = 25;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 21;
            this.gridColumn19.VisibleIndex = 20;
            this.gridColumn19.Width = 94;
            // 
            // gridColumn30
@@ -667,8 +665,6 @@
            this.gridColumn13.FieldName = "daa020";
            this.gridColumn13.MinWidth = 25;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 22;
            this.gridColumn13.Width = 94;
            // 
            // gridColumn17
@@ -1403,8 +1399,6 @@
            this.gvMx1fcheckItemDesc.MinWidth = 50;
            this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
            this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
            this.gvMx1fcheckItemDesc.Visible = true;
            this.gvMx1fcheckItemDesc.VisibleIndex = 2;
            this.gvMx1fcheckItemDesc.Width = 120;
            // 
            // gvMx1fspecRequ
@@ -1416,7 +1410,7 @@
            this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
            this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
            this.gvMx1fspecRequ.Visible = true;
            this.gvMx1fspecRequ.VisibleIndex = 3;
            this.gvMx1fspecRequ.VisibleIndex = 2;
            this.gvMx1fspecRequ.Width = 120;
            // 
            // gvMx1fupAllow
@@ -1428,7 +1422,7 @@
            this.gvMx1fupAllow.Name = "gvMx1fupAllow";
            this.gvMx1fupAllow.Tag = "query_a.fup_allow";
            this.gvMx1fupAllow.Visible = true;
            this.gvMx1fupAllow.VisibleIndex = 4;
            this.gvMx1fupAllow.VisibleIndex = 3;
            this.gvMx1fupAllow.Width = 50;
            // 
            // gvMx1fstand
@@ -1440,7 +1434,7 @@
            this.gvMx1fstand.Name = "gvMx1fstand";
            this.gvMx1fstand.Tag = "query_a.fstand";
            this.gvMx1fstand.Visible = true;
            this.gvMx1fstand.VisibleIndex = 5;
            this.gvMx1fstand.VisibleIndex = 4;
            this.gvMx1fstand.Width = 70;
            // 
            // gvMx1fdownAllow
@@ -1452,7 +1446,7 @@
            this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
            this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
            this.gvMx1fdownAllow.Visible = true;
            this.gvMx1fdownAllow.VisibleIndex = 6;
            this.gvMx1fdownAllow.VisibleIndex = 5;
            this.gvMx1fdownAllow.Width = 50;
            // 
            // gvMx1freQty
@@ -1464,7 +1458,7 @@
            this.gvMx1freQty.Name = "gvMx1freQty";
            this.gvMx1freQty.Tag = "query_a.fre_qty";
            this.gvMx1freQty.Visible = true;
            this.gvMx1freQty.VisibleIndex = 7;
            this.gvMx1freQty.VisibleIndex = 6;
            this.gvMx1freQty.Width = 50;
            // 
            // gvMx1checkQyt
@@ -1476,7 +1470,7 @@
            this.gvMx1checkQyt.Name = "gvMx1checkQyt";
            this.gvMx1checkQyt.Tag = "query_a.check_qyt";
            this.gvMx1checkQyt.Visible = true;
            this.gvMx1checkQyt.VisibleIndex = 8;
            this.gvMx1checkQyt.VisibleIndex = 7;
            this.gvMx1checkQyt.Width = 60;
            // 
            // gvMx1fenterQty
@@ -1488,7 +1482,7 @@
            this.gvMx1fenterQty.Name = "gvMx1fenterQty";
            this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
            this.gvMx1fenterQty.Visible = true;
            this.gvMx1fenterQty.VisibleIndex = 9;
            this.gvMx1fenterQty.VisibleIndex = 8;
            this.gvMx1fenterQty.Width = 60;
            // 
            // gvMx1fcheckResu
@@ -1504,7 +1498,7 @@
            this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
            this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
            this.gvMx1fcheckResu.Visible = true;
            this.gvMx1fcheckResu.VisibleIndex = 10;
            this.gvMx1fcheckResu.VisibleIndex = 9;
            this.gvMx1fcheckResu.Width = 94;
            // 
            // gvMx1fngRate
@@ -1516,7 +1510,7 @@
            this.gvMx1fngRate.Name = "gvMx1fngRate";
            this.gvMx1fngRate.Tag = "query_a.fng_rate";
            this.gvMx1fngRate.Visible = true;
            this.gvMx1fngRate.VisibleIndex = 11;
            this.gvMx1fngRate.VisibleIndex = 10;
            this.gvMx1fngRate.Width = 94;
            // 
            // gvMx1fngQty
@@ -1528,7 +1522,7 @@
            this.gvMx1fngQty.Name = "gvMx1fngQty";
            this.gvMx1fngQty.Tag = "query_a.fng_qty";
            this.gvMx1fngQty.Visible = true;
            this.gvMx1fngQty.VisibleIndex = 12;
            this.gvMx1fngQty.VisibleIndex = 11;
            this.gvMx1fngQty.Width = 50;
            // 
            // gvMx1sampleSizeNo
@@ -1540,7 +1534,7 @@
            this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
            this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
            this.gvMx1sampleSizeNo.Visible = true;
            this.gvMx1sampleSizeNo.VisibleIndex = 13;
            this.gvMx1sampleSizeNo.VisibleIndex = 12;
            this.gvMx1sampleSizeNo.Width = 200;
            // 
            // gvMx1fcheckLevel
@@ -1552,7 +1546,7 @@
            this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
            this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
            this.gvMx1fcheckLevel.Visible = true;
            this.gvMx1fcheckLevel.VisibleIndex = 14;
            this.gvMx1fcheckLevel.VisibleIndex = 13;
            this.gvMx1fcheckLevel.Width = 200;
            // 
            // gvMx1facLevel
@@ -1564,7 +1558,7 @@
            this.gvMx1facLevel.Name = "gvMx1facLevel";
            this.gvMx1facLevel.Tag = "query_a.fac_level";
            this.gvMx1facLevel.Visible = true;
            this.gvMx1facLevel.VisibleIndex = 15;
            this.gvMx1facLevel.VisibleIndex = 14;
            this.gvMx1facLevel.Width = 200;
            // 
            // splitYangLi

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

@@ -325,7 +325,10 @@
                        string _Fstand = row["Fstand"].ToString();
                        string _FupAllow = row["FupAllow"].ToString();
                        string _FdownAllow = row["FdownAllow"].ToString();
                        bool _isRzxx = (row["isRzxx"].ToString() == "1" ? true : false);
                        string _isRzxxTxt = row["isRzxx"].ToString();
                        bool _isRzxx = false;
                        if (_isRzxxTxt == "1" || _isRzxxTxt.ToUpper() == "true".ToUpper())
                            _isRzxx = true;
                        //假如三个都为空通过
                        if (string.IsNullOrEmpty(_Fstand) && string.IsNullOrEmpty(_FupAllow) && string.IsNullOrEmpty(_FdownAllow))
                        {
@@ -809,5 +812,6 @@
            }
        }
        #endregion

    }
}

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -255,6 +255,8 @@
            {
                foreach (var gv in gridViews)
                {
                    gv.ClearSorting();
                    gv.OptionsCustomization.AllowSort = isEdt;
                    foreach (GridColumn colmn in gv.Columns)
                    {
                        colmn.OptionsColumn.AllowEdit = true;
@@ -659,6 +661,8 @@
            {
                foreach (var gv in gridViews)
                {
                    gv.ClearSorting();
                    gv.OptionsCustomization.AllowSort = isEdt;
                    foreach (GridColumn colmn in gv.Columns)
                    {
                        colmn.OptionsColumn.AllowEdit = true;
@@ -935,6 +939,8 @@
            {
                foreach (var gv in gridViews)
                {
                    gv.ClearSorting();
                    gv.OptionsCustomization.AllowSort = isEdt;
                    foreach (GridColumn colmn in gv.Columns)
                    {
                        colmn.OptionsColumn.AllowEdit = true;