From 6c4f48c41bca123db3c3aac7955b785569112542 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 29 十一月 2024 13:53:38 +0800
Subject: [PATCH] 基础信息
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs | 432 +++++++++++++++++++++++------------------------
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs | 51 +---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 12 -
3 files changed, 226 insertions(+), 269 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs
index a08cf9f..bb43261 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs
@@ -29,185 +29,86 @@
/// </summary>
private void InitializeComponent()
{
- //BQSetControlObject
-this.lb_itemId = new DevExpress.XtraEditors.LabelControl();
-this.txt_itemId = new DevExpress.XtraEditors.TextEdit();
-this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
-
-this.lb_workshop = new DevExpress.XtraEditors.LabelControl();
-this.txt_workshop = new DevExpress.XtraEditors.TextEdit();
-this.gv_workshop = new DevExpress.XtraGrid.Columns.GridColumn();
-
-this.lb_id = new DevExpress.XtraEditors.LabelControl();
-this.txt_id = new DevExpress.XtraEditors.TextEdit();
-this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
-
-this.lb_guid = new DevExpress.XtraEditors.LabelControl();
-this.txt_guid = new DevExpress.XtraEditors.TextEdit();
-this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
-
- //BQSetControlInfo
-//
-//lb_itemId
-//
-this.lb_itemId.Location = new System.Drawing.Point(770, 20);
-this.lb_itemId.Name = "lb_itemId";
-this.lb_itemId.Size = new System.Drawing.Size(150,21);
-this.lb_itemId.TabIndex = 216;
-this.lb_itemId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-this.lb_itemId.Text = "鐗╂枡ID ";
-//
-//txt_itemId
-//
-this.txt_itemId.Location = new System.Drawing.Point(830, 20);
-this.txt_itemId.Name = "txt_itemId";
-this.txt_itemId.Size = new System.Drawing.Size(150,21);
-this.txt_itemId.TabIndex = 216;
-this.txt_itemId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-//
-//gv_itemId
-//
-this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-this.gv_itemId.AppearanceCell.Options.UseFont = true;
-this.gv_itemId.FieldName = "itemId";
-this.gv_itemId.Caption = "鐗╂枡ID ";
-this.gv_itemId.Tag = "query_a.item_id";
-this.gv_itemId.MinWidth =50;
-this.gv_itemId.Visible = true;
-this.gv_itemId.Width =94;
-this.gv_itemId.OptionsColumn.AllowEdit = false;
-this.gv_itemId.VisibleIndex = 0;
-
-//
-//lb_workshop
-//
-this.lb_workshop.Location = new System.Drawing.Point(520, 20);
-this.lb_workshop.Name = "lb_workshop";
-this.lb_workshop.Size = new System.Drawing.Size(150,21);
-this.lb_workshop.TabIndex = 213;
-this.lb_workshop.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-this.lb_workshop.Text = "杞﹂棿ID ";
-//
-//txt_workshop
-//
-this.txt_workshop.Location = new System.Drawing.Point(580, 20);
-this.txt_workshop.Name = "txt_workshop";
-this.txt_workshop.Size = new System.Drawing.Size(150,21);
-this.txt_workshop.TabIndex = 213;
-this.txt_workshop.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-//
-//gv_workshop
-//
-this.gv_workshop.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-this.gv_workshop.AppearanceCell.Options.UseFont = true;
-this.gv_workshop.FieldName = "workshop";
-this.gv_workshop.Caption = "杞﹂棿ID ";
-this.gv_workshop.Tag = "query_a.workshop";
-this.gv_workshop.MinWidth =50;
-this.gv_workshop.Visible = true;
-this.gv_workshop.Width =94;
-this.gv_workshop.OptionsColumn.AllowEdit = false;
-this.gv_workshop.VisibleIndex = 0;
-
-//
-//lb_id
-//
-this.lb_id.Location = new System.Drawing.Point(270, 20);
-this.lb_id.Name = "lb_id";
-this.lb_id.Size = new System.Drawing.Size(150,21);
-this.lb_id.TabIndex = 211;
-this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-this.lb_id.Text = "id ";
-//
-//txt_id
-//
-this.txt_id.Location = new System.Drawing.Point(330, 20);
-this.txt_id.Name = "txt_id";
-this.txt_id.Size = new System.Drawing.Size(150,21);
-this.txt_id.TabIndex = 211;
-this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-//
-//gv_id
-//
-this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-this.gv_id.AppearanceCell.Options.UseFont = true;
-this.gv_id.FieldName = "id";
-this.gv_id.Caption = "id ";
-this.gv_id.Tag = "query_a.id";
-this.gv_id.MinWidth =50;
-this.gv_id.Visible = true;
-this.gv_id.Width =94;
-this.gv_id.OptionsColumn.AllowEdit = false;
-this.gv_id.VisibleIndex = 0;
-
-//
-//lb_guid
-//
-this.lb_guid.Location = new System.Drawing.Point(20, 20);
-this.lb_guid.Name = "lb_guid";
-this.lb_guid.Size = new System.Drawing.Size(150,21);
-this.lb_guid.TabIndex = 210;
-this.lb_guid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-this.lb_guid.Text = "guid ";
-//
-//txt_guid
-//
-this.txt_guid.Location = new System.Drawing.Point(80, 20);
-this.txt_guid.Name = "txt_guid";
-this.txt_guid.Size = new System.Drawing.Size(150,21);
-this.txt_guid.TabIndex = 210;
-this.txt_guid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-//
-//gv_guid
-//
-this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-this.gv_guid.AppearanceCell.Options.UseFont = true;
-this.gv_guid.FieldName = "guid";
-this.gv_guid.Caption = "guid ";
-this.gv_guid.Tag = "query_a.guid";
-this.gv_guid.MinWidth =50;
-this.gv_guid.Visible = true;
-this.gv_guid.Width =94;
-this.gv_guid.OptionsColumn.AllowEdit = false;
-this.gv_guid.VisibleIndex = 0;
-
- this.toolBarMenu1 = new UserControl.UcToolBarMenu();
+ this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_workshop = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.pageBar1 = new UserControls.Data.UcPageBar();
- this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
+ this.txt_workshop = new Gs.DevApp.UserControl.UcLookWorkshop();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
+ this.lb_itemId = new DevExpress.XtraEditors.LabelControl();
+ this.lb_workshop = new DevExpress.XtraEditors.LabelControl();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
- this.xtraTabPage2.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
this.SuspendLayout();
+ //
+ // gv_itemId
+ //
+ this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_itemId.AppearanceCell.Options.UseFont = true;
+ this.gv_itemId.Caption = "鐗╂枡ID";
+ this.gv_itemId.FieldName = "itemId";
+ this.gv_itemId.MinWidth = 50;
+ this.gv_itemId.Name = "gv_itemId";
+ this.gv_itemId.OptionsColumn.AllowEdit = false;
+ this.gv_itemId.Tag = "query_a.item_id";
+ this.gv_itemId.Visible = true;
+ this.gv_itemId.VisibleIndex = 3;
+ this.gv_itemId.Width = 94;
+ //
+ // gv_workshop
+ //
+ this.gv_workshop.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_workshop.AppearanceCell.Options.UseFont = true;
+ this.gv_workshop.Caption = "杞﹂棿ID";
+ this.gv_workshop.FieldName = "workshop";
+ this.gv_workshop.MinWidth = 50;
+ this.gv_workshop.Name = "gv_workshop";
+ this.gv_workshop.OptionsColumn.AllowEdit = false;
+ this.gv_workshop.Tag = "query_a.workshop";
+ this.gv_workshop.Visible = true;
+ this.gv_workshop.VisibleIndex = 1;
+ this.gv_workshop.Width = 94;
//
// toolBarMenu1
//
-
+ this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
+ this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
this.toolBarMenu1.TabIndex = 0;
+ this.toolBarMenu1.xlsInService = null;
+ this.toolBarMenu1.xlsOutParameter = null;
//
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.Location = new System.Drawing.Point(0, 54);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1126, 531);
+ this.gcMain.Size = new System.Drawing.Size(1126, 477);
this.gcMain.TabIndex = 1;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -217,13 +118,69 @@
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_guid,this.gv_id,this.gv_workshop,this.gv_itemId});
+ this.gridColumn1,
+ this.gv_workshop,
+ this.gridColumn2,
+ this.gv_itemId,
+ this.gridColumn5,
+ this.gridColumn3,
+ this.gridColumn4});
this.gridView1.GridControl = this.gcMain;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "浣跨敤缁勭粐";
+ this.gridColumn1.FieldName = "fSubsidiary";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 0;
+ this.gridColumn1.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "杞﹂棿鍚嶇О";
+ this.gridColumn2.FieldName = "workshopName";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 2;
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn5.FieldName = "itemNo";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 4;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn3.FieldName = "itemName";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 5;
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn4.FieldName = "itemModel";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 6;
+ this.gridColumn4.Width = 94;
//
// xtraTabControl1
//
@@ -234,16 +191,92 @@
this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1,
- this.xtraTabPage2});
+ this.xtraTabPage1});
//
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.gcMain);
+ this.xtraTabPage1.Controls.Add(this.panel1);
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ //
+ // panel1
+ //
+ this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.textEdit1);
+ this.panel1.Controls.Add(this.txt_itemId);
+ this.panel1.Controls.Add(this.txt_workshop);
+ this.panel1.Controls.Add(this.labelControl11);
+ this.panel1.Controls.Add(this.lbGuid);
+ this.panel1.Controls.Add(this.lb_itemId);
+ this.panel1.Controls.Add(this.lb_workshop);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(1126, 54);
+ this.panel1.TabIndex = 4;
+ //
+ // txt_itemId
+ //
+ this.txt_itemId.Enabled = false;
+ this.txt_itemId.IsReadly = false;
+ this.txt_itemId.KeyFile = "";
+ this.txt_itemId.Location = new System.Drawing.Point(372, 9);
+ this.txt_itemId.Name = "txt_itemId";
+ this.txt_itemId.Size = new System.Drawing.Size(266, 33);
+ this.txt_itemId.TabIndex = 218;
+ this.txt_itemId.Tag = "no";
+ //
+ // txt_workshop
+ //
+ this.txt_workshop.Enabled = false;
+ this.txt_workshop.IsReadly = false;
+ this.txt_workshop.Location = new System.Drawing.Point(78, 11);
+ this.txt_workshop.Name = "txt_workshop";
+ this.txt_workshop.Size = new System.Drawing.Size(193, 29);
+ this.txt_workshop.TabIndex = 217;
+ //
+ // labelControl11
+ //
+ this.labelControl11.Location = new System.Drawing.Point(791, 15);
+ this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl11.Name = "labelControl11";
+ this.labelControl11.Size = new System.Drawing.Size(45, 18);
+ this.labelControl11.TabIndex = 130;
+ this.labelControl11.Text = "涓婚敭锛�";
+ this.labelControl11.Visible = false;
+ //
+ // lbGuid
+ //
+ this.lbGuid.AutoSize = true;
+ this.lbGuid.Location = new System.Drawing.Point(842, 15);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(0, 21);
+ this.lbGuid.TabIndex = 1;
+ this.lbGuid.Visible = false;
+ //
+ // lb_itemId
+ //
+ this.lb_itemId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_itemId.Appearance.Options.UseFont = true;
+ this.lb_itemId.Location = new System.Drawing.Point(305, 15);
+ this.lb_itemId.Name = "lb_itemId";
+ this.lb_itemId.Size = new System.Drawing.Size(57, 21);
+ this.lb_itemId.TabIndex = 216;
+ this.lb_itemId.Text = "鐗╂枡ID ";
+ //
+ // lb_workshop
+ //
+ this.lb_workshop.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_workshop.Appearance.Options.UseFont = true;
+ this.lb_workshop.Location = new System.Drawing.Point(15, 15);
+ this.lb_workshop.Name = "lb_workshop";
+ this.lb_workshop.Size = new System.Drawing.Size(57, 21);
+ this.lb_workshop.TabIndex = 213;
+ this.lb_workshop.Text = "杞﹂棿ID ";
//
// pageBar1
//
@@ -258,73 +291,32 @@
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
//
- // xtraTabPage2
+ // textEdit1
//
- this.xtraTabPage2.Controls.Add(this.panel1);
- this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.PageEnabled = false;
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.textEdit1.Location = new System.Drawing.Point(924, 12);
+ this.textEdit1.Name = "textEdit1";
+ this.textEdit1.Size = new System.Drawing.Size(125, 24);
+ this.textEdit1.TabIndex = 219;
+ this.textEdit1.Visible = false;
//
- // panel1
- //
- this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.labelControl11);
- this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
- this.panel1.Location = new System.Drawing.Point(76, 20);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(585, 426);
- this.panel1.TabIndex = 1;
- //
- // labelControl11
- //
- this.labelControl11.Location = new System.Drawing.Point(61, 388);
- this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl11.Name = "labelControl11";
- this.labelControl11.Size = new System.Drawing.Size(45, 18);
- this.labelControl11.TabIndex = 130;
- this.labelControl11.Text = "涓婚敭锛�";
- //
- // lbGuid
- //
- this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(112, 388);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 21);
- this.lbGuid.TabIndex = 1;
- //
- // category1
+ // Frm_MesDaaDirectOut
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1128, 682);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- //BQAddControltoMContainer
- this.panel1.Controls.Add(this.lb_itemId);
- this.panel1.Controls.Add(this.txt_itemId);
-
- this.panel1.Controls.Add(this.lb_workshop);
- this.panel1.Controls.Add(this.txt_workshop);
-
- this.panel1.Controls.Add(this.lb_id);
- this.panel1.Controls.Add(this.txt_id);
-
- this.panel1.Controls.Add(this.lb_guid);
- this.panel1.Controls.Add(this.txt_guid);
-
- this.Name = "category1";
- this.Text = "";
+ this.Name = "Frm_MesDaaDirectOut";
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
- this.xtraTabPage2.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
this.ResumeLayout(false);
+
}
#endregion
private UserControl.UcToolBarMenu toolBarMenu1;
@@ -332,27 +324,21 @@
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private UserControls.Data.UcPageBar pageBar1;
- private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.LabelControl labelControl11;
- //BQCreateConrolObejct
-private DevExpress.XtraEditors.LabelControl lb_itemId;
-private DevExpress.XtraEditors.TextEdit txt_itemId;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
-
-private DevExpress.XtraEditors.LabelControl lb_workshop;
-private DevExpress.XtraEditors.TextEdit txt_workshop;
private DevExpress.XtraGrid.Columns.GridColumn gv_workshop;
-
-private DevExpress.XtraEditors.LabelControl lb_id;
-private DevExpress.XtraEditors.TextEdit txt_id;
- private DevExpress.XtraGrid.Columns.GridColumn gv_id;
-
-private DevExpress.XtraEditors.LabelControl lb_guid;
-private DevExpress.XtraEditors.TextEdit txt_guid;
- private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
-
+ private System.Windows.Forms.Panel panel1;
+ private DevExpress.XtraEditors.LabelControl labelControl11;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.LabelControl lb_itemId;
+ private DevExpress.XtraEditors.LabelControl lb_workshop;
+ private UserControl.UcLookItems txt_itemId;
+ private UserControl.UcLookWorkshop txt_workshop;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraEditors.TextEdit textEdit1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs
index efdc99b..1d1ffec 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs
@@ -19,13 +19,11 @@
{
InitializeComponent();
this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
- this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
@@ -43,6 +41,7 @@
Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
+ txt_itemId.KeyFile = "id";
}
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -50,17 +49,7 @@
await Task.Delay(100);
getPageList(1);
}
- /// <summary>
- /// 鍙屽嚮浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
- {
- string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
- if (!string.IsNullOrEmpty(rowGuid))
- getModel(rowGuid, false, 999);
- }
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -113,7 +102,7 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_userName, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, textEdit1, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -162,22 +151,7 @@
getPageList(1);
}
}
- /// <summary>
- /// 淇敼浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
- {
- string rowGuid = "", rowName = "";
- // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_userName, gridView1);
- if (string.IsNullOrEmpty(rowGuid))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- getModel(rowGuid, true, 1);
- }
+
/// <summary>
/// 鏂板浜嬩欢
/// </summary>
@@ -198,16 +172,25 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- //if (string.IsNullOrEmpty(txt_account.Text.Trim()))
+ string _workshop = txt_workshop.GetId();
+ string _itemId=txt_itemId.GetId();
+ if (string.IsNullOrEmpty(_workshop.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
- // txt_account.Focus();
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨杞﹂棿锛�");
+ txt_workshop.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(_itemId.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鏃犺亰锛�");
+ txt_itemId.Focus();
return;
}
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-
+ Workshop= _workshop,
+ ItemId= _itemId
};
try
{
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 46e8be7..6484164 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -824,18 +824,6 @@
/// <param name="idx">浠�0寮�濮嬶紝濡傛灉鏄�999锛屽垯鍏ㄩ儴鍙敤</param>
public static void JumpToTab(XtraTabControl tabControl, int idx)
{
- if (idx == 999)
- {
- for (var i = 0; i < tabControl.TabPages.Count; i++)
- tabControl.TabPages[i].PageEnabled = true;
- tabControl.SelectedTabPageIndex = tabControl.TabPages.Count - 1;
- return;
- }
-
- for (var i = 0; i < tabControl.TabPages.Count; i++)
- tabControl.TabPages[i].PageEnabled = false;
- tabControl.TabPages[idx].PageEnabled = true;
- tabControl.SelectedTabPageIndex = idx;
}
/// <summary>
--
Gitblit v1.9.3