bug
lu
2025-05-12 1fd408a9ba01142cd824894f01ee0d3affff547e
bug
已修改5个文件
42 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -71,6 +71,11 @@
            Task.Delay(100);
            getPageList(1);
        }
        /// <summary>
        /// 5表焦点时,重新读取12表
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
        {
            if (e.FocusedRowHandle >= 0)
@@ -251,7 +256,7 @@
                return;
            if (txt_fcheckResu.Text.Trim() == _strTag)
            {
                if (string.IsNullOrEmpty(txt_fngDesc.Text.Trim()))
                if (string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
                {
                    MsgHelper.Warning("单据为不合格时,请填写异常备注说明!");
                    return;
@@ -399,7 +404,6 @@
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            // _sbSqlWhere += " and isnull(fsubmit,0)=0";
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
@@ -435,6 +439,11 @@
            }
        }
        /// <summary>
        /// 读取实体
        /// </summary>
        /// <param name="strGuid"></param>
        /// <param name="guid5"></param>
        private void getModel(string strGuid, string guid5)
        {
            bool isEdit = false;
@@ -556,7 +565,10 @@
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        /// <summary>
        /// 禁用检验框+重新加载按钮
        /// </summary>
        /// <param name="bl"></param>
        private void setEable(bool bl)
        {
            txtJianYan.ReadOnly = !bl;
@@ -564,7 +576,7 @@
            btnIpt.Text = (bl == true ? "录入样本" : "查看样本");
        }
        #region 打开父亲窗口委托
        #region 打开父亲窗口委托,查看异常报告
        public event EventHandler<UpdateParentEventArgs> ToUpdateParent;
        private void BtnYcReport_Click(object sender, EventArgs e)
        {
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -1142,7 +1142,7 @@
            // gvMx1ebeln
            // 
            this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
            this.gvMx1ebeln.Caption = "ERP单号";
            this.gvMx1ebeln.Caption = "采购单号";
            this.gvMx1ebeln.FieldName = "ebeln";
            this.gvMx1ebeln.MinWidth = 120;
            this.gvMx1ebeln.Name = "gvMx1ebeln";
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -112,7 +112,6 @@
                };
                frm.ShowDialog();
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -641,6 +640,5 @@
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
    }
}
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
@@ -52,7 +52,7 @@
            this.tlMenu.OptionsView.CheckBoxStyle = DevExpress.XtraTreeList.DefaultNodeCheckBoxStyle.Check;
            this.tlMenu.OptionsView.RootCheckBoxStyle = DevExpress.XtraTreeList.NodeCheckBoxStyle.Check;
            this.tlMenu.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Solid;
            this.tlMenu.Size = new System.Drawing.Size(445, 464);
            this.tlMenu.Size = new System.Drawing.Size(776, 475);
            this.tlMenu.TabIndex = 5;
            this.tlMenu.TreeLevelWidth = 21;
            // 
@@ -64,25 +64,26 @@
            this.tlcMenuName.Name = "tlcMenuName";
            this.tlcMenuName.Visible = true;
            this.tlcMenuName.VisibleIndex = 0;
            this.tlcMenuName.Width = 50;
            this.tlcMenuName.Width = 666;
            // 
            // tlcActions
            // 
            this.tlcActions.Caption = "菜单类型";
            this.tlcActions.Caption = "类型";
            this.tlcActions.FieldName = "sType";
            this.tlcActions.MaxWidth = 100;
            this.tlcActions.MinWidth = 23;
            this.tlcActions.Name = "tlcActions";
            this.tlcActions.Visible = true;
            this.tlcActions.VisibleIndex = 1;
            this.tlcActions.Width = 60;
            this.tlcActions.Width = 100;
            // 
            // panel1
            // 
            this.panel1.Controls.Add(this.btnIn);
            this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panel1.Location = new System.Drawing.Point(0, 464);
            this.panel1.Location = new System.Drawing.Point(0, 475);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(445, 56);
            this.panel1.Size = new System.Drawing.Size(776, 56);
            this.panel1.TabIndex = 6;
            // 
            // btnIn
@@ -91,7 +92,7 @@
            this.btnIn.Appearance.Options.UseBackColor = true;
            this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
            this.btnIn.Location = new System.Drawing.Point(351, 0);
            this.btnIn.Location = new System.Drawing.Point(682, 0);
            this.btnIn.Name = "btnIn";
            this.btnIn.Size = new System.Drawing.Size(94, 56);
            this.btnIn.TabIndex = 5;
@@ -101,7 +102,7 @@
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(445, 520);
            this.ClientSize = new System.Drawing.Size(776, 531);
            this.Controls.Add(this.tlMenu);
            this.Controls.Add(this.panel1);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
@@ -101,6 +101,7 @@
                //  tlMenu.OptionsBehavior.Editable = true;
                tlMenu.OptionsBehavior.AllowRecursiveNodeChecking = false;
                tlMenu.BestFitColumns();
                tlMenu.ExpandAll();
            }
            catch (Exception ex)
            {