From 8114becd3aa125191bf0ed06cb8b17379b5757aa Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期五, 12 十二月 2025 13:38:48 +0800
Subject: [PATCH] 其它入库单据类型改为可维护
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 130 ++++++++++++++++++++-----------------------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 4
DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs | 2
3 files changed, 63 insertions(+), 73 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
index ee98b78..c658c20 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
@@ -177,7 +177,7 @@
toolStripMenuItemAdd.Visible = false;
toolStripMenuItemEdt.Visible = false;
toolStripMenuItemDel.Visible = false;
- toolStripMenuItemRoot.Visible = false;//2025/07//11鏀逛负涓嶅鍔犱富椤圭洰浜�
+ toolStripMenuItemRoot.Visible = true;//2025/07//11鏀逛负涓嶅鍔犱富椤圭洰浜�
cms1.Show(tlMenu, e.Location);
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 53870bb..99611ad 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -116,7 +116,6 @@
this.txt_qt032 = new DevExpress.XtraEditors.CheckEdit();
this.txt_qt035 = new DevExpress.XtraEditors.ButtonEdit();
this.txt_isIqc = new DevExpress.XtraEditors.CheckEdit();
- this.txt_qtlx = new DevExpress.XtraEditors.ComboBoxEdit();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -141,7 +140,6 @@
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
@@ -221,6 +219,8 @@
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.txt_qtlx = new Gs.DevApp.UserControl.UcDictionaryComBox();
+ this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -256,7 +256,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isIqc.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qtlx.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
@@ -281,7 +280,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
@@ -333,6 +331,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -708,6 +707,7 @@
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.txt_qtlx);
this.layoutMx1.Controls.Add(this.ucBtnPrintAll1);
this.layoutMx1.Controls.Add(this.btnCopyXls);
this.layoutMx1.Controls.Add(this.txt_qt003);
@@ -733,7 +733,6 @@
this.layoutMx1.Controls.Add(this.txt_qt032);
this.layoutMx1.Controls.Add(this.txt_qt035);
this.layoutMx1.Controls.Add(this.txt_isIqc);
- this.layoutMx1.Controls.Add(this.txt_qtlx);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem12,
@@ -772,6 +771,7 @@
this.txt_qt003.Location = new System.Drawing.Point(770, 43);
this.txt_qt003.Margin = new System.Windows.Forms.Padding(4);
this.txt_qt003.Name = "txt_qt003";
+ this.txt_qt003.SelectedIndex = -1;
this.txt_qt003.Size = new System.Drawing.Size(222, 24);
this.txt_qt003.TabIndex = 333;
this.txt_qt003.TextTxt = "鍏跺畠鍏ュ簱(QTRKD01_SYS)";
@@ -993,26 +993,6 @@
this.txt_isIqc.TabIndex = 341;
this.txt_isIqc.Tag = "readonly";
//
- // txt_qtlx
- //
- this.txt_qtlx.EditValue = "璇烽�夋嫨";
- this.txt_qtlx.Location = new System.Drawing.Point(442, 12);
- this.txt_qtlx.Name = "txt_qtlx";
- this.txt_qtlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_qtlx.Properties.Items.AddRange(new object[] {
- "璇烽�夋嫨",
- "1:鍞悗缁翠慨",
- "2:鎷嗗嵏鍏ュ簱",
- "3:渚涘簲鍟嗚禒閫�",
- "4:鏃犳簮鍗曞澶栭��鏉愭枡",
- "5:鐩樼泩",
- "6:宸ュ崟瀹屾垚鍚庨��鎹㈡枡"});
- this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qtlx.Size = new System.Drawing.Size(222, 24);
- this.txt_qtlx.StyleController = this.layoutMx1;
- this.txt_qtlx.TabIndex = 445;
- //
// layoutControlItem12
//
this.layoutControlItem12.Control = this.lbGuid;
@@ -1084,9 +1064,9 @@
this.layoutControlItem9,
this.layoutControlItem11,
this.layoutControlItem2,
- this.layoutControlItem38,
this.layoutControlItem3,
- this.layoutControlItem39});
+ this.layoutControlItem39,
+ this.layoutControlItem38});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1336,16 +1316,6 @@
this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem38
- //
- this.layoutControlItem38.Control = this.txt_qtlx;
- this.layoutControlItem38.Location = new System.Drawing.Point(328, 0);
- this.layoutControlItem38.Name = "layoutControlItem38";
- this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem38.Size = new System.Drawing.Size(328, 31);
- this.layoutControlItem38.Text = "鍏ュ簱绫诲瀷";
- this.layoutControlItem38.TextSize = new System.Drawing.Size(90, 18);
- //
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_qt019;
@@ -1444,11 +1414,11 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 49);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 48);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(336, 33);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32);
this.ucBtnPrint1.TabIndex = 480;
//
// radOut
@@ -1462,7 +1432,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(336, 33);
+ this.radOut.Size = new System.Drawing.Size(336, 32);
this.radOut.StyleController = this.lay99;
this.radOut.TabIndex = 479;
//
@@ -1470,10 +1440,10 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 86);
+ this.layoutControl1.Location = new System.Drawing.Point(692, 84);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(336, 33);
+ this.layoutControl1.Size = new System.Drawing.Size(336, 32);
this.layoutControl1.TabIndex = 478;
this.layoutControl1.Text = "layoutControl1";
//
@@ -1517,7 +1487,7 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 32);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem33
@@ -1525,7 +1495,7 @@
this.layoutControlItem33.Control = this.txt_iCount_1;
this.layoutControlItem33.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.Size = new System.Drawing.Size(168, 33);
+ this.layoutControlItem33.Size = new System.Drawing.Size(168, 32);
this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1535,7 +1505,7 @@
this.layoutControlItem34.Location = new System.Drawing.Point(168, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem34.Size = new System.Drawing.Size(168, 33);
+ this.layoutControlItem34.Size = new System.Drawing.Size(168, 32);
this.layoutControlItem34.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1553,7 +1523,7 @@
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 49);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(794, 48);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
@@ -1572,7 +1542,7 @@
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 49);
+ this.txt_yQty.Location = new System.Drawing.Point(454, 48);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
@@ -1592,7 +1562,7 @@
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 49);
+ this.txtWlmc.Location = new System.Drawing.Point(114, 48);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
@@ -1602,7 +1572,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 86);
+ this.txtWlgg.Location = new System.Drawing.Point(114, 84);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
@@ -1662,7 +1632,7 @@
rowDefinition8,
rowDefinition9,
rowDefinition10});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 131);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 128);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -1671,7 +1641,7 @@
this.layoutControlItem23.Location = new System.Drawing.Point(1020, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem23.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem23.Text = "鎵撳嵃鏂瑰紡";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -1679,11 +1649,11 @@
// layoutControlItem22
//
this.layoutControlItem22.Control = this.layoutControl1;
- this.layoutControlItem22.Location = new System.Drawing.Point(680, 74);
+ this.layoutControlItem22.Location = new System.Drawing.Point(680, 72);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem22.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem22.Text = "鎵撳嵃寮犳暟";
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@@ -1696,7 +1666,7 @@
this.layoutControlItem27.Location = new System.Drawing.Point(680, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem27.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem27.Text = "鍙墦鍗版�绘暟";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1705,11 +1675,11 @@
this.layoutControlItem28.Control = this.txt_psnQty_1;
this.layoutControlItem28.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem28.CustomizationFormText = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem28.Location = new System.Drawing.Point(680, 37);
+ this.layoutControlItem28.Location = new System.Drawing.Point(680, 36);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem28.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem28.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1721,7 +1691,7 @@
this.layoutControlItem25.Location = new System.Drawing.Point(340, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem25.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1730,11 +1700,11 @@
this.layoutControlItem26.Control = this.txt_yQty;
this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem26.CustomizationFormText = "宸叉墦鍗版�婚噺";
- this.layoutControlItem26.Location = new System.Drawing.Point(340, 37);
+ this.layoutControlItem26.Location = new System.Drawing.Point(340, 36);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem26.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem26.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1745,7 +1715,7 @@
this.layoutControlItem24.CustomizationFormText = "鐗╂枡缂栫爜";
this.layoutControlItem24.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem24.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem24.Text = "鐗╂枡缂栫爜";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1754,10 +1724,10 @@
this.layoutControlItem29.Control = this.txtWlmc;
this.layoutControlItem29.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem29.CustomizationFormText = "鐗╂枡鍚嶇О";
- this.layoutControlItem29.Location = new System.Drawing.Point(0, 37);
+ this.layoutControlItem29.Location = new System.Drawing.Point(0, 36);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem29.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem29.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem29.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1766,22 +1736,22 @@
this.layoutControlItem30.Control = this.txtWlgg;
this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem30.CustomizationFormText = "鐗╂枡瑙勬牸";
- this.layoutControlItem30.Location = new System.Drawing.Point(0, 74);
+ this.layoutControlItem30.Location = new System.Drawing.Point(0, 72);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem30.Size = new System.Drawing.Size(680, 37);
+ this.layoutControlItem30.Size = new System.Drawing.Size(680, 36);
this.layoutControlItem30.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem31
//
this.layoutControlItem31.Control = this.ucBtnPrint1;
- this.layoutControlItem31.Location = new System.Drawing.Point(1020, 37);
+ this.layoutControlItem31.Location = new System.Drawing.Point(1020, 36);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem31.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem31.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem31.TextVisible = false;
@@ -2309,6 +2279,27 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // txt_qtlx
+ //
+ this.txt_qtlx.Location = new System.Drawing.Point(442, 12);
+ this.txt_qtlx.Name = "txt_qtlx";
+ this.txt_qtlx.SelectedIndex = -1;
+ this.txt_qtlx.Size = new System.Drawing.Size(222, 24);
+ this.txt_qtlx.TabIndex = 447;
+ this.txt_qtlx.TextTxt = "";
+ this.txt_qtlx.WhereTxt = "a.s_type=\'鍏跺畠鍏ュ簱鍏ュ簱绫诲瀷\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
+
+ //
+ // layoutControlItem38
+ //
+ this.layoutControlItem38.Control = this.txt_qtlx;
+ this.layoutControlItem38.Location = new System.Drawing.Point(328, 0);
+ this.layoutControlItem38.Name = "layoutControlItem38";
+ this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem38.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem38.Text = "鍏ュ簱绫诲瀷";
+ this.layoutControlItem38.TextSize = new System.Drawing.Size(90, 18);
+ //
// Frm_MesItemQtrk
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2354,7 +2345,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isIqc.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qtlx.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
@@ -2379,7 +2369,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
@@ -2431,6 +2420,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
this.ResumeLayout(false);
}
@@ -2586,14 +2576,14 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
private DevExpress.XtraEditors.SimpleButton btnCopyXls;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
- private DevExpress.XtraEditors.ComboBoxEdit txt_qtlx;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
private UserControl.UcBtnPrintAll ucBtnPrintAll1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
+ private UserControl.UcDictionaryComBox txt_qtlx;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index c4d2b88..3504af0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -563,7 +563,7 @@
string inHz = ucLookHuoZhu1.GetHzId();//璐т富
string inRkyy = txt_qt010.Text.Trim();//鍏ュ簱鍘熷洜
string kcCk = txt_qt008.GetId();//浠撳簱
- string qtlx = txt_qtlx.Text.Trim();//鍚庢潵澧炲姞鐨勭被鍨�
+ string qtlx = txt_qtlx.TextTxt.Trim();//鍚庢潵澧炲姞鐨勭被鍨�
if (string.IsNullOrEmpty(kcZz))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨搴撳瓨缁勭粐锛�");
@@ -586,7 +586,7 @@
txt_qt003.Focus();
return;
}
- if (txt_qtlx.SelectedIndex <= 0)
+ if (djLx.Length <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍏ュ簱绫诲瀷锛�");
txt_qtlx.Focus();
--
Gitblit v1.9.3