lu
2025-10-27 dd0832be5e8c30e88566bf369cd2415b627da5d7
编辑状态下禁止过滤明细
已修改2个文件
66 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs 57 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -95,6 +95,7 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.txt_xblb = new Gs.DevApp.UserControl.UcDictionary();
            this.layWeight = new DevExpress.XtraLayout.LayoutControl();
            this.txt_weight1 = new DevExpress.XtraEditors.TextEdit();
            this.txt_weight2 = new DevExpress.XtraEditors.TextEdit();
@@ -137,7 +138,6 @@
            this.txt_freceQty = new DevExpress.XtraEditors.TextEdit();
            this.txt_cgdNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_fngHandle = new DevExpress.XtraEditors.TextEdit();
            this.txt_xblb = new DevExpress.XtraEditors.MemoEdit();
            this.txt_xbsl = new DevExpress.XtraEditors.TextEdit();
            this.txt_iqcRemark = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -168,6 +168,7 @@
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -228,7 +229,6 @@
            this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
@@ -287,7 +287,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_cgdNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_xblb.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_xbsl.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iqcRemark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
@@ -318,6 +317,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
            this.xtraTabControl2.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -358,7 +358,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            this.SuspendLayout();
            // 
            // repositoryItemComboBox1
@@ -854,6 +853,7 @@
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.txt_xblb);
            this.layoutMx1.Controls.Add(this.layWeight);
            this.layoutMx1.Controls.Add(this.txt_fngDesc);
            this.layoutMx1.Controls.Add(this.btnYcReport);
@@ -879,7 +879,6 @@
            this.layoutMx1.Controls.Add(this.txt_freceQty);
            this.layoutMx1.Controls.Add(this.txt_cgdNo);
            this.layoutMx1.Controls.Add(this.txt_fngHandle);
            this.layoutMx1.Controls.Add(this.txt_xblb);
            this.layoutMx1.Controls.Add(this.txt_xbsl);
            this.layoutMx1.Controls.Add(this.txt_iqcRemark);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -895,6 +894,16 @@
            this.layoutMx1.Size = new System.Drawing.Size(1435, 270);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            //
            // txt_xblb
            //
            this.txt_xblb.BtnTxt = "选别类别";
            this.txt_xblb.Location = new System.Drawing.Point(1073, 198);
            this.txt_xblb.Name = "txt_xblb";
            this.txt_xblb.Size = new System.Drawing.Size(350, 60);
            this.txt_xblb.TabIndex = 820;
            this.txt_xblb.TextTxt = "";
            this.txt_xblb.WhereTxt = " a.s_type=\'OA选别类别\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
            // 
            // layWeight
            // 
@@ -1363,15 +1372,6 @@
            this.txt_fngHandle.TabIndex = 812;
            this.txt_fngHandle.Tag = "readonly";
            // 
            // txt_xblb
            //
            this.txt_xblb.Location = new System.Drawing.Point(1145, 198);
            this.txt_xblb.Name = "txt_xblb";
            this.txt_xblb.Size = new System.Drawing.Size(278, 27);
            this.txt_xblb.StyleController = this.layoutMx1;
            this.txt_xblb.TabIndex = 816;
            this.txt_xblb.Tag = "readonly";
            //
            // txt_xbsl
            // 
            this.txt_xbsl.Location = new System.Drawing.Point(1145, 136);
@@ -1758,6 +1758,19 @@
            this.layoutControlItem27.Text = "查看异常报告";
            this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem27.TextVisible = false;
            //
            // layoutControlItem26
            //
            this.layoutControlItem26.Control = this.txt_xblb;
            this.layoutControlItem26.Location = new System.Drawing.Point(1061, 186);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem26.OptionsTableLayoutItem.RowSpan = 2;
            this.layoutControlItem26.Size = new System.Drawing.Size(354, 64);
            this.layoutControlItem26.Text = "选别类别";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem26.TextVisible = false;
            // 
            // xtraTabControl2
            // 
@@ -2456,17 +2469,6 @@
            // 
            this.gridView4.Name = "gridView4";
            // 
            // layoutControlItem26
            //
            this.layoutControlItem26.Control = this.txt_xblb;
            this.layoutControlItem26.Location = new System.Drawing.Point(1061, 186);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem26.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem26.Text = "选别类别";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
            //
            // Frm_MesQaItemsDetect01
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2535,7 +2537,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_cgdNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_xblb.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_xbsl.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iqcRemark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
@@ -2566,6 +2567,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
            this.xtraTabControl2.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -2606,7 +2608,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            this.ResumeLayout(false);
        }
@@ -2755,7 +2756,6 @@
        private DevExpress.XtraEditors.SimpleButton btnYcReport;
        private UserControl.UcDictionary txt_fngDesc;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
        private DevExpress.XtraEditors.MemoEdit txt_xblb;
        private DevExpress.XtraEditors.TextEdit txt_xbsl;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
@@ -2783,6 +2783,7 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
        private UserControl.UcDictionary txt_xblb;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -546,8 +546,14 @@
            toolBarMenu1.isSetBtn = false;
            if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("当检验结果不合格时,请填写备注说明!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("当检验结果不合格时,请填写异常描述!");
                txt_fngDesc.Focus();
                return;
            }
            if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_xblb.TextTxt.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("当检验结果不合格时,请填写选别类别!");
                txt_xblb.Focus();
                return;
            }
            var _obj = new
@@ -555,6 +561,7 @@
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                fngDesc = txt_fngDesc.TextTxt.Trim(),
                iqcRemark= txt_iqcRemark.Text.Trim(),
                iqcXblb = txt_xblb.TextTxt.Trim(),
            };
            try
            {