From 6ac046a0e37536e5f1f111c1095fe35fc71884cb Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 02 八月 2025 13:06:19 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs | 2
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 149 ++++++++++++++-------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 10 +
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs | 244 +++++++++++++++++-----------------
4 files changed, 231 insertions(+), 174 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
index 3acac2c..a0796ec 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
@@ -82,7 +82,7 @@
this.txt_bl007 = new DevExpress.XtraEditors.TextEdit();
this.txt_bl013 = new DevExpress.XtraEditors.TextEdit();
this.txt_blNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_bl012 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
this.txt_bl006 = new DevExpress.XtraEditors.TextEdit();
this.txt_bl015 = new DevExpress.XtraEditors.TextEdit();
this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
@@ -105,6 +105,14 @@
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -128,14 +136,6 @@
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -159,7 +159,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_bl007.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl013.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_blNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_bl012.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl006.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl015.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
@@ -182,13 +182,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
- this.tabMx.SuspendLayout();
- this.tabMxPage1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
@@ -197,6 +190,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+ this.tabMx.SuspendLayout();
+ this.tabMxPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -632,7 +632,7 @@
this.layoutMx1.Controls.Add(this.txt_bl007);
this.layoutMx1.Controls.Add(this.txt_bl013);
this.layoutMx1.Controls.Add(this.txt_blNo);
- this.layoutMx1.Controls.Add(this.txt_bl012);
+ this.layoutMx1.Controls.Add(this.txt_lineName);
this.layoutMx1.Controls.Add(this.txt_bl006);
this.layoutMx1.Controls.Add(this.txt_bl015);
this.layoutMx1.Controls.Add(this.txt_dptName);
@@ -730,15 +730,15 @@
this.txt_blNo.TabIndex = 211;
this.txt_blNo.Tag = "readonly";
//
- // txt_bl012
+ // txt_lineName
//
- this.txt_bl012.Location = new System.Drawing.Point(365, 78);
- this.txt_bl012.Name = "txt_bl012";
- this.txt_bl012.Properties.Appearance.Options.UseFont = true;
- this.txt_bl012.Size = new System.Drawing.Size(195, 24);
- this.txt_bl012.StyleController = this.layoutMx1;
- this.txt_bl012.TabIndex = 247;
- this.txt_bl012.Tag = "readonly";
+ this.txt_lineName.Location = new System.Drawing.Point(365, 78);
+ this.txt_lineName.Name = "txt_lineName";
+ this.txt_lineName.Properties.Appearance.Options.UseFont = true;
+ this.txt_lineName.Size = new System.Drawing.Size(195, 24);
+ this.txt_lineName.StyleController = this.layoutMx1;
+ this.txt_lineName.TabIndex = 247;
+ this.txt_lineName.Tag = "readonly";
//
// txt_bl006
//
@@ -1014,6 +1014,93 @@
this.layoutControlItem1.Text = "鍗曟嵁缂栧彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
//
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.btnSelect;
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 132);
+ this.layoutControlItem13.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem13.MinSize = new System.Drawing.Size(95, 31);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem13.Size = new System.Drawing.Size(276, 35);
+ this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem13.Text = "閫夋嫨鐗╂枡";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem13.TextVisible = false;
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_aboutGuid;
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 99);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem9.Size = new System.Drawing.Size(276, 33);
+ this.layoutControlItem9.Text = "鐢熶骇宸ュ崟";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_orgId;
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 66);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem5.Size = new System.Drawing.Size(276, 33);
+ this.layoutControlItem5.Text = "鐢熶骇缁勭粐";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_bl017;
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 33);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 33);
+ this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_tldh;
+ this.layoutControlItem17.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem17.Size = new System.Drawing.Size(276, 33);
+ this.layoutControlItem17.Text = "鎶曟枡鍗曞彿";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_dptName;
+ this.layoutControlItem10.Location = new System.Drawing.Point(276, 33);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem10.Size = new System.Drawing.Size(276, 33);
+ this.layoutControlItem10.Text = "琛ユ枡杞﹂棿";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_lineName;
+ this.layoutControlItem11.Location = new System.Drawing.Point(276, 66);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(276, 33);
+ this.layoutControlItem11.Text = "琛ユ枡浜х嚎";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_bl007;
+ this.layoutControlItem14.Location = new System.Drawing.Point(276, 99);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 33);
+ this.layoutControlItem14.Text = "鐢宠鍘熷洜";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1283,93 +1370,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.btnSelect;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 132);
- this.layoutControlItem13.MaxSize = new System.Drawing.Size(120, 31);
- this.layoutControlItem13.MinSize = new System.Drawing.Size(95, 31);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(276, 35);
- this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem13.Text = "閫夋嫨鐗╂枡";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem13.TextVisible = false;
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_aboutGuid;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 99);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(276, 33);
- this.layoutControlItem9.Text = "鐢熶骇宸ュ崟";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_orgId;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 66);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 33);
- this.layoutControlItem5.Text = "鐢熶骇缁勭粐";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_bl017;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 33);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 33);
- this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_tldh;
- this.layoutControlItem17.Location = new System.Drawing.Point(276, 0);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem17.Size = new System.Drawing.Size(276, 33);
- this.layoutControlItem17.Text = "鎶曟枡鍗曞彿";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_dptName;
- this.layoutControlItem10.Location = new System.Drawing.Point(276, 33);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(276, 33);
- this.layoutControlItem10.Text = "琛ユ枡杞﹂棿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_bl012;
- this.layoutControlItem11.Location = new System.Drawing.Point(276, 66);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 33);
- this.layoutControlItem11.Text = "琛ユ枡浜х嚎";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_bl007;
- this.layoutControlItem14.Location = new System.Drawing.Point(276, 99);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 33);
- this.layoutControlItem14.Text = "鐢宠鍘熷洜";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
- //
// UcBlcl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1402,7 +1402,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_bl007.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl013.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_blNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_bl012.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl006.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl015.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
@@ -1425,13 +1425,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
- this.tabMx.ResumeLayout(false);
- this.tabMxPage1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
@@ -1440,6 +1433,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+ this.tabMx.ResumeLayout(false);
+ this.tabMxPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
@@ -1483,7 +1483,7 @@
private DevExpress.XtraEditors.TextEdit txt_bl015;
private DevExpress.XtraEditors.TextEdit txt_bl014;
private DevExpress.XtraEditors.TextEdit txt_bl013;
- private DevExpress.XtraEditors.TextEdit txt_bl012;
+ private DevExpress.XtraEditors.TextEdit txt_lineName;
private DevExpress.XtraEditors.TextEdit txt_dptName;
private DevExpress.XtraEditors.TextEdit txt_bl007;
private DevExpress.XtraEditors.TextEdit txt_bl006;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
index bb7e11b..c961dde 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
@@ -71,7 +71,7 @@
txt_bl014.Text = txt_aboutGuid.GetPrdName();
txt_bl015.Text = txt_aboutGuid.GetPrdModel();
txt_dptName.Text = txt_aboutGuid.GetWorkName();
- txt_bl012.Text = txt_aboutGuid.GetWorkXb();
+ txt_lineName.Text = txt_aboutGuid.GetWorkXb();
txt_bl013.Text = txt_aboutGuid.GetRwd();
txt_tldh.Text = txt_aboutGuid.GetTldh();
};
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index a45ec1f..5ae460b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -130,6 +130,8 @@
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -182,6 +184,9 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptBl = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
@@ -201,8 +206,6 @@
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -261,6 +264,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -308,8 +313,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -716,7 +719,7 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 131);
+ this.btnSelect.Location = new System.Drawing.Point(12, 136);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(96, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -726,7 +729,7 @@
// txt_tbl023
//
this.txt_tbl023.IsReadly = false;
- this.txt_tbl023.Location = new System.Drawing.Point(84, 38);
+ this.txt_tbl023.Location = new System.Drawing.Point(84, 43);
this.txt_tbl023.Name = "txt_tbl023";
this.txt_tbl023.Size = new System.Drawing.Size(228, 24);
this.txt_tbl023.TabIndex = 462;
@@ -734,7 +737,7 @@
// txt_tbl005
//
this.txt_tbl005.EditValue = "-璇烽�夋嫨-";
- this.txt_tbl005.Location = new System.Drawing.Point(84, 100);
+ this.txt_tbl005.Location = new System.Drawing.Point(84, 105);
this.txt_tbl005.Name = "txt_tbl005";
this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -750,7 +753,7 @@
//
// txt_tbl006
//
- this.txt_tbl006.Location = new System.Drawing.Point(388, 100);
+ this.txt_tbl006.Location = new System.Drawing.Point(388, 105);
this.txt_tbl006.Name = "txt_tbl006";
this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
this.txt_tbl006.Size = new System.Drawing.Size(228, 24);
@@ -761,14 +764,14 @@
//
this.txt_tbl002.category = null;
this.txt_tbl002.IsReadly = false;
- this.txt_tbl002.Location = new System.Drawing.Point(84, 69);
+ this.txt_tbl002.Location = new System.Drawing.Point(84, 74);
this.txt_tbl002.Name = "txt_tbl002";
this.txt_tbl002.Size = new System.Drawing.Size(228, 24);
this.txt_tbl002.TabIndex = 458;
//
// txt_workName
//
- this.txt_workName.Location = new System.Drawing.Point(388, 38);
+ this.txt_workName.Location = new System.Drawing.Point(388, 43);
this.txt_workName.Name = "txt_workName";
this.txt_workName.Properties.Appearance.Options.UseFont = true;
this.txt_workName.Size = new System.Drawing.Size(228, 24);
@@ -778,7 +781,7 @@
//
// txt_tbl012
//
- this.txt_tbl012.Location = new System.Drawing.Point(996, 38);
+ this.txt_tbl012.Location = new System.Drawing.Point(996, 43);
this.txt_tbl012.Name = "txt_tbl012";
this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
this.txt_tbl012.Size = new System.Drawing.Size(229, 24);
@@ -788,7 +791,7 @@
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(84, 7);
+ this.txt_billNo.Location = new System.Drawing.Point(84, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
this.txt_billNo.Size = new System.Drawing.Size(228, 24);
@@ -798,7 +801,7 @@
//
// txt_rwd
//
- this.txt_rwd.Location = new System.Drawing.Point(388, 7);
+ this.txt_rwd.Location = new System.Drawing.Point(388, 12);
this.txt_rwd.Name = "txt_rwd";
this.txt_rwd.Properties.Appearance.Options.UseFont = true;
this.txt_rwd.Size = new System.Drawing.Size(228, 24);
@@ -808,7 +811,7 @@
//
// txt_tbl011
//
- this.txt_tbl011.Location = new System.Drawing.Point(996, 7);
+ this.txt_tbl011.Location = new System.Drawing.Point(996, 12);
this.txt_tbl011.Name = "txt_tbl011";
this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
this.txt_tbl011.Size = new System.Drawing.Size(229, 24);
@@ -818,7 +821,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(388, 69);
+ this.txt_itemName.Location = new System.Drawing.Point(388, 74);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
this.txt_itemName.Size = new System.Drawing.Size(228, 24);
@@ -828,7 +831,7 @@
//
// txt_tbl013
//
- this.txt_tbl013.Location = new System.Drawing.Point(924, 69);
+ this.txt_tbl013.Location = new System.Drawing.Point(924, 74);
this.txt_tbl013.Name = "txt_tbl013";
this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��";
this.txt_tbl013.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -839,7 +842,7 @@
//
// txt_tbl009
//
- this.txt_tbl009.Location = new System.Drawing.Point(692, 7);
+ this.txt_tbl009.Location = new System.Drawing.Point(692, 12);
this.txt_tbl009.Name = "txt_tbl009";
this.txt_tbl009.Size = new System.Drawing.Size(228, 24);
this.txt_tbl009.StyleController = this.layoutMx1;
@@ -848,7 +851,7 @@
//
// txt_tbl010
//
- this.txt_tbl010.Location = new System.Drawing.Point(692, 38);
+ this.txt_tbl010.Location = new System.Drawing.Point(692, 43);
this.txt_tbl010.Name = "txt_tbl010";
this.txt_tbl010.Size = new System.Drawing.Size(228, 24);
this.txt_tbl010.StyleController = this.layoutMx1;
@@ -867,7 +870,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(692, 69);
+ this.txt_itemNo.Location = new System.Drawing.Point(692, 74);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Size = new System.Drawing.Size(228, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
@@ -885,7 +888,7 @@
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(692, 131);
+ this.txt_daa014.Location = new System.Drawing.Point(692, 136);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Size = new System.Drawing.Size(228, 24);
this.txt_daa014.StyleController = this.layoutMx1;
@@ -894,7 +897,7 @@
//
// txt_tbl026
//
- this.txt_tbl026.Location = new System.Drawing.Point(996, 100);
+ this.txt_tbl026.Location = new System.Drawing.Point(996, 105);
this.txt_tbl026.Name = "txt_tbl026";
this.txt_tbl026.Size = new System.Drawing.Size(229, 24);
this.txt_tbl026.StyleController = this.layoutMx1;
@@ -903,7 +906,7 @@
//
// txt_tbl025
//
- this.txt_tbl025.Location = new System.Drawing.Point(996, 131);
+ this.txt_tbl025.Location = new System.Drawing.Point(996, 136);
this.txt_tbl025.Name = "txt_tbl025";
this.txt_tbl025.Size = new System.Drawing.Size(229, 24);
this.txt_tbl025.StyleController = this.layoutMx1;
@@ -912,7 +915,7 @@
//
// txt_chkOut
//
- this.txt_chkOut.Location = new System.Drawing.Point(620, 100);
+ this.txt_chkOut.Location = new System.Drawing.Point(620, 105);
this.txt_chkOut.Name = "txt_chkOut";
this.txt_chkOut.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_chkOut.Properties.Appearance.Options.UseForeColor = true;
@@ -1196,6 +1199,28 @@
this.layoutControlItem20.Size = new System.Drawing.Size(305, 31);
this.layoutControlItem20.Text = "鎵瑰噯鏃堕棿";
this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // lab_daa014
+ //
+ this.lab_daa014.Control = this.txt_daa014;
+ this.lab_daa014.Location = new System.Drawing.Point(608, 124);
+ this.lab_daa014.Name = "lab_daa014";
+ this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.lab_daa014.OptionsTableLayoutItem.RowIndex = 4;
+ this.lab_daa014.Size = new System.Drawing.Size(304, 31);
+ this.lab_daa014.Text = "鎶曟枡鍗曞彿";
+ this.lab_daa014.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem34
+ //
+ this.layoutControlItem34.Control = this.txt_chkOut;
+ this.layoutControlItem34.Location = new System.Drawing.Point(608, 93);
+ this.layoutControlItem34.Name = "layoutControlItem34";
+ this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem34.Size = new System.Drawing.Size(304, 31);
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem34.TextVisible = false;
//
// tabMx
//
@@ -1655,7 +1680,10 @@
this.gridColumn2,
this.gvMxDel,
this.gridColumn18,
- this.gridColumn19});
+ this.gridColumn19,
+ this.gridColumn20,
+ this.gridColumn22,
+ this.gridColumn23});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1739,7 +1767,7 @@
this.gvMx1tld005.FieldName = "tld005";
this.gvMx1tld005.MinWidth = 50;
this.gvMx1tld005.Name = "gvMx1tld005";
- this.gvMx1tld005.Tag = "edit";
+ this.gvMx1tld005.Tag = "yz_quantity_0_edit";
this.gvMx1tld005.Visible = true;
this.gvMx1tld005.VisibleIndex = 4;
this.gvMx1tld005.Width = 78;
@@ -1868,6 +1896,48 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptBl.Name = "rptBl";
this.rptBl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBl_ButtonClick);
+ //
+ // gridColumn20
+ //
+ this.gridColumn20.AppearanceCell.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Critical;
+ this.gridColumn20.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn20.AppearanceHeader.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Critical;
+ this.gridColumn20.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn20.Caption = "绱鐢宠閲�";
+ this.gridColumn20.FieldName = "sqQty";
+ this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Visible = true;
+ this.gridColumn20.VisibleIndex = 13;
+ this.gridColumn20.Width = 94;
+ //
+ // gridColumn22
+ //
+ this.gridColumn22.AppearanceCell.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Critical;
+ this.gridColumn22.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn22.AppearanceHeader.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Critical;
+ this.gridColumn22.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn22.Caption = "绱Н閫�閲�";
+ this.gridColumn22.FieldName = "tQty";
+ this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.Visible = true;
+ this.gridColumn22.VisibleIndex = 14;
+ this.gridColumn22.Width = 94;
+ //
+ // gridColumn23
+ //
+ this.gridColumn23.AppearanceCell.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Critical;
+ this.gridColumn23.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn23.AppearanceHeader.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Critical;
+ this.gridColumn23.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn23.Caption = "绱琛ラ噺";
+ this.gridColumn23.FieldName = "bQty";
+ this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.Visible = true;
+ this.gridColumn23.VisibleIndex = 15;
+ this.gridColumn23.Width = 94;
//
// repositoryItemMemoEdit1
//
@@ -2063,28 +2133,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // lab_daa014
- //
- this.lab_daa014.Control = this.txt_daa014;
- this.lab_daa014.Location = new System.Drawing.Point(608, 124);
- this.lab_daa014.Name = "lab_daa014";
- this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 2;
- this.lab_daa014.OptionsTableLayoutItem.RowIndex = 4;
- this.lab_daa014.Size = new System.Drawing.Size(304, 31);
- this.lab_daa014.Text = "鎶曟枡鍗曞彿";
- this.lab_daa014.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem34
- //
- this.layoutControlItem34.Control = this.txt_chkOut;
- this.layoutControlItem34.Location = new System.Drawing.Point(608, 93);
- this.layoutControlItem34.Name = "layoutControlItem34";
- this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem34.Size = new System.Drawing.Size(304, 31);
- this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem34.TextVisible = false;
- //
// Frm_MesItemTbl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2153,6 +2201,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2200,8 +2250,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
this.ResumeLayout(false);
}
@@ -2350,5 +2398,8 @@
private DevExpress.XtraEditors.CheckEdit txt_chkOut;
private DevExpress.XtraLayout.LayoutControlItem lab_daa014;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index dfe6c6d..0fe4a98 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -100,6 +100,10 @@
gcMx1.DataSource = _oldTable;
gcMx1.ForceInitialize();
Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ gridView1.BestFitColumns();
}
catch (Exception ex)
{
@@ -441,9 +445,9 @@
txt_tbl005.Focus();
return;
}
- if (string.IsNullOrEmpty(txt_tbl005.Text.Trim()))
+ if ((txt_tbl005.Text.Trim()=="鑹搧閫�鏂�") && txt_chkOut.Checked)
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍘熷洜锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鑹搧閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛岃妫�鏌ワ紒");
txt_tbl005.Focus();
return;
}
@@ -785,6 +789,8 @@
{
DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
lbMxGuid.Text = row["tlid"].ToString();
+ if (string.IsNullOrEmpty(lbMxGuid.Text))
+ return;
toolBarMenu1.guidKey = row["tlid"].ToString();
txtWlid.Text = row["tld002"].ToString();
txtWlgg.Text = row["tld004"].ToString();
--
Gitblit v1.9.3