From e9daa5f88d0df2f377837544d2866f2ab8f74d9e Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 20 八月 2025 21:28:31 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs | 24 +++--
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | 142 ++++++++++++++---------------------
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 4
DevApp/Gs.DevApp/App.config | 6
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 28 +++---
7 files changed, 92 insertions(+), 115 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 6efe703..642d77a 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -41,9 +41,9 @@
</connectionStrings>
<appSettings>
- <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
<!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
@@ -55,7 +55,7 @@
<add key="IsWater" value="0" /><!--鏄惁瑕佹按妫�鍙婂伐浣嶇爜-->
- <!--<add key="ExecutionTime" value="5" />-->
+ <!--<add key="ExecutionTime" value="5" />-->
<add key="TimingMailInterval" value="10000" />
<add key="thisText" value="[鏂扮粶绉伴噸鏈嶅姟]" />
<!--<add key="notifyText" value="5" />-->
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
index af362ec..687f828 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -623,6 +623,7 @@
this.txt_itemId.Name = "txt_itemId";
this.txt_itemId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.txt_itemId.Properties.ReadOnly = true;
this.txt_itemId.Size = new System.Drawing.Size(200, 24);
this.txt_itemId.StyleController = this.layoutMx1;
this.txt_itemId.TabIndex = 391;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 57b9eda..027e071 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -62,7 +62,6 @@
{
dfValue = 0;
gvMx1.Columns["ypsl"].Visible = false;
-
}
//濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣�
if (strType != QcSeason.ipqc宸℃.ToString())
@@ -268,6 +267,7 @@
gridViews.Add(gvMx1);
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ this.txt_itemId.ReadOnly = true;
}
/// <summary>
@@ -616,7 +616,7 @@
#region 浠ヤ笅涓虹绉嶄笅鎷�
private void _setIno()
{
- txt_itemId.Click += (s, e) =>
+ txt_itemId.ButtonClick += (s, e) =>
{
var frm = new JyxmShow(this.strType);
frm.UpdateParent += (ss, ee) =>
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
index a69c00a..749f878 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -400,7 +400,7 @@
0,
0});
this.txt_noLength.Minimum = new decimal(new int[] {
- 4,
+ 3,
0,
0,
0});
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
index 8a46553..b886fce 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -29,20 +29,19 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition33 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition34 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition35 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition36 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition49 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition50 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition51 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition52 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition53 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition54 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
- this.lbCollectGuid = new DevExpress.XtraEditors.LabelControl();
this.txt_gdbh = new DevExpress.XtraEditors.TextEdit();
this.txt_gx = new DevExpress.XtraEditors.TextEdit();
this.txt_collectBy = new DevExpress.XtraEditors.TextEdit();
@@ -60,7 +59,6 @@
this.btnGood = new DevExpress.XtraEditors.SimpleButton();
this.btnBad = new DevExpress.XtraEditors.SimpleButton();
this.txt_dianJianPath = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -78,7 +76,6 @@
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem();
this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
@@ -134,6 +131,7 @@
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
+ this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
this.splitMx1.Panel1.SuspendLayout();
@@ -163,7 +161,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_yjDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sjDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dianJianPath.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -181,7 +178,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
this.panel3.SuspendLayout();
this.panel2.SuspendLayout();
@@ -195,6 +191,7 @@
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit();
this.SuspendLayout();
//
// splitMx1
@@ -250,7 +247,6 @@
//
// layoutMx1
//
- this.layoutMx1.Controls.Add(this.lbCollectGuid);
this.layoutMx1.Controls.Add(this.txt_gdbh);
this.layoutMx1.Controls.Add(this.txt_gx);
this.layoutMx1.Controls.Add(this.txt_collectBy);
@@ -269,8 +265,6 @@
this.layoutMx1.Controls.Add(this.btnBad);
this.layoutMx1.Controls.Add(this.txt_dianJianPath);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem6});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(981, 0, 812, 500);
@@ -278,15 +272,6 @@
this.layoutMx1.Size = new System.Drawing.Size(828, 229);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
- //
- // lbCollectGuid
- //
- this.lbCollectGuid.Location = new System.Drawing.Point(214, 177);
- this.lbCollectGuid.Name = "lbCollectGuid";
- this.lbCollectGuid.Size = new System.Drawing.Size(79, 18);
- this.lbCollectGuid.StyleController = this.layoutMx1;
- this.lbCollectGuid.TabIndex = 22;
- this.lbCollectGuid.Text = "lbCollectGuid";
//
// txt_gdbh
//
@@ -451,18 +436,6 @@
this.txt_dianJianPath.StyleController = this.layoutMx1;
this.txt_dianJianPath.TabIndex = 21;
//
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.lbCollectGuid;
- this.layoutControlItem6.Location = new System.Drawing.Point(202, 165);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem6.Size = new System.Drawing.Size(202, 36);
- this.layoutControlItem6.Text = "閲囬泦琛実uid";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem6.TextVisible = false;
- //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -487,38 +460,38 @@
this.layDianJian});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition33.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition33.Width = 100D;
- columnDefinition34.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition34.Width = 100D;
- columnDefinition35.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition35.Width = 100D;
- columnDefinition36.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition36.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition33,
- columnDefinition34,
- columnDefinition35,
- columnDefinition36});
- rowDefinition49.Height = 100D;
- rowDefinition49.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition50.Height = 100D;
- rowDefinition50.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition51.Height = 100D;
- rowDefinition51.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition52.Height = 100D;
- rowDefinition52.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition53.Height = 100D;
- rowDefinition53.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition54.Height = 100D;
- rowDefinition54.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition49,
- rowDefinition50,
- rowDefinition51,
- rowDefinition52,
- rowDefinition53,
- rowDefinition54});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
this.Root.Size = new System.Drawing.Size(828, 229);
this.Root.TextVisible = false;
//
@@ -703,17 +676,6 @@
this.layoutControlItem11.Size = new System.Drawing.Size(404, 34);
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18);
- //
- // layDianJian
- //
- this.layDianJian.Control = this.txt_dianJianPath;
- this.layDianJian.Location = new System.Drawing.Point(202, 174);
- this.layDianJian.Name = "layDianJian";
- this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layDianJian.OptionsTableLayoutItem.RowIndex = 5;
- this.layDianJian.Size = new System.Drawing.Size(202, 35);
- this.layDianJian.Text = "鐢垫璺緞";
- this.layDianJian.TextSize = new System.Drawing.Size(87, 18);
//
// simpleButton7
//
@@ -1100,7 +1062,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1365, 354);
+ this.tabMxPage2.Size = new System.Drawing.Size(1365, 346);
this.tabMxPage2.Text = "涓嶈壇鍝佹槑缁�";
//
// gcMx2
@@ -1109,7 +1071,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1365, 354);
+ this.gcMx2.Size = new System.Drawing.Size(1365, 346);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1303,6 +1265,17 @@
this.gridColumn25.VisibleIndex = 12;
this.gridColumn25.Width = 94;
//
+ // layDianJian
+ //
+ this.layDianJian.Control = this.txt_dianJianPath;
+ this.layDianJian.Location = new System.Drawing.Point(202, 174);
+ this.layDianJian.Name = "layDianJian";
+ this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layDianJian.OptionsTableLayoutItem.RowIndex = 5;
+ this.layDianJian.Size = new System.Drawing.Size(202, 35);
+ this.layDianJian.Text = "鐢垫璺緞";
+ this.layDianJian.TextSize = new System.Drawing.Size(87, 18);
+ //
// Frm_Work01
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1344,7 +1317,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_yjDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sjDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dianJianPath.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1362,7 +1334,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
this.panel3.ResumeLayout(false);
this.panel3.PerformLayout();
@@ -1380,6 +1351,7 @@
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit();
this.ResumeLayout(false);
}
@@ -1478,8 +1450,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraEditors.LabelControl lbCollectGuid;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layDianJian;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 696de4b..f53004d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -107,14 +107,24 @@
};
btnBad.Click += (s, e) =>
{
- string _collectGuid = lbCollectGuid.Text.Trim();
+ string _collectGuid ="";
+ string _collCode = "";
+ var dr = gvMx1.GetFocusedDataRow();
+ if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
+ {
+ }
+ else
+ {
+ _collectGuid = dr["guid"].ToString();
+ _collCode = dr["barCode"].ToString();
+ }
if (_collectGuid.Length < 30)
{
Toast vm = new Toast(-1, "~璇峰厛閫夋嫨杩芥函鐮亊");
vm.Show();
return;
}
- string _msg = "浣犲噯澶囧皢銆�" + txt_gdbh.Text + "銆戙��" + txt_currentBarCode.Text.Trim() + "銆戝彉鏇翠负涓嶈壇";
+ string _msg = "浣犲噯澶囧皢銆�" + _collCode + "銆戝彉鏇翠负涓嶈壇";
UcDictionarySelect frm = new UcDictionarySelect("宸ュ簭涓嶈壇鎻忚堪", " a.s_type='宸ュ簭涓嶈壇鎻忚堪' and pid<>'00000000-0000-0000-0000-000000000000'", _msg);
frm.UpdateParent += (ss, ee) =>
{
@@ -133,22 +143,14 @@
vm.Show();
}
else
- addModel(badTag, _txt, lbCollectGuid.Text.Trim());
+ addModel(badTag, _txt, _collectGuid);
};
frm.ShowDialog();
+ this.ActiveControl = this.txt_barCode;
+ txt_barCode.Focus();
};
this.ActiveControl = this.txt_barCode;
txt_barCode.Focus();
- gvMx1.FocusedRowChanged += (s, e) =>
- {
- if (e.FocusedRowHandle >= 0)
- {
- DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
- txt_gdbh.Text = row["gdbh"].ToString();
- txt_currentBarCode.Text = row["barCode"].ToString();
- lbCollectGuid.Text = row["guid"].ToString();
- }
- };
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
index 2037b0d..96ad9b0 100644
--- a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
@@ -32,8 +32,8 @@
this.tlcMenuName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
this.tlcActions = new DevExpress.XtraTreeList.Columns.TreeListColumn();
this.panel1 = new System.Windows.Forms.Panel();
- this.btnIn = new DevExpress.XtraEditors.SimpleButton();
this.lbMsg = new DevExpress.XtraEditors.LabelControl();
+ this.btnIn = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.tlMenu)).BeginInit();
this.panel1.SuspendLayout();
this.SuspendLayout();
@@ -88,6 +88,19 @@
this.panel1.Size = new System.Drawing.Size(776, 56);
this.panel1.TabIndex = 6;
//
+ // lbMsg
+ //
+ this.lbMsg.Appearance.Font = new System.Drawing.Font("Tahoma", 13F);
+ this.lbMsg.Appearance.ForeColor = System.Drawing.Color.Red;
+ this.lbMsg.Appearance.Options.UseFont = true;
+ this.lbMsg.Appearance.Options.UseForeColor = true;
+ this.lbMsg.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.lbMsg.Location = new System.Drawing.Point(0, 0);
+ this.lbMsg.Name = "lbMsg";
+ this.lbMsg.Size = new System.Drawing.Size(127, 27);
+ this.lbMsg.TabIndex = 6;
+ this.lbMsg.Text = "labelControl1";
+ //
// btnIn
//
this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
@@ -99,15 +112,6 @@
this.btnIn.Size = new System.Drawing.Size(94, 56);
this.btnIn.TabIndex = 5;
this.btnIn.Text = "纭畾閫夋嫨";
- //
- // lbMsg
- //
- this.lbMsg.Dock = System.Windows.Forms.DockStyle.Fill;
- this.lbMsg.Location = new System.Drawing.Point(0, 0);
- this.lbMsg.Name = "lbMsg";
- this.lbMsg.Size = new System.Drawing.Size(81, 18);
- this.lbMsg.TabIndex = 6;
- this.lbMsg.Text = "labelControl1";
//
// UcDictionarySelect
//
--
Gitblit v1.9.3