From ab354260b4b9ca8cf1aa12573310ec2a9598e084 Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期五, 20 九月 2024 22:04:35 +0800
Subject: [PATCH] 库位设置
---
DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.cs | 46 +++
DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.Designer.cs | 492 ++++++++++++++++++++++++++++++------------------
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 29 ++
3 files changed, 368 insertions(+), 199 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.Designer.cs
index 45e8e69..96ec057 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.Designer.cs
@@ -30,15 +30,6 @@
/// </summary>
private void InitializeComponent()
{
- this.lb_isStatus = new DevExpress.XtraEditors.LabelControl();
- this.lb_isWy = new DevExpress.XtraEditors.LabelControl();
- this.lb_category = new DevExpress.XtraEditors.LabelControl();
- this.lb_remark = new DevExpress.XtraEditors.LabelControl();
- this.txt_remark = new DevExpress.XtraEditors.TextEdit();
- this.lb_name = new DevExpress.XtraEditors.LabelControl();
- this.txt_name = new DevExpress.XtraEditors.TextEdit();
- this.lb_itemNo = new DevExpress.XtraEditors.LabelControl();
- this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.toolBarMenu1 = new Gs.DevApp.UserControl.ToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -51,121 +42,46 @@
this.tlcMenuType = new DevExpress.XtraTreeList.Columns.TreeListColumn();
this.pageBar1 = new UserControls.Data.PageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.gridControl1 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+ this.lb_itemNo = new DevExpress.XtraEditors.LabelControl();
this.txt_category = new DevExpress.XtraEditors.ComboBoxEdit();
- this.txt_isWy = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_isStatus = new DevExpress.XtraEditors.ComboBoxEdit();
- this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_name = new DevExpress.XtraEditors.TextEdit();
+ this.lb_isWy = new DevExpress.XtraEditors.LabelControl();
+ this.txt_isWy = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.lb_isStatus = new DevExpress.XtraEditors.LabelControl();
+ this.lb_name = new DevExpress.XtraEditors.LabelControl();
+ this.lb_category = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+ this.txt_remark = new DevExpress.XtraEditors.TextEdit();
+ this.lb_remark = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tlMenu)).BeginInit();
this.xtraTabPage2.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_category.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isWy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isWy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
this.SuspendLayout();
- //
- // lb_isStatus
- //
- this.lb_isStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_isStatus.Appearance.Options.UseFont = true;
- this.lb_isStatus.Location = new System.Drawing.Point(338, 59);
- this.lb_isStatus.Name = "lb_isStatus";
- this.lb_isStatus.Size = new System.Drawing.Size(51, 21);
- this.lb_isStatus.TabIndex = 231;
- this.lb_isStatus.Tag = "isStatus";
- this.lb_isStatus.Text = "鐘舵�侊細";
- //
- // lb_isWy
- //
- this.lb_isWy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_isWy.Appearance.Options.UseFont = true;
- this.lb_isWy.Location = new System.Drawing.Point(304, 17);
- this.lb_isWy.Name = "lb_isWy";
- this.lb_isWy.Size = new System.Drawing.Size(85, 21);
- this.lb_isWy.TabIndex = 220;
- this.lb_isWy.Tag = "isWy";
- this.lb_isWy.Text = "鏄惁濮斿锛�";
- //
- // lb_category
- //
- this.lb_category.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_category.Appearance.Options.UseFont = true;
- this.lb_category.Location = new System.Drawing.Point(54, 96);
- this.lb_category.Name = "lb_category";
- this.lb_category.Size = new System.Drawing.Size(51, 21);
- this.lb_category.TabIndex = 226;
- this.lb_category.Tag = "category";
- this.lb_category.Text = "绫诲埆锛�";
- //
- // lb_remark
- //
- this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_remark.Appearance.Options.UseFont = true;
- this.lb_remark.Location = new System.Drawing.Point(54, 140);
- this.lb_remark.Name = "lb_remark";
- this.lb_remark.Size = new System.Drawing.Size(51, 21);
- this.lb_remark.TabIndex = 217;
- this.lb_remark.Tag = "remark";
- this.lb_remark.Text = "澶囨敞锛�";
- //
- // txt_remark
- //
- this.txt_remark.Location = new System.Drawing.Point(111, 136);
- this.txt_remark.Name = "txt_remark";
- this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(150, 28);
- this.txt_remark.TabIndex = 217;
- this.txt_remark.Tag = "remark";
- //
- // lb_name
- //
- this.lb_name.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_name.Appearance.Options.UseFont = true;
- this.lb_name.Location = new System.Drawing.Point(20, 59);
- this.lb_name.Name = "lb_name";
- this.lb_name.Size = new System.Drawing.Size(85, 21);
- this.lb_name.TabIndex = 216;
- this.lb_name.Tag = "name";
- this.lb_name.Text = "浠撳簱鍚嶇О锛�";
- //
- // txt_name
- //
- this.txt_name.Location = new System.Drawing.Point(111, 55);
- this.txt_name.Name = "txt_name";
- this.txt_name.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_name.Properties.Appearance.Options.UseFont = true;
- this.txt_name.Size = new System.Drawing.Size(150, 28);
- this.txt_name.TabIndex = 216;
- this.txt_name.Tag = "name";
- //
- // lb_itemNo
- //
- this.lb_itemNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_itemNo.Appearance.Options.UseFont = true;
- this.lb_itemNo.Location = new System.Drawing.Point(20, 17);
- this.lb_itemNo.Name = "lb_itemNo";
- this.lb_itemNo.Size = new System.Drawing.Size(85, 21);
- this.lb_itemNo.TabIndex = 211;
- this.lb_itemNo.Tag = "itemNo";
- this.lb_itemNo.Text = "浠撳簱缂栫爜锛�";
- //
- // txt_itemNo
- //
- this.txt_itemNo.Location = new System.Drawing.Point(111, 13);
- this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(150, 28);
- this.txt_itemNo.TabIndex = 211;
- this.txt_itemNo.Tag = "itemNo";
//
// toolBarMenu1
//
@@ -182,7 +98,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 492);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1128, 627);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -193,7 +109,7 @@
this.xtraTabPage1.Controls.Add(this.tlMenu);
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 460);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 595);
this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
//
// tlMenu
@@ -216,7 +132,7 @@
this.tlMenu.Name = "tlMenu";
this.tlMenu.OptionsBehavior.Editable = false;
this.tlMenu.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Solid;
- this.tlMenu.Size = new System.Drawing.Size(1126, 421);
+ this.tlMenu.Size = new System.Drawing.Size(1126, 556);
this.tlMenu.TabIndex = 4;
this.tlMenu.TreeLevelWidth = 21;
//
@@ -256,7 +172,7 @@
this.treeListColumn1.FieldName = "createTime";
this.treeListColumn1.Name = "treeListColumn1";
this.treeListColumn1.Visible = true;
- this.treeListColumn1.VisibleIndex = 6;
+ this.treeListColumn1.VisibleIndex = 5;
this.treeListColumn1.Width = 104;
//
// tlcParentMenuName
@@ -283,7 +199,7 @@
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 421);
+ this.pageBar1.Location = new System.Drawing.Point(0, 556);
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
@@ -294,39 +210,160 @@
//
// xtraTabPage2
//
+ this.xtraTabPage2.Controls.Add(this.groupBox1);
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 460);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1126, 595);
this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.gridControl1);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBox1.Location = new System.Drawing.Point(0, 166);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(1126, 429);
+ this.groupBox1.TabIndex = 235;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "浠撲綅淇℃伅";
+ //
+ // gridControl1
+ //
+ this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gridControl1.Location = new System.Drawing.Point(3, 22);
+ this.gridControl1.MainView = this.gvMx1;
+ this.gridControl1.Name = "gridControl1";
+ this.gridControl1.Size = new System.Drawing.Size(1120, 404);
+ this.gridControl1.TabIndex = 2;
+ this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx1});
+ //
+ // gvMx1
+ //
+ this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn1,
+ this.gridColumn2,
+ this.gridColumn3,
+ this.gridColumn4,
+ this.gridColumn5,
+ this.gridColumn6});
+ this.gvMx1.GridControl = this.gridControl1;
+ this.gvMx1.Name = "gvMx1";
+ this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
+ this.gvMx1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "浠撲綅缂栧彿";
+ this.gridColumn1.FieldName = "sectionCode";
+ 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 = "sectionName";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "澶囨敞";
+ this.gridColumn3.FieldName = "remark";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "寤虹珛鑰�";
+ this.gridColumn4.FieldName = "createBy";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 3;
+ this.gridColumn4.Width = 94;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "寤虹珛鏃堕棿";
+ this.gridColumn5.FieldName = "createTime";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 4;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "鐘舵��";
+ this.gridColumn6.FieldName = "isStatusTxt";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.Width = 94;
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_category);
- this.panel1.Controls.Add(this.txt_isWy);
- this.panel1.Controls.Add(this.txt_isStatus);
- this.panel1.Controls.Add(this.labelControl11);
- this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_isStatus);
- this.panel1.Controls.Add(this.lb_isWy);
- this.panel1.Controls.Add(this.lb_category);
- this.panel1.Controls.Add(this.lb_remark);
- this.panel1.Controls.Add(this.txt_remark);
- this.panel1.Controls.Add(this.lb_name);
- this.panel1.Controls.Add(this.txt_name);
- this.panel1.Controls.Add(this.lb_itemNo);
this.panel1.Controls.Add(this.txt_itemNo);
+ this.panel1.Controls.Add(this.lb_itemNo);
+ this.panel1.Controls.Add(this.txt_category);
+ this.panel1.Controls.Add(this.txt_isStatus);
+ this.panel1.Controls.Add(this.txt_name);
+ this.panel1.Controls.Add(this.lb_isWy);
+ this.panel1.Controls.Add(this.txt_isWy);
+ this.panel1.Controls.Add(this.lb_isStatus);
+ this.panel1.Controls.Add(this.lb_name);
+ this.panel1.Controls.Add(this.lb_category);
+ this.panel1.Controls.Add(this.lbGuid);
+ this.panel1.Controls.Add(this.txt_remark);
+ this.panel1.Controls.Add(this.lb_remark);
+ this.panel1.Controls.Add(this.labelControl11);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
- this.panel1.Location = new System.Drawing.Point(76, 20);
+ this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(631, 336);
+ this.panel1.Size = new System.Drawing.Size(1126, 166);
this.panel1.TabIndex = 1;
+ //
+ // txt_itemNo
+ //
+ this.txt_itemNo.Location = new System.Drawing.Point(105, 35);
+ this.txt_itemNo.Name = "txt_itemNo";
+ this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_itemNo.TabIndex = 211;
+ this.txt_itemNo.Tag = "itemNo";
+ //
+ // lb_itemNo
+ //
+ this.lb_itemNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_itemNo.Appearance.Options.UseFont = true;
+ this.lb_itemNo.Location = new System.Drawing.Point(14, 39);
+ this.lb_itemNo.Name = "lb_itemNo";
+ this.lb_itemNo.Size = new System.Drawing.Size(85, 21);
+ this.lb_itemNo.TabIndex = 211;
+ this.lb_itemNo.Tag = "itemNo";
+ this.lb_itemNo.Text = "浠撳簱缂栫爜锛�";
//
// txt_category
//
this.txt_category.EditValue = "-璇烽�夋嫨-";
- this.txt_category.Location = new System.Drawing.Point(111, 93);
+ this.txt_category.Location = new System.Drawing.Point(105, 115);
this.txt_category.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_category.Name = "txt_category";
this.txt_category.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -341,28 +378,10 @@
this.txt_category.Size = new System.Drawing.Size(150, 28);
this.txt_category.TabIndex = 234;
//
- // txt_isWy
- //
- this.txt_isWy.EditValue = "-璇烽�夋嫨-";
- this.txt_isWy.Location = new System.Drawing.Point(395, 13);
- this.txt_isWy.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.txt_isWy.Name = "txt_isWy";
- this.txt_isWy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_isWy.Properties.Appearance.Options.UseFont = true;
- this.txt_isWy.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_isWy.Properties.Items.AddRange(new object[] {
- "-璇烽�夋嫨-",
- "鏄澶栦粨",
- "涓嶆槸濮斿浠�"});
- this.txt_isWy.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_isWy.Size = new System.Drawing.Size(127, 28);
- this.txt_isWy.TabIndex = 233;
- //
// txt_isStatus
//
this.txt_isStatus.EditValue = "-璇烽�夋嫨-";
- this.txt_isStatus.Location = new System.Drawing.Point(395, 55);
+ this.txt_isStatus.Location = new System.Drawing.Point(389, 77);
this.txt_isStatus.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_isStatus.Name = "txt_isStatus";
this.txt_isStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -377,44 +396,140 @@
this.txt_isStatus.Size = new System.Drawing.Size(127, 28);
this.txt_isStatus.TabIndex = 232;
//
+ // txt_name
+ //
+ this.txt_name.Location = new System.Drawing.Point(105, 77);
+ this.txt_name.Name = "txt_name";
+ this.txt_name.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_name.Properties.Appearance.Options.UseFont = true;
+ this.txt_name.Size = new System.Drawing.Size(150, 28);
+ this.txt_name.TabIndex = 216;
+ this.txt_name.Tag = "name";
+ //
+ // lb_isWy
+ //
+ this.lb_isWy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_isWy.Appearance.Options.UseFont = true;
+ this.lb_isWy.Location = new System.Drawing.Point(298, 39);
+ this.lb_isWy.Name = "lb_isWy";
+ this.lb_isWy.Size = new System.Drawing.Size(85, 21);
+ this.lb_isWy.TabIndex = 220;
+ this.lb_isWy.Tag = "isWy";
+ this.lb_isWy.Text = "鏄惁濮斿锛�";
+ //
+ // txt_isWy
+ //
+ this.txt_isWy.EditValue = "-璇烽�夋嫨-";
+ this.txt_isWy.Location = new System.Drawing.Point(389, 35);
+ this.txt_isWy.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txt_isWy.Name = "txt_isWy";
+ this.txt_isWy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_isWy.Properties.Appearance.Options.UseFont = true;
+ this.txt_isWy.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_isWy.Properties.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
+ "鏄澶栦粨",
+ "涓嶆槸濮斿浠�"});
+ this.txt_isWy.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_isWy.Size = new System.Drawing.Size(127, 28);
+ this.txt_isWy.TabIndex = 233;
+ //
+ // lb_isStatus
+ //
+ this.lb_isStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_isStatus.Appearance.Options.UseFont = true;
+ this.lb_isStatus.Location = new System.Drawing.Point(332, 81);
+ this.lb_isStatus.Name = "lb_isStatus";
+ this.lb_isStatus.Size = new System.Drawing.Size(51, 21);
+ this.lb_isStatus.TabIndex = 231;
+ this.lb_isStatus.Tag = "isStatus";
+ this.lb_isStatus.Text = "鐘舵�侊細";
+ //
+ // lb_name
+ //
+ this.lb_name.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_name.Appearance.Options.UseFont = true;
+ this.lb_name.Location = new System.Drawing.Point(14, 81);
+ this.lb_name.Name = "lb_name";
+ this.lb_name.Size = new System.Drawing.Size(85, 21);
+ this.lb_name.TabIndex = 216;
+ this.lb_name.Tag = "name";
+ this.lb_name.Text = "浠撳簱鍚嶇О锛�";
+ //
+ // lb_category
+ //
+ this.lb_category.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_category.Appearance.Options.UseFont = true;
+ this.lb_category.Location = new System.Drawing.Point(48, 118);
+ this.lb_category.Name = "lb_category";
+ this.lb_category.Size = new System.Drawing.Size(51, 21);
+ this.lb_category.TabIndex = 226;
+ this.lb_category.Tag = "category";
+ this.lb_category.Text = "绫诲埆锛�";
+ //
+ // lbGuid
+ //
+ this.lbGuid.AutoSize = true;
+ this.lbGuid.Location = new System.Drawing.Point(708, 35);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(0, 21);
+ this.lbGuid.TabIndex = 1;
+ //
+ // txt_remark
+ //
+ this.txt_remark.Location = new System.Drawing.Point(389, 115);
+ this.txt_remark.Name = "txt_remark";
+ this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_remark.Properties.Appearance.Options.UseFont = true;
+ this.txt_remark.Size = new System.Drawing.Size(150, 28);
+ this.txt_remark.TabIndex = 217;
+ this.txt_remark.Tag = "remark";
+ //
+ // lb_remark
+ //
+ this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_remark.Appearance.Options.UseFont = true;
+ this.lb_remark.Location = new System.Drawing.Point(332, 119);
+ this.lb_remark.Name = "lb_remark";
+ this.lb_remark.Size = new System.Drawing.Size(51, 21);
+ this.lb_remark.TabIndex = 217;
+ this.lb_remark.Tag = "remark";
+ this.lb_remark.Text = "澶囨敞锛�";
+ //
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(54, 266);
+ this.labelControl11.Location = new System.Drawing.Point(657, 38);
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(105, 266);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 21);
- this.lbGuid.TabIndex = 1;
- //
// FrmDepot
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 572);
+ this.ClientSize = new System.Drawing.Size(1128, 707);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "FrmDepot";
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.tlMenu)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
+ this.groupBox1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_category.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isWy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isWy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -424,27 +539,6 @@
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private UserControls.Data.PageBar pageBar1;
- private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.LabelControl labelControl11;
- //BQCreateConrolObejct
- private DevExpress.XtraEditors.LabelControl lb_isStatus;
-
- private DevExpress.XtraEditors.LabelControl lb_isWy;
-
- private DevExpress.XtraEditors.LabelControl lb_category;
-
- private DevExpress.XtraEditors.LabelControl lb_remark;
- private DevExpress.XtraEditors.TextEdit txt_remark;
-
- private DevExpress.XtraEditors.LabelControl lb_name;
- private DevExpress.XtraEditors.TextEdit txt_name;
-
- private DevExpress.XtraEditors.LabelControl lb_itemNo;
- private DevExpress.XtraEditors.TextEdit txt_itemNo;
- private DevExpress.XtraEditors.ComboBoxEdit txt_category;
- private DevExpress.XtraEditors.ComboBoxEdit txt_isWy;
- private DevExpress.XtraEditors.ComboBoxEdit txt_isStatus;
private DevExpress.XtraTreeList.TreeList tlMenu;
private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuName;
private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuCaption;
@@ -452,5 +546,29 @@
private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1;
private DevExpress.XtraTreeList.Columns.TreeListColumn tlcParentMenuName;
private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuType;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private DevExpress.XtraEditors.TextEdit txt_itemNo;
+ private DevExpress.XtraEditors.LabelControl lb_itemNo;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_category;
+ private DevExpress.XtraEditors.TextEdit txt_name;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_isWy;
+ private DevExpress.XtraEditors.LabelControl lb_name;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_isStatus;
+ private DevExpress.XtraEditors.TextEdit txt_remark;
+ private DevExpress.XtraEditors.LabelControl labelControl11;
+ private DevExpress.XtraEditors.LabelControl lb_remark;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.LabelControl lb_category;
+ private DevExpress.XtraEditors.LabelControl lb_isStatus;
+ private DevExpress.XtraEditors.LabelControl lb_isWy;
+ private DevExpress.XtraGrid.GridControl gridControl1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.cs
index 847fc8a..2056e48 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.cs
@@ -1,15 +1,13 @@
-锘縰sing DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Base;
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
+锘縰sing DevExpress.XtraGrid.Columns;
using DevExpress.XtraTreeList;
using DevExpress.XtraTreeList.Nodes;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
+using System.Collections.Generic;
using System.Data;
-using System.Drawing;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.Warehouse
@@ -64,6 +62,9 @@
if (clickedNode.FirstNode == null)
{
string rowGuid = clickedNode.GetValue("guid").ToString();
+ string depotGuid = clickedNode.GetValue("upGuid").ToString();
+ if (!string.IsNullOrEmpty(depotGuid))
+ rowGuid = depotGuid;
getModel(rowGuid, false, 999);
}
}
@@ -164,6 +165,9 @@
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
String rowGuid = Convert.ToString(tlMenu.FocusedNode.GetValue("guid"));
+ string depotGuid = Convert.ToString(tlMenu.FocusedNode.GetValue("upGuid"));
+ if (!string.IsNullOrEmpty(depotGuid))
+ rowGuid = depotGuid;
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -180,7 +184,17 @@
{
UtilityHelper.ChangeTab(xtraTabControl1, 1);
lbGuid.Text = "";
- UtilityHelper.CleanValue(this.panel1.Controls, true);
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gridViews.Add(gvMx1);
+ UtilityHelper.CleanValue(this.panel1.Controls, true, gridViews);
+ DataTable dt = new DataTable();
+ foreach (GridColumn col in gvMx1.Columns)
+ {
+ dt.Columns.Add(col.FieldName, typeof(string));
+ }
+ gridControl1.BindingContext = new BindingContext();
+ gridControl1.DataSource = dt;
+ gridControl1.ForceInitialize();
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -239,7 +253,9 @@
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnable(this.panel1.Controls, false);
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gridViews.Add(gvMx1);
+ UtilityHelper.ChangeEnable(this.panel1.Controls, false, gridViews);
}
}
catch (Exception ex)
@@ -300,7 +316,20 @@
{
dynamic dy = _rtn.rtnData;
lbGuid.Text = strGuid;
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gridViews.Add(gvMx1);
+ UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gridViews);
+ JObject _job = JObject.Parse(strJson);
+ JArray array = new JArray();
+ var d = _job["rtnData"]["list"];
+ foreach (var a in d)
+ {
+ array.Add(a);
+ }
+ DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ gridControl1.BindingContext = new BindingContext();
+ gridControl1.DataSource = dt;
+ gridControl1.ForceInitialize();
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -310,6 +339,7 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
}
}
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 700b018..83f1141 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -16,6 +16,7 @@
using DevExpress.XtraTab;
using System.Text.RegularExpressions;
using System.Xml;
+using System.Collections.Generic;
namespace Gs.DevApp.ToolBox
{
@@ -192,9 +193,15 @@
/// <param name="controls">controls:涓篻roupBox1.Controls/panel1.Controls</param>
/// <param name="dynamicObject">瀵瑰儚</param>
/// <param name="isEdt">鏄惁鍙紪杈�</param>
- public static void SetValueByObj(ControlCollection controls, dynamic dynamicObject, Boolean isEdt)
+ public static void SetValueByObj(ControlCollection controls, dynamic dynamicObject, Boolean isEdt, List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = null)
{
-
+ if (gridViews != null)
+ {
+ foreach (DevExpress.XtraGrid.Views.Grid.GridView gv in gridViews)
+ {
+ gv.OptionsBehavior.Editable = isEdt;
+ }
+ }
foreach (JProperty property in dynamicObject.Properties())
{
string strName = property.Name;
@@ -290,8 +297,15 @@
/// </summary>
/// <param name="controls">controls:涓篻roupBox1.Controls/panel1.Controls</param>
/// <param name="isEdt">鏄惁鍙紪杈�</param>
- public static void CleanValue(ControlCollection controls, Boolean isEdt)
+ public static void CleanValue(ControlCollection controls, Boolean isEdt, List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = null)
{
+ if (gridViews != null)
+ {
+ foreach (DevExpress.XtraGrid.Views.Grid.GridView gv in gridViews)
+ {
+ gv.OptionsBehavior.Editable = isEdt;
+ }
+ }
foreach (Control ctrl in controls)
{
ctrl.Enabled = isEdt;
@@ -328,8 +342,15 @@
/// </summary>
/// <param name="controls">controls:涓篻roupBox1.Controls/panel1.Controls</param>
/// <param name="isEdt">鏄惁鍙紪杈�</param>
- public static void ChangeEnable(ControlCollection controls, Boolean isEdt)
+ public static void ChangeEnable(ControlCollection controls, Boolean isEdt, List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = null)
{
+ if (gridViews != null)
+ {
+ foreach (DevExpress.XtraGrid.Views.Grid.GridView gv in gridViews)
+ {
+ gv.OptionsBehavior.Editable = isEdt;
+ }
+ }
foreach (Control ctrl in controls)
{
//鏂囨湰
--
Gitblit v1.9.3