From fb2dbdfe30adb03bfc990edc8339b5de72e7c867 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 06 十一月 2025 17:38:38 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 62 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 71ce12f..0da5062 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/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
//
@@ -923,6 +932,7 @@
this.txt_weight1.Size = new System.Drawing.Size(76, 24);
this.txt_weight1.StyleController = this.layWeight;
this.txt_weight1.TabIndex = 4;
+ this.txt_weight1.Tag = "readonly";
//
// txt_weight2
//
@@ -932,6 +942,7 @@
this.txt_weight2.Size = new System.Drawing.Size(79, 24);
this.txt_weight2.StyleController = this.layWeight;
this.txt_weight2.TabIndex = 5;
+ this.txt_weight2.Tag = "readonly";
//
// txt_weight3
//
@@ -941,6 +952,7 @@
this.txt_weight3.Size = new System.Drawing.Size(79, 24);
this.txt_weight3.StyleController = this.layWeight;
this.txt_weight3.TabIndex = 6;
+ this.txt_weight3.Tag = "readonly";
//
// txt_weight4
//
@@ -950,6 +962,7 @@
this.txt_weight4.Size = new System.Drawing.Size(79, 24);
this.txt_weight4.StyleController = this.layWeight;
this.txt_weight4.TabIndex = 7;
+ this.txt_weight4.Tag = "readonly";
//
// btnW
//
@@ -985,6 +998,7 @@
this.txt_weight5.Size = new System.Drawing.Size(79, 24);
this.txt_weight5.StyleController = this.layWeight;
this.txt_weight5.TabIndex = 11;
+ this.txt_weight5.Tag = "readonly";
//
// btnClean
//
@@ -1362,15 +1376,6 @@
this.txt_fngHandle.StyleController = this.layoutMx1;
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
//
@@ -1758,6 +1763,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 +2474,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 +2542,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 +2572,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 +2613,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 +2761,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 +2788,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;
}
}
\ No newline at end of file
--
Gitblit v1.9.3