From 0980130ac875cc1fc0d2f3ca34ec70fc00ff6664 Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期四, 19 九月 2024 21:31:55 +0800
Subject: [PATCH] 仓库设置
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 13
DevApp/Gs.DevApp/App.config | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.cs | 315 +++++++++++++++++++
DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.resx | 120 +++++++
DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.Designer.cs | 456 ++++++++++++++++++++++++++++
6 files changed, 903 insertions(+), 5 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 7fe3d96..aad7f10 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -26,7 +26,7 @@
<add key="LogPath" value="logs" />
<add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
<add key="PageSize" value="50" />
- <add key="Version" value="3.0" />
+ <add key="Version" value="0.1" />
<add key="IsAutoUpdater" value="0" />
<add key="AutoUpdaterXml" value="https://dianbei.top/AutoUpdater/AutoUpdater.xml" />
</appSettings>
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
index 40fa360..71b93fc 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
@@ -260,7 +260,7 @@
this.txt_formPath.Properties.Appearance.Options.UseFont = true;
this.txt_formPath.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_formPath.Properties.DropDownRows = 30;
+ this.txt_formPath.Properties.DropDownRows = 20;
this.txt_formPath.Size = new System.Drawing.Size(297, 28);
this.txt_formPath.TabIndex = 134;
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.Designer.cs
new file mode 100644
index 0000000..45e8e69
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.Designer.cs
@@ -0,0 +1,456 @@
+锘�
+namespace Gs.DevApp.DevFrm.Warehouse
+{
+ partial class FrmDepot
+ {
+
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </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();
+ this.tlMenu = new DevExpress.XtraTreeList.TreeList();
+ this.tlcMenuName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcMenuCaption = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcActions = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcParentMenuName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcMenuType = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.pageBar1 = new UserControls.Data.PageBar();
+ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.panel1 = new System.Windows.Forms.Panel();
+ 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.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();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.tlMenu)).BeginInit();
+ this.xtraTabPage2.SuspendLayout();
+ this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_category.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isWy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.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
+ //
+ this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.isSetBtn = false;
+ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Name = "toolBarMenu1";
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.TabIndex = 0;
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ 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.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1,
+ this.xtraTabPage2});
+ //
+ // xtraTabPage1
+ //
+ 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.Text = "鏁版嵁鏌ヨ";
+ //
+ // tlMenu
+ //
+ this.tlMenu.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.tlMenu.Appearance.Row.Options.UseFont = true;
+ this.tlMenu.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] {
+ this.tlcMenuName,
+ this.tlcMenuCaption,
+ this.tlcActions,
+ this.treeListColumn1,
+ this.tlcParentMenuName,
+ this.tlcMenuType});
+ this.tlMenu.Cursor = System.Windows.Forms.Cursors.Default;
+ this.tlMenu.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tlMenu.Font = new System.Drawing.Font("Tahoma", 9F);
+ this.tlMenu.Location = new System.Drawing.Point(0, 0);
+ this.tlMenu.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.tlMenu.MinWidth = 23;
+ 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.TabIndex = 4;
+ this.tlMenu.TreeLevelWidth = 21;
+ //
+ // tlcMenuName
+ //
+ this.tlcMenuName.Caption = "浠撳簱鍚嶇О";
+ this.tlcMenuName.FieldName = "name";
+ this.tlcMenuName.MinWidth = 38;
+ this.tlcMenuName.Name = "tlcMenuName";
+ this.tlcMenuName.Visible = true;
+ this.tlcMenuName.VisibleIndex = 0;
+ this.tlcMenuName.Width = 215;
+ //
+ // tlcMenuCaption
+ //
+ this.tlcMenuCaption.Caption = "浠撳簱缂栧彿";
+ this.tlcMenuCaption.FieldName = "itemNo";
+ this.tlcMenuCaption.MinWidth = 23;
+ this.tlcMenuCaption.Name = "tlcMenuCaption";
+ this.tlcMenuCaption.Visible = true;
+ this.tlcMenuCaption.VisibleIndex = 1;
+ this.tlcMenuCaption.Width = 139;
+ //
+ // tlcActions
+ //
+ this.tlcActions.Caption = "澶囨敞";
+ this.tlcActions.FieldName = "remark";
+ this.tlcActions.MinWidth = 23;
+ this.tlcActions.Name = "tlcActions";
+ this.tlcActions.Visible = true;
+ this.tlcActions.VisibleIndex = 2;
+ this.tlcActions.Width = 50;
+ //
+ // treeListColumn1
+ //
+ this.treeListColumn1.Caption = "寤虹珛鏃堕棿";
+ this.treeListColumn1.FieldName = "createTime";
+ this.treeListColumn1.Name = "treeListColumn1";
+ this.treeListColumn1.Visible = true;
+ this.treeListColumn1.VisibleIndex = 6;
+ this.treeListColumn1.Width = 104;
+ //
+ // tlcParentMenuName
+ //
+ this.tlcParentMenuName.Caption = "鐘舵��";
+ this.tlcParentMenuName.FieldName = "isStatusTxt";
+ this.tlcParentMenuName.MinWidth = 23;
+ this.tlcParentMenuName.Name = "tlcParentMenuName";
+ this.tlcParentMenuName.Visible = true;
+ this.tlcParentMenuName.VisibleIndex = 4;
+ this.tlcParentMenuName.Width = 64;
+ //
+ // tlcMenuType
+ //
+ this.tlcMenuType.Caption = "濮斿";
+ this.tlcMenuType.FieldName = "isWy";
+ this.tlcMenuType.MinWidth = 23;
+ this.tlcMenuType.Name = "tlcMenuType";
+ this.tlcMenuType.Visible = true;
+ this.tlcMenuType.VisibleIndex = 3;
+ this.tlcMenuType.Width = 50;
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 421);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.RowsCount = 50;
+ this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.TabIndex = 3;
+ this.pageBar1.TotalPages = 0;
+ //
+ // xtraTabPage2
+ //
+ 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.Text = "鏁版嵁缂栬緫";
+ //
+ // 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.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(631, 336);
+ this.panel1.TabIndex = 1;
+ //
+ // txt_category
+ //
+ this.txt_category.EditValue = "-璇烽�夋嫨-";
+ this.txt_category.Location = new System.Drawing.Point(111, 93);
+ 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);
+ this.txt_category.Properties.Appearance.Options.UseFont = true;
+ this.txt_category.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_category.Properties.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
+ "绫诲埆1",
+ "绫诲埆2"});
+ this.txt_category.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ 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.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);
+ this.txt_isStatus.Properties.Appearance.Options.UseFont = true;
+ this.txt_isStatus.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_isStatus.Properties.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
+ "姝ｅ父",
+ "閿佸畾"});
+ this.txt_isStatus.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_isStatus.Size = new System.Drawing.Size(127, 28);
+ this.txt_isStatus.TabIndex = 232;
+ //
+ // labelControl11
+ //
+ this.labelControl11.Location = new System.Drawing.Point(54, 266);
+ 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.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.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_category.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isWy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+ private UserControl.ToolBarMenu toolBarMenu1;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ 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;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcActions;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcParentMenuName;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuType;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.cs
new file mode 100644
index 0000000..847fc8a
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.cs
@@ -0,0 +1,315 @@
+锘縰sing DevExpress.XtraEditors;
+using DevExpress.XtraGrid.Views.Base;
+using DevExpress.XtraGrid.Views.Grid;
+using DevExpress.XtraGrid.Views.Grid.ViewInfo;
+using DevExpress.XtraTreeList;
+using DevExpress.XtraTreeList.Nodes;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Data;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.Warehouse
+{
+ public partial class FrmDepot : DevExpress.XtraEditors.XtraForm
+ {
+ public FrmDepot()
+ {
+ 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;
+ tlMenu.MouseDoubleClick += GcMain_MouseDoubleClick;
+ tlMenu.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ tlMenu.CustomDrawNodeIndicator += (s, ee) =>
+ {
+ if (ee.IsNodeIndicator)
+ {
+ var index = ee.Node.TreeList.GetVisibleIndexByNode(ee.Node);
+ ee.Info.DisplayText = (index + 1).ToString();
+ }
+ };
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ getPageList(1, UtilityHelper.GetPageSize());
+ }
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ //// 鑾峰彇GridView缁勪欢
+ //GridView view = sender as GridView;
+ //// 纭繚view涓嶄负null
+ //if (view == null) return;
+ //// 鑾峰彇搴旂敤鐨勭瓫閫夊櫒淇℃伅
+ //string filter = view.ActiveFilterString;
+ //MessageBox.Show(filter);
+ //getPageList(1, UtilityHelper.GetPageSize());
+ }
+ /// <summary>
+ /// 鍙屽嚮浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
+ {
+ TreeListHitInfo info = tlMenu.CalcHitInfo(e.Location);
+ if (info.Node != null)
+ {
+ TreeListNode clickedNode = this.tlMenu.FocusedNode;
+ if (clickedNode.FirstNode == null)
+ {
+ string rowGuid = clickedNode.GetValue("guid").ToString();
+ getModel(rowGuid, false, 999);
+ }
+ }
+ }
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage, pageSize);
+ }
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ //Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns);
+ //frm.UpdateParent += Frm_UpdateParent;
+ //frm.ShowDialog();
+ }
+ /// <summary>
+ /// 鏌ヨ鍥炶皟
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ {
+ string strWhere = e.Data;
+ MessageBox.Show(strWhere);
+ }
+
+ /// <summary>
+ /// 鍙栨秷浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+ {
+ UtilityHelper.ChangeTab(xtraTabControl1, 0);
+ }
+ /// <summary>
+ /// 鍒犻櫎浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
+ {
+ String rowGuid = Convert.ToString(tlMenu.FocusedNode.GetValue("guid"));
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鍒犻櫎鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + tlMenu.FocusedNode.GetValue("name") + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+ {
+ return;
+ }
+ var _obj = new
+ {
+ guidList = rowGuid,//涓诲缓
+ };
+ string strJson = "";
+ try
+ {
+ strJson = UtilityHelper.HttpPost("", "Depot/DeleteModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ UtilityHelper.ChangeTab(xtraTabControl1, 0);
+ getPageList(1, UtilityHelper.GetPageSize());
+ }
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ UtilityHelper.ChangeTab(xtraTabControl1, 0);
+ getPageList(1, UtilityHelper.GetPageSize());
+ }
+ /// <summary>
+ /// 淇敼浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+ {
+ String rowGuid = Convert.ToString(tlMenu.FocusedNode.GetValue("guid"));
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ getModel(rowGuid, true, 1);
+ }
+ /// <summary>
+ /// 鏂板浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
+ {
+ UtilityHelper.ChangeTab(xtraTabControl1, 1);
+ lbGuid.Text = "";
+ UtilityHelper.CleanValue(this.panel1.Controls, true);
+ }
+ /// <summary>
+ /// 淇濆瓨浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.isSetBtn = false;
+ if (string.IsNullOrEmpty(txt_itemNo.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("缂栧彿鍙蜂笉鑳戒负绌猴紒");
+ txt_itemNo.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(txt_name.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鍚嶇О涓嶈兘涓虹┖锛�");
+ txt_name.Focus();
+ return;
+ }
+ if (txt_category.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("绫诲瀷涓嶈兘涓虹┖锛�");
+ txt_category.Focus();
+ return;
+ }
+ if (txt_isWy.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("濮斿涓嶈兘涓虹┖锛�");
+ txt_isWy.Focus();
+ return;
+ }
+ if (txt_isStatus.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鐘舵�佷笉鑳戒负绌猴紒");
+ txt_isStatus.Focus();
+ return;
+ }
+ var _obj = new
+ {
+ guid = lbGuid.Text.Trim(),//涓诲缓
+ itemNo = txt_itemNo.Text.Trim(),
+ name = txt_name.Text.Trim(),
+ remark = txt_remark.Text.Trim(),
+ category = txt_category.SelectedIndex,
+ isWy = txt_isWy.SelectedIndex,
+ isStatus = txt_isStatus.SelectedIndex,
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", "Depot/EditModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ lbGuid.Text = _rtn.rtnData;
+ toolBarMenu1.isSetBtn = true;
+ UtilityHelper.ChangeEnable(this.panel1.Controls, false);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage, int pageSize)
+ {
+ PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "createTime", "asc", "", "");
+ string json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ string strReturn = UtilityHelper.HttpPost("", "Depot/GetListPage", json);
+ ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
+ DataTable dt = dd.rtnData.list;
+ this.tlMenu.DataSource = dt;
+ this.tlMenu.KeyFieldName = "guid";
+ this.tlMenu.ParentFieldName = "upGuid";
+ this.tlMenu.Tag = "name";
+ this.tlMenu.EndUpdate();
+ this.tlMenu.ExpandAll();
+ tlMenu.OptionsView.CheckBoxStyle = DevExpress.XtraTreeList.DefaultNodeCheckBoxStyle.Default;
+ int dddd = dd.rtnData.pages;//鎬婚〉
+ pageBar1.TotalPages = dddd;
+ pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
+ pageBar1.setTxt();
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ private void getModel(string strGuid, bool isEdit, int tabIdx)
+ {
+ if (string.IsNullOrEmpty(strGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ UtilityHelper.ChangeTab(xtraTabControl1, tabIdx);
+ var _obj = new
+ {
+ guid = strGuid,//涓诲缓
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", "Depot/GetModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ dynamic dy = _rtn.rtnData;
+ lbGuid.Text = strGuid;
+ UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
+ }
+ else
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+}
+
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.resx b/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 4f43a79..2e16884 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -253,6 +253,12 @@
<Compile Include="DevFrm\User\UserSetPwd.Designer.cs">
<DependentUpon>UserSetPwd.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Warehouse\FrmDepot.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Warehouse\FrmDepot.Designer.cs">
+ <DependentUpon>FrmDepot.cs</DependentUpon>
+ </Compile>
<Compile Include="Entity\LoginInfoModel.cs" />
<Compile Include="Entity\MesItems.cs" />
<Compile Include="Entity\PageQueryModel.cs" />
@@ -359,6 +365,9 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\User\UserSetPwd.resx">
<DependentUpon>UserSetPwd.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Warehouse\FrmDepot.resx">
+ <DependentUpon>FrmDepot.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
@@ -469,9 +478,7 @@
<None Include="Resources\logo_png_black.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
- <ItemGroup>
- <Folder Include="DevFrm\Warehouse\" />
- </ItemGroup>
+ <ItemGroup />
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.8">
<Visible>False</Visible>
--
Gitblit v1.9.3